From fd977660620d77f7cfe0e4b385037ac4265d9053 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 09 2021 14:50:26 +0000
Subject: import postgresql-10.17-1.module+el8.5.0+11250+60bae6d4


---

diff --git a/.gitignore b/.gitignore
index ef447a2..0063bb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/postgresql-10.15-US.pdf
-SOURCES/postgresql-10.15.tar.bz2
+SOURCES/postgresql-10.17-US.pdf
+SOURCES/postgresql-10.17.tar.bz2
 SOURCES/postgresql-9.2.24.tar.bz2
 SOURCES/postgresql-setup-8.2.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index f583f8c..5c2f946 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
-c979624349bbd2b0b7db13faf02b98c927119e3e SOURCES/postgresql-10.15-US.pdf
-3d688f05d2de7c9ed89ef6be8d33906a4e7a833d SOURCES/postgresql-10.15.tar.bz2
+af5b768bfb9fe2d6482a2ee46fbd9b21f07975c8 SOURCES/postgresql-10.17-US.pdf
+479ec3bf2882a3188dd16ec92169c67e78995400 SOURCES/postgresql-10.17.tar.bz2
 63d6966ccdbab6aae1f9754fdb8e341ada1ef653 SOURCES/postgresql-9.2.24.tar.bz2
 c1f5190ed00adbcca38ec6f57c1452222450bb0e SOURCES/postgresql-setup-8.2.tar.gz
diff --git a/SOURCES/postgresql-10.15-contrib-dblink-expected-out.patch b/SOURCES/postgresql-10.15-contrib-dblink-expected-out.patch
new file mode 100644
index 0000000..bd4b0e5
--- /dev/null
+++ b/SOURCES/postgresql-10.15-contrib-dblink-expected-out.patch
@@ -0,0 +1,13 @@
+diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
+index 6ceabb453c..6516d4f131 100644
+--- a/contrib/dblink/expected/dblink.out
++++ b/contrib/dblink/expected/dblink.out
+@@ -879,7 +879,7 @@ $d$;
+ CREATE USER MAPPING FOR public SERVER fdtest
+   OPTIONS (server 'localhost');  -- fail, can't specify server here
+ ERROR:  invalid option "server"
+-HINT:  Valid options in this context are: user, password
++HINT:  Valid options in this context are: user, password, sslpassword
+ CREATE USER MAPPING FOR public SERVER fdtest OPTIONS (user :'USER');
+ GRANT USAGE ON FOREIGN SERVER fdtest TO regress_dblink_user;
+ GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TO regress_dblink_user;
diff --git a/SOURCES/postgresql-10.15.tar.bz2.sha256 b/SOURCES/postgresql-10.15.tar.bz2.sha256
deleted file mode 100644
index a59a1a2..0000000
--- a/SOURCES/postgresql-10.15.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-5956bce0becffa77883c41594c95a23110b94f10cd66a1157e373c3575921f7e  postgresql-10.15.tar.bz2
diff --git a/SOURCES/postgresql-10.17.tar.bz2.sha256 b/SOURCES/postgresql-10.17.tar.bz2.sha256
new file mode 100644
index 0000000..f4a52a7
--- /dev/null
+++ b/SOURCES/postgresql-10.17.tar.bz2.sha256
@@ -0,0 +1 @@
+5af28071606c9cd82212c19ba584657a9d240e1c4c2da28fc1f3998a2754b26c  postgresql-10.17.tar.bz2
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index b6aa694..151af7d 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -58,7 +58,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 10
-Version: %{majorversion}.15
+Version: %{majorversion}.17
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -107,7 +107,7 @@ Patch5: postgresql-var-run-socket.patch
 Patch6: postgresql-man.patch
 Patch8: postgresql-no-libs.patch
 Patch9: postgresql-server-pg_config.patch
-# Patch10: postgresql-10.15-contrib-dblink-expected-out.patch
+Patch10: postgresql-10.15-contrib-dblink-expected-out.patch
 
 BuildRequires: gcc
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
@@ -366,7 +366,7 @@ benchmarks.
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
-# %%patch10 -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.
@@ -1166,11 +1166,16 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Tue Jun 1 2021 Filip Januš <fjanus@redhat.com> - 10.17-1
+- Update to 10.17
+  Resolves: #1964521
+  Fix: CVE-2021-32027, CVE-2021-32028
+
 * Wed Nov 18 2020 Patrik Novotný <panovotn@redhat.com> - 10.15-1
 - Rebase to upstream release 10.15
-  Resolves: rhbz#1898213
-  Resolves: rhbz#1898341
-  Resolves: rhbz#1901567
+  Resolves: rhbz#1898214
+  Resolves: rhbz#1898342
+  Resolves: rhbz#1898248
 
 * Tue Aug 11 2020 Patrik Novotný <panovotn@redhat.com> - 10.14-1
 - Rebase to upstream release 10.14