From 1fbc4153ba228168fcb56aa8e163bb0a65d0866e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 30 2021 11:21:39 +0000
Subject: import postgresql-9.6.20-1.module+el8.3.0+8938+7f0e88b6


---

diff --git a/.gitignore b/.gitignore
index 98defb0..b892e08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/postgresql-9.6.10-US.pdf
-SOURCES/postgresql-9.6.10.tar.bz2
+SOURCES/postgresql-9.6.20-US.pdf
+SOURCES/postgresql-9.6.20.tar.bz2
 SOURCES/postgresql-setup-8.2.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index a672e12..df6d54d 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,3 +1,3 @@
-a22737b203a44694c1dd53e4991203900899de49 SOURCES/postgresql-9.6.10-US.pdf
-860ff3e2ce42246f45db1fc4519f972228168242 SOURCES/postgresql-9.6.10.tar.bz2
+19d6cc6f8268e2135026d87dcffe202144829a96 SOURCES/postgresql-9.6.20-US.pdf
+13aa206da020a550e56dbf524ca227bc2191fa48 SOURCES/postgresql-9.6.20.tar.bz2
 c1f5190ed00adbcca38ec6f57c1452222450bb0e SOURCES/postgresql-setup-8.2.tar.gz
diff --git a/SOURCES/postgresql-9.6.10.tar.bz2.sha256 b/SOURCES/postgresql-9.6.10.tar.bz2.sha256
deleted file mode 100644
index 1d5f96b..0000000
--- a/SOURCES/postgresql-9.6.10.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-8615acc56646401f0ede97a767dfd27ce07a8ae9c952afdb57163b7234fe8426  postgresql-9.6.10.tar.bz2
diff --git a/SOURCES/postgresql-9.6.20.tar.bz2.sha256 b/SOURCES/postgresql-9.6.20.tar.bz2.sha256
new file mode 100644
index 0000000..6b42c74
--- /dev/null
+++ b/SOURCES/postgresql-9.6.20.tar.bz2.sha256
@@ -0,0 +1 @@
+3d08cba409d45ab62d42b24431a0d55e7537bcd1db2d979f5f2eefe34d487bb6  postgresql-9.6.20.tar.bz2
diff --git a/SOURCES/postgresql-man.patch b/SOURCES/postgresql-man.patch
index 8d3afe3..d231f47 100644
--- a/SOURCES/postgresql-man.patch
+++ b/SOURCES/postgresql-man.patch
@@ -6,18 +6,6 @@ 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
-@@ -80,6 +80,11 @@ INFORMIX_SE\&.
- Define a C preprocessor symbol\&.
- .RE
- .PP
-+\fB\-h \fR
-+.RS 4
-+Parse a header file, this option includes option \fB\-c\fR\&.
-+.RE
-+.PP
- \fB\-i\fR
- .RS 4
- Parse system include files as well\&.
 @@ -128,6 +133,11 @@ Allow question mark as placeholder for c
  .RE
  .RE
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index d7d8ee8..35f0925 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -58,7 +58,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 9.6
-Version: 9.6.10
+Version: %{majorversion}.20
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -71,8 +71,8 @@ Url: http://www.postgresql.org/
 # in-place upgrade of an old database.  In most cases it will not be critical
 # 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 prevversion 9.5.13
 %global prevmajorversion 9.5
+%global prevversion %{prevmajorversion}.24
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -105,6 +105,7 @@ Patch5: postgresql-var-run-socket.patch
 Patch6: postgresql-man.patch
 Patch8: postgresql-no-libs.patch
 Patch9: postgresql-server-pg_config.patch
+# Patch10: postgresql-9.6.20-contrib-dblink-expected-out.patch
 
 BuildRequires: gcc
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
@@ -363,6 +364,7 @@ benchmarks.
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
+# %%patch10 -p1
 
 # We used to run autoconf here, but there's no longer any real need to,
 # since Postgres ships with a reasonably modern configure script.
@@ -1167,6 +1169,19 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Thu Nov 19 2020 Patrik Novotný <panovotn@redhat.com> - 9.6.20-1
+- Rebase to upstream release 9.6.20
+  Resolves: rhbz#1901563
+  Resolves: rhbz#1898218
+  Resolves: rhbz#1898334
+
+* Mon Aug 24 2020 Honza Horak <hhorak@redhat.com> - 9.6.19-1
+- Rebase to 9.6.19
+  Also fixes: CVE-2019-10208, CVE-2020-14350, CVE-2019-10130
+  Resolves: #1741490
+  Resolves: #1867111
+  Resolves: #1845074
+
 * Fri Aug 10 2018 Pavel Raiskup <praiskup@redhat.com> - 9.6.10-1
 - update to the latest 9.6 release