From 760df4964c4afa0f507796d571461ca25338645f Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 12 Aug 2025 15:41:52 +0200 Subject: [PATCH] - updated to 17.5 --- postgresql-autoconf.patch | 4 ++-- postgresql-conf.patch | 15 ++++++------ postgresql-link.patch | 2 +- postgresql.spec | 48 +++++++++++++++++++-------------------- 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/postgresql-autoconf.patch b/postgresql-autoconf.patch index a52c69a..c0c60bc 100644 --- a/postgresql-autoconf.patch +++ b/postgresql-autoconf.patch @@ -3,12 +3,12 @@ diff -ur postgresql-16.1.orig/configure.ac postgresql-16.1/configure.ac +++ postgresql-16.1/configure.ac 2023-12-13 21:54:44.023989230 +0100 @@ -19,10 +19,6 @@ - AC_INIT([PostgreSQL], [16.8], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [17.5], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not -recommended. You can remove the check from 'configure.ac' but it is then -your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2023, PostgreSQL Global Development Group]) + AC_COPYRIGHT([Copyright (c) 1996-2024, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) diff --git a/postgresql-conf.patch b/postgresql-conf.patch index b56d003..57598ca 100644 --- a/postgresql-conf.patch +++ b/postgresql-conf.patch @@ -1,6 +1,6 @@ ---- postgresql-16.1/src/backend/utils/misc/postgresql.conf.sample 2023-11-06 23:04:27.000000000 +0100 -+++ postgresql-16.1/src/backend/utils/misc/postgresql.conf.sample 2023-12-16 01:39:41.030887367 +0100 -@@ -447,28 +447,28 @@ +--- postgresql-17.5/src/backend/utils/misc/postgresql.conf.sample 2025-05-05 22:28:35.000000000 +0200 ++++ postgresql-17.5/src/backend/utils/misc/postgresql.conf.sample 2025-08-12 14:03:04.615779844 +0200 +@@ -466,28 +466,28 @@ # - Where to Log - @@ -23,9 +23,10 @@ +log_directory = '/var/log/postgresql' # 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-16.log' # log file name pattern, - # can include strftime() escapes +- # can include strftime() escapes -#log_file_mode = 0600 # creation mode for log files, ++log_filename = 'postgresql-16.log' # log file name pattern, ++ # can include strftime() escapes +log_file_mode = 0640 # creation mode for log files, # begin with 0 to use octal notation -#log_rotation_age = 1d # Automatic rotation of logfiles will @@ -36,7 +37,7 @@ # happen after that much log output. # 0 disables. #log_truncate_on_rotation = off # If on, an existing log file with the -@@ -481,9 +481,9 @@ +@@ -500,9 +500,9 @@ # in all cases. # These are relevant when logging to syslog: @@ -49,7 +50,7 @@ #syslog_split_messages = on # This is only relevant when logging to eventlog (Windows): -@@ -557,12 +557,12 @@ +@@ -576,12 +576,12 @@ # actions running at least this number # of milliseconds. #log_checkpoints = on diff --git a/postgresql-link.patch b/postgresql-link.patch index d983f4c..f65090f 100644 --- a/postgresql-link.patch +++ b/postgresql-link.patch @@ -21,7 +21,7 @@ diff -ur postgresql-16.1.orig/src/backend/Makefile postgresql-16.1/src/backend/M --- postgresql-16.1.orig/src/backend/Makefile 2023-11-06 23:04:27.000000000 +0100 +++ postgresql-16.1/src/backend/Makefile 2023-12-13 21:43:07.594106591 +0100 @@ -65,7 +65,7 @@ - ifneq ($(PORTNAME), aix) + ifneq ($(PORTNAME), win32) postgres: $(OBJS) - $(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LIBS) -o $@ diff --git a/postgresql.spec b/postgresql.spec index f212a45..9eebaa7 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -14,8 +14,8 @@ # %define beta %{nil} -%define pgsqlversion 16 -%define pgsqlpriority 160 +%define pgsqlversion 17 +%define pgsqlpriority 170 Summary: PostgreSQL Data Base Management System Summary(de.UTF-8): PostgreSQL Datenbankverwaltungssystem @@ -28,12 +28,12 @@ Summary(tr.UTF-8): Veri Tabanı Yönetim Sistemi Summary(uk.UTF-8): PostgreSQL - система керування базами даних Summary(zh_CN.UTF-8): PostgreSQL 客户端程序和库文件 Name: postgresql-%{pgsqlversion} -Version: %{pgsqlversion}.8 +Version: %{pgsqlversion}.5 Release: 1 License: BSD Group: Applications/Databases Source0: http://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 -# Source0-md5: f149a9f7aea0dbd66d366f70d6e7bda6 +# Source0-md5: 8831df48f22433ef3a3b53d20b47acea Source1: postgresql.init Source2: pgsql-Database-HOWTO-html.tar.gz # Source2-md5: 5b656ddf1db41965761f85204a14398e @@ -110,7 +110,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # omitted contribs: # spi, test_decoding, worker_spi - examples/tests # tsearch2 - old module for compatibility only -%define contrib_modules adminpack amcheck auth_delay auto_explain basebackup_to_shell basic_archive bloom %{?with_perl:bool_plperl} btree_gin btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw fuzzystrmatch hstore %{?with_perl:hstore_plperl} %{?with_python:hstore_plpython} intagg intarray isn %{?with_perl:jsonb_plperl} %{?with_python:jsonb_plpython} lo ltree %{?with_python:ltree_plpython} oid2name old_snapshot pageinspect passwordcheck pg_buffercache pg_freespacemap pg_prewarm pg_stat_statements pg_surgery pg_trgm pg_visibility pg_walinspect pgcrypto pgrowlocks pgstattuple postgres_fdw seg %{?with_selinux:sepgsql} spi sslinfo tablefunc tcn tsm_system_rows tsm_system_time unaccent uuid-ossp vacuumlo xml2 +%define contrib_modules amcheck auth_delay auto_explain basebackup_to_shell basic_archive bloom %{?with_perl:bool_plperl} btree_gin btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw fuzzystrmatch hstore %{?with_perl:hstore_plperl} %{?with_python:hstore_plpython} intagg intarray isn %{?with_perl:jsonb_plperl} %{?with_python:jsonb_plpython} lo ltree %{?with_python:ltree_plpython} oid2name pageinspect passwordcheck pg_buffercache pg_freespacemap pg_prewarm pg_stat_statements pg_surgery pg_trgm pg_visibility pg_walinspect pgcrypto pgrowlocks pgstattuple postgres_fdw seg %{?with_selinux:sepgsql} spi sslinfo tablefunc tcn tsm_system_rows tsm_system_time unaccent uuid-ossp vacuumlo xml2 %description PostgreSQL Data Base Management System (formerly known as Postgres, @@ -592,15 +592,15 @@ Różne moduły dołączone do PostgreSQL-a. %prep %setup -q -n postgresql-%{version} -%patch0 -p1 -%{?with_absolute_dbpaths:%patch1 -p1} -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%patch -P0 -p1 +%{?with_absolute_dbpaths:%patch -P1 -p1} +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 +%patch -P6 -p1 +%patch -P7 -p1 +%patch -P8 -p1 # force rebuild of bison/flex files find src -name \*.l -o -name \*.y | xargs touch @@ -699,7 +699,7 @@ tar zxf %{SOURCE2} -C howto # find locales for f in libpq5 pgscripts postgres psql initdb ecpg ecpglib6 \ plpgsql %{?with_perl:plperl} %{?with_python:plpython} \ - pg_amcheck pg_archivecleanup pg_basebackup pg_checksums pg_config pg_controldata pg_ctl pg_dump pg_resetwal pg_rewind pg_test_fsync pg_test_timing pg_upgrade pg_verifybackup pg_waldump; do + pg_amcheck pg_archivecleanup pg_basebackup pg_checksums pg_combinebackup pg_config pg_controldata pg_ctl pg_dump pg_resetwal pg_rewind pg_test_fsync pg_test_timing pg_upgrade pg_verifybackup pg_waldump pg_walsummary; do %find_lang $f-%{pgsqlversion} done # merge locales @@ -707,7 +707,7 @@ merge_lang() { cat $(for f in $@; do echo ${f}-%{pgsqlversion}.lang ; done) } merge_lang pgscripts postgres plpgsql \ - pg_amcheck pg_basebackup pg_checksums pg_config pg_controldata pg_resetwal pg_rewind pg_test_fsync pg_test_timing pg_upgrade pg_verifybackup pg_waldump > main.lang + pg_amcheck pg_basebackup pg_checksums pg_combinebackup pg_config pg_controldata pg_resetwal pg_rewind pg_test_fsync pg_test_timing pg_upgrade pg_verifybackup pg_waldump pg_walsummary > main.lang merge_lang psql initdb \ pg_archivecleanup pg_ctl pg_dump > clients.lang @@ -860,7 +860,7 @@ fi %files -f main.lang %defattr(644,root,root,755) -%doc COPYRIGHT README HISTORY doc/{KNOWN_BUGS,MISSING_FEATURES,TODO} +%doc COPYRIGHT README.md HISTORY doc/{KNOWN_BUGS,MISSING_FEATURES,TODO} %attr(754,root,root) /etc/rc.d/init.d/postgresql-%{pgsqlversion} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postgresql-%{pgsqlversion} @@ -868,7 +868,9 @@ fi %attr(755,root,root) %{pgsqllibdir}/bin/pg_amcheck %attr(755,root,root) %{pgsqllibdir}/bin/pg_basebackup %attr(755,root,root) %{pgsqllibdir}/bin/pg_checksums +%attr(755,root,root) %{pgsqllibdir}/bin/pg_combinebackup %attr(755,root,root) %{pgsqllibdir}/bin/pg_controldata +%attr(755,root,root) %{pgsqllibdir}/bin/pg_createsubscriber %attr(755,root,root) %{pgsqllibdir}/bin/pg_ctl %attr(755,root,root) %{pgsqllibdir}/bin/pg_resetwal %attr(755,root,root) %{pgsqllibdir}/bin/pg_receivewal @@ -879,6 +881,7 @@ fi %attr(755,root,root) %{pgsqllibdir}/bin/pg_upgrade %attr(755,root,root) %{pgsqllibdir}/bin/pg_verifybackup %attr(755,root,root) %{pgsqllibdir}/bin/pg_waldump +%attr(755,root,root) %{pgsqllibdir}/bin/pg_walsummary %attr(755,root,root) %{pgsqllibdir}/bin/pgbench %attr(755,root,root) %{pgsqllibdir}/bin/postgres @@ -911,7 +914,9 @@ fi %{pgsqldatadir}/man/man1/pg_amcheck.1* %{pgsqldatadir}/man/man1/pg_basebackup.1* %{pgsqldatadir}/man/man1/pg_checksums.1* +%{pgsqldatadir}/man/man1/pg_combinebackup.1* %{pgsqldatadir}/man/man1/pg_controldata.1* +%{pgsqldatadir}/man/man1/pg_createsubscriber.1* %{pgsqldatadir}/man/man1/pg_ctl.1* %{pgsqldatadir}/man/man1/pg_resetwal.1* %{pgsqldatadir}/man/man1/pg_receivewal.1* @@ -919,6 +924,7 @@ fi %{pgsqldatadir}/man/man1/pg_rewind.1* %{pgsqldatadir}/man/man1/pg_verifybackup.1* %{pgsqldatadir}/man/man1/pg_waldump.1* +%{pgsqldatadir}/man/man1/pg_walsummary.1* %{pgsqldatadir}/man/man1/pg_test_fsync.1* %{pgsqldatadir}/man/man1/pg_test_timing.1* %{pgsqldatadir}/man/man1/pg_upgrade.1* @@ -949,7 +955,7 @@ fi %files doc %defattr(644,root,root,755) -%doc doc/src/sgml/html howto +#%doc doc/src/sgml/html howto %{_examplesdir}/%{name}-%{version} %files -n postgresql-libs -f libpq5-%{pgsqlversion}.lang @@ -1135,7 +1141,6 @@ fi %attr(755,root,root) %{pgsqllibdir}/bin/oid2name %attr(755,root,root) %{pgsqllibdir}/bin/vacuumlo %attr(755,root,root) %{moduledir}/_int.so -%attr(755,root,root) %{moduledir}/adminpack.so %attr(755,root,root) %{moduledir}/amcheck.so %attr(755,root,root) %{moduledir}/auth_delay.so %attr(755,root,root) %{moduledir}/auto_explain.so @@ -1155,7 +1160,6 @@ fi %attr(755,root,root) %{moduledir}/isn.so %attr(755,root,root) %{moduledir}/ltree.so %attr(755,root,root) %{moduledir}/moddatetime.so -%attr(755,root,root) %{moduledir}/old_snapshot.so %attr(755,root,root) %{moduledir}/pageinspect.so %attr(755,root,root) %{moduledir}/passwordcheck.so %attr(755,root,root) %{moduledir}/pg_buffercache.so @@ -1176,8 +1180,6 @@ fi %attr(755,root,root) %{moduledir}/tsm_system_time.so %attr(755,root,root) %{moduledir}/unaccent.so %attr(755,root,root) %{moduledir}/uuid-ossp.so -%{extensiondir}/adminpack--*.sql -%{extensiondir}/adminpack.control %{extensiondir}/amcheck--*.sql %{extensiondir}/amcheck.control %{extensiondir}/autoinc--*.sql @@ -1216,8 +1218,6 @@ fi %{extensiondir}/ltree.control %{extensiondir}/moddatetime--*.sql %{extensiondir}/moddatetime.control -%{extensiondir}/old_snapshot--*.sql -%{extensiondir}/old_snapshot.control %{extensiondir}/pageinspect--*.sql %{extensiondir}/pageinspect.control %{extensiondir}/pg_buffercache--*.sql -- 2.49.0