Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libpq.git#61ac07a3c9fb30b58eed6135dd4d28a9e0a3087f

.gitignore

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

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 -Naur postgresql-9.0.1.orig/src/Makefile.global.in postgresql-9.0.1/src/Makefile.global.in
---- postgresql-9.0.1.orig/src/Makefile.global.in	2010-10-01 10:25:44.000000000 -0400
-+++ postgresql-9.0.1/src/Makefile.global.in	2010-10-11 11:52:05.224975308 -0400
-@@ -55,8 +55,7 @@
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index 9a6265b3a0..c9371a07c4 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -82,8 +82,7 @@ vpathsearch = `for f in $(addsuffix /$(1),$(subst :, ,. $(VPATH))); do test -r $
  # Installation directories
  #
  # These are set by the equivalent --xxxdir configure options.  We
@@ -21,7 +21,7 @@ diff -Naur postgresql-9.0.1.orig/src/Makefile.global.in postgresql-9.0.1/src/Mak
  #
  # In a PGXS build, we cannot use the values inserted into Makefile.global
  # by configure, since the installation tree may have been relocated.
-@@ -74,45 +73,23 @@
+@@ -101,45 +100,23 @@ datarootdir := @datarootdir@
  bindir := @bindir@
  
  datadir := @datadir@

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

libpq-12.1-symbol-versioning.patch

@@ -1,5 +1,13 @@
+commit 75040c3388d9a7dd5ad2bee53cbcc8bf3d35cd17
+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
+    depend on appropriate libpq ABI version (picked at build-time).
+
 diff --git a/config/Makefile b/config/Makefile
-index 67e7998f55..86612a42c3 100644
+index 67e7998..86612a4 100644
 --- a/config/Makefile
 +++ b/config/Makefile
 @@ -8,6 +8,7 @@ include $(top_builddir)/src/Makefile.global
@@ -71,10 +79,10 @@ 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 7c808e5215..3631340b23 100644
+index bbc1f90..fc3ef8a 100644
 --- a/src/interfaces/libpq/exports.txt
 +++ b/src/interfaces/libpq/exports.txt
-@@ -171,7 +171,7 @@ PQsslAttributeNames       168
+@@ -171,11 +171,11 @@ PQsslAttributeNames       168
  PQsslAttribute            169
  PQsetErrorContextVisibility 170
  PQresultVerboseErrorMessage 171
@@ -83,3 +91,8 @@ index 7c808e5215..3631340b23 100644
  PQresultMemorySize        173
  PQhostaddr                174
  PQgssEncInUse             175
+ PQgetgssctx               176
+-PQsetSSLKeyPassHook_OpenSSL         177
++PQsetSSLKeyPassHook_OpenSSL         177     13
+ PQgetSSLKeyPassHook_OpenSSL         178
+ PQdefaultSSLKeyPassHook_OpenSSL     179

libpq.spec

@@ -1,10 +1,10 @@
-%global majorversion 12
+%global majorversion 13
 %global obsoletes_version %( echo $(( %majorversion + 1 )) )
 
 Summary: PostgreSQL client library
 Name: libpq
-Version: %{majorversion}.4
-Release: 1%{?dist}
+Version: %{majorversion}.0
+Release: 2%{?dist}
 
 License: PostgreSQL
 Url: http://www.postgresql.org/
@@ -130,6 +130,12 @@ find_lang_bins %name-devel.lst  pg_config
 
 
 %changelog
+* Mon Nov 02 2020 Patrik Novotný <panovotn@redhat.com> - 13.0-2
+- 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
 

sources

@@ -1,2 +1,2 @@
-SHA512 (postgresql-12.4.tar.bz2) = 36daf10878ca153370829178786dd6ee366ab4d4d6dc9c527536740fdb14b688ae4c33f850eb4243a7667d23f87e4bfd1ddee0755447ad4f3996e423e391c2f3
-SHA512 (postgresql-12.4.tar.bz2.sha256) = d5c6d9c6cf189f0ef9c4ebac18782f25c0ff8420d0b063217f4ac250cca4706ec782e983326ffcb23258bcd5bf17b481e53d84aeb85b5744bfd90ea1bd33431a
+SHA512 (postgresql-13.0.tar.bz2) = 1fde89487c3e50a7a07e1d42fba60d415645ea89c5d4c5c7fcc93fbd5330feca7ec991d5b274f6ab757d5d04667ca1a7efdf4eaaa760add19d2e02437465f8f5
+SHA512 (postgresql-13.0.tar.bz2.sha256) = 147e2fa96eb8aab3c80dfbfdcf2dbd220599ec9c2200bd890e30e5a8a65b3136b035835444ab2c98368ac53c8ae190d83999e344ee6b52c069b3cd6d157dd34e