Import rpm: 5f9e6d7c1ff572c001c07a92425dff4b76ba3e72

.gitignore

@@ -0,0 +1,4 @@
+SOURCES/postgresql-10.23-US.pdf
+SOURCES/postgresql-10.23.tar.bz2
+SOURCES/postgresql-9.2.24.tar.bz2
+SOURCES/postgresql-setup-8.6.tar.gz

Makefile.regress

@@ -0,0 +1,67 @@
+#
+# Simplified makefile for running the PostgreSQL regression tests
+# in an RPM installation
+#
+
+# maximum simultaneous connections for parallel tests
+MAXCONNOPT =
+ifdef MAX_CONNECTIONS
+MAXCONNOPT += --max-connections=$(MAX_CONNECTIONS)
+endif
+
+# locale
+NOLOCALE =
+ifdef NO_LOCALE
+NOLOCALE += --no-locale
+endif
+
+srcdir := .
+
+REGRESS_OPTS += --dlpath=.
+
+pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
+
+pg_regress_installcheck = ./pg_regress --inputdir=$(srcdir) --bindir=@bindir@ $(pg_regress_locale_flags)
+
+# Test input and expected files.  These are created by pg_regress itself, so we
+# don't have a rule to create them.  We do need rules to clean them however.
+ifile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/input/*.source)))
+input_files  := $(foreach file, $(ifile_list), sql/$(file).sql)
+ofile_list := $(subst .source,, $(notdir $(wildcard $(srcdir)/output/*.source)))
+output_files := $(foreach file, $(ofile_list), expected/$(file).out)
+
+abs_srcdir := $(shell pwd)
+abs_builddir := $(shell pwd)
+
+check: installcheck-parallel
+
+installcheck: cleandirs
+	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule $(EXTRA_TESTS)
+
+installcheck-parallel: cleandirs
+	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
+
+# The tests command the server to write into testtablespace and results.
+# On a SELinux-enabled system this will fail unless we mark those directories
+# as writable by the server.
+cleandirs:
+	-rm -rf testtablespace results
+	mkdir testtablespace results
+	[ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_db_t testtablespace results
+
+# old interfaces follow...
+
+runcheck: check
+runtest: installcheck
+runtest-parallel: installcheck-parallel
+
+
+##
+## Clean up
+##
+
+clean distclean maintainer-clean:
+	rm -f $(output_files) $(input_files)
+	rm -rf testtablespace
+	rm -rf results tmp_check log
+	rm -f regression.diffs regression.out regress.out run_check.out

gating.yaml

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

generate-pdf.sh

@@ -0,0 +1,58 @@
+#! /bin/sh
+
+# This script builds the PDF version of the PostgreSQL documentation.
+#
+# In principle we could do this as part of the RPM build, but there are
+# good reasons not to:
+# 1. The build would take longer and have a larger BuildRequires footprint.
+# 2. The generated PDF has timestamps in it, which would inevitably result
+#    in multilib conflicts due to slightly different timestamps.
+# So instead, we run this manually when rebasing to a new upstream release,
+# and treat the resulting PDF as a separate Source file.
+#
+# You will need to have the docbook packages installed to run this.
+# Expect it to take about 20 minutes and use about 160MB of disk.
+
+set -e
+
+# Pass package version (e.g., 9.1.2) as argument
+VERSION=$1
+
+test -z "$VERSION" && VERSION=`awk '/^Version:/ { print $2; }' postgresql.spec`
+
+TARGETFILE=postgresql-$VERSION-US.pdf
+test -f "$TARGETFILE" && echo "$TARGETFILE exists" && exit 1
+
+echo Building $TARGETFILE ...
+
+# Unpack postgresql
+
+rm -rf postgresql-$VERSION
+
+tar xfj postgresql-$VERSION.tar.bz2
+
+cd postgresql-$VERSION
+
+# Apply any patches that affect the PDF documentation
+
+# patch -p1 < ../xxx.patch
+
+# Configure ...
+
+./configure >/dev/null
+
+# Build the PDF docs
+
+cd doc/src/sgml
+
+make postgres-US.pdf >make.log
+
+mv -f postgres-US.pdf ../../../../$TARGETFILE
+
+# Clean up
+
+cd ../../../..
+
+rm -rf postgresql-$VERSION
+
+exit 0

generate-sources.sh

@@ -0,0 +1,12 @@
+#! /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

hstore-plperl-data-dumper.patch

@@ -0,0 +1,192 @@
+From 69db3b0cfccc0687dfbdf56afcfb2f8e536053c6 Mon Sep 17 00:00:00 2001
+From: Andrew Dunstan <andrew@dunslane.net>
+Date: Sun, 14 May 2017 01:10:18 -0400
+Subject: [PATCH] Suppress indentation from Data::Dumper in regression tests
+
+Ultra-modern versions of the perl Data::Dumper module have apparently
+changed how they indent output. Instead of trying to keep up we choose
+to tell it to supporess all indentation in the hstore_plperl regression
+tests.
+
+Backpatch to 9.5 where this feature was introduced.
+---
+ contrib/hstore_plperl/expected/hstore_plperlu.out | 44 ++++++-----------------
+ contrib/hstore_plperl/sql/hstore_plperlu.sql      |  6 ++++
+ 2 files changed, 17 insertions(+), 33 deletions(-)
+
+diff --git a/contrib/hstore_plperl/expected/hstore_plperlu.out b/contrib/hstore_plperl/expected/hstore_plperlu.out
+index b09fb78..d719d29 100644
+--- a/contrib/hstore_plperl/expected/hstore_plperlu.out
++++ b/contrib/hstore_plperl/expected/hstore_plperlu.out
+@@ -20,15 +20,12 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1('aa=>bb, cc=>NULL'::hstore);
+-INFO:  $VAR1 = {
+-          'aa' => 'bb',
+-          'cc' => undef
+-        };
+-
++INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};
+  test1 
+ -------
+      2
+@@ -39,12 +36,12 @@ LANGUAGE plperlu
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1none('aa=>bb, cc=>NULL'::hstore);
+ INFO:  $VAR1 = '"aa"=>"bb", "cc"=>NULL';
+-
+  test1none 
+ -----------
+          0
+@@ -56,15 +53,12 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1list('aa=>bb, cc=>NULL'::hstore);
+-INFO:  $VAR1 = {
+-          'aa' => 'bb',
+-          'cc' => undef
+-        };
+-
++INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};
+  test1list 
+ -----------
+          2
+@@ -77,18 +71,12 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
+ return scalar(keys %{$_[0]});
+ $$;
+ SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
+-INFO:  $VAR1 = {
+-          'aa' => 'bb',
+-          'cc' => undef
+-        };
+-$VAR2 = {
+-          'dd' => 'ee'
+-        };
+-
++INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};$VAR2 = {'dd' => 'ee'};
+  test1arr 
+ ----------
+         2
+@@ -101,6 +89,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ 
+ $rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
+ elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+@@ -111,13 +100,8 @@ $rv = spi_exec_prepared($plan, {}, $val);
+ elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+ $$;
+ SELECT test3();
+-INFO:  $VAR1 = {
+-          'aa' => 'bb',
+-          'cc' => undef
+-        };
+-
++INFO:  $VAR1 = {'aa' => 'bb','cc' => undef};
+ INFO:  $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
+-
+  test3 
+ -------
+  
+@@ -138,6 +122,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_TD->{new}));
+ if ($_TD->{new}{a} == 1) {
+     $_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
+@@ -147,14 +132,7 @@ return "MODIFY";
+ $$;
+ CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();
+ UPDATE test1 SET a = a;
+-INFO:  $VAR1 = {
+-          'a' => '1',
+-          'b' => {
+-                 'aa' => 'bb',
+-                 'cc' => undef
+-               }
+-        };
+-
++INFO:  $VAR1 = {'a' => '1','b' => {'aa' => 'bb','cc' => undef}};
+ SELECT * FROM test1;
+  a |                b                
+ ---+---------------------------------
+diff --git a/contrib/hstore_plperl/sql/hstore_plperlu.sql b/contrib/hstore_plperl/sql/hstore_plperlu.sql
+index 8d8508c..c714b35 100644
+--- a/contrib/hstore_plperl/sql/hstore_plperlu.sql
++++ b/contrib/hstore_plperl/sql/hstore_plperlu.sql
+@@ -15,6 +15,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -26,6 +27,7 @@ LANGUAGE plperlu
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -38,6 +40,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -52,6 +55,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_[0]->[0], $_[0]->[1]));
+ return scalar(keys %{$_[0]});
+ $$;
+@@ -66,6 +70,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ 
+ $rv = spi_exec_query(q{SELECT 'aa=>bb, cc=>NULL'::hstore AS col1});
+ elog(INFO, Dumper($rv->{rows}[0]->{col1}));
+@@ -90,6 +95,7 @@ TRANSFORM FOR TYPE hstore
+ AS $$
+ use Data::Dumper;
+ $Data::Dumper::Sortkeys = 1;
++$Data::Dumper::Indent = 0;
+ elog(INFO, Dumper($_TD->{new}));
+ if ($_TD->{new}{a} == 1) {
+     $_TD->{new}{b} = {a => 1, b => 'boo', c => undef};
+-- 
+2.1.4

postgresql-10.15-contrib-dblink-expected-out.patch

@@ -0,0 +1,13 @@
+diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
+index 6ceabb453c..6516d4f131 100644
+--- a/contrib/dblink/expected/dblink.out
++++ b/contrib/dblink/expected/dblink.out
+@@ -879,7 +879,7 @@ $d$;
+ CREATE USER MAPPING FOR public SERVER fdtest
+   OPTIONS (server 'localhost');  -- fail, can't specify server here
+ ERROR:  invalid option "server"
+-HINT:  Valid options in this context are: user, password
++HINT:  Valid options in this context are: user, password, sslpassword
+ CREATE USER MAPPING FOR public SERVER fdtest OPTIONS (user :'USER');
+ GRANT USAGE ON FOREIGN SERVER fdtest TO regress_dblink_user;
+ GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TO regress_dblink_user;

postgresql-10.23.tar.bz2.sha256

@@ -0,0 +1 @@
+94a4b2528372458e5662c18d406629266667c437198160a18cdfd2c4a4d6eee9  postgresql-10.23.tar.bz2

postgresql-12.5-contrib-dblink-expected-out.patch

@@ -0,0 +1,13 @@
+diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
+index 6ceabb453c..6516d4f131 100644
+--- a/contrib/dblink/expected/dblink.out
++++ b/contrib/dblink/expected/dblink.out
+@@ -879,7 +879,7 @@ $d$;
+ CREATE USER MAPPING FOR public SERVER fdtest
+   OPTIONS (server 'localhost');  -- fail, can't specify server here
+ ERROR:  invalid option "server"
+-HINT:  Valid options in this context are: user, password
++HINT:  Valid options in this context are: user, password, sslpassword
+ CREATE USER MAPPING FOR public SERVER fdtest OPTIONS (user :'USER');
+ GRANT USAGE ON FOREIGN SERVER fdtest TO regress_dblink_user;
+ GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TO regress_dblink_user;

postgresql-9.2.24.tar.bz2.sha256

@@ -0,0 +1 @@
+a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126  postgresql-9.2.24.tar.bz2

postgresql-bashprofile

@@ -0,0 +1,4 @@
+[ -f /etc/profile ] && source /etc/profile
+
+PGDATA=/var/lib/pgsql/data
+export PGDATA

postgresql-external-libpq.patch

@@ -0,0 +1,43 @@
+We don't build/install interfaces by upstream's implicit rules.
+
+This patch is used on two places; postgresql.spec and libecpg.spec -- keep those
+in sync!
+
+Related: rhbz#1618698
+
+diff --git a/src/Makefile b/src/Makefile
+index bcdbd95..4bea236 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -20,7 +20,6 @@ SUBDIRS = \
+ 	backend/utils/mb/conversion_procs \
+ 	backend/snowball \
+ 	include \
+-	interfaces \
+ 	backend/replication/libpqwalreceiver \
+ 	backend/replication/pgoutput \
+ 	fe_utils \
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index b9d86ac..29df69f 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -549,7 +549,7 @@ endif
+ # How to link to libpq.  (This macro may be used as-is by backend extensions.
+ # Client-side code should go through libpq_pgport or libpq_pgport_shlib,
+ # instead.)
+-libpq = -L$(libpq_builddir) -lpq
++libpq = -lpq
+ 
+ # libpq_pgport is for use by client executables (not libraries) that use libpq.
+ # We force clients to pull symbols from the non-shared libraries libpgport
+@@ -579,7 +579,6 @@ endif
+ # Commonly used submake targets
+ 
+ submake-libpq: | submake-generated-headers
+-	$(MAKE) -C $(libpq_builddir) all
+ 
+ submake-libpgport: | submake-generated-headers
+ 	$(MAKE) -C $(top_builddir)/src/port all
+-- 
+2.21.0
+

postgresql-logging.patch

@@ -0,0 +1,41 @@
+Default to stderr-based logging with a week's worth of daily logfiles.
+
+
+diff -Naur postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.1rc1/src/backend/utils/misc/postgresql.conf.sample
+--- postgresql-9.1rc1.orig/src/backend/utils/misc/postgresql.conf.sample	2011-08-18 17:23:13.000000000 -0400
++++ postgresql-9.1rc1/src/backend/utils/misc/postgresql.conf.sample	2011-08-18 18:39:39.697526799 -0400
+@@ -279,7 +279,7 @@
+ 					# requires logging_collector to be on.
+ 
+ # This is used when logging to stderr:
+-#logging_collector = off		# Enable capturing of stderr and csvlog
++logging_collector = on			# Enable capturing of stderr and csvlog
+ 					# into log files. Required to be on for
+ 					# csvlogs.
+ 					# (change requires restart)
+@@ -355,11 +355,11 @@
+ # These are only used if logging_collector is on:
+ #log_directory = 'log'			# directory where log files are written,
+ 					# can be absolute or relative to PGDATA
+-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log'	# log file name pattern,
++log_filename = 'postgresql-%a.log'	# log file name pattern,
+ 					# can include strftime() escapes
+ #log_file_mode = 0600			# creation mode for log files,
+ 					# begin with 0 to use octal notation
+-#log_truncate_on_rotation = off		# If on, an existing log file with the
++log_truncate_on_rotation = on		# If on, an existing log file with the
+ 					# same name as the new log file will be
+ 					# truncated rather than appended to.
+ 					# But such truncation only occurs on
+@@ -367,9 +367,9 @@
+ 					# or size-driven rotation.  Default is
+ 					# off, meaning append to existing files
+ 					# in all cases.
+-#log_rotation_age = 1d			# Automatic rotation of logfiles will
++log_rotation_age = 1d			# Automatic rotation of logfiles will
+ 					# happen after that time.  0 disables.
+-#log_rotation_size = 10MB		# Automatic rotation of logfiles will
++log_rotation_size = 0			# Automatic rotation of logfiles will
+ 					# happen after that much log output.
+ 					# 0 disables.
+ 

postgresql-man.patch

@@ -0,0 +1,37 @@
+PostgreSQL ecpg/initdb manual page fixes
+
+This was generated based on automatic Red Hat manual page scan (private
+RHBZ#948933).
+
+diff -up ./doc/src/sgml/man1/ecpg.1.man948933 ./doc/src/sgml/man1/ecpg.1
+--- ./doc/src/sgml/man1/ecpg.1.man948933	2014-12-16 02:13:15.000000000 +0100
++++ ./doc/src/sgml/man1/ecpg.1	2014-12-23 11:26:37.883644047 +0100
+@@ -128,6 +133,11 @@ Allow question mark as placeholder for c
+ .RE
+ .RE
+ .PP
++\fB\-\-regression\fR
++.RS 4
++Run in regression testing mode\&.
++.RE
++.PP
+ \fB\-t\fR
+ .RS 4
+ Turn on autocommit of transactions\&. In this mode, each SQL command is automatically committed unless it is inside an explicit transaction block\&. In the default mode, commands are committed only when
+diff -up ./doc/src/sgml/man1/initdb.1.man948933 ./doc/src/sgml/man1/initdb.1
+--- ./doc/src/sgml/man1/initdb.1.man948933	2014-12-16 02:13:21.000000000 +0100
++++ ./doc/src/sgml/man1/initdb.1	2014-12-23 11:26:37.883644047 +0100
+@@ -281,6 +281,13 @@ determines that an error prevented it fr
+ .PP
+ Other options:
+ .PP
++\fB\-s\fR
++.br
++\fB\-\-show\fR
++.RS 4
++Print the internal settings, then exit\&.
++.RE
++.PP
+ \fB\-V\fR
+ .br
+ \fB\-\-version\fR

postgresql-no-libecpg.patch

@@ -0,0 +1,12 @@
+diff -up postgresql-13.1/src/interfaces/Makefile.patch10 postgresql-13.1/src/interfaces/Makefile
+--- postgresql-13.1/src/interfaces/Makefile.patch10	2021-02-02 21:33:23.235292305 +0100
++++ postgresql-13.1/src/interfaces/Makefile	2021-02-02 21:33:30.281365440 +0100
+@@ -12,7 +12,7 @@ subdir = src/interfaces
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-SUBDIRS = libpq ecpg
++SUBDIRS = libpq
+ 
+ $(recurse)
+ 

postgresql-no-libs.patch

@@ -0,0 +1,33 @@
+diff --git a/src/Makefile b/src/Makefile
+index febbced..9737b55 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -20,7 +20,6 @@ SUBDIRS = \
+ 	backend/utils/mb/conversion_procs \
+ 	backend/snowball \
+ 	include \
+-	interfaces \
+ 	backend/replication/libpqwalreceiver \
+ 	backend/replication/pgoutput \
+ 	fe_utils \
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index 4ed5174..d0e0dae 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -457,7 +457,7 @@ endif
+ 
+ # This macro is for use by libraries linking to libpq.  (Because libpgport
+ # isn't created with the same link flags as libpq, it can't be used.)
+-libpq = -L$(libpq_builddir) -lpq
++libpq = -lpq
+ 
+ # This macro is for use by client executables (not libraries) that use libpq.
+ # We force clients to pull symbols from the non-shared libraries libpgport
+@@ -483,7 +483,6 @@ endif
+ # Commonly used submake targets
+ 
+ submake-libpq:
+-	$(MAKE) -C $(libpq_builddir) all
+ 
+ submake-libpgport:
+ 	$(MAKE) -C $(top_builddir)/src/port all

postgresql-pgcrypto-openssl3-tests.patch

@@ -0,0 +1,102 @@
+diff -ur postgresql-13.4/contrib/pgcrypto/expected/pgp-decrypt.out postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-decrypt.out
+--- postgresql-13.4/contrib/pgcrypto/expected/pgp-decrypt.out	2021-08-09 16:49:05.000000000 -0400
++++ postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-decrypt.out	2021-09-01 08:16:48.138600886 -0400
+@@ -4,20 +4,6 @@
+ --  Checking ciphers
+ select pgp_sym_decrypt(dearmor('
+ -----BEGIN PGP MESSAGE-----
+-Comment: dat1.blowfish.sha1.mdc.s2k3.z0
+-
+-jA0EBAMCfFNwxnvodX9g0jwB4n4s26/g5VmKzVab1bX1SmwY7gvgvlWdF3jKisvS
+-yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE=
+-=JcP+
+------END PGP MESSAGE-----
+-'), 'foobar');
+- pgp_sym_decrypt 
+------------------
+- Secret message.
+-(1 row)
+-
+-select pgp_sym_decrypt(dearmor('
+------BEGIN PGP MESSAGE-----
+ Comment: dat1.aes.sha1.mdc.s2k3.z0
+ 
+ jA0EBwMCci97v0Q6Z0Zg0kQBsVf5Oe3iC+FBzUmuMV9KxmAyOMyjCc/5i8f1Eest
+diff -ur postgresql-13.4/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out
+--- postgresql-13.4/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out	2021-08-09 16:49:05.000000000 -0400
++++ postgresql-13.4.patched/contrib/pgcrypto/expected/pgp-pubkey-decrypt.out	2021-09-01 08:05:27.750172653 -0400
+@@ -594,13 +594,6 @@
+ (1 row)
+ 
+ select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
+-from keytbl, encdata where keytbl.id=2 and encdata.id=2;
+- pgp_pub_decrypt 
+------------------
+- Secret msg
+-(1 row)
+-
+-select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
+ from keytbl, encdata where keytbl.id=3 and encdata.id=3;
+  pgp_pub_decrypt 
+ -----------------
+diff -ur postgresql-13.4/contrib/pgcrypto/Makefile postgresql-13.4.patched/contrib/pgcrypto/Makefile
+--- postgresql-13.4/contrib/pgcrypto/Makefile	2021-08-09 16:49:05.000000000 -0400
++++ postgresql-13.4.patched/contrib/pgcrypto/Makefile	2021-09-01 08:26:47.207164873 -0400
+@@ -5,7 +5,7 @@
+ INT_TESTS = sha2
+ 
+ OSSL_SRCS = openssl.c pgp-mpi-openssl.c
+-OSSL_TESTS = sha2 des 3des cast5
++OSSL_TESTS = sha2
+ 
+ ZLIB_TST = pgp-compression
+ ZLIB_OFF_TST = pgp-zlib-DISABLED
+@@ -49,12 +49,13 @@
+ 	pgcrypto--1.0--1.1.sql
+ PGFILEDESC = "pgcrypto - cryptographic functions"
+ 
+-REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \
++REGRESS = init md5 sha1 hmac-md5 hmac-sha1 rijndael \
+ 	$(CF_TESTS) \
+-	crypt-des crypt-md5 crypt-blowfish crypt-xdes \
++	crypt-md5 \
+ 	pgp-armor pgp-decrypt pgp-encrypt $(CF_PGP_TESTS) \
+ 	pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info
+ 
++#REGRESS = init pgp-pubkey-decrypt pgp-decrypt \
+ EXTRA_CLEAN = gen-rtab
+ 
+ ifdef USE_PGXS
+diff -ur postgresql-13.4/contrib/pgcrypto/sql/pgp-decrypt.sql postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-decrypt.sql
+--- postgresql-13.4/contrib/pgcrypto/sql/pgp-decrypt.sql	2021-08-09 16:49:05.000000000 -0400
++++ postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-decrypt.sql	2021-09-01 08:16:12.525212175 -0400
+@@ -5,16 +5,6 @@
+ --  Checking ciphers
+ select pgp_sym_decrypt(dearmor('
+ -----BEGIN PGP MESSAGE-----
+-Comment: dat1.blowfish.sha1.mdc.s2k3.z0
+-
+-jA0EBAMCfFNwxnvodX9g0jwB4n4s26/g5VmKzVab1bX1SmwY7gvgvlWdF3jKisvS
+-yA6Ce1QTMK3KdL2MPfamsTUSAML8huCJMwYQFfE=
+-=JcP+
+------END PGP MESSAGE-----
+-'), 'foobar');
+-
+-select pgp_sym_decrypt(dearmor('
+------BEGIN PGP MESSAGE-----
+ Comment: dat1.aes.sha1.mdc.s2k3.z0
+ 
+ jA0EBwMCci97v0Q6Z0Zg0kQBsVf5Oe3iC+FBzUmuMV9KxmAyOMyjCc/5i8f1Eest
+diff -ur postgresql-13.4/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql
+--- postgresql-13.4/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql	2021-08-09 16:49:05.000000000 -0400
++++ postgresql-13.4.patched/contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql	2021-09-01 08:06:18.963732342 -0400
+@@ -606,9 +606,6 @@
+ from keytbl, encdata where keytbl.id=1 and encdata.id=1;
+ 
+ select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
+-from keytbl, encdata where keytbl.id=2 and encdata.id=2;
+-
+-select pgp_pub_decrypt(dearmor(data), dearmor(seckey))
+ from keytbl, encdata where keytbl.id=3 and encdata.id=3;
+ 
+ select pgp_pub_decrypt(dearmor(data), dearmor(seckey))

postgresql-server-pg_config.patch

@@ -0,0 +1,51 @@
+diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
+index c410087..e546b7b 100644
+--- a/src/bin/pg_config/Makefile
++++ b/src/bin/pg_config/Makefile
+@@ -11,28 +11,30 @@
+ PGFILEDESC = "pg_config - report configuration information"
+ PGAPPICON=win32
+ 
++PG_CONFIG = pg_server_config$(X)
++
+ subdir = src/bin/pg_config
+ top_builddir = ../../..
+ include $(top_builddir)/src/Makefile.global
+ 
+ OBJS=   pg_config.o $(WIN32RES)
+ 
+-all: pg_config
++all: $(PG_CONFIG)
+ 
+-pg_config: $(OBJS) | submake-libpgport
+-	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
++$(PG_CONFIG): $(OBJS) | submake-libpgport
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
+ 
+ install: all installdirs
+-	$(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)'
++	$(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
+ 
+ installdirs:
+ 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
+ 
+ uninstall:
+-	rm -f '$(DESTDIR)$(bindir)/pg_config$(X)'
++	rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
+ 
+ clean distclean maintainer-clean:
+-	rm -f pg_config$(X) $(OBJS)
++	rm -f $(PG_CONFIG)  $(OBJS)
+ 	rm -rf tmp_check
+ 
+ check:
+diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
+index 1d41f90ee0..0f34f371cc 100644
+--- a/src/bin/pg_config/nls.mk
++++ b/src/bin/pg_config/nls.mk
+@@ -1,4 +1,4 @@
+ # src/bin/pg_config/nls.mk
+-CATALOG_NAME     = pg_config
++CATALOG_NAME     = pg_server_config
+ AVAIL_LANGUAGES  = cs de es fr he it ja ko nb pl pt_BR ro ru sv ta tr zh_CN zh_TW
+ GETTEXT_FILES    = pg_config.c ../../common/config_info.c ../../common/exec.c

postgresql-var-run-socket.patch

@@ -0,0 +1,53 @@
+Change the built-in default socket directory to be /var/run/postgresql.
+For backwards compatibility with (probably non-libpq-based) clients that
+might still expect to find the socket in /tmp, also create a socket in
+/tmp.  This is to resolve communication problems with clients operating
+under systemd's PrivateTmp environment, which won't be using the same
+global /tmp directory as the server; see bug #825448.
+
+Note that we apply the socket directory change at the level of the
+hard-wired defaults in the C code, not by just twiddling the setting in
+postgresql.conf.sample; this is so that the change will take effect on
+server package update, without requiring any existing postgresql.conf
+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
+--- a/src/backend/utils/misc/guc.c
++++ b/src/backend/utils/misc/guc.c
+@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] =
+ 		},
+ 		&Unix_socket_directories,
+ #ifdef HAVE_UNIX_SOCKETS
+-		DEFAULT_PGSOCKET_DIR,
++		DEFAULT_PGSOCKET_DIR ", /tmp",
+ #else
+ 		"",
+ #endif
+diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
+index feeff9e..3e3d784 100644
+--- a/src/bin/initdb/initdb.c
++++ b/src/bin/initdb/initdb.c
+@@ -1234,7 +1234,7 @@ setup_config(void)
+ 
+ #ifdef HAVE_UNIX_SOCKETS
+ 	snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
+-			 DEFAULT_PGSOCKET_DIR);
++			 DEFAULT_PGSOCKET_DIR ", /tmp");
+ #else
+ 	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
+--- 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.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
+ 
+ /*
+  * This is the default event source for Windows event log.

postgresql.pam

@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth		include		password-auth
+account		include		password-auth

postgresql.tmpfiles.d

@@ -0,0 +1 @@
+d /run/postgresql 0755 postgres postgres -

rpm-pgsql.patch

@@ -0,0 +1,72 @@
+For the RPMs, we want the custom installation directories to end in
+/pgsql not /postgresql.  This is historical but not worth changing.
+
+Notice that this patch also makes the appending of /pgsql unconditional.
+This is to avoid unexpected behavior if the RPM is built in a working
+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 @@
+ # Installation directories
+ #
+ # These are set by the equivalent --xxxdir configure options.  We
+-# append "postgresql" to some of them, if the string does not already
+-# contain "pgsql" or "postgres", in order to avoid directory clutter.
++# append "pgsql" to some of them, in order to avoid directory clutter.
+ #
+ # 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 @@
+ bindir := @bindir@
+ 
+ datadir := @datadir@
+-ifeq "$(findstring pgsql, $(datadir))" ""
+-ifeq "$(findstring postgres, $(datadir))" ""
+-override datadir := $(datadir)/postgresql
+-endif
+-endif
+ 
+ sysconfdir := @sysconfdir@
+-ifeq "$(findstring pgsql, $(sysconfdir))" ""
+-ifeq "$(findstring postgres, $(sysconfdir))" ""
+-override sysconfdir := $(sysconfdir)/postgresql
+-endif
+-endif
+ 
+ libdir := @libdir@
+ 
+ pkglibdir = $(libdir)
+-ifeq "$(findstring pgsql, $(pkglibdir))" ""
+-ifeq "$(findstring postgres, $(pkglibdir))" ""
+-override pkglibdir := $(pkglibdir)/postgresql
+-endif
+-endif
++override pkglibdir := $(pkglibdir)/pgsql
+ 
+ includedir := @includedir@
+ 
+ pkgincludedir = $(includedir)
+-ifeq "$(findstring pgsql, $(pkgincludedir))" ""
+-ifeq "$(findstring postgres, $(pkgincludedir))" ""
+-override pkgincludedir := $(pkgincludedir)/postgresql
+-endif
+-endif
++override pkgincludedir := $(pkgincludedir)/pgsql
+ 
+ mandir := @mandir@
+ 
+ docdir := @docdir@
+-ifeq "$(findstring pgsql, $(docdir))" ""
+-ifeq "$(findstring postgres, $(docdir))" ""
+-override docdir := $(docdir)/postgresql
+-endif
+-endif
++override docdir := $(docdir)/pgsql
+ 
+ htmldir := @htmldir@
+ 

rpminspect.yaml

@@ -0,0 +1,9 @@
+---
+# Forbidden function symbols found:
+#   inet_net_ntop
+#   inet_net_pton
+# This is not a problem because the older version is only used for upgrade
+# purposes and communicates through unix socket only
+badfuncs:
+    ignore:
+        - /usr/lib*/pgsql/postgresql-*/bin/postgres

sources

@@ -0,0 +1,4 @@
+SHA1 (postgresql-10.23-US.pdf) = a416c245ff0815fbde534bc49b0a07ffdd373894
+SHA1 (postgresql-10.23.tar.bz2) = 2df7b4b3751112f3cb543c3ea81e45531bebc7a1
+SHA1 (postgresql-9.2.24.tar.bz2) = 63d6966ccdbab6aae1f9754fdb8e341ada1ef653
+SHA1 (postgresql-setup-8.6.tar.gz) = 9e12ee26bf41d3831f83049b51ae5da76de2ce12

tests/tests.yml

@@ -0,0 +1,16 @@
+# This package uses external repositories for maintaining CI test cases.
+# Please don't edit this file if possible.
+
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    repositories:
+    - repo: https://src.fedoraproject.org/tests/postgresql.git
+      dest: postgresql
+      # TODO: minimize: https://pagure.io/standard-test-roles/issue/294
+      fmf_filter: "tier: 1"
+    # TODO: minimize: https://pagure.io/standard-test-roles/issue/294
+    tags:
+    - classic
+    - container
+    - atomic