Upgrade to PostgreSQL 17beta1

2024-06-03 16:13:51 +02:00 · 2024-06-03 16:13:51 +02:00 · d0226f3f8e
commit d0226f3f8e
parent ac0f192419
3 changed files with 53 additions and 40 deletions
--- a/postgresql-logging.patch
+++ b/postgresql-logging.patch
@ -1,22 +1,23 @@
-diff -up postgresql-15.0_original/src/backend/utils/misc/postgresql.conf.sample postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample
--- postgresql-15.0_original/src/backend/utils/misc/postgresql.conf.sample	2022-09-27 16:57:00.652909198 +0200
-+++ postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample	2022-09-27 17:01:56.073606108 +0200
-@@ -449,7 +449,7 @@
+diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
+index 83d5df8e46..e47d127a7b 100644
+--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
+@@ -473,7 +473,7 @@
 					# logging_collector to be on.
 
 # This is used when logging to stderr:
 -#logging_collector = off		# Enable capturing of stderr, jsonlog,
-+logging_collector = on			# 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)
-@@ -457,16 +457,16 @@
+@@ -481,16 +481,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
 -#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log'	# log file name pattern,
 +log_filename = 'postgresql-%a.log'	# log file name pattern,
- 					# can include strftime() escapes
+ 							# can include strftime() escapes
 #log_file_mode = 0600			# creation mode for log files,
 					# begin with 0 to use octal notation
 -#log_rotation_age = 1d			# Automatic rotation of logfiles will
