From b39f32393280320c8c9876bb48990eb4ca32afd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Thu, 18 Jul 2019 15:19:30 +0200 Subject: [PATCH 1/7] Rebase to PostgreSQL 12beta2 release. --- libpq-10.4-symbol-versioning.patch | 20 ++++++++------------ libpq.spec | 11 ++++++++--- sources | 4 ++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/libpq-10.4-symbol-versioning.patch b/libpq-10.4-symbol-versioning.patch index ad09569..d977789 100644 --- a/libpq-10.4-symbol-versioning.patch +++ b/libpq-10.4-symbol-versioning.patch @@ -1,7 +1,3 @@ -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 --- a/config/Makefile @@ -16,7 +12,7 @@ index 67e7998f55..86612a42c3 100644 $(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..bdcfb40d48 +index 0000000000..84c48e3ade --- /dev/null +++ b/config/build-exports-gnu-ld @@ -0,0 +1,41 @@ @@ -62,10 +58,10 @@ index 0000000000..bdcfb40d48 +echo " *;" +close_block diff --git a/src/Makefile.shlib b/src/Makefile.shlib -index 95b82a6dea..a7065d02a4 100644 +index 373d73caef..d5bd5468cd 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib -@@ -221,7 +221,7 @@ ifeq ($(PORTNAME), linux) +@@ -231,7 +231,7 @@ ifeq ($(PORTNAME), linux) ifdef soname LINK.shared += -Wl,-soname,$(soname) endif @@ -75,15 +71,15 @@ index 95b82a6dea..a7065d02a4 100644 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 d6a38d0df8..29bebeac7e 100644 +index 7c808e5215..3631340b23 100644 --- a/src/interfaces/libpq/exports.txt +++ b/src/interfaces/libpq/exports.txt -@@ -171,4 +171,4 @@ PQsslAttributeNames 168 +@@ -171,7 +171,7 @@ PQsslAttributeNames 168 PQsslAttribute 169 PQsetErrorContextVisibility 170 PQresultVerboseErrorMessage 171 -PQencryptPasswordConn 172 +PQencryptPasswordConn 172 10 --- -2.17.0 - + PQresultMemorySize 173 + PQhostaddr 174 + PQgssEncInUse 175 diff --git a/libpq.spec b/libpq.spec index 1779f55..29a8acc 100644 --- a/libpq.spec +++ b/libpq.spec @@ -1,10 +1,10 @@ -%global majorversion 11 +%global majorversion 12 %global obsoletes_version %( echo $(( %majorversion + 1 )) ) Summary: PostgreSQL client library Name: libpq -Version: %majorversion.3 -Release: 2%{?dist} +Version: %{majorversion}beta2 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -78,6 +78,8 @@ export SYMBOL_VERSION_PREFIX=RHPG_ --datadir=%_datadir/pgsql %global build_subdirs \\\ + src/common \\\ + src/port \\\ src/interfaces/libpq \\\ src/bin/pg_config \\\ src/include @@ -128,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Wed Jul 03 2019 Patrik Novotný - 12beta2-1 +- Rebase to upstream release 12beta2-1 + * Fri May 10 2019 Pavel Raiskup - 11.3-2 - obsolete anything < %%majorversion+1 diff --git a/sources b/sources index a2fce48..179174b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-11.3.tar.bz2) = 03269bb88f44f3a81d5e3a8ca2fe59f63f784436840f08870b2e539755629cbde8ac288e0bb4472ee93294a88b37b814ddff48444254c1a3f7a10b4bb64f7133 -SHA512 (postgresql-11.3.tar.bz2.sha256) = ac1cd1e2c39c11fb48b2326c804f681fafad32bfa81e4954766916ce3879df8a792b2ff6067c11215b4b00b8ea176ead13a2be50e0ae6f8e11bda1ff7d264c07 +SHA512 (postgresql-12beta2.tar.bz2) = 64b3ffd7e61ece5572ca72b3168618150214f89d21b113c6f630687372f6f7212bdfa086fa5b22e466a529a0e929c76d34e5b3ed5c04c94299589822fbff4935 +SHA512 (postgresql-12beta2.tar.bz2.sha256) = 97ed725bf0529c1bfbf4840b0498c63e10eddfc77d5c5a071bc05685c809f535ef310ad0ee6949042f59feb3e01a3fd6f1cc672e4b08078eae37ceb1d3df3cfb From 8bbbb3ff3951d1aad0aeadd8ae60fc2957ecb9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 31 Jul 2019 14:43:42 +0200 Subject: [PATCH 2/7] Fix version according to guidelines --- libpq.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libpq.spec b/libpq.spec index 29a8acc..66e7011 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,8 +3,8 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}beta2 -Release: 1%{?dist} +Version: %{majorversion}.0 +Release: 0.1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,7 +130,7 @@ find_lang_bins %name-devel.lst pg_config %changelog -* Wed Jul 03 2019 Patrik Novotný - 12beta2-1 +* Wed Jul 03 2019 Patrik Novotný - 12.0-0.1 - Rebase to upstream release 12beta2-1 * Fri May 10 2019 Pavel Raiskup - 11.3-2 From e55055d6d1052e24fce59f5d5a12d5dde07f0cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 31 Jul 2019 15:42:59 +0200 Subject: [PATCH 3/7] Fix sources after version change --- libpq.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libpq.spec b/libpq.spec index 66e7011..9585ea9 100644 --- a/libpq.spec +++ b/libpq.spec @@ -9,8 +9,8 @@ Release: 0.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 +Source0: https://ftp.postgresql.org/pub/source/v12beta2/postgresql-12beta2.tar.bz2 +Source1: https://ftp.postgresql.org/pub/source/v12beta2/postgresql-12beta2.tar.bz2.sha256 # Comments for these patches are in the patch files. @@ -56,7 +56,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-12beta2 -p1 # remove .gitignore files to ensure none get into the RPMs (bug #642210) find . -type f -name .gitignore | xargs rm From 2f0ed64ad608129d857c360769b446a783a85930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Thu, 1 Aug 2019 13:52:19 +0200 Subject: [PATCH 4/7] Fixed build_subdirs order --- libpq.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpq.spec b/libpq.spec index 9585ea9..5a21499 100644 --- a/libpq.spec +++ b/libpq.spec @@ -78,11 +78,11 @@ export SYMBOL_VERSION_PREFIX=RHPG_ --datadir=%_datadir/pgsql %global build_subdirs \\\ + src/include \\\ src/common \\\ src/port \\\ src/interfaces/libpq \\\ - src/bin/pg_config \\\ - src/include + src/bin/pg_config for subdir in %build_subdirs; do %make_build -C "$subdir" From 9f56435086c70786b0834326fc7a4a889cced95c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Thu, 12 Sep 2019 15:23:32 +0200 Subject: [PATCH 5/7] Rebase to upstream beta release 12beta4 --- libpq.spec | 12 ++++++++---- sources | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libpq.spec b/libpq.spec index 5a21499..a1f14b5 100644 --- a/libpq.spec +++ b/libpq.spec @@ -1,16 +1,17 @@ %global majorversion 12 +%global betaversion 12beta4 %global obsoletes_version %( echo $(( %majorversion + 1 )) ) Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.0 -Release: 0.1%{?dist} +Release: 0.2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ -Source0: https://ftp.postgresql.org/pub/source/v12beta2/postgresql-12beta2.tar.bz2 -Source1: https://ftp.postgresql.org/pub/source/v12beta2/postgresql-12beta2.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. @@ -56,7 +57,7 @@ package or any clients that need to connect to a PostgreSQL server. %prep ( cd "$(dirname "%SOURCE1")" ; sha256sum -c "%SOURCE1" ) -%autosetup -n postgresql-12beta2 -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 @@ -130,6 +131,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Thu Sep 12 2019 Patrik Novotný - 12.0-0.2 +- Rebase to upstream release 12beta4 + * Wed Jul 03 2019 Patrik Novotný - 12.0-0.1 - Rebase to upstream release 12beta2-1 diff --git a/sources b/sources index 179174b..47b750b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-12beta2.tar.bz2) = 64b3ffd7e61ece5572ca72b3168618150214f89d21b113c6f630687372f6f7212bdfa086fa5b22e466a529a0e929c76d34e5b3ed5c04c94299589822fbff4935 -SHA512 (postgresql-12beta2.tar.bz2.sha256) = 97ed725bf0529c1bfbf4840b0498c63e10eddfc77d5c5a071bc05685c809f535ef310ad0ee6949042f59feb3e01a3fd6f1cc672e4b08078eae37ceb1d3df3cfb +SHA512 (postgresql-12beta4.tar.bz2) = 52bf2fca13ea52890e5f6c6d42bfe8724267a3bb0c703cf792cab67cb7d71794107ec68a54e1b7cdc88d5050aa0745ad4980336074b04dcc610967b70776503b +SHA512 (postgresql-12beta4.tar.bz2.sha256) = 2ea78cbfbc10925eed7e096a89cf736ddc9502b5d22168c721791dc9d5e3486e581c6a2db6588874f828af8f960897f3a9b72e5a54aa1a80860546688e071bb0 From 392152b1f3fd5dcd80c16415427e517b64fbd90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Wed, 9 Oct 2019 16:52:17 +0200 Subject: [PATCH 6/7] Rebase to upstream version 12.0 --- libpq.spec | 12 +++++++----- sources | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libpq.spec b/libpq.spec index a1f14b5..9dc7815 100644 --- a/libpq.spec +++ b/libpq.spec @@ -1,17 +1,16 @@ %global majorversion 12 -%global betaversion 12beta4 %global obsoletes_version %( echo $(( %majorversion + 1 )) ) Summary: PostgreSQL client library Name: libpq Version: %{majorversion}.0 -Release: 0.2%{?dist} +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ -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 +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 # Comments for these patches are in the patch files. @@ -57,7 +56,7 @@ package or any clients that need to connect to a PostgreSQL server. %prep ( cd "$(dirname "%SOURCE1")" ; sha256sum -c "%SOURCE1" ) -%autosetup -n postgresql-%{betaversion} -p1 +%autosetup -n postgresql-%{version} -p1 # remove .gitignore files to ensure none get into the RPMs (bug #642210) find . -type f -name .gitignore | xargs rm @@ -131,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Thu Oct 03 2019 Patrik Novotný - 12.0-1 +- Rebase to upstream release 12.0 + * Thu Sep 12 2019 Patrik Novotný - 12.0-0.2 - Rebase to upstream release 12beta4 diff --git a/sources b/sources index 47b750b..c9b17b0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-12beta4.tar.bz2) = 52bf2fca13ea52890e5f6c6d42bfe8724267a3bb0c703cf792cab67cb7d71794107ec68a54e1b7cdc88d5050aa0745ad4980336074b04dcc610967b70776503b -SHA512 (postgresql-12beta4.tar.bz2.sha256) = 2ea78cbfbc10925eed7e096a89cf736ddc9502b5d22168c721791dc9d5e3486e581c6a2db6588874f828af8f960897f3a9b72e5a54aa1a80860546688e071bb0 +SHA512 (postgresql-12.0.tar.bz2) = 231a0b5c181c33cb01c3f39de1802319b79eceec6997935ab8605dea1f4583a52d0d16e5a70fcdeea313462f062503361d543433ee03d858ba332c72a665f696 +SHA512 (postgresql-12.0.tar.bz2.sha256) = 0984a4ca3f1bbede0a6bd34cd131ce2d04bbc60875ab9939abec93ec3d3962c147d8245826b31e5edcfab5b27995a9336843f581b6f240537cd7d2b6573081d3 From 38b142f864762f4f557377f3f67cfefbfdf1d09f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Novotn=C3=BD?= Date: Mon, 25 Nov 2019 14:11:14 +0100 Subject: [PATCH 7/7] Rebase to upstream version 12.1 Version: 12.1-1 --- libpq.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libpq.spec b/libpq.spec index 9dc7815..51286fe 100644 --- a/libpq.spec +++ b/libpq.spec @@ -3,7 +3,7 @@ Summary: PostgreSQL client library Name: libpq -Version: %{majorversion}.0 +Version: %{majorversion}.1 Release: 1%{?dist} License: PostgreSQL @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst pg_config %changelog +* Mon Nov 25 2019 Patrik Novotný - 12.1-1 +- Rebase to upstream release 12.1 + * Thu Oct 03 2019 Patrik Novotný - 12.0-1 - Rebase to upstream release 12.0 diff --git a/sources b/sources index c9b17b0..0a0c6ee 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-12.0.tar.bz2) = 231a0b5c181c33cb01c3f39de1802319b79eceec6997935ab8605dea1f4583a52d0d16e5a70fcdeea313462f062503361d543433ee03d858ba332c72a665f696 -SHA512 (postgresql-12.0.tar.bz2.sha256) = 0984a4ca3f1bbede0a6bd34cd131ce2d04bbc60875ab9939abec93ec3d3962c147d8245826b31e5edcfab5b27995a9336843f581b6f240537cd7d2b6573081d3 +SHA512 (postgresql-12.1.tar.bz2) = f45b1762fd60b6f7419305d108b7fc521e3a7afa833d3aacccba814465baf40d19f57ff9bf2909d726c4c94a1cd99a39f1aa8e45fd0364cdedbcbed36ff48caf +SHA512 (postgresql-12.1.tar.bz2.sha256) = 275a72bb1e27c6ec4385722cd53d7244186885a402d613d1c6a45c1173154559791713dfbdf5af11b596a867cec7eb6be949c734badd3c458b0a9345b37bd899