From dd3591395dadc4a947d692a7ea2ac87498f937e6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 18 May 2021 02:47:28 -0400
Subject: [PATCH] import libpq-13.2-1.el8

---
 .gitignore                                     |  2 +-
 .libpq.metadata                                |  2 +-
 SOURCES/libpq-10.3-var-run-socket.patch        | 12 ++++++------
 ...atch => libpq-13.1-symbol-versioning.patch} |  6 +++++-
 SOURCES/postgresql-12.5.tar.bz2.sha256         |  1 -
 SOURCES/postgresql-13.2.tar.bz2.sha256         |  1 +
 SPECS/libpq.spec                               | 18 +++++++++++-------
 7 files changed, 25 insertions(+), 17 deletions(-)
 rename SOURCES/{libpq-12.0-symbol-versioning.patch => libpq-13.1-symbol-versioning.patch} (93%)
 delete mode 100644 SOURCES/postgresql-12.5.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-13.2.tar.bz2.sha256

diff --git a/.gitignore b/.gitignore
index 4eefe76..1ff8c26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/postgresql-12.5.tar.bz2
+SOURCES/postgresql-13.2.tar.bz2
diff --git a/.libpq.metadata b/.libpq.metadata
index 1d2f8f0..19b7b06 100644
--- a/.libpq.metadata
+++ b/.libpq.metadata
@@ -1 +1 @@
-031c42b26df6aa91351c02c336b9aa6111bf6c7e SOURCES/postgresql-12.5.tar.bz2
+fc40c06ee7f2fd5f4ee5af88c8502f06a44c8698 SOURCES/postgresql-13.2.tar.bz2
diff --git a/SOURCES/libpq-10.3-var-run-socket.patch b/SOURCES/libpq-10.3-var-run-socket.patch
index 8e3b193..91dceab 100644
--- a/SOURCES/libpq-10.3-var-run-socket.patch
+++ b/SOURCES/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 e278fa0..9ee15d4 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.
+@@ -201,7 +201,7 @@
+  * support them yet.
   */
+ #ifndef WIN32
 -#define DEFAULT_PGSOCKET_DIR  "/tmp"
 +#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * This is the default event source for Windows event log.
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
diff --git a/SOURCES/libpq-12.0-symbol-versioning.patch b/SOURCES/libpq-13.1-symbol-versioning.patch
similarity index 93%
rename from SOURCES/libpq-12.0-symbol-versioning.patch
rename to SOURCES/libpq-13.1-symbol-versioning.patch
index 2ff9570..08c0d71 100644
--- a/SOURCES/libpq-12.0-symbol-versioning.patch
+++ b/SOURCES/libpq-13.1-symbol-versioning.patch
@@ -79,7 +79,7 @@ diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt
 index ccec59919b..4c2be8b7d5 100644
 --- a/src/interfaces/libpq/exports.txt
 +++ b/src/interfaces/libpq/exports.txt
-@@ -171,8 +171,8 @@ PQsslAttributeNames       168
+@@ -171,11 +171,11 @@
  PQsslAttribute            169
  PQsetErrorContextVisibility 170
  PQresultVerboseErrorMessage 171
@@ -90,3 +90,7 @@ index ccec59919b..4c2be8b7d5 100644
  PQhostaddr                174
  PQgssEncInUse             175
  PQgetgssctx               176
+-PQsetSSLKeyPassHook_OpenSSL         177
++PQsetSSLKeyPassHook_OpenSSL         177      13
+ PQgetSSLKeyPassHook_OpenSSL         178
+ PQdefaultSSLKeyPassHook_OpenSSL     179
diff --git a/SOURCES/postgresql-12.5.tar.bz2.sha256 b/SOURCES/postgresql-12.5.tar.bz2.sha256
deleted file mode 100644
index 7e7febf..0000000
--- a/SOURCES/postgresql-12.5.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95  postgresql-12.5.tar.bz2
diff --git a/SOURCES/postgresql-13.2.tar.bz2.sha256 b/SOURCES/postgresql-13.2.tar.bz2.sha256
new file mode 100644
index 0000000..9bdf2b0
--- /dev/null
+++ b/SOURCES/postgresql-13.2.tar.bz2.sha256
@@ -0,0 +1 @@
+5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc  postgresql-13.2.tar.bz2
diff --git a/SPECS/libpq.spec b/SPECS/libpq.spec
index 8b7bfef..80eab74 100644
--- a/SPECS/libpq.spec
+++ b/SPECS/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}.5
+Version: %{majorversion}.2
 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.0-symbol-versioning.patch
+Patch3: libpq-13.1-symbol-versioning.patch
 
 BuildRequires: gcc
 BuildRequires: glibc-devel bison flex gawk
@@ -130,10 +130,14 @@ find_lang_bins %name-devel.lst  pg_config
 
 
 %changelog
-* Wed Nov 18 2020 Patrik Novotný <panovotn@redhat.com> - 12.5-1
-- Rebase to upstream release 12.5
-  Resolves: rhbz#1898228
-  Resolves: rhbz#1901558
+* Tue Feb 16 2021 Honza Horak <hhorak@redhat.com> - 13.2-1
+- Rebase to 13.2
+  Related: #1855776
+
+* Tue Nov 17 2020 Patrik Novotný <panovotn@redhat.com> - 13.1-1
+- Rebase to upstream release 13.1
+  Resolves: BZ#1855776
+  (BZ#1856242 particuarly)
 
 * Mon Aug 17 2020 Patrik Novotný <panovotn@redhat.com> - 12.4-1
 - Rebase to upstream release 12.4