From e30c0647036e097b38ed2e56536333f95957f189 Mon Sep 17 00:00:00 2001
From: Palle Girgensohn <girgen@FreeBSD.org>
Date: Thu, 20 Feb 2025 14:30:32 +0100
Subject: [PATCH] databases/postgresql??-*: Upgrade to latest versions

The PostgreSQL Global Development Group has released an update to all
supported versions of PostgreSQL, including 17.4, 16.8, 15.12, 14.17,
and 13.20.

The issues listed below affect PostgreSQL 17. Some of these issues may
also affect other supported versions of PostgreSQL.

Improve behavior of quoting functions in libpq. The fix for
CVE-2025-1094 caused the quoting functions to not honor their string
length parameters and, in some cases, cause crashes. This problem could
be noticeable from a PostgreSQL client library, based on how it is
integrated with libpq.

Fix small memory leak in pg_createsubscriber.

Also fix a problem in the FreeBSD port, where the rc script wouldn't
return properly, messing up orchestration tools like ansible. [1]

PR:		272502 [1]
Release notes:	https://www.postgresql.org/docs/release/
---
 databases/postgresql13-server/Makefile            | 2 +-
 databases/postgresql13-server/distinfo            | 6 +++---
 databases/postgresql13-server/files/postgresql.in | 4 +++-
 databases/postgresql14-server/Makefile            | 2 +-
 databases/postgresql14-server/distinfo            | 6 +++---
 databases/postgresql14-server/files/postgresql.in | 4 +++-
 databases/postgresql15-server/Makefile            | 2 +-
 databases/postgresql15-server/distinfo            | 6 +++---
 databases/postgresql15-server/files/postgresql.in | 4 +++-
 databases/postgresql16-server/Makefile            | 2 +-
 databases/postgresql16-server/distinfo            | 6 +++---
 databases/postgresql16-server/files/postgresql.in | 4 +++-
 databases/postgresql17-server/Makefile            | 2 +-
 databases/postgresql17-server/distinfo            | 6 +++---
 databases/postgresql17-server/files/postgresql.in | 4 +++-
 15 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index c1419cb0a806..87196779fe42 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?=	13.19
+DISTVERSION?=	13.20
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	1
diff --git a/databases/postgresql13-server/distinfo b/databases/postgresql13-server/distinfo
index 7ecf676fdd4d..723c2fb98f2f 100644
--- a/databases/postgresql13-server/distinfo
+++ b/databases/postgresql13-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739277660
-SHA256 (postgresql/postgresql-13.19.tar.bz2) = 482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea
-SIZE (postgresql/postgresql-13.19.tar.bz2) = 21729020
+TIMESTAMP = 1739873705
+SHA256 (postgresql/postgresql-13.20.tar.bz2) = 8134b685724d15e60d93bea206fbe0f14c8295e84f1cc91d5a3928163e4fb288
+SIZE (postgresql/postgresql-13.20.tar.bz2) = 21730844
diff --git a/databases/postgresql13-server/files/postgresql.in b/databases/postgresql13-server/files/postgresql.in
index 3cf6475a9a9b..073d3a64c004 100644
--- a/databases/postgresql13-server/files/postgresql.in
+++ b/databases/postgresql13-server/files/postgresql.in
@@ -104,10 +104,11 @@ else
 	fi
 fi
 
