.gitignore

@@ -1,2 +1 @@
-/postgresql-*.tar.bz2*
+SOURCES/postgresql-13.11.tar.bz2
-/rpms

README.md

@@ -1,3 +0,0 @@
-# libpq
-
-The libpq package

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.11.tar.bz2.sha256

@@ -0,0 +1 @@
+4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb  postgresql-13.11.tar.bz2

SPECS/libpq.spec

@@ -3,8 +3,8 @@
 
 Summary: PostgreSQL client library
 Name: libpq
-Version: %{majorversion}.15
+Version: %{majorversion}.11
-Release: 1%{?dist}
+Release: 1%{?dist}.alma.1
 
 License: PostgreSQL
 Url: http://www.postgresql.org/
@@ -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
@@ -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,8 +130,8 @@ find_lang_bins %name-devel.lst  pg_config
 
 
 %changelog
-* Thu Jul 18 2024 Filip Janus <fjanus@redhat.com> - 13.15-1
+* Mon May 29 2023 Dominik Rehák <drehak@redhat.com> - 13.11-1.alma.1
-- Update to 13.15
+- Revert to el8
 
 * Mon May 29 2023 Dominik Rehák <drehak@redhat.com> - 13.11-1
 - Update to 13.11

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-        - rhel-9
-decision_context: osci_compose_gate
-rules:
-        - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

generate-sources.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-rm sources
-set -e
-spectool -S *.spec | cut -d' ' -f2 \
-    | grep -E -e 'postgresql-.*\.tar\.*' -e 'postgresql.*\.pdf' | sort | \
-while read line
-do
-    base=`basename "$line"`
-    echo " * handling $base"
-    sha512sum --tag "$base" >> sources
-done

sources

@@ -1,2 +0,0 @@
-SHA512 (postgresql-13.15.tar.bz2) = 6614b3ccf3ab41f34fc36e75f501853b13e0b9900728b8f8bbf8e3ac22783d18b0f05183beab778eb84ca71665574063fac6e1153bcd86bac252a8a9bbff0d8b
-SHA512 (postgresql-13.15.tar.bz2.sha256) = 42842ed58317182a8d040c09c1f3e1c9b33c6a6f07837638aab30a234a8960d0f4d3f33f597ac14980b674ec6fa55c9d04e3f5c359c858880cfb848f643a7117