From f87db06bfbce957b59c3f41300350a07c186ccf2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 27 Sep 2022 09:40:57 -0400
Subject: [PATCH] import postgresql-12.11-2.module+el8.6.0+15345+1dd8d6b8

---
 .gitignore                              |  6 +++---
 .postgresql.metadata                    |  6 +++---
 SOURCES/postgresql-10.17.tar.bz2.sha256 |  1 -
 SOURCES/postgresql-10.21.tar.bz2.sha256 |  1 +
 SOURCES/postgresql-12.11.tar.bz2.sha256 |  1 +
 SOURCES/postgresql-12.9.tar.bz2.sha256  |  1 -
 SPECS/postgresql.spec                   | 16 +++++++++++++---
 7 files changed, 21 insertions(+), 11 deletions(-)
 delete mode 100644 SOURCES/postgresql-10.17.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-10.21.tar.bz2.sha256
 create mode 100644 SOURCES/postgresql-12.11.tar.bz2.sha256
 delete mode 100644 SOURCES/postgresql-12.9.tar.bz2.sha256

diff --git a/.gitignore b/.gitignore
index 08c0672..073a65e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/postgresql-10.17.tar.bz2
-SOURCES/postgresql-12.9-US.pdf
-SOURCES/postgresql-12.9.tar.bz2
+SOURCES/postgresql-10.21.tar.bz2
+SOURCES/postgresql-12.11-US.pdf
+SOURCES/postgresql-12.11.tar.bz2
 SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 0a7e7a0..311387a 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
-479ec3bf2882a3188dd16ec92169c67e78995400 SOURCES/postgresql-10.17.tar.bz2
-5d4ff6d35b993626da2d4b98ea4224a9d6a8894a SOURCES/postgresql-12.9-US.pdf
-a79d8428850da50a65451e5e44771844c7f166d5 SOURCES/postgresql-12.9.tar.bz2
+8ecd9d4592f91a6f36bf8e1ab4b1054f38fbe340 SOURCES/postgresql-10.21.tar.bz2
+a33e3d5bbdfdf221da2c5f08d8a8f64f8f09ee77 SOURCES/postgresql-12.11-US.pdf
+9bfd227802565eb749bb2b5338afcca60c64acd9 SOURCES/postgresql-12.11.tar.bz2
 9e12ee26bf41d3831f83049b51ae5da76de2ce12 SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/SOURCES/postgresql-10.17.tar.bz2.sha256 b/SOURCES/postgresql-10.17.tar.bz2.sha256
deleted file mode 100644
index f4a52a7..0000000
--- a/SOURCES/postgresql-10.17.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-5af28071606c9cd82212c19ba584657a9d240e1c4c2da28fc1f3998a2754b26c  postgresql-10.17.tar.bz2
diff --git a/SOURCES/postgresql-10.21.tar.bz2.sha256 b/SOURCES/postgresql-10.21.tar.bz2.sha256
new file mode 100644
index 0000000..9dfa861
--- /dev/null
+++ b/SOURCES/postgresql-10.21.tar.bz2.sha256
@@ -0,0 +1 @@
+d32198856d52a9a6f5d50642ef86687ac058bd6efca5c9ed57be7808496f45d1  postgresql-10.21.tar.bz2
diff --git a/SOURCES/postgresql-12.11.tar.bz2.sha256 b/SOURCES/postgresql-12.11.tar.bz2.sha256
new file mode 100644
index 0000000..929a351
--- /dev/null
+++ b/SOURCES/postgresql-12.11.tar.bz2.sha256
@@ -0,0 +1 @@
+1026248a5fd2beeaf43e4c7236ac817e56d58b681a335856465dfbc75b3e8302  postgresql-12.11.tar.bz2
diff --git a/SOURCES/postgresql-12.9.tar.bz2.sha256 b/SOURCES/postgresql-12.9.tar.bz2.sha256
deleted file mode 100644
index 5eae283..0000000
--- a/SOURCES/postgresql-12.9.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-89fda2de33ed04a98548e43f3ee5f15b882be17505d631fe0dd1a540a2b56dce  postgresql-12.9.tar.bz2
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index f0a1862..e521d09 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -59,8 +59,8 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 12
-Version: %{majorversion}.9
-Release: 3%{?dist}
+Version: %{majorversion}.11
+Release: 2%{?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.
@@ -72,7 +72,7 @@ Url: http://www.postgresql.org/
 # that this be kept up with the latest minor release of the previous series;
 # but update when bugs affecting pg_dump output are fixed.
 %global prevmajorversion 10
-%global prevversion %{prevmajorversion}.17
+%global prevversion %{prevmajorversion}.21
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1225,6 +1225,16 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Thu May 19 2022 Filip Januš <fjanus@redhat.com> - 12.11-2
+- Resolves: CVE-2022-1552
+- Release bump due to wrongly reported CVE of libpq
+  Build after reverted changes in libpq package
+
+* Mon May 16 2022 Filip Januš <fjanus@redhat.com> - 12.11-1
+- Resolves: CVE-2022-1552
+- Update to 12.11
+- Release notes: https://www.postgresql.org/docs/release/12.11/
+
 * Tue Nov 30 2021 Filip Januš <fjanus@redhat.com> - 12.9-3
 - Add missing files from postgresql-setup v8.6
 - Realted: #1935301