.gitignore

@@ -1,4 +1,3 @@
-SOURCES/postgresql-12.22.tar.bz2
-SOURCES/postgresql-13.18-US.pdf
-SOURCES/postgresql-13.18.tar.bz2
-SOURCES/postgresql-setup-8.6.tar.gz
+SOURCES/postgresql-15.10.tar.bz2
+SOURCES/postgresql-16.6.tar.bz2
+SOURCES/postgresql-setup-8.9.tar.gz

.postgresql.metadata

@@ -1,4 +1,3 @@
-4f0a2bfcdaa6b370029353d7a01451d7a8282750 SOURCES/postgresql-12.22.tar.bz2
-955d79c1020409995834540260981b95e269b980 SOURCES/postgresql-13.18-US.pdf
-e314353cf318ce5e33dfb73a91cd2ac9553c9885 SOURCES/postgresql-13.18.tar.bz2
-9e12ee26bf41d3831f83049b51ae5da76de2ce12 SOURCES/postgresql-setup-8.6.tar.gz
+a5547e3dd549cbaf8b6f0bf47996edeaad9d0c6a SOURCES/postgresql-15.10.tar.bz2
+4213fa91ab843ad5956aa54bfa30adc4a6466561 SOURCES/postgresql-16.6.tar.bz2
+25a05ef36218b1de80d8eeb55f4b4e0b723bd7f6 SOURCES/postgresql-setup-8.9.tar.gz

SOURCES/generate-pdf.sh

@@ -1,58 +0,0 @@
-#! /bin/sh
-
-# This script builds the PDF version of the PostgreSQL documentation.
-#
-# In principle we could do this as part of the RPM build, but there are
-# good reasons not to:
-# 1. The build would take longer and have a larger BuildRequires footprint.
-# 2. The generated PDF has timestamps in it, which would inevitably result
-#    in multilib conflicts due to slightly different timestamps.
-# So instead, we run this manually when rebasing to a new upstream release,
-# and treat the resulting PDF as a separate Source file.
-#
-# You will need to have the docbook packages installed to run this.
-# Expect it to take about 20 minutes and use about 160MB of disk.
-
-set -e
-
-# Pass package version (e.g., 9.1.2) as argument
-VERSION=$1
-
-test -z "$VERSION" && VERSION=`awk '/^Version:/ { print $2; }' postgresql.spec`
-
-TARGETFILE=postgresql-$VERSION-US.pdf
-test -f "$TARGETFILE" && echo "$TARGETFILE exists" && exit 1
-
-echo Building $TARGETFILE ...
-
-# Unpack postgresql
-
-rm -rf postgresql-$VERSION
-
-tar xfj postgresql-$VERSION.tar.bz2
-
-cd postgresql-$VERSION
-
-# Apply any patches that affect the PDF documentation
-
-# patch -p1 < ../xxx.patch
-
-# Configure ...
-
-./configure >/dev/null
-
-# Build the PDF docs
-
-cd doc/src/sgml
-
-make postgres-US.pdf >make.log
-
-mv -f postgres-US.pdf ../../../../$TARGETFILE
-
-# Clean up
-
-cd ../../../..
-
-rm -rf postgresql-$VERSION
-
-exit 0

SOURCES/postgresql-12.22.tar.bz2.sha256

@@ -1 +0,0 @@
-8df3c0474782589d3c6f374b5133b1bd14d168086edbc13c6e72e67dd4527a3b  postgresql-12.22.tar.bz2

SOURCES/postgresql-13.18.tar.bz2.sha256

@@ -1 +0,0 @@
-ceea92abee2a8c19408d278b68de6a78b6bd3dbb4fa2d653fa7ca745d666aab1  postgresql-13.18.tar.bz2

SOURCES/postgresql-15.10.tar.bz2.sha256

@@ -0,0 +1 @@
+55abe738d441f0e58658b3ec6f88097a713b5e3b73139f6230d7b5c4c389e573  postgresql-15.10.tar.bz2

SOURCES/postgresql-16.6.tar.bz2.sha256

@@ -0,0 +1 @@
+23369cdaccd45270ac5dcc30fa9da205d5be33fa505e1f17a0418d2caeca477b  postgresql-16.6.tar.bz2

SOURCES/postgresql-logging.patch

@@ -1,19 +1,16 @@
-Default to stderr-based logging with a week's worth of daily logfiles.
-
-
-diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1rc1/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample	2011-08-18 17:23:13.000000000 -0400
-+++ postgresql-9.1rc1/src/backend/utils/misc/postgresql.conf.sample	2011-08-18 18:39:39.697526799 -0400
-@@ -279,7 +279,7 @@
- 					# requires logging_collector to be on.
+diff -ur postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample patched/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample	2022-10-10 22:57:37.000000000 +0200
++++ patched/src/backend/utils/misc/postgresql.conf.sample	2022-10-13 10:51:57.000000000 +0200
+@@ -448,7 +448,7 @@
+ 					# logging_collector to be on.
  
  # This is used when logging to stderr:
