.gitignore

@@ -1 +1 @@
-SOURCES/postgresql-13.15.tar.bz2
+SOURCES/postgresql-13.20.tar.bz2

.libpq.metadata

@@ -1 +1 @@
-d2275aa3a69a6cdcdd9774945ec3dd7aded0f419 SOURCES/postgresql-13.15.tar.bz2
+e56b335306a0dd446987c35dba655427dfcc325c SOURCES/postgresql-13.20.tar.bz2

SOURCES/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 --git a/src/Makefile.global.in b/src/Makefile.global.in
+
-index 9a6265b3a0..c9371a07c4 100644
+diff -Naur postgresql-9.0.1.orig/src/Makefile.global.in postgresql-9.0.1/src/Makefile.global.in
---- a/src/Makefile.global.in
+--- postgresql-9.0.1.orig/src/Makefile.global.in	2010-10-01 10:25:44.000000000 -0400
-+++ b/src/Makefile.global.in
++++ postgresql-9.0.1/src/Makefile.global.in	2010-10-11 11:52:05.224975308 -0400
-@@ -82,8 +82,7 @@ vpathsearch = `for f in $(addsuffix /$(1),$(subst :, ,. $(VPATH))); do test -r $
+@@ -55,8 +55,7 @@
  # Installation directories
  #
  # These are set by the equivalent --xxxdir configure options.  We
@@ -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@
+@@ -74,45 +73,23 @@
  bindir := @bindir@
  
  datadir := @datadir@

SOURCES/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 4dde819652..8c2f601333 100644
+index 9481f2d..75532c7 100644
 --- a/src/backend/utils/misc/guc.c
 +++ b/src/backend/utils/misc/guc.c
-@@ -4159,7 +4159,7 @@ static struct config_string ConfigureNamesString[] =
+@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] =
  		},
  		&Unix_socket_directories,
  #ifdef HAVE_UNIX_SOCKETS
@@ -26,10 +26,10 @@ index 4dde819652..8c2f601333 100644
  		"",
  #endif
 diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
-index 4ff0c6c700..6ccd96b1f2 100644
+index feeff9e..3e3d784 100644
 --- a/src/bin/initdb/initdb.c
 +++ b/src/bin/initdb/initdb.c
-@@ -1091,7 +1091,7 @@ setup_config(void)
+@@ -1234,7 +1234,7 @@ setup_config(void)
  
  #ifdef HAVE_UNIX_SOCKETS
  	snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
@@ -39,7 +39,7 @@ index 4ff0c6c700..6ccd96b1f2 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 8f3ec6bde1..066daf3f08 100644
+index e278fa0..9ee15d4 100644
 --- a/src/include/pg_config_manual.h
 +++ b/src/include/pg_config_manual.h
 @@ -201,7 +201,7 @@

SOURCES/libpq-13.1-symbol-versioning.patch

@@ -1,13 +1,10 @@
-commit 75040c3388d9a7dd5ad2bee53cbcc8bf3d35cd17
+- The libpq package is supposed to be used for all the PostgreSQL modules
-Author: Honza Horak <hhorak@redhat.com>
-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
-    available in RHEL 8, and ABI versioning will guarantee us that modular RPMs will
+- depend on appropriate libpq ABI version (picked at build-time).
-    depend on appropriate libpq ABI version (picked at build-time).
 
 diff --git a/config/Makefile b/config/Makefile
-index 67e7998..86612a4 100644
+index 67e7998f55..86612a42c3 100644
 --- a/config/Makefile
 +++ b/config/Makefile
 @@ -8,6 +8,7 @@ include $(top_builddir)/src/Makefile.global
@@ -79,16 +76,16 @@ index 373d73caef..d5bd5468cd 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 bbc1f90..fc3ef8a 100644
+index ccec59919b..4c2be8b7d5 100644
 --- a/src/interfaces/libpq/exports.txt
 +++ b/src/interfaces/libpq/exports.txt
-@@ -171,11 +171,11 @@ PQsslAttributeNames       168
+@@ -171,11 +171,11 @@
  PQsslAttribute            169
  PQsetErrorContextVisibility 170
  PQresultVerboseErrorMessage 171
 -PQencryptPasswordConn     172
-+PQencryptPasswordConn     172     10
 -PQresultMemorySize        173
++PQencryptPasswordConn     172      10
 +PQresultMemorySize        173      12
  PQhostaddr                174
  PQgssEncInUse             175

SOURCES/postgresql-13.15.tar.bz2.sha256

@@ -1 +0,0 @@
-42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925  postgresql-13.15.tar.bz2

SOURCES/postgresql-13.20.tar.bz2.sha256

@@ -0,0 +1 @@
+8134b685724d15e60d93bea206fbe0f14c8295e84f1cc91d5a3928163e4fb288  postgresql-13.20.tar.bz2

SPECS/libpq.spec

@@ -3,7 +3,7 @@
 
 Summary: PostgreSQL client library
 Name: libpq
-Version: %{majorversion}.15
+Version: %{majorversion}.20
 Release: 1%{?dist}
 
 License: PostgreSQL
@@ -16,7 +16,7 @@ Source1: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}
 # Comments for these patches are in the patch files.
 Patch1: libpq-10.3-rpm-pgsql.patch
 Patch2: libpq-10.3-var-run-socket.patch
-Patch3: libpq-12.1-symbol-versioning.patch
+Patch3: libpq-13.1-symbol-versioning.patch
 
 BuildRequires: gcc
 BuildRequires: glibc-devel bison flex gawk
@@ -26,7 +26,6 @@ BuildRequires: krb5-devel
 BuildRequires: openldap-devel
 BuildRequires: gettext
 BuildRequires: multilib-rpm-config
-BuildRequires: make
 
 Obsoletes: postgresql-libs < %obsoletes_version
 Provides: postgresql-libs = %version-%release
@@ -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-%version -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
@@ -118,7 +117,7 @@ find_lang_bins %name-devel.lst  pg_config
 
 %files -f %name.lst
 %license COPYRIGHT
-%_libdir/libpq.so.5*
+%_libdir/libpq.so.*
 %dir %_datadir/pgsql
 %doc %_datadir/pgsql/pg_service.conf.sample
 
@@ -131,98 +130,62 @@ find_lang_bins %name-devel.lst  pg_config
 
 
 %changelog
-* Thu Jul 18 2024 Filip Janus <fjanus@redhat.com> - 13.15-1
+* Tue Feb 18 2025 Ales Nezbeda <anezbeda@redhat.com> - 13.20-1
-- Update to 13.15
+- Update to 13.20
 
-* Mon May 29 2023 Dominik Rehák <drehak@redhat.com> - 13.11-1
+* Wed Jun 21 2023 Masahiro Matsuya <mmatsuya@redhat.com> - 13.11-1
-- Update to 13.11
+- Rebase to 13.11
-  Resolves: #2171370
+  Resolves: #2171369
 
-* Tue Nov 16 2021 Marek Kulik <mkulik@redhat.com> - 13.5-1
+* Mon Nov 29 2021 Marek Kulik <mkulik@redhat.com> - 13.5-1
-- Update to 13.5
+- Rebase to 13.5
+  Resolves: #2023294
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 13.2-4
+* Mon May 31 2021 Honza Horak <hhorak@redhat.com> - 13.3-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebase to 13.3
-  Related: rhbz#1991688
+  Resolves: #1966146
-
-* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 13.2-3
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 13.2-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Tue Feb 16 2021 Honza Horak <hhorak@redhat.com> - 13.2-1
-- Update to 13.2
+- Rebase to 13.2
+  Related: #1855776
 
-* Mon Feb 08 2021 Patrik Novotný <panovotn@redhat.com> - 13.1-3
+* Tue Nov 17 2020 Patrik Novotný <panovotn@redhat.com> - 13.1-1
-- Fix symbol versioning
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 13.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Nov 16 2020 Patrik Novotný <panovotn@redhat.com> - 13.1-1
 - Rebase to upstream release 13.1
+  Resolves: BZ#1855776
+  (BZ#1856242 particuarly)
 
-* Mon Nov 02 2020 Patrik Novotný <panovotn@redhat.com> - 13.0-2
+* Mon Aug 17 2020 Patrik Novotný <panovotn@redhat.com> - 12.4-1
-- Rebuild for symbol versioning fix
-
-* Wed Oct 14 2020 Patrik Novotný <panovotn@redhat.com> - 13.0-1
-- Rebase to upstream release 13.0
-
-* Tue Aug 18 2020 Patrik Novotný <panovotn@redhat.com> - 12.4-1
 - Rebase to upstream release 12.4
 
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 12.3-2
+* Tue Jun 16 2020 Patrik Novotný <panovotn@redhat.com> - 12.3-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon May 18 2020 Patrik Novotný <panovotn@redhat.com> - 12.3-1
 - Rebase to upstream release 12.3
 
-* Mon Feb 17 2020 Patrik Novotný <panovotn@redhat.com> - 12.2-1
+* Tue Nov 19 2019 Patrik Novotný <panovotn@redhat.com> - 12.1-3
-- Rebase to upstream release 12.2
+- Rebuild with rebased symbol versioning patch
 
-* Tue Feb 04 2020 Patrik Novotný <panovotn@redhat.com> - 12.1-1
+* Fri Nov 15 2019 Patrik Novotný <panovotn@redhat.com> - 12.1-2
+- Rebuild with rebased symbol versioning patch
+
+* Tue Nov 12 2019 Patrik Novotný <panovotn@redhat.com> - 12.1-1
 - Rebase to upstream release 12.1
 
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.6-2
+* Fri Nov 08 2019 Honza Horak <hhorak@redhat.com> - 12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+- Bump release for a new build with gating.yaml added
+  Related: #1749461
 
-* Mon Nov 25 2019 Patrik Novotný <panovotn@redhat.com> - 11.6-1
+* Thu Oct 03 2019 Patrik Novotný <panovotn@redhat.com> - 12.0-1
-- Rebase to upstream version 11.6
+- Initial release for upstream version 12.0
 
-* Wed Aug 07 2019 Petr Kubat <pkubat@redhat.com> - 11.5-1
+* Wed Aug 08 2018 Pavel Raiskup <praiskup@redhat.com> - 10.5-1
-- New upstream version 11.5
+- update to 10.5 per release notes:
+  https://www.postgresql.org/docs/10/static/release-10-5.html
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 11.4-2
+* Fri Jul 13 2018 Pavel Raiskup <praiskup@redhat.com> - 10.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+- ABI/symbol versioning
 
-* Tue Jul 09 2019 Petr Kubat <pkubat@redhat.com> - 11.4-1
+* Thu Jul 12 2018 Pavel Raiskup <praiskup@redhat.com> - 10.4-1
-- New upstream version 11.4
+- rebase to the latest upstream release
 
-* Fri May 10 2019 Pavel Raiskup <praiskup@redhat.com> - 11.3-2
+* Fri Apr 13 2018 Pavel Raiskup <praiskup@redhat.com> - 10.3-1
-- obsolete anything < %%majorversion+1
+- initial release, packaging inspired by postgresql.spec
-
+- provide postgresql-devel to avoid fixing all the client packages
-* Thu May 09 2019 Patrik Novotný <panovotn@redhat.com> - 11.3-1
-- New upstream version 11.3
-
-* Mon Feb 18 2019 Pavel Raiskup <praiskup@redhat.com> - 11.2-2
-- fix dnf system-upgrade from f29 to f29+, rhbz#1677849
-
-* Thu Feb 14 2019 Pavel Raiskup <praiskup@redhat.com> - 11.2-1
-- latest upstream release, per release notes:
-  https://www.postgresql.org/docs/11/static/release-11-1.html
-  https://www.postgresql.org/docs/11/static/release-11-2.html
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Oct 16 2018 Pavel Raiskup <praiskup@redhat.com> - 11.0-1
-- latest upstream release, per release notes:
-  https://www.postgresql.org/docs/11/static/release-11-0.html
-
-* Tue Sep 04 2018 Pavel Raiskup <praiskup@redhat.com> - 10.5-4
-- fix provides/obsoletes to final state
-
-* Thu Aug 30 2018 Pavel Raiskup <praiskup@redhat.com> - 10.5-1
-- libpq packaging for Fedora