--- a/postgresql-server-pg_config.patch
+++ b/postgresql-server-pg_config.patch
@ -6,50 +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 -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
+diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
+index c54f68c9da..a06c3c16ce 100644
+--- a/src/bin/pg_config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -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 @@
+@@ -19,22 +21,22 @@ OBJS = \
 	$(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:
+ 
+ clean distclean:
 -	rm -f pg_config$(X) $(OBJS)
 +	rm -f $(PG_CONFIG) $(OBJS)
 	rm -rf tmp_check
-
+ 
 check:
-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
+diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
+index d86c28c404..383f509d7f 100644
+--- a/src/bin/pg_config/nls.mk
+++ b/src/bin/pg_config/nls.mk
@@ -1,3 +1,3 @@
 # src/bin/pg_config/nls.mk
 -CATALOG_NAME     = pg_config
--- a/postgresql16.spec
+++ b/postgresql16.spec
@ -29,10 +29,10 @@
 %{!?sdt:%global sdt 1}
 %{!?selinux:%global selinux 1}
 %{!?runselftest:%global runselftest 1}
-%{!?postgresql_default:%global postgresql_default 1}
+%{!?postgresql_default:%global postgresql_default 0}

 %global majorname postgresql
-%global majorversion 16
+%global majorversion 17

 # By default, patch(1) creates backup files when chunks apply with offsets.
 # Turn that off to ensure such files don't get included in RPMs.
@ -47,7 +47,7 @@

 Summary: PostgreSQL client programs
 Name: %{majorname}%{majorversion}
-Version: %{majorversion}.3
+Version: %{majorversion}beta1
 Release: 1%{?dist}

 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@ -59,8 +59,8 @@ Url: http://www.postgresql.org/
 # in-place upgrade of an old database.  In most cases it will not be critical
 # that this be kept up with the latest minor release of the previous series;
 # but update when bugs affecting pg_dump output are fixed.
-%global prevmajorversion 15
-%global prevversion %{prevmajorversion}.7
+%global prevmajorversion 16
+%global prevversion %{prevmajorversion}.3
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release

@ -111,6 +111,7 @@ BuildRequires: gcc
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
 BuildRequires: perl(ExtUtils::Embed), perl-devel
 BuildRequires: perl(Opcode)
+BuildRequires: perl-FindBin
 %if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: perl-generators
 %endif
@ -922,7 +923,8 @@ find_lang_bins ()
 find_lang_bins devel.lst pg_server_config
 find_lang_bins server.lst \
 	initdb pg_basebackup pg_controldata pg_ctl pg_resetwal pg_rewind plpgsql \
-	postgres pg_checksums pg_verifybackup
+	postgres pg_checksums pg_verifybackup pg_combinebackup \
+    pg_walsummary
 find_lang_bins contrib.lst \
 	pg_amcheck pg_archivecleanup pg_test_fsync pg_test_timing pg_waldump
 find_lang_bins main.lst \
@ -967,7 +969,7 @@ make -C postgresql-setup-%{setup_version} check
 # FILES sections.
 %files -f main.lst -n %{pkgname}
 %doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
-%doc COPYRIGHT README HISTORY
+%doc COPYRIGHT HISTORY
 %doc README.rpm-dist
 %{_bindir}/clusterdb
 %{_bindir}/createdb
@ -1022,9 +1024,12 @@ make -C postgresql-setup-%{setup_version} check
 %{_bindir}/pg_test_fsync
 %{_bindir}/pg_test_timing
 %{_bindir}/pg_waldump
+
+%{_bindir}/pg_walsummary
+%{_bindir}/pg_combinebackup
+
 %{_bindir}/pgbench
 %{_bindir}/vacuumlo
-%{_datadir}/pgsql/extension/adminpack*
 %{_datadir}/pgsql/extension/amcheck*
 %{_datadir}/pgsql/extension/autoinc*
 %{_datadir}/pgsql/extension/bloom*
@ -1052,7 +1057,6 @@ make -C postgresql-setup-%{setup_version} check
 %{_datadir}/pgsql/extension/lo*
 %{_datadir}/pgsql/extension/ltree*
 %{_datadir}/pgsql/extension/moddatetime*
-%{_datadir}/pgsql/extension/old_snapshot*
 %{_datadir}/pgsql/extension/pageinspect*
 %{_datadir}/pgsql/extension/pg_buffercache*
 %{_datadir}/pgsql/extension/pg_freespacemap*
@ -1074,7 +1078,6 @@ make -C postgresql-setup-%{setup_version} check
 %{_datadir}/pgsql/extension/tsm_system_time*
 %{_datadir}/pgsql/extension/unaccent*
 %{_libdir}/pgsql/_int.so
-%{_libdir}/pgsql/adminpack.so
 %{_libdir}/pgsql/amcheck.so
 %{_libdir}/pgsql/auth_delay.so
 %{_libdir}/pgsql/auto_explain.so
@ -1111,7 +1114,6 @@ make -C postgresql-setup-%{setup_version} check
 %{_libdir}/pgsql/ltree_plpython3.so
 %endif
 %{_libdir}/pgsql/moddatetime.so
-%{_libdir}/pgsql/old_snapshot.so
 %{_libdir}/pgsql/pageinspect.so
 %{_libdir}/pgsql/passwordcheck.so
 %{_libdir}/pgsql/pg_buffercache.so
@ -1165,6 +1167,7 @@ make -C postgresql-setup-%{setup_version} check
 %files -n %{pkgname}-server -f server.lst
 %{_bindir}/initdb
 %{_bindir}/pg_basebackup
+
 %{_bindir}/pg_controldata
 %{_bindir}/pg_ctl
 %{_bindir}/pg_receivewal
@ -1173,6 +1176,9 @@ make -C postgresql-setup-%{setup_version} check
 %{_bindir}/pg_rewind
 %{_bindir}/pg_checksums
 %{_bindir}/pg_verifybackup
+
+%{_bindir}/pg_createsubscriber
+
 %{_bindir}/postgres
 %{_bindir}/postgresql-setup
 %{_bindir}/postgresql-upgrade
@ -1188,9 +1194,6 @@ make -C postgresql-setup-%{setup_version} check
 %{_datadir}/pgsql/system_constraints.sql
 %{_datadir}/pgsql/system_functions.sql
 %{_datadir}/pgsql/system_views.sql
-
-%{_datadir}/pgsql/fix-CVE-2024-4317.sql
-
 %{_datadir}/pgsql/timezonesets/
 %{_datadir}/pgsql/tsearch_data/
 %dir %{_datadir}/postgresql-setup
@ -1222,6 +1225,11 @@ make -C postgresql-setup-%{setup_version} check
 %{_mandir}/man1/postgresql-new-systemd-unit.*
 %{_mandir}/man1/postgresql-setup.*
 %{_mandir}/man1/postgresql-upgrade.*
+
+%{_mandir}/man1/pg_walsummary.*
+%{_mandir}/man1/pg_combinebackup.*
+%{_mandir}/man1/pg_createsubscriber.*
+
 %{_sbindir}/postgresql-new-systemd-unit
 %{_tmpfilesdir}/postgresql.conf
 %{_unitdir}/*postgresql*.service
@ -1255,6 +1263,9 @@ make -C postgresql-setup-%{setup_version} check
 %{_includedir}/postgres_ext.h
 %{_includedir}/pgsql/internal/*.h
 %{_includedir}/pgsql/internal/libpq/pqcomm.h
+
+%{_includedir}/pgsql/internal/libpq/protocol.h
+
 %{_includedir}/libpq/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libpq.so
@ -1330,9 +1341,8 @@ make -C postgresql-setup-%{setup_version} check


 %changelog
-* Fri May 31 2024 Ales Nezbeda <anezbeda@redhat.com> - 16.3-1
- Update to 16.3
- Remove unneeded libXML and OpenSSL patches
+* Mon Jun 3 2024 Ales Nezbeda <anezbeda@redhat.com> - 17beta1-1
+- Update to 17beta1

 * Mon Feb 26 2024 Filip Janus <fjanus@redhat.com> - 16.1-7
 - Remove /var/run/postgresql