--#logging_collector = off		# Enable capturing of stderr and csvlog
-+logging_collector = on			# Enable capturing of stderr and csvlog
- 					# into log files. Required to be on for
- 					# csvlogs.
+-#logging_collector = off		# Enable capturing of stderr, jsonlog,
++logging_collector = on			# Enable capturing of stderr, jsonlog,
+ 					# and csvlog into log files. Required
+ 					# to be on for csvlogs and jsonlogs.
  					# (change requires restart)
-@@ -355,11 +355,11 @@
+@@ -456,16 +456,16 @@
  # These are only used if logging_collector is on:
  #log_directory = 'log'			# directory where log files are written,
  					# can be absolute or relative to PGDATA
@@ -22,15 +19,6 @@ diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample
  					# can include strftime() escapes
  #log_file_mode = 0600			# creation mode for log files,
  					# begin with 0 to use octal notation
--#log_truncate_on_rotation = off		# If on, an existing log file with the
-+log_truncate_on_rotation = on		# If on, an existing log file with the
- 					# same name as the new log file will be
- 					# truncated rather than appended to.
- 					# But such truncation only occurs on
-@@ -367,9 +367,9 @@
- 					# or size-driven rotation.  Default is
- 					# off, meaning append to existing files
- 					# in all cases.
 -#log_rotation_age = 1d			# Automatic rotation of logfiles will
 +log_rotation_age = 1d			# Automatic rotation of logfiles will
  					# happen after that time.  0 disables.
@@ -38,4 +26,8 @@ diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample
 +log_rotation_size = 0			# Automatic rotation of logfiles will
  					# happen after that much log output.
  					# 0 disables.
- 
+-#log_truncate_on_rotation = off		# If on, an existing log file with the
++log_truncate_on_rotation = on		# If on, an existing log file with the
+ 					# same name as the new log file will be
+ 					# truncated rather than appended to.
+ 					# But such truncation only occurs on

SOURCES/postgresql-pgcrypto-openssl3-tests.patch

