From c4ad7fa5d4477eadb9f00ba5e0290fbcd39abeac Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 02 2020 10:09:03 +0000
Subject: import rh-postgresql12-postgresql-12.5-1.el7


---

diff --git a/.gitignore b/.gitignore
index 3d3efcc..83079e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/postgresql-12.4-US.pdf
-SOURCES/postgresql-12.4.tar.bz2
+SOURCES/postgresql-12.5-US.pdf
+SOURCES/postgresql-12.5.tar.bz2
 SOURCES/postgresql-setup-8.4.tar.gz
diff --git a/.rh-postgresql12-postgresql.metadata b/.rh-postgresql12-postgresql.metadata
index f183fe7..9278b80 100644
--- a/.rh-postgresql12-postgresql.metadata
+++ b/.rh-postgresql12-postgresql.metadata
@@ -1,3 +1,3 @@
-28a5665b69d13ad426d903bcb93fe28be735da7f SOURCES/postgresql-12.4-US.pdf
-5a64e3916a42547227f2afec359d1c9ddc3eba8e SOURCES/postgresql-12.4.tar.bz2
+3f094d4a9885bc059e57a29cbc8d50269ab4ad8a SOURCES/postgresql-12.5-US.pdf
+031c42b26df6aa91351c02c336b9aa6111bf6c7e SOURCES/postgresql-12.5.tar.bz2
 f2112500abf4365fe968f1a7983fe174cca9e6f9 SOURCES/postgresql-setup-8.4.tar.gz
diff --git a/SOURCES/postgresql-12.4.tar.bz2.sha256 b/SOURCES/postgresql-12.4.tar.bz2.sha256
deleted file mode 100644
index 1a4f61b..0000000
--- a/SOURCES/postgresql-12.4.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-bee93fbe2c32f59419cb162bcc0145c58da9a8644ee154a30b9a5ce47de606cc  postgresql-12.4.tar.bz2
diff --git a/SOURCES/postgresql-12.5.tar.bz2.sha256 b/SOURCES/postgresql-12.5.tar.bz2.sha256
new file mode 100644
index 0000000..7e7febf
--- /dev/null
+++ b/SOURCES/postgresql-12.5.tar.bz2.sha256
@@ -0,0 +1 @@
+bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95  postgresql-12.5.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 c89958a..92a1c7f 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -71,7 +71,7 @@
 Summary: PostgreSQL client programs
 Name: %{?scl_prefix}postgresql
 %global majorversion 12
-Version: %{majorversion}.4
+Version: %{majorversion}.5
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -1191,6 +1191,12 @@ make -C postgresql-setup-%{setup_version} check
 %endif
 
 %changelog
+* Wed Nov 18 2020 Patrik Novotný <panovotn@redhat.com> - 12.5-1
+- Rebase to upstream release 12.5
+  Resolves: CVE-2020-25695
+  Resolves: CVE-2020-25694
+  Resolves: CVE-2020-25696
+
 * Tue Sep 08 2020 Patrik Novotný <panovotn@redhat.com> - 12.4-1
 - Rebase to upstream release 12.4
   https://www.postgresql.org/docs/12/release-12-4.html