From 0daf06bded6fa7df5eb3dd1e12cb07373fad58fc Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 10 Jun 2021 04:46:57 -0400 Subject: [PATCH] import postgresql-12.7-1.module+el8.4.0+11288+c193d6d7 --- .gitignore | 6 +++--- .postgresql.metadata | 6 +++--- SOURCES/postgresql-10.15.tar.bz2.sha256 | 1 - SOURCES/postgresql-10.17.tar.bz2.sha256 | 1 + ...sql-12.5-contrib-dblink-expected-out.patch | 13 +++++++++++++ SOURCES/postgresql-12.5.tar.bz2.sha256 | 1 - SOURCES/postgresql-12.7.tar.bz2.sha256 | 1 + SPECS/postgresql.spec | 19 ++++++++++++------- 8 files changed, 33 insertions(+), 15 deletions(-) delete mode 100644 SOURCES/postgresql-10.15.tar.bz2.sha256 create mode 100644 SOURCES/postgresql-10.17.tar.bz2.sha256 create mode 100644 SOURCES/postgresql-12.5-contrib-dblink-expected-out.patch delete mode 100644 SOURCES/postgresql-12.5.tar.bz2.sha256 create mode 100644 SOURCES/postgresql-12.7.tar.bz2.sha256 diff --git a/.gitignore b/.gitignore index 53079aa..a65c0e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/postgresql-10.15.tar.bz2 -SOURCES/postgresql-12.5-US.pdf -SOURCES/postgresql-12.5.tar.bz2 +SOURCES/postgresql-10.17.tar.bz2 +SOURCES/postgresql-12.7-US.pdf +SOURCES/postgresql-12.7.tar.bz2 SOURCES/postgresql-setup-8.4.tar.gz diff --git a/.postgresql.metadata b/.postgresql.metadata index cadebb8..218d4cd 100644 --- a/.postgresql.metadata +++ b/.postgresql.metadata @@ -1,4 +1,4 @@ -3d688f05d2de7c9ed89ef6be8d33906a4e7a833d SOURCES/postgresql-10.15.tar.bz2 -b6896c2b2d6064ba0c0d8803b4c795296c29cd6c SOURCES/postgresql-12.5-US.pdf -031c42b26df6aa91351c02c336b9aa6111bf6c7e SOURCES/postgresql-12.5.tar.bz2 +479ec3bf2882a3188dd16ec92169c67e78995400 SOURCES/postgresql-10.17.tar.bz2 +704751c856874dd4f845b536fcefeacb25c96607 SOURCES/postgresql-12.7-US.pdf +e7071caed1f31a0b6d7579ea66e00342e8ebe146 SOURCES/postgresql-12.7.tar.bz2 f2112500abf4365fe968f1a7983fe174cca9e6f9 SOURCES/postgresql-setup-8.4.tar.gz 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/SOURCES/postgresql-12.5-contrib-dblink-expected-out.patch b/SOURCES/postgresql-12.5-contrib-dblink-expected-out.patch new file mode 100644 index 0000000..bd4b0e5 --- /dev/null +++ b/SOURCES/postgresql-12.5-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-12.5.tar.bz2.sha256 b/SOURCES/postgresql-12.5.tar.bz2.sha256 deleted file mode 100644 index 7e7febf..0000000 --- a/SOURCES/postgresql-12.5.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95 postgresql-12.5.tar.bz2 diff --git a/SOURCES/postgresql-12.7.tar.bz2.sha256 b/SOURCES/postgresql-12.7.tar.bz2.sha256 new file mode 100644 index 0000000..7bbec0d --- /dev/null +++ b/SOURCES/postgresql-12.7.tar.bz2.sha256 @@ -0,0 +1 @@ +8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995 postgresql-12.7.tar.bz2 diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec index 1ac01be..82dc82f 100644 --- a/SPECS/postgresql.spec +++ b/SPECS/postgresql.spec @@ -59,7 +59,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 12 -Version: %{majorversion}.5 +Version: %{majorversion}.7 Release: 1%{?dist} # The PostgreSQL license is very similar to other MIT licenses, but the OSI @@ -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}.15 +%global prevversion %{prevmajorversion}.17 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release @@ -108,7 +108,7 @@ Patch5: postgresql-var-run-socket.patch Patch6: postgresql-man.patch Patch8: postgresql-external-libpq.patch Patch9: postgresql-server-pg_config.patch -# Patch10: postgresql-12.5-contrib-dblink-expected-out.patch +Patch10: postgresql-12.5-contrib-dblink-expected-out.patch BuildRequires: gcc BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk @@ -369,7 +369,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. @@ -1220,11 +1220,16 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Tue Jun 1 2021 Filip Januš 12.7-1 +- Update to 12.7 + Resolves: #1964510 + Fix: CVE-2021-32027,CVE-2021-32028 + * Tue Nov 17 2020 Patrik Novotný - 12.5-1 - Rebase to upstream release 12.5 - Resolves: rhbz#1901555 - Resolves: rhbz#1898223 - Resolves: rhbz#1898329 + Resolves: rhbz#1898330 + Resolves: rhbz#1898224 + Resolves: rhbz#1898244 * Tue Nov 26 2019 Patrik Novotný - 12.1-3 - Release bump for 8.2.0 BZ#1776805