-command_args="-D ${postgresql_data} ${postgresql_flags}"
+command_args="-l /dev/null -D ${postgresql_data} ${postgresql_flags}"
 
 postgresql_command()
 {
+    echo "${rc_arg} ${name}"
     ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
 	    -l ${postgresql_user} \
 	    -c "exec ${command} ${command_args} ${rc_arg}"
@@ -115,6 +116,7 @@ postgresql_command()
 
 postgresql_initdb()
 {
+    echo "${rc_arg} ${name}"
     ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
 	    -l ${postgresql_user} \
 	    -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index 4cd71dcee6a3..ebd219f4a32b 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?=	14.16
+DISTVERSION?=	14.17
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	1
diff --git a/databases/postgresql14-server/distinfo b/databases/postgresql14-server/distinfo
index 8e5538ebe19c..4612d80a9b14 100644
--- a/databases/postgresql14-server/distinfo
+++ b/databases/postgresql14-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739277661
-SHA256 (postgresql/postgresql-14.16.tar.bz2) = 673c26f15ebb14306ad0ea051d8acfb3915dd342de942f5b502e5354a0ab760c
-SIZE (postgresql/postgresql-14.16.tar.bz2) = 22491073
+TIMESTAMP = 1739873706
+SHA256 (postgresql/postgresql-14.17.tar.bz2) = 6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1
+SIZE (postgresql/postgresql-14.17.tar.bz2) = 22488812
diff --git a/databases/postgresql14-server/files/postgresql.in b/databases/postgresql14-server/files/postgresql.in
index 3cf6475a9a9b..073d3a64c004 100644
--- a/databases/postgresql14-server/files/postgresql.in
+++ b/databases/postgresql14-server/files/postgresql.in
@@ -104,10 +104,11 @@ else
 	fi
 fi
 
-command_args="-D ${postgresql_data} ${postgresql_flags}"
+command_args="-l /dev/null -D ${postgresql_data} ${postgresql_flags}"
 
 postgresql_command()
 {
+    echo "${rc_arg} ${name}"
     ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
 	    -l ${postgresql_user} \
 	    -c "exec ${command} ${command_args} ${rc_arg}"
@@ -115,6 +116,7 @@ postgresql_command()
 
 postgresql_initdb()
 {
+    echo "${rc_arg} ${name}"
     ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
 	    -l ${postgresql_user} \
 	    -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
index 073ad7eea660..959c02e355a5 100644
--- a/databases/postgresql15-server/Makefile
+++ b/databases/postgresql15-server/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?=	15.11
+DISTVERSION?=	15.12
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	1
diff --git a/databases/postgresql15-server/distinfo b/databases/postgresql15-server/distinfo
index 6edb93347405..cd3b74a3a24e 100644
--- a/databases/postgresql15-server/distinfo
+++ b/databases/postgresql15-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739277663
-SHA256 (postgresql/postgresql-15.11.tar.bz2) = 5367e97e81e493301cc4aab049dfbc9b4913822985bc62379faab2a281cfbdf0
-SIZE (postgresql/postgresql-15.11.tar.bz2) = 23167652
+TIMESTAMP = 1739873912
+SHA256 (postgresql/postgresql-15.12.tar.bz2) = 3bc8462a38ca0857270cc88b949a3f6659f0d5c44c029c482355835b61a0f6f7
+SIZE (postgresql/postgresql-15.12.tar.bz2) = 23170228
diff --git a/databases/postgresql15-server/files/postgresql.in b/databases/postgresql15-server/files/postgresql.in
index 3cf6475a9a9b..073d3a64c004 100644
--- a/databases/postgresql15-server/files/postgresql.in
+++ b/databases/postgresql15-server/files/postgresql.in
@@ -104,10 +104,11 @@ else
 	fi
 fi
 
-command_args="-D ${postgresql_data} ${postgresql_flags}"
+command_args="-l /dev/null -D ${postgresql_data} ${postgresql_flags}"
 
 postgresql_command()
 {
+    echo "${rc_arg} ${name}"
     ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
 	    -l ${postgresql_user} \
 	    -c "exec ${command} ${command_args} ${rc_arg}"
@@ -115,6 +116,7 @@ postgresql_command()
 
 postgresql_initdb()
 {
+    echo "${rc_arg} ${name}"
     ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
 	    -l ${postgresql_user} \
 	    -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile
index 8f20adf5a53a..4ad9ebbd9ab4 100644
--- a/databases/postgresql16-server/Makefile
+++ b/databases/postgresql16-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	postgresql
-DISTVERSION?=	16.7
+DISTVERSION?=	16.8
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	1
diff --git a/databases/postgresql16-server/distinfo b/databases/postgresql16-server/distinfo
index 92f58d3ef78e..3bccde2d6243 100644
--- a/databases/postgresql16-server/distinfo
+++ b/databases/postgresql16-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739277664
-SHA256 (postgresql/postgresql-16.7.tar.bz2) = 62e02f77ebfc4a37f1700c20cc3ccd85ff797b5613766ebf949a7899bb2113fe
-SIZE (postgresql/postgresql-16.7.tar.bz2) = 24905167
+TIMESTAMP = 1739873709
+SHA256 (postgresql/postgresql-16.8.tar.bz2) = 9468083a56ce0ee7d294601b74dad3dd9fc69d87aff61f0a9fb63c813ff7efd8
+SIZE (postgresql/postgresql-16.8.tar.bz2) = 24911337
diff --git a/databases/postgresql16-server/files/postgresql.in b/databases/postgresql16-server/files/postgresql.in
index 3cf6475a9a9b..073d3a64c004 100644
--- a/databases/postgresql16-server/files/postgresql.in
+++ b/databases/postgresql16-server/files/postgresql.in
@@ -104,10 +104,11 @@ else
 	fi
 fi
 
-command_args="-D ${postgresql_data} ${postgresql_flags}"
+command_args="-l /dev/null -D ${postgresql_data} ${postgresql_flags}"
 
 postgresql_command()
 {
+    echo "${rc_arg} ${name}"
     ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
 	    -l ${postgresql_user} \
 	    -c "exec ${command} ${command_args} ${rc_arg}"
@@ -115,6 +116,7 @@ postgresql_command()
 
 postgresql_initdb()
 {
+    echo "${rc_arg} ${name}"
     ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
 	    -l ${postgresql_user} \
 	    -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
diff --git a/databases/postgresql17-server/Makefile b/databases/postgresql17-server/Makefile
index e118b6c3b5f5..d5d68a3fe154 100644
--- a/databases/postgresql17-server/Makefile
+++ b/databases/postgresql17-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	postgresql
-DISTVERSION?=	17.3
+DISTVERSION?=	17.4
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	1
diff --git a/databases/postgresql17-server/distinfo b/databases/postgresql17-server/distinfo
index 9487a5b669c8..24f0a6d70703 100644
--- a/databases/postgresql17-server/distinfo
+++ b/databases/postgresql17-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739277665
-SHA256 (postgresql/postgresql-17.3.tar.bz2) = 13c18b35bf67a97bd639925fc581db7fd2aae4d3548eac39fcdb8da74ace2bea
-SIZE (postgresql/postgresql-17.3.tar.bz2) = 21520115
+TIMESTAMP = 1739873710
+SHA256 (postgresql/postgresql-17.4.tar.bz2) = c4605b73fea11963406699f949b966e5d173a7ee0ccaef8938dec0ca8a995fe7
+SIZE (postgresql/postgresql-17.4.tar.bz2) = 21519810
diff --git a/databases/postgresql17-server/files/postgresql.in b/databases/postgresql17-server/files/postgresql.in
index 3cf6475a9a9b..073d3a64c004 100644
--- a/databases/postgresql17-server/files/postgresql.in
+++ b/databases/postgresql17-server/files/postgresql.in
@@ -104,10 +104,11 @@ else
 	fi
 fi
 
-command_args="-D ${postgresql_data} ${postgresql_flags}"
+command_args="-l /dev/null -D ${postgresql_data} ${postgresql_flags}"
 
 postgresql_command()
 {
+    echo "${rc_arg} ${name}"
     ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
 	    -l ${postgresql_user} \
 	    -c "exec ${command} ${command_args} ${rc_arg}"
@@ -115,6 +116,7 @@ postgresql_command()
 
 postgresql_initdb()
 {
+    echo "${rc_arg} ${name}"
     ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
 	    -l ${postgresql_user} \
 	    -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"