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] 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