@@ -1,102 +0,0 @@
-diff -ur postgresql-13.4/contrib/pgcrypto/expected/pgp-decrypt.out postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-decrypt.out
---- postgresql-13.4/contrib/pgcrypto/expected/pgp-decrypt.out	2021-08-09 16:49:05.000000000 -0400
-+++ postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-decrypt.out	2021-09-01 08:16:48.138600886 -0400
-@@ -4,20 +4,6 @@
- --  Checking ciphers
- select pgp_sym_decrypt(dearmor('
- -----BEGIN PGP MESSAGE-----
--Comment: dat1.blowfish.sha1.mdc.s2k3.z0
--
--jA0EBAMCfFNwxnvodX9g0jwB4n4s26/g5VmKzVab1bX1SmwY7gvgvlWdF3jKisvS
--yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE=
--=JcP+
-------END PGP MESSAGE-----
--'), 'foobar');
-- pgp_sym_decrypt 
-------------------
-- Secret message.
--(1 row)
--
--select pgp_sym_decrypt(dearmor('
-------BEGIN PGP MESSAGE-----
- Comment: dat1.aes.sha1.mdc.s2k3.z0
- 
- jA0EBwMCci97v0Q6Z0Zg0kQBsVf5Oe3iC+FBzUmuMV9KxmAyOMyjCc/5i8f1Eest
-diff -ur postgresql-13.4/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out
---- postgresql-13.4/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out	2021-08-09 16:49:05.000000000 -0400
-+++ postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out	2021-09-01 08:05:27.750172653 -0400
-@@ -594,13 +594,6 @@
- (1 row)
- 
- select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
--from keytbl, encdata where keytbl.id=2 and encdata.id=2;
-- pgp_pub_decrypt 
-------------------
-- Secret msg
--(1 row)
--
--select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
- from keytbl, encdata where keytbl.id=3 and encdata.id=3;
-  pgp_pub_decrypt 
- -----------------
-diff -ur postgresql-13.4/contrib/pgcrypto/Makefile postgresql-13.4.patched/contrib/pgcrypto/Makefile
---- postgresql-13.4/contrib/pgcrypto/Makefile	2021-08-09 16:49:05.000000000 -0400
-+++ postgresql-13.4.patched/contrib/pgcrypto/Makefile	2021-09-01 08:26:47.207164873 -0400
-@@ -5,7 +5,7 @@
- INT_TESTS = sha2
- 
- OSSL_SRCS = openssl.c pgp-mpi-openssl.c
--OSSL_TESTS = sha2 des 3des cast5
-+OSSL_TESTS = sha2
- 
- ZLIB_TST = pgp-compression
- ZLIB_OFF_TST = pgp-zlib-DISABLED
-@@ -49,12 +49,13 @@
- 	pgcrypto--1.0--1.1.sql
- PGFILEDESC = "pgcrypto - cryptographic functions"
- 
--REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \
-+REGRESS = init md5 sha1 hmac-md5 hmac-sha1 rijndael \
- 	$(CF_TESTS) \
--	crypt-des crypt-md5 crypt-blowfish crypt-xdes \
-+	crypt-md5 \
- 	pgp-armor pgp-decrypt pgp-encrypt $(CF_PGP_TESTS) \
- 	pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info
- 
-+#REGRESS = init pgp-pubkey-decrypt pgp-decrypt \
- EXTRA_CLEAN = gen-rtab
- 
- ifdef USE_PGXS
-diff -ur postgresql-13.4/contrib/pgcrypto/sql/pgp-decrypt.sql postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-decrypt.sql
---- postgresql-13.4/contrib/pgcrypto/sql/pgp-decrypt.sql	2021-08-09 16:49:05.000000000 -0400
-+++ postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-decrypt.sql	2021-09-01 08:16:12.525212175 -0400
-@@ -5,16 +5,6 @@
- --  Checking ciphers
- select pgp_sym_decrypt(dearmor('
- -----BEGIN PGP MESSAGE-----
--Comment: dat1.blowfish.sha1.mdc.s2k3.z0
--
--jA0EBAMCfFNwxnvodX9g0jwB4n4s26/g5VmKzVab1bX1SmwY7gvgvlWdF3jKisvS
--yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE=
--=JcP+
-------END PGP MESSAGE-----
--'), 'foobar');
--
--select pgp_sym_decrypt(dearmor('
-------BEGIN PGP MESSAGE-----
- Comment: dat1.aes.sha1.mdc.s2k3.z0
- 
- jA0EBwMCci97v0Q6Z0Zg0kQBsVf5Oe3iC+FBzUmuMV9KxmAyOMyjCc/5i8f1Eest
-diff -ur postgresql-13.4/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql
---- postgresql-13.4/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql	2021-08-09 16:49:05.000000000 -0400
-+++ postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql	2021-09-01 08:06:18.963732342 -0400
-@@ -606,9 +606,6 @@
- from keytbl, encdata where keytbl.id=1 and encdata.id=1;
- 
- select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
--from keytbl, encdata where keytbl.id=2 and encdata.id=2;
--
--select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
- from keytbl, encdata where keytbl.id=3 and encdata.id=3;
- 
- select pgp_pub_decrypt(dearmor(data), dearmor(seckey))

SOURCES/postgresql-server-pg_config.patch

@@ -6,53 +6,52 @@ rhbz#1618698 change, rather provide pg_server_config binary, which int urn means
 that we'll have to fix only a minimal set of packages which really build
 PostgreSQL server modules.
 
-diff -up postgresql-13.1/src/bin/pg_config/Makefile.patch9 postgresql-13.1/src/bin/pg_config/Makefile
---- postgresql-13.1/src/bin/pg_config/Makefile.patch9	2020-11-18 09:28:30.885453275 +0100
-+++ postgresql-13.1/src/bin/pg_config/Makefile	2020-11-18 09:31:33.926325327 +0100
+diff -ur postgresql-16beta1/src/bin/pg_config/Makefile postgresql16_pg_config_patch/src/bin/pg_config/Makefile
+--- postgresql-16beta1/src/bin/pg_config/Makefile	2023-05-22 23:08:08.000000000 +0200
++++ postgresql16_pg_config_patch/src/bin/pg_config/Makefile	2023-06-05 13:51:30.000000000 +0200
 @@ -11,6 +11,8 @@
  PGFILEDESC = "pg_config - report configuration information"
  PGAPPICON=win32
- 
+
 +PG_CONFIG = pg_server_config$(X)
 +
  subdir = src/bin/pg_config
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
-@@ -19,22 +21,22 @@ OBJS = \
+@@ -19,22 +21,22 @@
  	$(WIN32RES) \
  	pg_config.o
- 
+
 -all: pg_config
 +all: $(PG_CONFIG)
- 
+
 -pg_config: $(OBJS) | submake-libpgport
 -	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 +$(PG_CONFIG): $(OBJS) | submake-libpgport
 +	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
- 
+
  install: all installdirs
 -	$(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)'
 +	$(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
- 
+
  installdirs:
  	$(MKDIR_P) '$(DESTDIR)$(bindir)'
- 
+
  uninstall:
 -	rm -f '$(DESTDIR)$(bindir)/pg_config$(X)'
 +	rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
- 
+
  clean distclean maintainer-clean:
 -	rm -f pg_config$(X) $(OBJS)
 +	rm -f $(PG_CONFIG) $(OBJS)
  	rm -rf tmp_check
- 
+
  check:
-diff -up postgresql-13.1/src/bin/pg_config/nls.mk.patch9 postgresql-13.1/src/bin/pg_config/nls.mk
---- postgresql-13.1/src/bin/pg_config/nls.mk.patch9	2020-11-18 09:28:30.885453275 +0100
-+++ postgresql-13.1/src/bin/pg_config/nls.mk	2020-11-18 09:32:00.735599526 +0100
-@@ -1,4 +1,4 @@
+diff -ur postgresql-16beta1/src/bin/pg_config/nls.mk postgresql16_pg_config_patch/src/bin/pg_config/nls.mk
+--- postgresql-16beta1/src/bin/pg_config/nls.mk	2023-05-22 23:08:08.000000000 +0200
++++ postgresql16_pg_config_patch/src/bin/pg_config/nls.mk	2023-06-05 13:49:37.000000000 +0200
+@@ -1,3 +1,3 @@
  # src/bin/pg_config/nls.mk
 -CATALOG_NAME     = pg_config
 +CATALOG_NAME     = pg_server_config
- AVAIL_LANGUAGES  = cs de es fr he it ja ko pl pt_BR ru sv tr uk vi zh_CN
  GETTEXT_FILES    = pg_config.c ../../common/config_info.c ../../common/exec.c

SOURCES/postgresql-var-run-socket.patch

@@ -12,37 +12,34 @@ server package update, without requiring any existing postgresql.conf
 to be updated.  (Of course, a user who dislikes this behavior can still
 override it via postgresql.conf.)
 
-diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
-index 9481f2d..75532c7 100644
---- a/src/backend/utils/misc/guc.c
-+++ b/src/backend/utils/misc/guc.c
-@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] =
+diff -ur -x 'cscope*' postgresql-16beta1/src/backend/utils/misc/guc_tables.c postgresql16_socket_patch/src/backend/utils/misc/guc_tables.c
+--- postgresql-16beta1/src/backend/utils/misc/guc_tables.c	2023-05-22 23:08:08.000000000 +0200
++++ postgresql16_socket_patch/src/backend/utils/misc/guc_tables.c	2023-06-01 09:39:24.000000000 +0200
+@@ -4300,7 +4300,7 @@
+ 			GUC_LIST_INPUT | GUC_LIST_QUOTE | GUC_SUPERUSER_ONLY
  		},
  		&Unix_socket_directories,
- #ifdef HAVE_UNIX_SOCKETS
 -		DEFAULT_PGSOCKET_DIR,
 +		DEFAULT_PGSOCKET_DIR ", /tmp",
- #else
- 		"",
- #endif
-diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
-index feeff9e..3e3d784 100644
---- a/src/bin/initdb/initdb.c
-+++ b/src/bin/initdb/initdb.c
-@@ -1234,7 +1234,7 @@ setup_config(void)
- 
- #ifdef HAVE_UNIX_SOCKETS
- 	snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
--			 DEFAULT_PGSOCKET_DIR);
-+			 DEFAULT_PGSOCKET_DIR ", /tmp");
- #else
- 	snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
- #endif
-diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
-index e278fa0..9ee15d4 100644
---- a/src/include/pg_config_manual.h
-+++ b/src/include/pg_config_manual.h
-@@ -201,7 +201,7 @@
+ 		NULL, NULL, NULL
+ 	},
+
+diff -ur -x 'cscope*' postgresql-16beta1/src/bin/initdb/initdb.c postgresql16_socket_patch/src/bin/initdb/initdb.c
+--- postgresql-16beta1/src/bin/initdb/initdb.c	2023-05-22 23:08:08.000000000 +0200
++++ postgresql16_socket_patch/src/bin/initdb/initdb.c	2023-06-01 09:42:16.000000000 +0200
+@@ -1291,7 +1291,7 @@
+ 	 * these are indeed defaults, keep the postgresql.conf lines commented.
+ 	 */
+ 	conflines = replace_guc_value(conflines, "unix_socket_directories",
+-								  DEFAULT_PGSOCKET_DIR, true);
++								  DEFAULT_PGSOCKET_DIR ", /tmp", true);
+
+ 	conflines = replace_guc_value(conflines, "port",
+ 								  DEF_PGPORT_STR, true);
+diff -ur -x 'cscope*' postgresql-16beta1/src/include/pg_config_manual.h postgresql16_socket_patch/src/include/pg_config_manual.h
+--- postgresql-16beta1/src/include/pg_config_manual.h	2023-05-22 23:08:08.000000000 +0200
++++ postgresql16_socket_patch/src/include/pg_config_manual.h	2023-06-01 09:43:19.000000000 +0200
+@@ -206,7 +206,7 @@
   * support them yet.
   */
  #ifndef WIN32