From f8b38c7755e3a3aac51780b8d8a0061ff6545387 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 08 2017 02:20:14 +0000
Subject: import rh-postgresql95-postgresql-9.5.9-4.el7


---

diff --git a/.gitignore b/.gitignore
index abaddf4..b053033 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 SOURCES/postgresql-9.5.9-US.pdf
 SOURCES/postgresql-9.5.9.tar.bz2
-SOURCES/postgresql-setup-4.0.tar.gz
+SOURCES/postgresql-setup-6.0.tar.gz
diff --git a/.rh-postgresql95-postgresql.metadata b/.rh-postgresql95-postgresql.metadata
index 434cd7a..a4d20b0 100644
--- a/.rh-postgresql95-postgresql.metadata
+++ b/.rh-postgresql95-postgresql.metadata
@@ -1,3 +1,3 @@
 321e364040b09ab4423782de3bbf06a70b55f5d0 SOURCES/postgresql-9.5.9-US.pdf
 ea1fc6ce64611e2c32620330b2de5a54a04d7e8d SOURCES/postgresql-9.5.9.tar.bz2
-827528d678764c60ab37e3e73adecf6113587842 SOURCES/postgresql-setup-4.0.tar.gz
+8c2d7c97ba79dbb5dc804461a6acddbd1b7959e6 SOURCES/postgresql-setup-6.0.tar.gz
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index c193e32..8727669 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -54,6 +54,9 @@
 # Turn that off to ensure such files don't get included in RPMs.
 %global _default_patch_flags --no-backup-if-mismatch
 
+# https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_of_Additional_RPM_Macros
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{!?scl:%_sysconfdir}%{?scl:%_root_sysconfdir}/rpm; echo $d)
+
 %if 0%{?scl:1}
 %global scl_upper %{lua:print(string.upper(string.gsub(rpm.expand("%{scl}"), "-", "_")))}
 %endif
@@ -63,7 +66,7 @@ Summary: PostgreSQL client programs
 Name: %{?scl_prefix}postgresql
 %global majorversion 9.5
 Version: 9.5.9
-Release: 1%{?dist}
+Release: 4%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -71,7 +74,7 @@ License: PostgreSQL
 Group: Applications/Databases
 Url: http://www.postgresql.org/
 
-%global setup_version 4.0
+%global setup_version 6.0
 
 %global service_name %{?scl_prefix}postgresql.service
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -382,15 +385,14 @@ CFLAGS="$CFLAGS -DLINUX_OOM_SCORE_ADJ=0"
 cd postgresql-setup-%{setup_version}
 %configure \
     pgdocdir=%{_pkgdocdir} \
-    systemdunitsdir=%{_root_prefix}/lib/systemd/system \
-    systemduserunitsdir=%{_root_sysconfdir}/systemd/system \
-    systemdlegacyscriptsdir=%{_root_libexecdir}/initscripts/legacy-actions \
     PGVERSION=%{version} \
     PGMAJORVERSION=%{majorversion} \
-    NAME_DEFAULT_PREV_SERVICE=postgresql \
+%if 0%{?scl:1}
     SCLS=%{?scl} \
     NAME_SRV_PFX=%{?scl}- \
-    NAME_PKG_PFX=%{?scl}-
+    NAME_PKG_PFX=%{?scl}- \
+%endif
+    NAME_DEFAULT_PREV_SERVICE=postgresql
 
 make %{?_smp_mflags}
 cd ..
@@ -687,6 +689,9 @@ install -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{?scl_prefix}postgre
 
 # PGDATA needs removal of group and world permissions due to pg_pwd hole.
 install -d -m 700 $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/data 
+%if 0%{?scl:1}
+rm -r $RPM_BUILD_ROOT/%{macrosdir}/macros.postgresql
+%endif
 
 # backups of data go here...
 install -d -m 700 $RPM_BUILD_ROOT%{?_localstatedir}/lib/pgsql/backups
@@ -1056,6 +1061,7 @@ cd -
 %{_mandir}/man1/pg_resetxlog.*
 %{_mandir}/man1/pg_rewind.*
 %{_mandir}/man1/postgres.*
+%{_mandir}/man1/postgresql-new-systemd-unit.*
 %{_mandir}/man1/postgresql-setup.*
 %{_mandir}/man1/postmaster.*
 %{_datadir}/pgsql/postgres.bki
@@ -1067,6 +1073,7 @@ cd -
 %{_datadir}/pgsql/tsearch_data/
 %dir %{_datadir}/postgresql-setup
 %{_datadir}/postgresql-setup/library.sh
+%{_datadir}/postgresql-setup/postgresql_pkg_tests.sh
 %{_libdir}/pgsql/dict_snowball.so
 %{_libdir}/pgsql/pg_prewarm.so
 %{_libdir}/pgsql/plpgsql.so
@@ -1089,6 +1096,7 @@ cd -
 %{_datadir}/pgsql/sql_features.txt
 %{_libexecdir}/postgresql-check-db-dir
 %{_libexecdir}/postgresql-ctl
+%{_sbindir}/postgresql-new-systemd-unit
 %dir %{_sysconfdir}/postgresql-setup
 %dir %{_sysconfdir}/postgresql-setup/upgrade
 %config %{_sysconfdir}/postgresql-setup/upgrade/*.conf
@@ -1153,6 +1161,15 @@ cd -
 %endif
 
 %changelog
+* Mon Nov 13 2017 Pavel Raiskup <praiskup@redhat.com> - 9.5.9-4
+- bump again, now build only x86_64 plus s390x on el6
+
+* Wed Nov 08 2017 Pavel Raiskup <praiskup@redhat.com> - 9.5.9-3
+- bump to get build only for x86_64
+
+* Mon Nov 06 2017 Pavel Raiskup <praiskup@redhat.com> - 9.5.9-2
+- fix CVE-2017-15097 by rebasing postgresql-setup to the latest version
+
 * Tue Aug 29 2017 Petr Kubat <pkubat@redhat.com> - 9.5.9-1
 - Rebase to 9.5.9 per release notes
   http://www.postgresql.org/docs/9.5/static/release-9-5-9.html