From 757babfaab2982e3ab39e83df3d15dc705703699 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 02 2020 10:09:04 +0000
Subject: import rh-postgresql10-postgresql-10.15-1.el7


---

diff --git a/.gitignore b/.gitignore
index 088ba61..9935145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/postgresql-10.14-US.pdf
-SOURCES/postgresql-10.14.tar.bz2
+SOURCES/postgresql-10.15-US.pdf
+SOURCES/postgresql-10.15.tar.bz2
 SOURCES/postgresql-setup-8.0.tar.gz
diff --git a/.rh-postgresql10-postgresql.metadata b/.rh-postgresql10-postgresql.metadata
index 861f9c4..876b326 100644
--- a/.rh-postgresql10-postgresql.metadata
+++ b/.rh-postgresql10-postgresql.metadata
@@ -1,3 +1,3 @@
-a6da4357b8bbfa06c88fac7b847940b14e9d9a05 SOURCES/postgresql-10.14-US.pdf
-db230e62422673814419e76508708164a2cbfb09 SOURCES/postgresql-10.14.tar.bz2
+c979624349bbd2b0b7db13faf02b98c927119e3e SOURCES/postgresql-10.15-US.pdf
+3d688f05d2de7c9ed89ef6be8d33906a4e7a833d SOURCES/postgresql-10.15.tar.bz2
 4c1a983d9317abe242af19631d8730f2ed2f6e56 SOURCES/postgresql-setup-8.0.tar.gz
diff --git a/SOURCES/postgresql-10.14.tar.bz2.sha256 b/SOURCES/postgresql-10.14.tar.bz2.sha256
deleted file mode 100644
index aa7fd7c..0000000
--- a/SOURCES/postgresql-10.14.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-381cd8f491d8f77db2f4326974542a50095b5fa7709f24d7c5b760be2518b23b  postgresql-10.14.tar.bz2
diff --git a/SOURCES/postgresql-10.15.tar.bz2.sha256 b/SOURCES/postgresql-10.15.tar.bz2.sha256
new file mode 100644
index 0000000..a59a1a2
--- /dev/null
+++ b/SOURCES/postgresql-10.15.tar.bz2.sha256
@@ -0,0 +1 @@
+5956bce0becffa77883c41594c95a23110b94f10cd66a1157e373c3575921f7e  postgresql-10.15.tar.bz2
diff --git a/SOURCES/postgresql-socket-dirs-pgupgrade.patch b/SOURCES/postgresql-socket-dirs-pgupgrade.patch
index a135cd4..a139839 100644
--- a/SOURCES/postgresql-socket-dirs-pgupgrade.patch
+++ b/SOURCES/postgresql-socket-dirs-pgupgrade.patch
@@ -22,11 +22,11 @@ index 3d041ef..a9c56e0 100644
  	if (!exit_hook_registered)
  	{
  		atexit(stop_postmaster_atexit);
-@@ -196,7 +202,7 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
+@@ -227,7 +227,7 @@
  		snprintf(socket_string + strlen(socket_string),
  				 sizeof(socket_string) - strlen(socket_string),
  				 " -c %s='%s'",
--				 (GET_MAJOR_VERSION(cluster->major_version) < 903) ?
+-				 (GET_MAJOR_VERSION(cluster->major_version) <= 902) ?
 +				 (GET_MAJOR_VERSION(cluster->major_version) < rh_sock_dir_split) ?
  				 "unix_socket_directory" : "unix_socket_directories",
  				 cluster->sockdir);
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 2ca9538..0256f04 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -74,7 +74,7 @@
 Summary: PostgreSQL client programs
 Name: %{?scl_prefix}postgresql
 %global majorversion 10
-Version: %{majorversion}.14
+Version: %{majorversion}.15
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -1228,6 +1228,12 @@ make -C postgresql-setup-%{setup_version} check
 %endif
 
 %changelog
+* Wed Nov 18 2020 Patrik Novotný <panovotn@redhat.com> - 10.15-1
+- Rebase to upstream release 10.15
+  Resolves: CVE-2020-25695
+  Resolves: CVE-2020-25694
+  Resolves: CVE-2020-25696
+
 * Tue Sep 08 2020 Patrik Novotný <panovotn@redhat.com> - 10.14-1
 - Rebase to upstream release 10.14
   https://www.postgresql.org/docs/10/release-10-14.html