From 1422a8ef43de083e7305398d03d9ce960d26bca7 Mon Sep 17 00:00:00 2001 From: Petr Kubat Date: Wed, 7 Aug 2019 07:27:44 +0200 Subject: [PATCH 01/45] New upstream version 11.5 --- libpq.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libpq.spec b/libpq.spec index 7da6ddb..205d256 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,7 +3,7 @@ Summary: PostgreSQL client library Name: libpq -Version: %majorversion.4 +Version: %majorversion.5 Release: 1%{?dist} License: PostgreSQL @@ -128,6 +128,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Wed Aug 07 2019 Petr Kubat - 11.5-1 +- New upstream version 11.5 + * Tue Jul 09 2019 Petr Kubat - 11.4-1 - New upstream version 11.4 diff --git a/sources b/sources index 436153b..d54ab50 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-11.4.tar.bz2) = 159fb84134e05ddc58e40a879ca52ed4d58ced7bcd1e7310d59bda84f9055339a31a92cfaab2c063a88685f7417b9a828534394bf9a2477fc33d1fb6cd26186b -SHA512 (postgresql-11.4.tar.bz2.sha256) = 9cceb9ae6403ad97ba3ae7f3eac67576b6fa216a65feb509217d4b69d2d53d3cc50160508a24770f4b9e450c97832494228b2644f0f8522d4c5a49540bf40ad7 +SHA512 (postgresql-11.5.tar.bz2) = 537148079dc6c33cfb9bf9722171e524707b42ef01369deb968d0d6e8fa9b7f16f6ce67139d9dc45fb7385defbf56aa2c0affe5ee9d76e996f31e47486192141 +SHA512 (postgresql-11.5.tar.bz2.sha256) = 73810583ae0ff2aadcb3e88d7369e9c49b02b5e5f31e5199620019c7c897b7397e4f230c7b76388c114c6c70be71fc7cc061263abb4a2dc71d2a3d58affae73f From a3710c220a2b87bdeabba34b85b94ad240a377ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 26 Nov 2019 12:44:54 +0100 Subject: [PATCH 02/45] Rebase to upstream release 11.6 --- libpq.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libpq.spec b/libpq.spec index 205d256..794e3c6 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,7 +3,7 @@ Summary: PostgreSQL client library Name: libpq -Version: %majorversion.5 +Version: %{majorversion}.6 Release: 1%{?dist} License: PostgreSQL @@ -128,6 +128,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Tue Nov 26 2019 Patrik Novotný - 11.6-1 +- New upstream version 11.6 + * Wed Aug 07 2019 Petr Kubat - 11.5-1 - New upstream version 11.5 diff --git a/sources b/sources index d54ab50..0c2a495 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-11.5.tar.bz2) = 537148079dc6c33cfb9bf9722171e524707b42ef01369deb968d0d6e8fa9b7f16f6ce67139d9dc45fb7385defbf56aa2c0affe5ee9d76e996f31e47486192141 -SHA512 (postgresql-11.5.tar.bz2.sha256) = 73810583ae0ff2aadcb3e88d7369e9c49b02b5e5f31e5199620019c7c897b7397e4f230c7b76388c114c6c70be71fc7cc061263abb4a2dc71d2a3d58affae73f +SHA512 (postgresql-11.6.tar.bz2) = de6833c0df8dbac7bc498ac573dc4c3645070d9bbdd6b5d89db3ef41e86e7fc19d5e6450aa46ee2a1392d86c33acf6b9364b2863caac49f45351a46647feecbd +SHA512 (postgresql-11.6.tar.bz2.sha256) = cb462b2ed50c6cb1e6afe914cae9a6a47fb81bcca313b1489e36a61fa0b5fa884b201e81e105fb361f344b2ccd3e123267438513bf534276d9f629f6ac3a48ce From 521b77b6797b08b0955bc914404d922c4a316e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 18 May 2020 12:14:22 +0200 Subject: [PATCH 03/45] Rebase to upstream release 12.3 --- libpq.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libpq.spec b/libpq.spec index 3af2273..d5b8ef2 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,7 +3,7 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.2 +Version: %{majorversion}.3 Release: 1%{?dist} License: PostgreSQL @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Mon May 18 2020 Patrik Novotný - 12.3-1 +- Rebase to upstream release 12.3 + * Mon Feb 17 2020 Patrik Novotný - 12.2-1 - Rebase to upstream release 12.2 diff --git a/sources b/sources index b0f9400..daf75f7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-12.2.tar.bz2) = 0e0ce8e21856e8f43e58b840c10c4e3ffae6d5207e0d778e9176e36f8e20e34633cbb06f0030a7c963c3491bb7e941456d91b55444c561cfc6f283fba76f33ee -SHA512 (postgresql-12.2.tar.bz2.sha256) = 8f94163228bb7d854d6fe4924a8a2ded00f90af662dd4a7c39b415be0826d9395e55f9b8e3b472baf7c19550e7c35198a650604a28756ad85d096bcfbaa5d1fd +SHA512 (postgresql-12.3.tar.bz2) = 68e2d244ae2a9f2138d7569bcadc1cf6f62a410fa56ad1d4ac53206f2adefabb5ae136110b41ca9246df0f8b8cb039918997e0f8a81fc7e6efb7ad10b3a59ba1 +SHA512 (postgresql-12.3.tar.bz2.sha256) = a84c02a1fc7b0b015b1be0369c7da609e054280ef560fb61b3f3fe36749f13424b1e2bd13b883d96b2c375ef2de2057d062194a203b1851b0f82984878909a93 From f0c73b0e13abc83e54a93495190d42a179bb5b8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 05:22:17 +0000 Subject: [PATCH 04/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index d5b8ef2..a160f10 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.3 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 12.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon May 18 2020 Patrik Novotný - 12.3-1 - Rebase to upstream release 12.3 From 15eca5b3ef3612435e030c675597ce8705d11ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Tue, 18 Aug 2020 09:21:13 +0200 Subject: [PATCH 05/45] Rebase to usptream release 12.4 --- libpq.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libpq.spec b/libpq.spec index a160f10..ce4d394 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,8 +3,8 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.3 -Release: 2%{?dist} +Version: %{majorversion}.4 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Tue Aug 18 2020 Patrik Novotný - 12.4-1 +- Rebase to upstream release 12.4 + * Tue Jul 28 2020 Fedora Release Engineering - 12.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index daf75f7..c8ee27a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-12.3.tar.bz2) = 68e2d244ae2a9f2138d7569bcadc1cf6f62a410fa56ad1d4ac53206f2adefabb5ae136110b41ca9246df0f8b8cb039918997e0f8a81fc7e6efb7ad10b3a59ba1 -SHA512 (postgresql-12.3.tar.bz2.sha256) = a84c02a1fc7b0b015b1be0369c7da609e054280ef560fb61b3f3fe36749f13424b1e2bd13b883d96b2c375ef2de2057d062194a203b1851b0f82984878909a93 +SHA512 (postgresql-12.4.tar.bz2) = 36daf10878ca153370829178786dd6ee366ab4d4d6dc9c527536740fdb14b688ae4c33f850eb4243a7667d23f87e4bfd1ddee0755447ad4f3996e423e391c2f3 +SHA512 (postgresql-12.4.tar.bz2.sha256) = d5c6d9c6cf189f0ef9c4ebac18782f25c0ff8420d0b063217f4ac250cca4706ec782e983326ffcb23258bcd5bf17b481e53d84aeb85b5744bfd90ea1bd33431a From 7d81dca0eae977de64a6db7aa2cd5814b1bb1112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Thu, 22 Oct 2020 13:14:13 +0200 Subject: [PATCH 06/45] Rebase to upstream release 13.0 --- .gitignore | 1 + libpq-10.3-rpm-pgsql.patch | 12 ++-- libpq-10.3-var-run-socket.patch | 22 +++--- libpq-12.1-symbol-versioning.patch | 112 +++++++++++++++-------------- libpq.spec | 7 +- sources | 4 +- 6 files changed, 84 insertions(+), 74 deletions(-) diff --git a/.gitignore b/.gitignore index d83a125..b1bf628 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /postgresql-*.tar.bz2* +/rpms diff --git a/libpq-10.3-rpm-pgsql.patch b/libpq-10.3-rpm-pgsql.patch index aec64ac..93a3532 100644 --- a/libpq-10.3-rpm-pgsql.patch +++ b/libpq-10.3-rpm-pgsql.patch @@ -7,11 +7,11 @@ directory whose path happens to include "postgres" or "pgsql" already. However, datadir and sysconfdir are already set up in the specfile's configure call, so we do not have to append anything to them. - -diff -Naur postgresql-9.0.1.orig/src/Makefile.global.in postgresql-9.0.1/src/Makefile.global.in ---- postgresql-9.0.1.orig/src/Makefile.global.in 2010-10-01 10:25:44.000000000 -0400 -+++ postgresql-9.0.1/src/Makefile.global.in 2010-10-11 11:52:05.224975308 -0400 -@@ -55,8 +55,7 @@ +diff --git a/src/Makefile.global.in b/src/Makefile.global.in +index 9a6265b3a0..c9371a07c4 100644 +--- a/src/Makefile.global.in ++++ b/src/Makefile.global.in +@@ -82,8 +82,7 @@ vpathsearch = `for f in $(addsuffix /$(1),$(subst :, ,. $(VPATH))); do test -r $ # Installation directories # # These are set by the equivalent --xxxdir configure options. We @@ -21,7 +21,7 @@ diff -Naur postgresql-9.0.1.orig/src/Makefile.global.in postgresql-9.0.1/src/Mak # # In a PGXS build, we cannot use the values inserted into Makefile.global # by configure, since the installation tree may have been relocated. -@@ -74,45 +73,23 @@ +@@ -101,45 +100,23 @@ datarootdir := @datarootdir@ bindir := @bindir@ datadir := @datadir@ diff --git a/libpq-10.3-var-run-socket.patch b/libpq-10.3-var-run-socket.patch index 8e3b193..0c3e882 100644 --- a/libpq-10.3-var-run-socket.patch +++ b/libpq-10.3-var-run-socket.patch @@ -13,10 +13,10 @@ 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 +index 4dde819652..8c2f601333 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c -@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] = +@@ -4159,7 +4159,7 @@ static struct config_string ConfigureNamesString[] = }, &Unix_socket_directories, #ifdef HAVE_UNIX_SOCKETS @@ -26,10 +26,10 @@ index 9481f2d..75532c7 100644 "", #endif diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c -index feeff9e..3e3d784 100644 +index 4ff0c6c700..6ccd96b1f2 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c -@@ -1234,7 +1234,7 @@ setup_config(void) +@@ -1091,7 +1091,7 @@ setup_config(void) #ifdef HAVE_UNIX_SOCKETS snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'", @@ -39,15 +39,15 @@ index feeff9e..3e3d784 100644 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 +index 8f3ec6bde1..066daf3f08 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h -@@ -169,7 +169,7 @@ - * here's where to twiddle it. You can also override this at runtime - * with the postmaster's -k switch. - */ --#define DEFAULT_PGSOCKET_DIR "/tmp" +@@ -203,7 +203,7 @@ + #ifndef WIN32 + #define DEFAULT_PGSOCKET_DIR "/tmp" + #else +-#define DEFAULT_PGSOCKET_DIR "" +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + #endif /* - * This is the default event source for Windows event log. diff --git a/libpq-12.1-symbol-versioning.patch b/libpq-12.1-symbol-versioning.patch index d977789..189140b 100644 --- a/libpq-12.1-symbol-versioning.patch +++ b/libpq-12.1-symbol-versioning.patch @@ -10,58 +10,11 @@ index 67e7998f55..86612a42c3 100644 installdirs: $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/config' -diff --git a/config/build-exports-gnu-ld b/config/build-exports-gnu-ld -new file mode 100755 -index 0000000000..84c48e3ade ---- /dev/null -+++ b/config/build-exports-gnu-ld -@@ -0,0 +1,41 @@ -+#! /bin/sh -+ -+# by default use PG_ prefix -+: "${SYMBOL_VERSION_PREFIX=PG_}" -+ -+# we started symbol versioning since v10 -+: "${SYMBOL_VERSION_START=9.6}" -+ -+version=$SYMBOL_VERSION_START -+version_prev= -+first=: -+ -+open_block () -+{ -+ $first || echo -+ first=false -+ echo "${SYMBOL_VERSION_PREFIX}$version {" -+ echo "global:" -+} -+ -+close_block () -+{ -+ echo "}${version_prev:+ $SYMBOL_VERSION_PREFIX$version_prev};" -+ version_prev=$version -+ version=$1 -+} -+ -+open_block -+while read -r symbol _ new_version -+do -+ case $symbol in '#'*) continue ;; esac -+ if test -n "$new_version" && test "$new_version" != "$version"; then -+ close_block "$new_version" -+ open_block -+ fi -+ echo " $symbol;" -+done -+ -+echo "local:" -+echo " *;" -+close_block diff --git a/src/Makefile.shlib b/src/Makefile.shlib -index 373d73caef..d5bd5468cd 100644 +index 29a7f6d38c..d7599a3e16 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib -@@ -231,7 +231,7 @@ ifeq ($(PORTNAME), linux) +@@ -215,7 +215,7 @@ ifeq ($(PORTNAME), linux) ifdef soname LINK.shared += -Wl,-soname,$(soname) endif @@ -70,16 +23,69 @@ index 373d73caef..d5bd5468cd 100644 exports_file = $(SHLIB_EXPORTS:%.txt=%.list) ifneq (,$(exports_file)) LINK.shared += -Wl,--version-script=$(exports_file) +diff --git a/config/build-exports-gnu-ld b/config/build-exports-gnu-ld +new file mode 100755 +index 0000000000..84c48e3ade +--- /dev/null ++++ b/config/build-exports-gnu-ld +@@ -0,0 +1,41 @@ ++#! /bin/sh ++ ++# by default use PG_ prefix ++: "${SYMBOL_VERSION_PREFIX=PG_}" ++ ++# we started symbol versioning since v10 ++: "${SYMBOL_VERSION_START=9.6}" ++ ++version=$SYMBOL_VERSION_START ++version_prev= ++first=: ++ ++open_block () ++{ ++ $first || echo ++ first=false ++ echo "${SYMBOL_VERSION_PREFIX}$version {" ++ echo "global:" ++} ++ ++close_block () ++{ ++ echo "}${version_prev:+ $SYMBOL_VERSION_PREFIX$version_prev};" ++ version_prev=$version ++ version=$1 ++} ++ ++open_block ++while read -r symbol _ new_version ++do ++ case $symbol in '#'*) continue ;; esac ++ if test -n "$new_version" && test "$new_version" != "$version"; then ++ close_block "$new_version" ++ open_block ++ fi ++ echo " $symbol;" ++done ++ ++echo "local:" ++echo " *;" ++close_block diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt -index 7c808e5215..3631340b23 100644 +index bbc1f90481..0b00a94279 100644 --- a/src/interfaces/libpq/exports.txt +++ b/src/interfaces/libpq/exports.txt -@@ -171,7 +171,7 @@ PQsslAttributeNames 168 +@@ -171,11 +171,11 @@ PQsslAttributeNames 168 PQsslAttribute 169 PQsetErrorContextVisibility 170 PQresultVerboseErrorMessage 171 -PQencryptPasswordConn 172 -+PQencryptPasswordConn 172 10 - PQresultMemorySize 173 +-PQresultMemorySize 173 ++PQencryptPasswordConn 172 10 ++PQresultMemorySize 173 12 PQhostaddr 174 PQgssEncInUse 175 +-PQgetgssctx 176 ++PQgetgssctx 176 13 + PQsetSSLKeyPassHook_OpenSSL 177 + PQgetSSLKeyPassHook_OpenSSL 178 + PQdefaultSSLKeyPassHook_OpenSSL 179 diff --git a/libpq.spec b/libpq.spec index ce4d394..2f16263 100644 --- a/libpq.spec +++ b/libpq.spec @@ -1,9 +1,9 @@ -%global majorversion 12 +%global majorversion 13 %global obsoletes_version %( echo $(( %majorversion + 1 )) ) Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.4 +Version: %{majorversion}.0 Release: 1%{?dist} License: PostgreSQL @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Wed Oct 14 2020 Patrik Novotný - 13.0-1 +- Rebase to upstream release 13.0 + * Tue Aug 18 2020 Patrik Novotný - 12.4-1 - Rebase to upstream release 12.4 diff --git a/sources b/sources index c8ee27a..5e751b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-12.4.tar.bz2) = 36daf10878ca153370829178786dd6ee366ab4d4d6dc9c527536740fdb14b688ae4c33f850eb4243a7667d23f87e4bfd1ddee0755447ad4f3996e423e391c2f3 -SHA512 (postgresql-12.4.tar.bz2.sha256) = d5c6d9c6cf189f0ef9c4ebac18782f25c0ff8420d0b063217f4ac250cca4706ec782e983326ffcb23258bcd5bf17b481e53d84aeb85b5744bfd90ea1bd33431a +SHA512 (postgresql-13.0.tar.bz2) = 1fde89487c3e50a7a07e1d42fba60d415645ea89c5d4c5c7fcc93fbd5330feca7ec991d5b274f6ab757d5d04667ca1a7efdf4eaaa760add19d2e02437465f8f5 +SHA512 (postgresql-13.0.tar.bz2.sha256) = 147e2fa96eb8aab3c80dfbfdcf2dbd220599ec9c2200bd890e30e5a8a65b3136b035835444ab2c98368ac53c8ae190d83999e344ee6b52c069b3cd6d157dd34e From 0af3abaff40621b0703343a9a6540de4b91b9787 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Fri, 30 Oct 2020 20:29:26 +0100 Subject: [PATCH 07/45] Fix the v13 update --- libpq-10.3-var-run-socket.patch | 12 +-- libpq-12.1-symbol-versioning.patch | 121 +++++++++++++++-------------- 2 files changed, 70 insertions(+), 63 deletions(-) diff --git a/libpq-10.3-var-run-socket.patch b/libpq-10.3-var-run-socket.patch index 0c3e882..4b130b0 100644 --- a/libpq-10.3-var-run-socket.patch +++ b/libpq-10.3-var-run-socket.patch @@ -42,12 +42,12 @@ diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index 8f3ec6bde1..066daf3f08 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h -@@ -203,7 +203,7 @@ +@@ -201,7 +201,7 @@ + * support them yet. + */ #ifndef WIN32 - #define DEFAULT_PGSOCKET_DIR "/tmp" - #else --#define DEFAULT_PGSOCKET_DIR "" +-#define DEFAULT_PGSOCKET_DIR "/tmp" +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + #else + #define DEFAULT_PGSOCKET_DIR "" #endif - - /* diff --git a/libpq-12.1-symbol-versioning.patch b/libpq-12.1-symbol-versioning.patch index 189140b..4c0f3b6 100644 --- a/libpq-12.1-symbol-versioning.patch +++ b/libpq-12.1-symbol-versioning.patch @@ -1,5 +1,13 @@ +commit 75040c3388d9a7dd5ad2bee53cbcc8bf3d35cd17 +Author: Honza Horak +Date: Fri Oct 30 20:16:50 2020 +0100 + + The libpq package is supposed to be used for all the PostgreSQL modules + available in RHEL 8, and ABI versioning will guarantee us that modular RPMs will + depend on appropriate libpq ABI version (picked at build-time). + diff --git a/config/Makefile b/config/Makefile -index 67e7998f55..86612a42c3 100644 +index 67e7998..86612a4 100644 --- a/config/Makefile +++ b/config/Makefile @@ -8,6 +8,7 @@ include $(top_builddir)/src/Makefile.global @@ -10,11 +18,58 @@ index 67e7998f55..86612a42c3 100644 installdirs: $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/config' +diff --git a/config/build-exports-gnu-ld b/config/build-exports-gnu-ld +new file mode 100755 +index 0000000000..84c48e3ade +--- /dev/null ++++ b/config/build-exports-gnu-ld +@@ -0,0 +1,41 @@ ++#! /bin/sh ++ ++# by default use PG_ prefix ++: "${SYMBOL_VERSION_PREFIX=PG_}" ++ ++# we started symbol versioning since v10 ++: "${SYMBOL_VERSION_START=9.6}" ++ ++version=$SYMBOL_VERSION_START ++version_prev= ++first=: ++ ++open_block () ++{ ++ $first || echo ++ first=false ++ echo "${SYMBOL_VERSION_PREFIX}$version {" ++ echo "global:" ++} ++ ++close_block () ++{ ++ echo "}${version_prev:+ $SYMBOL_VERSION_PREFIX$version_prev};" ++ version_prev=$version ++ version=$1 ++} ++ ++open_block ++while read -r symbol _ new_version ++do ++ case $symbol in '#'*) continue ;; esac ++ if test -n "$new_version" && test "$new_version" != "$version"; then ++ close_block "$new_version" ++ open_block ++ fi ++ echo " $symbol;" ++done ++ ++echo "local:" ++echo " *;" ++close_block diff --git a/src/Makefile.shlib b/src/Makefile.shlib -index 29a7f6d38c..d7599a3e16 100644 +index 373d73caef..d5bd5468cd 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib -@@ -215,7 +215,7 @@ ifeq ($(PORTNAME), linux) +@@ -231,7 +231,7 @@ ifeq ($(PORTNAME), linux) ifdef soname LINK.shared += -Wl,-soname,$(soname) endif @@ -23,55 +78,8 @@ index 29a7f6d38c..d7599a3e16 100644 exports_file = $(SHLIB_EXPORTS:%.txt=%.list) ifneq (,$(exports_file)) LINK.shared += -Wl,--version-script=$(exports_file) -diff --git a/config/build-exports-gnu-ld b/config/build-exports-gnu-ld -new file mode 100755 -index 0000000000..84c48e3ade ---- /dev/null -+++ b/config/build-exports-gnu-ld -@@ -0,0 +1,41 @@ -+#! /bin/sh -+ -+# by default use PG_ prefix -+: "${SYMBOL_VERSION_PREFIX=PG_}" -+ -+# we started symbol versioning since v10 -+: "${SYMBOL_VERSION_START=9.6}" -+ -+version=$SYMBOL_VERSION_START -+version_prev= -+first=: -+ -+open_block () -+{ -+ $first || echo -+ first=false -+ echo "${SYMBOL_VERSION_PREFIX}$version {" -+ echo "global:" -+} -+ -+close_block () -+{ -+ echo "}${version_prev:+ $SYMBOL_VERSION_PREFIX$version_prev};" -+ version_prev=$version -+ version=$1 -+} -+ -+open_block -+while read -r symbol _ new_version -+do -+ case $symbol in '#'*) continue ;; esac -+ if test -n "$new_version" && test "$new_version" != "$version"; then -+ close_block "$new_version" -+ open_block -+ fi -+ echo " $symbol;" -+done -+ -+echo "local:" -+echo " *;" -+close_block diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt -index bbc1f90481..0b00a94279 100644 +index bbc1f90..fc3ef8a 100644 --- a/src/interfaces/libpq/exports.txt +++ b/src/interfaces/libpq/exports.txt @@ -171,11 +171,11 @@ PQsslAttributeNames 168 @@ -79,13 +87,12 @@ index bbc1f90481..0b00a94279 100644 PQsetErrorContextVisibility 170 PQresultVerboseErrorMessage 171 -PQencryptPasswordConn 172 --PQresultMemorySize 173 -+PQencryptPasswordConn 172 10 -+PQresultMemorySize 173 12 ++PQencryptPasswordConn 172 10 + PQresultMemorySize 173 PQhostaddr 174 PQgssEncInUse 175 --PQgetgssctx 176 -+PQgetgssctx 176 13 - PQsetSSLKeyPassHook_OpenSSL 177 + PQgetgssctx 176 +-PQsetSSLKeyPassHook_OpenSSL 177 ++PQsetSSLKeyPassHook_OpenSSL 177 13 PQgetSSLKeyPassHook_OpenSSL 178 PQdefaultSSLKeyPassHook_OpenSSL 179 From 61ac07a3c9fb30b58eed6135dd4d28a9e0a3087f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 2 Nov 2020 13:41:45 +0100 Subject: [PATCH 08/45] Release bump for symbol versioning fix --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 2f16263..54cff49 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.0 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Mon Nov 02 2020 Patrik Novotný - 13.0-2 +- Rebuild for symbol versioning fix + * Wed Oct 14 2020 Patrik Novotný - 13.0-1 - Rebase to upstream release 13.0 From 69b48eab92881e3b830f6234bfecfb6c3de2d4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 16 Nov 2020 15:09:07 +0100 Subject: [PATCH 09/45] Rebase to upstream release 13.1 --- libpq.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libpq.spec b/libpq.spec index 54cff49..8747972 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,8 +3,8 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.0 -Release: 2%{?dist} +Version: %{majorversion}.1 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Mon Nov 16 2020 Patrik Novotný - 13.1-1 +- Rebase to upstream release 13.1 + * Mon Nov 02 2020 Patrik Novotný - 13.0-2 - Rebuild for symbol versioning fix diff --git a/sources b/sources index 5e751b5..9c16b33 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-13.0.tar.bz2) = 1fde89487c3e50a7a07e1d42fba60d415645ea89c5d4c5c7fcc93fbd5330feca7ec991d5b274f6ab757d5d04667ca1a7efdf4eaaa760add19d2e02437465f8f5 -SHA512 (postgresql-13.0.tar.bz2.sha256) = 147e2fa96eb8aab3c80dfbfdcf2dbd220599ec9c2200bd890e30e5a8a65b3136b035835444ab2c98368ac53c8ae190d83999e344ee6b52c069b3cd6d157dd34e +SHA512 (postgresql-13.1.tar.bz2) = b7bd378db1dcb74ebcd5fffba03b82d8117d182029e4caca48eef62d8bcdbeef2c2e10f18eef0cdafb9d7acf21aa164d040e56687709f97b08c51540a786eeca +SHA512 (postgresql-13.1.tar.bz2.sha256) = 58f2ad590b5946bdb3f8bc512318c60a48916ebac7df854b6b737daa609b4fd78c71fe9bf04a4103885527ed498bb46bf68ce8e656b357f9ae43b556bd48df41 From 3d219860ec766fa79d17dcf9863b681db2f498ed Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 02:31:46 +0000 Subject: [PATCH 10/45] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libpq.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libpq.spec b/libpq.spec index 8747972..2c1d972 100644 --- a/libpq.spec +++ b/libpq.spec @@ -26,6 +26,7 @@ BuildRequires: krb5-devel BuildRequires: openldap-devel BuildRequires: gettext BuildRequires: multilib-rpm-config +BuildRequires: make Obsoletes: postgresql-libs < %obsoletes_version Provides: postgresql-libs = %version-%release From 10a80637a95cd988d5d609db7f2396c2ff467d98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:47:17 +0000 Subject: [PATCH 11/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 2c1d972..81808fc 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.1 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 16 2020 Patrik Novotný - 13.1-1 - Rebase to upstream release 13.1 From 4ddf12894fcdfaeae9e30db181413f662a8fcbe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 8 Feb 2021 06:33:39 +0100 Subject: [PATCH 12/45] Fix symbol versioning --- libpq-12.1-symbol-versioning.patch | 3 ++- libpq.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libpq-12.1-symbol-versioning.patch b/libpq-12.1-symbol-versioning.patch index 4c0f3b6..9bbb15b 100644 --- a/libpq-12.1-symbol-versioning.patch +++ b/libpq-12.1-symbol-versioning.patch @@ -88,7 +88,8 @@ index bbc1f90..fc3ef8a 100644 PQresultVerboseErrorMessage 171 -PQencryptPasswordConn 172 +PQencryptPasswordConn 172 10 - PQresultMemorySize 173 +-PQresultMemorySize 173 ++PQresultMemorySize 173 12 PQhostaddr 174 PQgssEncInUse 175 PQgetgssctx 176 diff --git a/libpq.spec b/libpq.spec index 81808fc..eb846bb 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.1 -Release: 2%{?dist} +Release: 3%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Mon Feb 08 2021 Patrik Novotný - 13.1-3 +- Fix symbol versioning + * Tue Jan 26 2021 Fedora Release Engineering - 13.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 45b078a9b67828a43504a7784dc6f639a0a9e368 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Tue, 16 Feb 2021 21:20:26 +0100 Subject: [PATCH 13/45] Update to 13.2 --- libpq.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libpq.spec b/libpq.spec index eb846bb..1af5969 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,8 +3,8 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.1 -Release: 3%{?dist} +Version: %{majorversion}.2 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Tue Feb 16 2021 Honza Horak - 13.2-1 +- Update to 13.2 + * Mon Feb 08 2021 Patrik Novotný - 13.1-3 - Fix symbol versioning diff --git a/sources b/sources index 9c16b33..e8b37be 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-13.1.tar.bz2) = b7bd378db1dcb74ebcd5fffba03b82d8117d182029e4caca48eef62d8bcdbeef2c2e10f18eef0cdafb9d7acf21aa164d040e56687709f97b08c51540a786eeca -SHA512 (postgresql-13.1.tar.bz2.sha256) = 58f2ad590b5946bdb3f8bc512318c60a48916ebac7df854b6b737daa609b4fd78c71fe9bf04a4103885527ed498bb46bf68ce8e656b357f9ae43b556bd48df41 +SHA512 (postgresql-13.2.tar.bz2) = 6d93cbae8de8637deeccd851fb676a12015e8e1efa6be2424f506f232db535c54b974b11f47ed4578575f90f6de1947b1647f399794b4ec242838efd4c5b2bce +SHA512 (postgresql-13.2.tar.bz2.sha256) = 04f0daf7605be0d0df0860faa35cc079afc3e12e2986a17e4f22d71edb2da12731cd935d1e9e3a397713aeadc9ff88b5f4dea494456c1b639328fbdc0188fe7c From 78ec08d1d7fcbc7bd2b12411aee10ca156c22087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Mon, 17 May 2021 10:49:01 +0200 Subject: [PATCH 14/45] Update to 13.3 --- libpq.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libpq.spec b/libpq.spec index 1af5969..45ed2ea 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,7 +3,7 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.2 +Version: %{majorversion}.3 Release: 1%{?dist} License: PostgreSQL @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Mon May 17 2021 Filip Januš - 13.3-1 +- Update to 13.3 + * Tue Feb 16 2021 Honza Horak - 13.2-1 - Update to 13.2 diff --git a/sources b/sources index e8b37be..4d746a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-13.2.tar.bz2) = 6d93cbae8de8637deeccd851fb676a12015e8e1efa6be2424f506f232db535c54b974b11f47ed4578575f90f6de1947b1647f399794b4ec242838efd4c5b2bce -SHA512 (postgresql-13.2.tar.bz2.sha256) = 04f0daf7605be0d0df0860faa35cc079afc3e12e2986a17e4f22d71edb2da12731cd935d1e9e3a397713aeadc9ff88b5f4dea494456c1b639328fbdc0188fe7c +SHA512 (postgresql-13.3.tar.bz2) = 1560cc766982a9ea9d33c77835b20e33e11b03acb77fc75d905c565883935a7dbcd27b9b2ab6a0ecdb815261f7c259865cb3dac85c10a3181c3fcaeb4d28bf60 +SHA512 (postgresql-13.3.tar.bz2.sha256) = 5d0297a8e7596cf6305592de8a5c66f587b3d5bd9f4b4d1780357798381482e9653c42557fdde26f62eacf2f814c6d7c9ab8189faa39a5eb532384630fbcfe26 From 8f11782e8ded8d6923ad1250e3a251c859c469ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 12:08:08 +0000 Subject: [PATCH 15/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 45ed2ea..293947c 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.3 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 13.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Filip Januš - 13.3-1 - Update to 13.3 From 9e2dc02b5e92504acc9408bc7e0f6be5627cea3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Tue, 10 Aug 2021 12:03:23 +0200 Subject: [PATCH 16/45] Update to 13.4 --- libpq.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libpq.spec b/libpq.spec index 293947c..a17e506 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,8 +3,8 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.3 -Release: 2%{?dist} +Version: %{majorversion}.4 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Thu Aug 12 2021 Filip Januš - 13.4-1 +- Update to 13.4 + * Thu Jul 22 2021 Fedora Release Engineering - 13.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 4d746a3..6ce8523 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-13.3.tar.bz2) = 1560cc766982a9ea9d33c77835b20e33e11b03acb77fc75d905c565883935a7dbcd27b9b2ab6a0ecdb815261f7c259865cb3dac85c10a3181c3fcaeb4d28bf60 -SHA512 (postgresql-13.3.tar.bz2.sha256) = 5d0297a8e7596cf6305592de8a5c66f587b3d5bd9f4b4d1780357798381482e9653c42557fdde26f62eacf2f814c6d7c9ab8189faa39a5eb532384630fbcfe26 +SHA512 (postgresql-13.4.tar.bz2) = f1faf676ffdcee3e7f2c3b78f4badf44770d6be58090036d119d8fb0688e2b9f9159dd44fe850c179b8e23f256942c05edb8fcc385f0e852d16b37eace785b5a +SHA512 (postgresql-13.4.tar.bz2.sha256) = d29333d45678e17a0b342690e3772414fbb5cb90ac9e4843c42bbebc2167b5de096b2ececb5e43e1e8847e342ad0d9dd7e6a9a36617f3d7add54950da628e318 From 9f5cabe90ac61b6981c6119828ab9f14d07aba07 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:06:26 +0200 Subject: [PATCH 17/45] Rebuilt with OpenSSL 3.0.0 --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index a17e506..2711da2 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.4 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Tue Sep 14 2021 Sahana Prasad - 13.4-2 +- Rebuilt with OpenSSL 3.0.0 + * Thu Aug 12 2021 Filip Januš - 13.4-1 - Update to 13.4 From 844bc3732a073fcc772899deb1b1e0aa6b729796 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Thu, 6 Jan 2022 11:23:12 +0100 Subject: [PATCH 18/45] Update to version 14 Add new symbols into symbol-versioning patch --- libpq-12.1-symbol-versioning.patch | 18 +++++++++++------- libpq.spec | 10 +++++++--- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/libpq-12.1-symbol-versioning.patch b/libpq-12.1-symbol-versioning.patch index 9bbb15b..48a2482 100644 --- a/libpq-12.1-symbol-versioning.patch +++ b/libpq-12.1-symbol-versioning.patch @@ -15,7 +15,7 @@ index 67e7998..86612a4 100644 $(INSTALL_SCRIPT) $(srcdir)/install-sh '$(DESTDIR)$(pgxsdir)/config/install-sh' $(INSTALL_SCRIPT) $(srcdir)/missing '$(DESTDIR)$(pgxsdir)/config/missing' + $(INSTALL_SCRIPT) $(srcdir)/build-exports-gnu-ld '$(DESTDIR)$(pgxsdir)/config/build-exports-gnu-ld' - + installdirs: $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/config' diff --git a/config/build-exports-gnu-ld b/config/build-exports-gnu-ld @@ -78,17 +78,16 @@ index 373d73caef..d5bd5468cd 100644 exports_file = $(SHLIB_EXPORTS:%.txt=%.list) ifneq (,$(exports_file)) LINK.shared += -Wl,--version-script=$(exports_file) -diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt -index bbc1f90..fc3ef8a 100644 ---- a/src/interfaces/libpq/exports.txt -+++ b/src/interfaces/libpq/exports.txt -@@ -171,11 +171,11 @@ PQsslAttributeNames 168 +diff -ur postgresql-14.1/src/interfaces/libpq/exports.txt patched/src/interfaces/libpq/exports.txt +--- postgresql-14.1/src/interfaces/libpq/exports.txt 2021-11-08 22:58:24.000000000 +0100 ++++ patched/src/interfaces/libpq/exports.txt 2022-01-12 12:00:28.000000000 +0100 +@@ -171,15 +171,15 @@ PQsslAttribute 169 PQsetErrorContextVisibility 170 PQresultVerboseErrorMessage 171 -PQencryptPasswordConn 172 -+PQencryptPasswordConn 172 10 -PQresultMemorySize 173 ++PQencryptPasswordConn 172 10 +PQresultMemorySize 173 12 PQhostaddr 174 PQgssEncInUse 175 @@ -97,3 +96,8 @@ index bbc1f90..fc3ef8a 100644 +PQsetSSLKeyPassHook_OpenSSL 177 13 PQgetSSLKeyPassHook_OpenSSL 178 PQdefaultSSLKeyPassHook_OpenSSL 179 +-PQenterPipelineMode 180 ++PQenterPipelineMode 180 14 + PQexitPipelineMode 181 + PQpipelineSync 182 + PQpipelineStatus 183 diff --git a/libpq.spec b/libpq.spec index 2711da2..f76fe17 100644 --- a/libpq.spec +++ b/libpq.spec @@ -1,10 +1,10 @@ -%global majorversion 13 +%global majorversion 14 %global obsoletes_version %( echo $(( %majorversion + 1 )) ) Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.4 -Release: 2%{?dist} +Version: %{majorversion}.1 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,10 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Mon Jan 03 2022 Filip Januš - 14.1-1 +- Update to v14 +- Resolves: https://fedoraproject.org/wiki/Changes/PostgreSQL_14 + * Tue Sep 14 2021 Sahana Prasad - 13.4-2 - Rebuilt with OpenSSL 3.0.0 From df9afe246012ec6b86097c1fc3d5a443559f4a3f Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Fri, 14 Jan 2022 11:36:06 +0100 Subject: [PATCH 19/45] Update sources to v14.1 --- .gitignore | 0 sources | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 sources diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/sources b/sources old mode 100644 new mode 100755 index 6ce8523..0d7df43 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-13.4.tar.bz2) = f1faf676ffdcee3e7f2c3b78f4badf44770d6be58090036d119d8fb0688e2b9f9159dd44fe850c179b8e23f256942c05edb8fcc385f0e852d16b37eace785b5a -SHA512 (postgresql-13.4.tar.bz2.sha256) = d29333d45678e17a0b342690e3772414fbb5cb90ac9e4843c42bbebc2167b5de096b2ececb5e43e1e8847e342ad0d9dd7e6a9a36617f3d7add54950da628e318 +SHA512 (postgresql-14.1.tar.bz2) = 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd +SHA512 (postgresql-14.1.tar.bz2.sha256) = 99edebb68b62a11d4698423deae2a9349b98128909221d7ca9aff347061d56dcd11bd8a6e445dcde27b6556598a73d7beea01ea08dccca7ed517d28377145a5d From 7347ef7236cef6a6b70666e557195340eb727cc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 17:00:13 +0000 Subject: [PATCH 20/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index f76fe17..55e689f 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.1 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jan 03 2022 Filip Januš - 14.1-1 - Update to v14 - Resolves: https://fedoraproject.org/wiki/Changes/PostgreSQL_14 From 5f5880a2f075059e8cbf8818a94d4423e995e1de Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 22 Feb 2022 13:53:25 +0100 Subject: [PATCH 21/45] Update to 14.2 --- libpq.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libpq.spec b/libpq.spec index 55e689f..1805f57 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,8 +3,8 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.1 -Release: 2%{?dist} +Version: %{majorversion}.2 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,10 +131,13 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Tue Feb 22 2022 Filip Januš - 14.2-1 +- Update to 14.2 + * Thu Jan 20 2022 Fedora Release Engineering - 14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Mon Jan 03 2022 Filip Januš - 14.1-1 +* Mon Jan 03 2022 Filip Januš - 14.1-1 - Update to v14 - Resolves: https://fedoraproject.org/wiki/Changes/PostgreSQL_14 diff --git a/sources b/sources index 0d7df43..3a0b56c 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-14.1.tar.bz2) = 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd -SHA512 (postgresql-14.1.tar.bz2.sha256) = 99edebb68b62a11d4698423deae2a9349b98128909221d7ca9aff347061d56dcd11bd8a6e445dcde27b6556598a73d7beea01ea08dccca7ed517d28377145a5d +SHA512 (postgresql-14.2.tar.bz2) = 19aeb6528605dbcf5df84048b2eed8f54b202576134d3fe3900bb8f073179c4258d2581acd745887e7e6fa86ebdb5f7b159ffaa0a645d601efee7c5f7730456b +SHA512 (postgresql-14.2.tar.bz2.sha256) = 5f6ea852a9afafb5051ed2abf406d5119f6f0133d2bb275a7c14d2fe7380f9db438423ee185366a3afd8d11a27c33664f13e6fdc862b95cc3ae6ddd827d390f2 From e791651d70178ef5de5c313d427bfe6c2e5e321b Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 19 Apr 2022 14:15:41 +0200 Subject: [PATCH 22/45] Enable CI --- .fmf/version | 1 + ci.fmf | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c2528b6 --- /dev/null +++ b/ci.fmf @@ -0,0 +1,12 @@ +/test: + summary: + Basic set of quick tests for libpq. Since libpq is client library and + part of postgresql. Postgresql testsuite is used. + discover: + - name: fedora + how: fmf + url: "https://src.fedoraproject.org/tests/postgresql.git" + ref: main + filter: tag:libpq + execute: + how: tmt From 2c45de9a6a199a11394bb4cbf3a226e14f5bae53 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 14 Jun 2022 14:49:42 +0200 Subject: [PATCH 23/45] Update to 14.3 --- libpq.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libpq.spec b/libpq.spec index 1805f57..e77ed2e 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,7 +3,7 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.2 +Version: %{majorversion}.3 Release: 1%{?dist} License: PostgreSQL @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Tue Jun 14 2022 Filip Januš - 14.3-1 +- Update to 14.3 + * Tue Feb 22 2022 Filip Januš - 14.2-1 - Update to 14.2 diff --git a/sources b/sources index 3a0b56c..477dee1 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-14.2.tar.bz2) = 19aeb6528605dbcf5df84048b2eed8f54b202576134d3fe3900bb8f073179c4258d2581acd745887e7e6fa86ebdb5f7b159ffaa0a645d601efee7c5f7730456b -SHA512 (postgresql-14.2.tar.bz2.sha256) = 5f6ea852a9afafb5051ed2abf406d5119f6f0133d2bb275a7c14d2fe7380f9db438423ee185366a3afd8d11a27c33664f13e6fdc862b95cc3ae6ddd827d390f2 +SHA512 (postgresql-14.3.tar.bz2) = 70e6f67b5729a23f80b92b04e3fad2e09596b939660e3ddebf499d06af946459a45a019279e05413673e7b65d09a28a0440ed3c2ae565068466ed37e2d4f6f17 +SHA512 (postgresql-14.3.tar.bz2.sha256) = 29a4b501bdd17ad36e6b7c8c8e7c2f418b72c70811317409ad067d2d059e6adaf511efa367393d6837dcab458537fb3f297e9046bfc38072dc5d1af6338404f5 From 8e9e8cefd729fdbe43cc778be425820ca1b062ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 18:42:52 +0000 Subject: [PATCH 24/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index e77ed2e..ddc8def 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.3 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 14.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 14 2022 Filip Januš - 14.3-1 - Update to 14.3 From a330d64407fc24c5d05f06f5a15323f9e4d603c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Tue, 1 Nov 2022 14:52:40 +0100 Subject: [PATCH 25/45] Rebase to PostgreSQL 15 Update patches, especially symbol versioning Resolves: https://fedoraproject.org/wiki/Changes/PostgreSQL_15 --- libpq-12.1-symbol-versioning.patch | 13 ++++++++----- libpq.spec | 12 ++++++++---- sources | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/libpq-12.1-symbol-versioning.patch b/libpq-12.1-symbol-versioning.patch index 48a2482..cd5edc3 100644 --- a/libpq-12.1-symbol-versioning.patch +++ b/libpq-12.1-symbol-versioning.patch @@ -78,10 +78,10 @@ index 373d73caef..d5bd5468cd 100644 exports_file = $(SHLIB_EXPORTS:%.txt=%.list) ifneq (,$(exports_file)) LINK.shared += -Wl,--version-script=$(exports_file) -diff -ur postgresql-14.1/src/interfaces/libpq/exports.txt patched/src/interfaces/libpq/exports.txt ---- postgresql-14.1/src/interfaces/libpq/exports.txt 2021-11-08 22:58:24.000000000 +0100 -+++ patched/src/interfaces/libpq/exports.txt 2022-01-12 12:00:28.000000000 +0100 -@@ -171,15 +171,15 @@ +diff -ur postgresql-15.0_original/src/interfaces/libpq/exports.txt postgresql-15.0/src/interfaces/libpq/exports.txt +--- postgresql-15.0_original/src/interfaces/libpq/exports.txt 2022-10-10 22:57:37.000000000 +0200 ++++ postgresql-15.0/src/interfaces/libpq/exports.txt 2022-10-19 15:07:19.733908438 +0200 +@@ -171,16 +171,16 @@ PQsslAttribute 169 PQsetErrorContextVisibility 170 PQresultVerboseErrorMessage 171 @@ -97,7 +97,10 @@ diff -ur postgresql-14.1/src/interfaces/libpq/exports.txt patched/src/interfaces PQgetSSLKeyPassHook_OpenSSL 178 PQdefaultSSLKeyPassHook_OpenSSL 179 -PQenterPipelineMode 180 +-PQexitPipelineMode 181 +PQenterPipelineMode 180 14 - PQexitPipelineMode 181 ++PQexitPipelineMode 181 15 PQpipelineSync 182 PQpipelineStatus 183 + PQsetTraceFlags 184 + \ No newline at end of file diff --git a/libpq.spec b/libpq.spec index ddc8def..3c92fff 100644 --- a/libpq.spec +++ b/libpq.spec @@ -1,10 +1,10 @@ -%global majorversion 14 +%global majorversion 15 %global obsoletes_version %( echo $(( %majorversion + 1 )) ) Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.3 -Release: 2%{?dist} +Version: %{majorversion}.0 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -129,8 +129,12 @@ find_lang_bins %name-devel.lst pg_config %_libdir/libpq.so %_libdir/pkgconfig/libpq.pc - %changelog +* Tue Sep 27 2022 Ondrej Sloup - 15.1-1 +- Update to v15 +- Update patches +- Resolves: https://fedoraproject.org/wiki/Changes/PostgreSQL_15 + * Thu Jul 21 2022 Fedora Release Engineering - 14.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 477dee1..74eb452 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-14.3.tar.bz2) = 70e6f67b5729a23f80b92b04e3fad2e09596b939660e3ddebf499d06af946459a45a019279e05413673e7b65d09a28a0440ed3c2ae565068466ed37e2d4f6f17 -SHA512 (postgresql-14.3.tar.bz2.sha256) = 29a4b501bdd17ad36e6b7c8c8e7c2f418b72c70811317409ad067d2d059e6adaf511efa367393d6837dcab458537fb3f297e9046bfc38072dc5d1af6338404f5 +SHA512 (postgresql-15.0.tar.bz2) = 537d223be619d8b192756791cb614638f7188532f981e233bbfa8c0245adf5afe94ba5160d771af77f7d4ead41bcf346cbb2197e1358a6411ead06b19e29f120 +SHA512 (postgresql-15.0.tar.bz2.sha256) = 9da21058369ceac6870f5394853ba58c90f0b5dbcd1524f170033598d6cd5e38b4329373e97f242c4f56a93ae0b1a212e762740149937f519db22ed7435c6fe8 From 64accdf4cce80152ccdcfa42a08d761aff067bbd Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Mon, 5 Dec 2022 14:57:06 +0100 Subject: [PATCH 26/45] Revert versioning patch, because there are no new symbols in libpq 15 --- libpq-12.1-symbol-versioning.patch | 13 +++++-------- libpq.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libpq-12.1-symbol-versioning.patch b/libpq-12.1-symbol-versioning.patch index cd5edc3..48a2482 100644 --- a/libpq-12.1-symbol-versioning.patch +++ b/libpq-12.1-symbol-versioning.patch @@ -78,10 +78,10 @@ index 373d73caef..d5bd5468cd 100644 exports_file = $(SHLIB_EXPORTS:%.txt=%.list) ifneq (,$(exports_file)) LINK.shared += -Wl,--version-script=$(exports_file) -diff -ur postgresql-15.0_original/src/interfaces/libpq/exports.txt postgresql-15.0/src/interfaces/libpq/exports.txt ---- postgresql-15.0_original/src/interfaces/libpq/exports.txt 2022-10-10 22:57:37.000000000 +0200 -+++ postgresql-15.0/src/interfaces/libpq/exports.txt 2022-10-19 15:07:19.733908438 +0200 -@@ -171,16 +171,16 @@ +diff -ur postgresql-14.1/src/interfaces/libpq/exports.txt patched/src/interfaces/libpq/exports.txt +--- postgresql-14.1/src/interfaces/libpq/exports.txt 2021-11-08 22:58:24.000000000 +0100 ++++ patched/src/interfaces/libpq/exports.txt 2022-01-12 12:00:28.000000000 +0100 +@@ -171,15 +171,15 @@ PQsslAttribute 169 PQsetErrorContextVisibility 170 PQresultVerboseErrorMessage 171 @@ -97,10 +97,7 @@ diff -ur postgresql-15.0_original/src/interfaces/libpq/exports.txt postgresql-15 PQgetSSLKeyPassHook_OpenSSL 178 PQdefaultSSLKeyPassHook_OpenSSL 179 -PQenterPipelineMode 180 --PQexitPipelineMode 181 +PQenterPipelineMode 180 14 -+PQexitPipelineMode 181 15 + PQexitPipelineMode 181 PQpipelineSync 182 PQpipelineStatus 183 - PQsetTraceFlags 184 - \ No newline at end of file diff --git a/libpq.spec b/libpq.spec index 3c92fff..55be9b7 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.0 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,7 +130,11 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog -* Tue Sep 27 2022 Ondrej Sloup - 15.1-1 +* Mon Dec 05 2022 Filip Janus - 15.0-2 +- Revert versioning patch +- There are no new symbols in libpq 15 + +* Tue Sep 27 2022 Ondrej Sloup - 15.0-1 - Update to v15 - Update patches - Resolves: https://fedoraproject.org/wiki/Changes/PostgreSQL_15 From d5a1f3d83e1b5faa50013c43d24516be195c5be3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 17:11:34 +0000 Subject: [PATCH 27/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 55be9b7..47e74ae 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.0 -Release: 2%{?dist} +Release: 3%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 15.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Dec 05 2022 Filip Janus - 15.0-2 - Revert versioning patch - There are no new symbols in libpq 15 From c1b623a71b97dfffc832c3f6ada72e794ca6bdf1 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Wed, 3 May 2023 13:49:57 +0200 Subject: [PATCH 28/45] migrated to SPDX license From 29681bd04ecca297d062171bf9efcbc735e1ef04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 11:48:30 +0000 Subject: [PATCH 29/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 47e74ae..104b304 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.0 -Release: 3%{?dist} +Release: 4%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 15.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 15.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ffe73c3696a608177fdd40150419cbe6ba1e8e6c Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Wed, 2 Aug 2023 12:54:52 +0200 Subject: [PATCH 30/45] update to 15.3 --- libpq.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libpq.spec b/libpq.spec index 104b304..d621239 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,8 +3,8 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.0 -Release: 4%{?dist} +Version: %{majorversion}.3 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Wed Aug 2 2023 Filip Janus - 15.3-1 +- Update to the latest upstream version + * Thu Jul 20 2023 Fedora Release Engineering - 15.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 74eb452..214826a 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-15.0.tar.bz2) = 537d223be619d8b192756791cb614638f7188532f981e233bbfa8c0245adf5afe94ba5160d771af77f7d4ead41bcf346cbb2197e1358a6411ead06b19e29f120 -SHA512 (postgresql-15.0.tar.bz2.sha256) = 9da21058369ceac6870f5394853ba58c90f0b5dbcd1524f170033598d6cd5e38b4329373e97f242c4f56a93ae0b1a212e762740149937f519db22ed7435c6fe8 +SHA512 (postgresql-15.3.tar.bz2) = cac97edeb40df1e8f2162f401b465751132929d7249495ef001e950645a2db46343bd732e7bd6504a7f795e25aea66724f2f4ab0065e3d9331b36db4b3a3bec6 +SHA512 (postgresql-15.3.tar.bz2.sha256) = 1c4874650352b8c61b24271d668e09fe64d7e3a961bb7fcf46a5cafe2d4daa8d7a25e2e0ff6fc49ad889c82be8fd03709ff1c032f87f943ba5feb5b3892c7b15 From 629dad748050bf5ae7bdd8f50bcfdee871854b1e Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 5 Dec 2023 14:57:41 +0100 Subject: [PATCH 31/45] Update to version 16 Build with ICU support --- libpq-10.3-var-run-socket.patch | 52 +++++++------ libpq-12.1-symbol-versioning.patch | 113 +++++++++++++++-------------- libpq.spec | 9 ++- sources | 4 +- 4 files changed, 92 insertions(+), 86 deletions(-) diff --git a/libpq-10.3-var-run-socket.patch b/libpq-10.3-var-run-socket.patch index 4b130b0..2c5c128 100644 --- a/libpq-10.3-var-run-socket.patch +++ b/libpq-10.3-var-run-socket.patch @@ -1,3 +1,4 @@ + Change the built-in default socket directory to be /var/run/postgresql. For backwards compatibility with (probably non-libpq-based) clients that might still expect to find the socket in /tmp, also create a socket in @@ -12,37 +13,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 4dde819652..8c2f601333 100644 ---- a/src/backend/utils/misc/guc.c -+++ b/src/backend/utils/misc/guc.c -@@ -4159,7 +4159,7 @@ static struct config_string ConfigureNamesString[] = +diff -ur postgresql-16.1/src/backend/utils/misc/guc_tables.c pg_patched/src/backend/utils/misc/guc_tables.c +--- postgresql-16.1/src/backend/utils/misc/guc_tables.c 2023-11-06 23:04:27.000000000 +0100 ++++ pg_patched/src/backend/utils/misc/guc_tables.c 2023-12-05 12:02:46.000000000 +0100 +@@ -4271,7 +4271,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 4ff0c6c700..6ccd96b1f2 100644 ---- a/src/bin/initdb/initdb.c -+++ b/src/bin/initdb/initdb.c -@@ -1091,7 +1091,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 8f3ec6bde1..066daf3f08 100644 ---- a/src/include/pg_config_manual.h -+++ b/src/include/pg_config_manual.h -@@ -201,7 +201,7 @@ + NULL, NULL, NULL + }, + +diff -ur postgresql-16.1/src/bin/initdb/initdb.c pg_patched/src/bin/initdb/initdb.c +--- postgresql-16.1/src/bin/initdb/initdb.c 2023-11-06 23:04:27.000000000 +0100 ++++ pg_patched/src/bin/initdb/initdb.c 2023-12-05 12:04:19.000000000 +0100 +@@ -1287,7 +1287,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 postgresql-16.1/src/include/pg_config_manual.h pg_patched/src/include/pg_config_manual.h +--- postgresql-16.1/src/include/pg_config_manual.h 2023-11-06 23:04:27.000000000 +0100 ++++ pg_patched/src/include/pg_config_manual.h 2023-12-05 11:45:20.000000000 +0100 +@@ -206,7 +206,7 @@ * support them yet. */ #ifndef WIN32 diff --git a/libpq-12.1-symbol-versioning.patch b/libpq-12.1-symbol-versioning.patch index 48a2482..955510c 100644 --- a/libpq-12.1-symbol-versioning.patch +++ b/libpq-12.1-symbol-versioning.patch @@ -6,11 +6,10 @@ Date: Fri Oct 30 20:16:50 2020 +0100 available in RHEL 8, and ABI versioning will guarantee us that modular RPMs will depend on appropriate libpq ABI version (picked at build-time). -diff --git a/config/Makefile b/config/Makefile -index 67e7998..86612a4 100644 ---- a/config/Makefile -+++ b/config/Makefile -@@ -8,6 +8,7 @@ include $(top_builddir)/src/Makefile.global +diff -ur postgresql-16.1/config/Makefile postgresql_patched/config/Makefile +--- postgresql-16.1/config/Makefile 2023-11-06 23:04:27.000000000 +0100 ++++ postgresql_patched/config/Makefile 2023-12-05 10:43:19.733619095 +0100 +@@ -8,6 +8,7 @@ install: all installdirs $(INSTALL_SCRIPT) $(srcdir)/install-sh '$(DESTDIR)$(pgxsdir)/config/install-sh' $(INSTALL_SCRIPT) $(srcdir)/missing '$(DESTDIR)$(pgxsdir)/config/missing' @@ -18,6 +17,46 @@ index 67e7998..86612a4 100644 installdirs: $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/config' +diff -ur postgresql-16.1/src/interfaces/libpq/exports.txt postgresql_patched/src/interfaces/libpq/exports.txt +--- postgresql-16.1/src/interfaces/libpq/exports.txt 2023-11-06 23:04:27.000000000 +0100 ++++ postgresql_patched/src/interfaces/libpq/exports.txt 2023-12-05 10:48:24.627604638 +0100 +@@ -171,19 +171,19 @@ + PQsslAttribute 169 + PQsetErrorContextVisibility 170 + PQresultVerboseErrorMessage 171 +-PQencryptPasswordConn 172 +-PQresultMemorySize 173 ++PQencryptPasswordConn 172 10 ++PQresultMemorySize 173 12 + PQhostaddr 174 + PQgssEncInUse 175 + PQgetgssctx 176 +-PQsetSSLKeyPassHook_OpenSSL 177 ++PQsetSSLKeyPassHook_OpenSSL 177 13 + PQgetSSLKeyPassHook_OpenSSL 178 + PQdefaultSSLKeyPassHook_OpenSSL 179 +-PQenterPipelineMode 180 ++PQenterPipelineMode 180 14 + PQexitPipelineMode 181 + PQpipelineSync 182 + PQpipelineStatus 183 + PQsetTraceFlags 184 + PQmblenBounded 185 + PQsendFlushRequest 186 +-PQconnectionUsedGSSAPI 187 ++PQconnectionUsedGSSAPI 187 16 +diff -ur postgresql-16.1/src/Makefile.shlib postgresql_patched/src/Makefile.shlib +--- postgresql-16.1/src/Makefile.shlib 2023-11-06 23:04:27.000000000 +0100 ++++ postgresql_patched/src/Makefile.shlib 2023-12-05 10:43:19.739634021 +0100 +@@ -185,7 +185,7 @@ + ifdef soname + LINK.shared += -Wl,-soname,$(soname) + endif +- BUILD.exports = ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@ ++ BUILD.exports = $(SHELL) $(top_srcdir)/config/build-exports-gnu-ld < $< > $@ + exports_file = $(SHLIB_EXPORTS:%.txt=%.list) + ifneq (,$(exports_file)) + LINK.shared += -Wl,--version-script=$(exports_file) diff --git a/config/build-exports-gnu-ld b/config/build-exports-gnu-ld new file mode 100755 index 0000000000..84c48e3ade @@ -38,66 +77,30 @@ index 0000000000..84c48e3ade + +open_block () +{ -+ $first || echo -+ first=false -+ echo "${SYMBOL_VERSION_PREFIX}$version {" -+ echo "global:" ++ $first || echo ++ first=false ++ echo "${SYMBOL_VERSION_PREFIX}$version {" ++ echo "global:" +} + +close_block () +{ -+ echo "}${version_prev:+ $SYMBOL_VERSION_PREFIX$version_prev};" -+ version_prev=$version -+ version=$1 ++ echo "}${version_prev:+ $SYMBOL_VERSION_PREFIX$version_prev};" ++ version_prev=$version ++ version=$1 +} + +open_block +while read -r symbol _ new_version +do -+ case $symbol in '#'*) continue ;; esac -+ if test -n "$new_version" && test "$new_version" != "$version"; then -+ close_block "$new_version" -+ open_block -+ fi -+ echo " $symbol;" ++ case $symbol in '#'*) continue ;; esac ++ if test -n "$new_version" && test "$new_version" != "$version"; then ++ close_block "$new_version" ++ open_block ++ fi ++ echo " $symbol;" +done + +echo "local:" -+echo " *;" ++echo " *;" +close_block -diff --git a/src/Makefile.shlib b/src/Makefile.shlib -index 373d73caef..d5bd5468cd 100644 ---- a/src/Makefile.shlib -+++ b/src/Makefile.shlib -@@ -231,7 +231,7 @@ ifeq ($(PORTNAME), linux) - ifdef soname - LINK.shared += -Wl,-soname,$(soname) - endif -- BUILD.exports = ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@ -+ BUILD.exports = $(SHELL) $(top_srcdir)/config/build-exports-gnu-ld < $< > $@ - exports_file = $(SHLIB_EXPORTS:%.txt=%.list) - ifneq (,$(exports_file)) - LINK.shared += -Wl,--version-script=$(exports_file) -diff -ur postgresql-14.1/src/interfaces/libpq/exports.txt patched/src/interfaces/libpq/exports.txt ---- postgresql-14.1/src/interfaces/libpq/exports.txt 2021-11-08 22:58:24.000000000 +0100 -+++ patched/src/interfaces/libpq/exports.txt 2022-01-12 12:00:28.000000000 +0100 -@@ -171,15 +171,15 @@ - PQsslAttribute 169 - PQsetErrorContextVisibility 170 - PQresultVerboseErrorMessage 171 --PQencryptPasswordConn 172 --PQresultMemorySize 173 -+PQencryptPasswordConn 172 10 -+PQresultMemorySize 173 12 - PQhostaddr 174 - PQgssEncInUse 175 - PQgetgssctx 176 --PQsetSSLKeyPassHook_OpenSSL 177 -+PQsetSSLKeyPassHook_OpenSSL 177 13 - PQgetSSLKeyPassHook_OpenSSL 178 - PQdefaultSSLKeyPassHook_OpenSSL 179 --PQenterPipelineMode 180 -+PQenterPipelineMode 180 14 - PQexitPipelineMode 181 - PQpipelineSync 182 - PQpipelineStatus 183 diff --git a/libpq.spec b/libpq.spec index d621239..3eb7a3d 100644 --- a/libpq.spec +++ b/libpq.spec @@ -1,9 +1,9 @@ -%global majorversion 15 +%global majorversion 16 %global obsoletes_version %( echo $(( %majorversion + 1 )) ) Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.3 +Version: %{majorversion}.1 Release: 1%{?dist} License: PostgreSQL @@ -27,6 +27,7 @@ BuildRequires: openldap-devel BuildRequires: gettext BuildRequires: multilib-rpm-config BuildRequires: make +BuildRequires: libicu-devel Obsoletes: postgresql-libs < %obsoletes_version Provides: postgresql-libs = %version-%release @@ -130,6 +131,10 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Tue Dec 5 2023 Filip Janus - 16.1-1 +- Update to 16.1 +- Build with ICU by default - new upstream feature + * Wed Aug 2 2023 Filip Janus - 15.3-1 - Update to the latest upstream version diff --git a/sources b/sources index 214826a..2bc1280 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-15.3.tar.bz2) = cac97edeb40df1e8f2162f401b465751132929d7249495ef001e950645a2db46343bd732e7bd6504a7f795e25aea66724f2f4ab0065e3d9331b36db4b3a3bec6 -SHA512 (postgresql-15.3.tar.bz2.sha256) = 1c4874650352b8c61b24271d668e09fe64d7e3a961bb7fcf46a5cafe2d4daa8d7a25e2e0ff6fc49ad889c82be8fd03709ff1c032f87f943ba5feb5b3892c7b15 +SHA512 (postgresql-16.1.tar.bz2) = 69f4635e5841452599f13b47df41ce2425ab34b4e4582fd2c635bc78d561fa36c5b03eccb4ae6569872dc74775be1b5a62dee20c9a4f12a43339250128352918 +SHA512 (postgresql-16.1.tar.bz2.sha256) = 3f573d81a7af02dea2a3eee180d4e465546fc4d283dde5b6627d25af0be4a546ffd3ae914dd3490e45264d1a43cf143e829e14e5cd9c6bd8f179b6eae4fd6ff1 From cf1cdcbd24b7dd267d140e506ebf46969d6d9a46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 05:03:08 +0000 Subject: [PATCH 32/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 3eb7a3d..b7f35fe 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.1 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 5 2023 Filip Janus - 16.1-1 - Update to 16.1 - Build with ICU by default - new upstream feature From e7a8590fe373fbb38c9def228d74870c5a496a1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 03:15:35 +0000 Subject: [PATCH 33/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index b7f35fe..6902fb1 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.1 -Release: 2%{?dist} +Release: 3%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 16.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 16.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7831b20fe31ba1f1e951e3baa2d354c58498b293 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 19 Feb 2024 21:53:23 -0500 Subject: [PATCH 34/45] Backport OpenSSL 3.2 fix from upstream master https://git.postgresql.org/gitweb/?p=postgresql.git;h=b2b1f12882fb561c7d474b834044dd8ed570bfea --- libpq.spec | 6 +- postgresql-openssl32.patch | 142 +++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 postgresql-openssl32.patch diff --git a/libpq.spec b/libpq.spec index 6902fb1..6357a62 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.1 -Release: 3%{?dist} +Release: 4%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -17,6 +17,7 @@ Source1: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version} Patch1: libpq-10.3-rpm-pgsql.patch Patch2: libpq-10.3-var-run-socket.patch Patch3: libpq-12.1-symbol-versioning.patch +Patch4: postgresql-openssl32.patch BuildRequires: gcc BuildRequires: glibc-devel bison flex gawk @@ -131,6 +132,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Tue Feb 20 2024 Yaakov Selkowitz - 16.1-4 +- Backport OpenSSL 3.2 fix from upstream master + * Thu Jan 25 2024 Fedora Release Engineering - 16.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/postgresql-openssl32.patch b/postgresql-openssl32.patch new file mode 100644 index 0000000..683ffc5 --- /dev/null +++ b/postgresql-openssl32.patch @@ -0,0 +1,142 @@ +Backport of commit b2b1f12882fb561c7d474b834044dd8ed570bfea to 16.1 + +Use BIO_{get,set}_app_data instead of BIO_{get,set}_data. + +We should have done it this way all along, but we accidentally got +away with using the wrong BIO field up until OpenSSL 3.2. There, +the library's BIO routines that we rely on use the "data" field +for their own purposes, and our conflicting use causes assorted +weird behaviors up to and including core dumps when SSL connections +are attempted. Switch to using the approved field for the purpose, +i.e. app_data. + +While at it, remove our configure probes for BIO_get_data as well +as the fallback implementation. BIO_{get,set}_app_data have been +there since long before any OpenSSL version that we still support, +even in the back branches. + +Also, update src/test/ssl/t/001_ssltests.pl to allow for a minor +change in an error message spelling that evidently came in with 3.2. + +Tristan Partin and Bo Andreson. Back-patch to all supported branches. + +Discussion: https://postgr.es/m/CAN55FZ1eDDYsYaL7mv+oSLUij2h_u6hvD4Qmv-7PK7jkji0uyQ@mail.gmail.com +--- + +diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c +index 31b6a6eacdf0..1b8b32c5b39e 100644 +--- a/src/backend/libpq/be-secure-openssl.c ++++ b/src/backend/libpq/be-secure-openssl.c +@@ -842,11 +842,6 @@ be_tls_write(Port *port, void *ptr, size_t len, int *waitfor) + * to retry; do we need to adopt their logic for that? + */ + +-#ifndef HAVE_BIO_GET_DATA +-#define BIO_get_data(bio) (bio->ptr) +-#define BIO_set_data(bio, data) (bio->ptr = data) +-#endif +- + static BIO_METHOD *my_bio_methods = NULL; + + static int +@@ -856,7 +851,7 @@ my_sock_read(BIO *h, char *buf, int size) + + if (buf != NULL) + { +- res = secure_raw_read(((Port *) BIO_get_data(h)), buf, size); ++ res = secure_raw_read(((Port *) BIO_get_app_data(h)), buf, size); + BIO_clear_retry_flags(h); + if (res <= 0) + { +@@ -876,7 +871,7 @@ my_sock_write(BIO *h, const char *buf, int size) + { + int res = 0; + +- res = secure_raw_write(((Port *) BIO_get_data(h)), buf, size); ++ res = secure_raw_write(((Port *) BIO_get_app_data(h)), buf, size); + BIO_clear_retry_flags(h); + if (res <= 0) + { +@@ -952,7 +947,7 @@ my_SSL_set_fd(Port *port, int fd) + SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB); + goto err; + } +- BIO_set_data(bio, port); ++ BIO_set_app_data(bio, port); + + BIO_set_fd(bio, fd, BIO_NOCLOSE); + SSL_set_bio(port->ssl, bio, bio); +diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c +index 4aeaf08312ce..e669bdbf1d2d 100644 +--- a/src/interfaces/libpq/fe-secure-openssl.c ++++ b/src/interfaces/libpq/fe-secure-openssl.c +@@ -1815,11 +1815,6 @@ PQsslAttribute(PGconn *conn, const char *attribute_name) + * to retry; do we need to adopt their logic for that? + */ + +-#ifndef HAVE_BIO_GET_DATA +-#define BIO_get_data(bio) (bio->ptr) +-#define BIO_set_data(bio, data) (bio->ptr = data) +-#endif +- + static BIO_METHOD *my_bio_methods; + + static int +@@ -1828,7 +1823,7 @@ my_sock_read(BIO *h, char *buf, int size) + { + int res; + +- res = pqsecure_raw_read((PGconn *) BIO_get_data(h), buf, size); ++ res = pqsecure_raw_read((PGconn *) BIO_get_app_data(h), buf, size); + BIO_clear_retry_flags(h); + if (res < 0) + { +@@ -1858,7 +1853,7 @@ my_sock_write(BIO *h, const char *buf, int size) + { + int res; + +- res = pqsecure_raw_write((PGconn *) BIO_get_data(h), buf, size); ++ res = pqsecure_raw_write((PGconn *) BIO_get_app_data(h), buf, size); + BIO_clear_retry_flags(h); + if (res < 0) + { +@@ -1968,7 +1963,7 @@ my_SSL_set_fd(PGconn *conn, int fd) + SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB); + goto err; + } +- BIO_set_data(bio, conn); ++ BIO_set_app_data(bio, conn); + + SSL_set_bio(conn->ssl, bio, bio); + BIO_set_fd(bio, fd, BIO_NOCLOSE); +diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl +index a049fd2ff03a..d921f1dde9fa 100644 +--- a/src/test/ssl/t/001_ssltests.pl ++++ b/src/test/ssl/t/001_ssltests.pl +@@ -776,7 +776,7 @@ sub switch_server_cert + "$common_connstr user=ssltestuser sslcert=ssl/client-revoked.crt " + . sslkey('client-revoked.key'), + "certificate authorization fails with revoked client cert", +- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/, ++ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|, + # temporarily(?) skip this check due to timing issue + # log_like => [ + # qr{Client certificate verification failed at depth 0: certificate revoked}, +@@ -881,7 +881,7 @@ sub switch_server_cert + "$common_connstr user=ssltestuser sslcert=ssl/client-revoked.crt " + . sslkey('client-revoked.key'), + "certificate authorization fails with revoked client cert with server-side CRL directory", +- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/, ++ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|, + # temporarily(?) skip this check due to timing issue + # log_like => [ + # qr{Client certificate verification failed at depth 0: certificate revoked}, +@@ -894,7 +894,7 @@ sub switch_server_cert + "$common_connstr user=ssltestuser sslcert=ssl/client-revoked-utf8.crt " + . sslkey('client-revoked-utf8.key'), + "certificate authorization fails with revoked UTF-8 client cert with server-side CRL directory", +- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/, ++ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|, + # temporarily(?) skip this check due to timing issue + # log_like => [ + # qr{Client certificate verification failed at depth 0: certificate revoked}, From 1e3a712a3a6d6042834e0454d792fc4a939b29c9 Mon Sep 17 00:00:00 2001 From: Ales Nezbeda Date: Mon, 27 May 2024 13:29:59 +0200 Subject: [PATCH 35/45] Bump version to 16.3 and remove unneeded OpenSSL patch --- libpq.spec | 9 ++- postgresql-openssl32.patch | 142 ------------------------------------- sources | 4 +- 3 files changed, 8 insertions(+), 147 deletions(-) delete mode 100644 postgresql-openssl32.patch diff --git a/libpq.spec b/libpq.spec index 6357a62..52a05aa 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,8 +3,8 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.1 -Release: 4%{?dist} +Version: %{majorversion}.3 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -17,7 +17,6 @@ Source1: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version} Patch1: libpq-10.3-rpm-pgsql.patch Patch2: libpq-10.3-var-run-socket.patch Patch3: libpq-12.1-symbol-versioning.patch -Patch4: postgresql-openssl32.patch BuildRequires: gcc BuildRequires: glibc-devel bison flex gawk @@ -132,6 +131,10 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Mon May 27 2024 Ales Nezbeda - 16.3-1 +- Update to 16.3 +- Remove backported OpenSSL fix + * Tue Feb 20 2024 Yaakov Selkowitz - 16.1-4 - Backport OpenSSL 3.2 fix from upstream master diff --git a/postgresql-openssl32.patch b/postgresql-openssl32.patch deleted file mode 100644 index 683ffc5..0000000 --- a/postgresql-openssl32.patch +++ /dev/null @@ -1,142 +0,0 @@ -Backport of commit b2b1f12882fb561c7d474b834044dd8ed570bfea to 16.1 - -Use BIO_{get,set}_app_data instead of BIO_{get,set}_data. - -We should have done it this way all along, but we accidentally got -away with using the wrong BIO field up until OpenSSL 3.2. There, -the library's BIO routines that we rely on use the "data" field -for their own purposes, and our conflicting use causes assorted -weird behaviors up to and including core dumps when SSL connections -are attempted. Switch to using the approved field for the purpose, -i.e. app_data. - -While at it, remove our configure probes for BIO_get_data as well -as the fallback implementation. BIO_{get,set}_app_data have been -there since long before any OpenSSL version that we still support, -even in the back branches. - -Also, update src/test/ssl/t/001_ssltests.pl to allow for a minor -change in an error message spelling that evidently came in with 3.2. - -Tristan Partin and Bo Andreson. Back-patch to all supported branches. - -Discussion: https://postgr.es/m/CAN55FZ1eDDYsYaL7mv+oSLUij2h_u6hvD4Qmv-7PK7jkji0uyQ@mail.gmail.com ---- - -diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c -index 31b6a6eacdf0..1b8b32c5b39e 100644 ---- a/src/backend/libpq/be-secure-openssl.c -+++ b/src/backend/libpq/be-secure-openssl.c -@@ -842,11 +842,6 @@ be_tls_write(Port *port, void *ptr, size_t len, int *waitfor) - * to retry; do we need to adopt their logic for that? - */ - --#ifndef HAVE_BIO_GET_DATA --#define BIO_get_data(bio) (bio->ptr) --#define BIO_set_data(bio, data) (bio->ptr = data) --#endif -- - static BIO_METHOD *my_bio_methods = NULL; - - static int -@@ -856,7 +851,7 @@ my_sock_read(BIO *h, char *buf, int size) - - if (buf != NULL) - { -- res = secure_raw_read(((Port *) BIO_get_data(h)), buf, size); -+ res = secure_raw_read(((Port *) BIO_get_app_data(h)), buf, size); - BIO_clear_retry_flags(h); - if (res <= 0) - { -@@ -876,7 +871,7 @@ my_sock_write(BIO *h, const char *buf, int size) - { - int res = 0; - -- res = secure_raw_write(((Port *) BIO_get_data(h)), buf, size); -+ res = secure_raw_write(((Port *) BIO_get_app_data(h)), buf, size); - BIO_clear_retry_flags(h); - if (res <= 0) - { -@@ -952,7 +947,7 @@ my_SSL_set_fd(Port *port, int fd) - SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB); - goto err; - } -- BIO_set_data(bio, port); -+ BIO_set_app_data(bio, port); - - BIO_set_fd(bio, fd, BIO_NOCLOSE); - SSL_set_bio(port->ssl, bio, bio); -diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c -index 4aeaf08312ce..e669bdbf1d2d 100644 ---- a/src/interfaces/libpq/fe-secure-openssl.c -+++ b/src/interfaces/libpq/fe-secure-openssl.c -@@ -1815,11 +1815,6 @@ PQsslAttribute(PGconn *conn, const char *attribute_name) - * to retry; do we need to adopt their logic for that? - */ - --#ifndef HAVE_BIO_GET_DATA --#define BIO_get_data(bio) (bio->ptr) --#define BIO_set_data(bio, data) (bio->ptr = data) --#endif -- - static BIO_METHOD *my_bio_methods; - - static int -@@ -1828,7 +1823,7 @@ my_sock_read(BIO *h, char *buf, int size) - { - int res; - -- res = pqsecure_raw_read((PGconn *) BIO_get_data(h), buf, size); -+ res = pqsecure_raw_read((PGconn *) BIO_get_app_data(h), buf, size); - BIO_clear_retry_flags(h); - if (res < 0) - { -@@ -1858,7 +1853,7 @@ my_sock_write(BIO *h, const char *buf, int size) - { - int res; - -- res = pqsecure_raw_write((PGconn *) BIO_get_data(h), buf, size); -+ res = pqsecure_raw_write((PGconn *) BIO_get_app_data(h), buf, size); - BIO_clear_retry_flags(h); - if (res < 0) - { -@@ -1968,7 +1963,7 @@ my_SSL_set_fd(PGconn *conn, int fd) - SSLerr(SSL_F_SSL_SET_FD, ERR_R_BUF_LIB); - goto err; - } -- BIO_set_data(bio, conn); -+ BIO_set_app_data(bio, conn); - - SSL_set_bio(conn->ssl, bio, bio); - BIO_set_fd(bio, fd, BIO_NOCLOSE); -diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl -index a049fd2ff03a..d921f1dde9fa 100644 ---- a/src/test/ssl/t/001_ssltests.pl -+++ b/src/test/ssl/t/001_ssltests.pl -@@ -776,7 +776,7 @@ sub switch_server_cert - "$common_connstr user=ssltestuser sslcert=ssl/client-revoked.crt " - . sslkey('client-revoked.key'), - "certificate authorization fails with revoked client cert", -- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/, -+ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|, - # temporarily(?) skip this check due to timing issue - # log_like => [ - # qr{Client certificate verification failed at depth 0: certificate revoked}, -@@ -881,7 +881,7 @@ sub switch_server_cert - "$common_connstr user=ssltestuser sslcert=ssl/client-revoked.crt " - . sslkey('client-revoked.key'), - "certificate authorization fails with revoked client cert with server-side CRL directory", -- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/, -+ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|, - # temporarily(?) skip this check due to timing issue - # log_like => [ - # qr{Client certificate verification failed at depth 0: certificate revoked}, -@@ -894,7 +894,7 @@ sub switch_server_cert - "$common_connstr user=ssltestuser sslcert=ssl/client-revoked-utf8.crt " - . sslkey('client-revoked-utf8.key'), - "certificate authorization fails with revoked UTF-8 client cert with server-side CRL directory", -- expected_stderr => qr/SSL error: sslv3 alert certificate revoked/, -+ expected_stderr => qr|SSL error: ssl[a-z0-9/]* alert certificate revoked|, - # temporarily(?) skip this check due to timing issue - # log_like => [ - # qr{Client certificate verification failed at depth 0: certificate revoked}, diff --git a/sources b/sources index 2bc1280..4f151c0 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-16.1.tar.bz2) = 69f4635e5841452599f13b47df41ce2425ab34b4e4582fd2c635bc78d561fa36c5b03eccb4ae6569872dc74775be1b5a62dee20c9a4f12a43339250128352918 -SHA512 (postgresql-16.1.tar.bz2.sha256) = 3f573d81a7af02dea2a3eee180d4e465546fc4d283dde5b6627d25af0be4a546ffd3ae914dd3490e45264d1a43cf143e829e14e5cd9c6bd8f179b6eae4fd6ff1 +SHA512 (postgresql-16.3.tar.bz2) = dc1c8d4fbc8e53e9be91dcf1b644b3969bd634f11bf5a1c4fe16619fd386f3349a5509788d43e6a57d099ad75233026d4dd4e0bb180ffc747fd3c1a575c51a5f +SHA512 (postgresql-16.3.tar.bz2.sha256) = eeebced14bc6c42df864c00397caaafa91b3ddc1c3900943989f04d396674907f63051b93aeb6b1b2408ffeb1b2fc44521b123b42b986b45c19bdcf706523c84 From e52f462d6fd40e6b3090984d5c981fc94bdb58f6 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 18 Jun 2024 09:36:59 +0200 Subject: [PATCH 36/45] Ship errcodes.h header file in -devel pacakge - kea package requires errorcodes. --- libpq.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 52a05aa..34c6464 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.3 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -98,6 +98,8 @@ done # remove files not to be packaged find $RPM_BUILD_ROOT -name '*.a' -delete +mv $RPM_BUILD_ROOT%{_includedir}/pgsql/server/utils/errcodes.h \ + $RPM_BUILD_ROOT%{_includedir}/pgsql rm -r $RPM_BUILD_ROOT%_includedir/pgsql/server %multilib_fix_c_header --file "%_includedir/pg_config.h" @@ -131,6 +133,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Tue Jun 18 2024 Filip Janus - 16.3-2 +- Ship errcodes.h in -devel package (kea package requires errorcodes) + * Mon May 27 2024 Ales Nezbeda - 16.3-1 - Update to 16.3 - Remove backported OpenSSL fix From e98e1d2454186d7c7608c52823c43f99d4f73761 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 18 Jun 2024 17:59:04 +0200 Subject: [PATCH 37/45] Move errcodes.h to usr/include/pgsql/server/utils/ to be consistent with the upstream --- libpq.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 34c6464..65f61f2 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.3 -Release: 2%{?dist} +Release: 3%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -98,9 +98,14 @@ done # remove files not to be packaged find $RPM_BUILD_ROOT -name '*.a' -delete +# preserve just errcodes.h mv $RPM_BUILD_ROOT%{_includedir}/pgsql/server/utils/errcodes.h \ $RPM_BUILD_ROOT%{_includedir}/pgsql rm -r $RPM_BUILD_ROOT%_includedir/pgsql/server +mkdir -p $RPM_BUILD_ROOT%{_includedir}/pgsql/server/utils +mv $RPM_BUILD_ROOT%{_includedir}/pgsql/errcodes.h \ + $RPM_BUILD_ROOT%{_includedir}/pgsql/server/utils + %multilib_fix_c_header --file "%_includedir/pg_config.h" %multilib_fix_c_header --file "%_includedir/pg_config_ext.h" @@ -133,6 +138,10 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Tue Jun 18 2024 Filip Janus - 16.3-3 +- Move errcodes.h to usr/include/pgsql/server/utils/ +- to be consistent with upstream + * Tue Jun 18 2024 Filip Janus - 16.3-2 - Ship errcodes.h in -devel package (kea package requires errorcodes) From ff838b3058edc8ad422db00a527a85983f5de816 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 14:48:59 +0000 Subject: [PATCH 38/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 65f61f2..3401db5 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.3 -Release: 3%{?dist} +Release: 4%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -138,6 +138,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 16.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 18 2024 Filip Janus - 16.3-3 - Move errcodes.h to usr/include/pgsql/server/utils/ - to be consistent with upstream From 266c646e51ecfaec22469a2850fb9a5f36d0f944 Mon Sep 17 00:00:00 2001 From: Ales Nezbeda Date: Tue, 30 Jul 2024 09:36:55 +0200 Subject: [PATCH 39/45] Disable ENGINE API --- libpq.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 3401db5..3c0d8a2 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.3 -Release: 4%{?dist} +Release: 5%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -68,6 +68,7 @@ find . -type f -name .gitignore | xargs rm # complements symbol-versioning patch export SYMBOL_VERSION_PREFIX=RHPG_ +export CFLAGS="$CFLAGS -DOPENSSL_NO_ENGINE" # We don't build server nor client (e.g. /bin/psql) binaries in this package, so # we can disable some configure options. %configure \ @@ -138,6 +139,11 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Tue Jul 30 2024 Ales Nezbeda - 16.3-5 +- Disable openssl ENGINE_API +- Fedora change: https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine +- BZ: 2300910 + * Thu Jul 18 2024 Fedora Release Engineering - 16.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9fcf3c0030cc0f228a3af80dc231dc3633cf1895 Mon Sep 17 00:00:00 2001 From: Ales Nezbeda Date: Wed, 21 Aug 2024 15:54:41 +0200 Subject: [PATCH 40/45] Update to 16.4 --- libpq.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libpq.spec b/libpq.spec index 3c0d8a2..fbad5c2 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,8 +3,8 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.3 -Release: 5%{?dist} +Version: %{majorversion}.4 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -139,6 +139,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Wed Aug 21 2024 Ales Nezbeda - 16.4-1 +- Update to 16.4 + * Tue Jul 30 2024 Ales Nezbeda - 16.3-5 - Disable openssl ENGINE_API - Fedora change: https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine diff --git a/sources b/sources index 4f151c0..04b03aa 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-16.3.tar.bz2) = dc1c8d4fbc8e53e9be91dcf1b644b3969bd634f11bf5a1c4fe16619fd386f3349a5509788d43e6a57d099ad75233026d4dd4e0bb180ffc747fd3c1a575c51a5f -SHA512 (postgresql-16.3.tar.bz2.sha256) = eeebced14bc6c42df864c00397caaafa91b3ddc1c3900943989f04d396674907f63051b93aeb6b1b2408ffeb1b2fc44521b123b42b986b45c19bdcf706523c84 +SHA512 (postgresql-16.4.tar.bz2) = f2070299f0857a270317ac984f8393374cf00d4f32a082fe3c5481e36c560595ea711fed95e40d1bc90c5089edf8f165649d443d8b9c68614e1c83fc91268e96 +SHA512 (postgresql-16.4.tar.bz2.sha256) = f5a33591b4a0810e2f90d21df471ba086acbd1f97099e38aed46e4d3b45ee72037ef5958c7f155dd9fb7969152599fb6946b792a12d92575bfbc595049b74674 From 5687a6828e176811ddd683dd8587f231cb4a4a81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 13:04:16 +0000 Subject: [PATCH 41/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index fbad5c2..4fbed95 100644 --- a/libpq.spec +++ b/libpq.spec @@ -4,7 +4,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.4 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -139,6 +139,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 16.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 21 2024 Ales Nezbeda - 16.4-1 - Update to 16.4 From 38488413a7a79856de54a2d940d09a53dea17274 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Sun, 2 Feb 2025 15:24:31 +0000 Subject: [PATCH 42/45] gcc now uses std=gnu23 Use std=c17 to avoid errors --- libpq.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 4fbed95..bc85739 100644 --- a/libpq.spec +++ b/libpq.spec @@ -68,7 +68,7 @@ find . -type f -name .gitignore | xargs rm # complements symbol-versioning patch export SYMBOL_VERSION_PREFIX=RHPG_ -export CFLAGS="$CFLAGS -DOPENSSL_NO_ENGINE" +export CFLAGS="$CFLAGS -DOPENSSL_NO_ENGINE -std=c17" # We don't build server nor client (e.g. /bin/psql) binaries in this package, so # we can disable some configure options. %configure \ From efc0e9a401ab2a74206a7494887946a95c4ea951 Mon Sep 17 00:00:00 2001 From: Nikola Davidova Date: Mon, 9 Jun 2025 14:53:40 +0200 Subject: [PATCH 43/45] Rebase to 18.0 (beta) --- libpq-10.3-rpm-pgsql.patch | 2 +- libpq-10.3-var-run-socket.patch | 6 +++--- libpq-12.1-symbol-versioning.patch | 11 ++++++++--- libpq.spec | 24 +++++++++++++++++------- sources | 4 ++-- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/libpq-10.3-rpm-pgsql.patch b/libpq-10.3-rpm-pgsql.patch index 93a3532..71a28e5 100644 --- a/libpq-10.3-rpm-pgsql.patch +++ b/libpq-10.3-rpm-pgsql.patch @@ -21,7 +21,7 @@ index 9a6265b3a0..c9371a07c4 100644 # # In a PGXS build, we cannot use the values inserted into Makefile.global # by configure, since the installation tree may have been relocated. -@@ -101,45 +100,23 @@ datarootdir := @datarootdir@ +@@ -111,45 +110,23 @@ datarootdir := @datarootdir@ bindir := @bindir@ datadir := @datadir@ diff --git a/libpq-10.3-var-run-socket.patch b/libpq-10.3-var-run-socket.patch index 2c5c128..3081c26 100644 --- a/libpq-10.3-var-run-socket.patch +++ b/libpq-10.3-var-run-socket.patch @@ -16,7 +16,7 @@ override it via postgresql.conf.) diff -ur postgresql-16.1/src/backend/utils/misc/guc_tables.c pg_patched/src/backend/utils/misc/guc_tables.c --- postgresql-16.1/src/backend/utils/misc/guc_tables.c 2023-11-06 23:04:27.000000000 +0100 +++ pg_patched/src/backend/utils/misc/guc_tables.c 2023-12-05 12:02:46.000000000 +0100 -@@ -4271,7 +4271,7 @@ +@@ -4648,7 +4648,7 @@ GUC_LIST_INPUT | GUC_LIST_QUOTE | GUC_SUPERUSER_ONLY }, &Unix_socket_directories, @@ -28,7 +28,7 @@ diff -ur postgresql-16.1/src/backend/utils/misc/guc_tables.c pg_patched/src/back diff -ur postgresql-16.1/src/bin/initdb/initdb.c pg_patched/src/bin/initdb/initdb.c --- postgresql-16.1/src/bin/initdb/initdb.c 2023-11-06 23:04:27.000000000 +0100 +++ pg_patched/src/bin/initdb/initdb.c 2023-12-05 12:04:19.000000000 +0100 -@@ -1287,7 +1287,7 @@ +@@ -1368,7 +1368,7 @@ * these are indeed defaults, keep the postgresql.conf lines commented. */ conflines = replace_guc_value(conflines, "unix_socket_directories", @@ -40,7 +40,7 @@ diff -ur postgresql-16.1/src/bin/initdb/initdb.c pg_patched/src/bin/initdb/initd diff -ur postgresql-16.1/src/include/pg_config_manual.h pg_patched/src/include/pg_config_manual.h --- postgresql-16.1/src/include/pg_config_manual.h 2023-11-06 23:04:27.000000000 +0100 +++ pg_patched/src/include/pg_config_manual.h 2023-12-05 11:45:20.000000000 +0100 -@@ -206,7 +206,7 @@ +@@ -190,7 +190,7 @@ * support them yet. */ #ifndef WIN32 diff --git a/libpq-12.1-symbol-versioning.patch b/libpq-12.1-symbol-versioning.patch index 955510c..2bd2525 100644 --- a/libpq-12.1-symbol-versioning.patch +++ b/libpq-12.1-symbol-versioning.patch @@ -20,7 +20,7 @@ diff -ur postgresql-16.1/config/Makefile postgresql_patched/config/Makefile diff -ur postgresql-16.1/src/interfaces/libpq/exports.txt postgresql_patched/src/interfaces/libpq/exports.txt --- postgresql-16.1/src/interfaces/libpq/exports.txt 2023-11-06 23:04:27.000000000 +0100 +++ postgresql_patched/src/interfaces/libpq/exports.txt 2023-12-05 10:48:24.627604638 +0100 -@@ -171,19 +171,19 @@ +@@ -171,23 +171,23 @@ PQsslAttribute 169 PQsetErrorContextVisibility 170 PQresultVerboseErrorMessage 171 @@ -44,12 +44,17 @@ diff -ur postgresql-16.1/src/interfaces/libpq/exports.txt postgresql_patched/src PQmblenBounded 185 PQsendFlushRequest 186 -PQconnectionUsedGSSAPI 187 +-PQclosePrepared 188 +PQconnectionUsedGSSAPI 187 16 ++PQclosePrepared 188 18 + PQclosePortal 189 + PQsendClosePrepared 190 + PQsendClosePortal 191 diff -ur postgresql-16.1/src/Makefile.shlib postgresql_patched/src/Makefile.shlib --- postgresql-16.1/src/Makefile.shlib 2023-11-06 23:04:27.000000000 +0100 +++ postgresql_patched/src/Makefile.shlib 2023-12-05 10:43:19.739634021 +0100 -@@ -185,7 +185,7 @@ - ifdef soname +@@ -176,7 +176,7 @@ + endif LINK.shared += -Wl,-soname,$(soname) endif - BUILD.exports = ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@ diff --git a/libpq.spec b/libpq.spec index bc85739..2419153 100644 --- a/libpq.spec +++ b/libpq.spec @@ -1,16 +1,21 @@ -%global majorversion 16 +%global majorversion 18 %global obsoletes_version %( echo $(( %majorversion + 1 )) ) +%global betaversion 18beta1 Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.4 -Release: 2%{?dist} +Version: %{majorversion}.0 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ -Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2 -Source1: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.sha256 +# Use this when 18.0 is released +# Source0: https://ftp.postgresql.org/pub/source/v%%{version}/postgresql-%%{version}.tar.bz2 +# Source1: https://ftp.postgresql.org/pub/source/v%%{version}/postgresql-%%{version}.tar.bz2.sha256 + +Source0: https://ftp.postgresql.org/pub/source/v%{betaversion}/postgresql-%{betaversion}.tar.bz2 +Source1: https://ftp.postgresql.org/pub/source/v%{betaversion}/postgresql-%{betaversion}.tar.bz2.sha256 # Comments for these patches are in the patch files. @@ -28,6 +33,7 @@ BuildRequires: gettext BuildRequires: multilib-rpm-config BuildRequires: make BuildRequires: libicu-devel +BuildRequires: perl Obsoletes: postgresql-libs < %obsoletes_version Provides: postgresql-libs = %version-%release @@ -58,7 +64,7 @@ package or any clients that need to connect to a PostgreSQL server. %prep ( cd "$(dirname "%SOURCE1")" ; sha256sum -c "%SOURCE1" ) -%autosetup -n postgresql-%version -p1 +%autosetup -n postgresql-%{betaversion} -p1 # remove .gitignore files to ensure none get into the RPMs (bug #642210) find . -type f -name .gitignore | xargs rm @@ -109,7 +115,6 @@ mv $RPM_BUILD_ROOT%{_includedir}/pgsql/errcodes.h \ %multilib_fix_c_header --file "%_includedir/pg_config.h" -%multilib_fix_c_header --file "%_includedir/pg_config_ext.h" find_lang_bins () { @@ -130,6 +135,8 @@ find_lang_bins %name-devel.lst pg_config %_libdir/libpq.so.5* %dir %_datadir/pgsql %doc %_datadir/pgsql/pg_service.conf.sample +%_datadir/pgsql/postgres.bki +%_datadir/pgsql/system_constraints.sql %files devel -f %name-devel.lst @@ -139,6 +146,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Mon Jun 09 2025 Nikola Davidova - 18.0-1 +- Rebase to upstream release 18.0 + * Fri Jan 17 2025 Fedora Release Engineering - 16.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 04b03aa..26803b0 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-16.4.tar.bz2) = f2070299f0857a270317ac984f8393374cf00d4f32a082fe3c5481e36c560595ea711fed95e40d1bc90c5089edf8f165649d443d8b9c68614e1c83fc91268e96 -SHA512 (postgresql-16.4.tar.bz2.sha256) = f5a33591b4a0810e2f90d21df471ba086acbd1f97099e38aed46e4d3b45ee72037ef5958c7f155dd9fb7969152599fb6946b792a12d92575bfbc595049b74674 +SHA512 (postgresql-18beta1.tar.bz2) = 881a3442552d282fbe03ea22fab4bdd818cb901f8410485f19867ff64dc577d50cd9f7bb898828aec9783ff7e482798ffae63ff1cbfd19c4e1c64fed9e0a2daf +SHA512 (postgresql-18beta1.tar.bz2.sha256) = fc8fb34666d899dde9bb3c5886dec3ea87241913d47a464f960d1d1b4b105c8b007a36dac6f62ae2c45b9d254fe3c1b1a32fa42693af43d8561a192fee4340d9 From 4f9cf9e4faead9de283dabdb18bab332e0f98299 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:12:06 +0000 Subject: [PATCH 44/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libpq.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpq.spec b/libpq.spec index 2419153..3098ae0 100644 --- a/libpq.spec +++ b/libpq.spec @@ -5,7 +5,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.0 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -146,6 +146,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 09 2025 Nikola Davidova - 18.0-1 - Rebase to upstream release 18.0 From ace31f6aa0c5404a3508437c76badafcc77c4af8 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Wed, 17 Sep 2025 11:49:36 +0000 Subject: [PATCH 45/45] libpq: Remove server-based files from client library package - Remove postgres.bki and system_constraints.sql files from package - These files are server-specific and should not be included in the client library - Fixes issue introduced by previous rebase to PostgreSQL 18.0 Resolves packaging inconsistency where server files were incorrectly included in the client library package. --- libpq.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libpq.spec b/libpq.spec index 3098ae0..4db4d81 100644 --- a/libpq.spec +++ b/libpq.spec @@ -5,7 +5,7 @@ Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.0 -Release: 2%{?dist} +Release: 3%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -112,7 +112,8 @@ rm -r $RPM_BUILD_ROOT%_includedir/pgsql/server mkdir -p $RPM_BUILD_ROOT%{_includedir}/pgsql/server/utils mv $RPM_BUILD_ROOT%{_includedir}/pgsql/errcodes.h \ $RPM_BUILD_ROOT%{_includedir}/pgsql/server/utils - +rm $RPM_BUILD_ROOT%_datadir/pgsql/postgres.bki +rm $RPM_BUILD_ROOT%_datadir/pgsql/system_constraints.sql %multilib_fix_c_header --file "%_includedir/pg_config.h" @@ -135,8 +136,6 @@ find_lang_bins %name-devel.lst pg_config %_libdir/libpq.so.5* %dir %_datadir/pgsql %doc %_datadir/pgsql/pg_service.conf.sample -%_datadir/pgsql/postgres.bki -%_datadir/pgsql/system_constraints.sql %files devel -f %name-devel.lst @@ -146,6 +145,9 @@ find_lang_bins %name-devel.lst pg_config %_libdir/pkgconfig/libpq.pc %changelog +* Wed Sep 17 2025 Filip Janus - 18.0-3 +- Removes server based files + * Thu Jul 24 2025 Fedora Release Engineering - 18.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild