From c920917f8230bf8e77a93b61edf13d9df3c3a33d Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 28 Jan 2021 11:34:00 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/postgresql.git#08867eaa8fa6fcd23d15e449043fd72cb9c5f15e --- ...sql-12.5-contrib-dblink-expected-out.patch | 13 ++++++++++ postgresql.spec | 26 ++++++++++++++++--- sources | 12 ++++----- 3 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 postgresql-12.5-contrib-dblink-expected-out.patch diff --git a/postgresql-12.5-contrib-dblink-expected-out.patch b/postgresql-12.5-contrib-dblink-expected-out.patch new file mode 100644 index 0000000..bd4b0e5 --- /dev/null +++ b/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/postgresql.spec b/postgresql.spec index f891780..3b2ce50 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -60,8 +60,8 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 12 -Version: %{majorversion}.4 -Release: 3%{?dist} +Version: %{majorversion}.5 +Release: 1%{?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. @@ -73,11 +73,11 @@ 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 11 -%global prevversion %{prevmajorversion}.9 +%global prevversion %{prevmajorversion}.10 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release -%global setup_version 8.4 +%global setup_version 8.5 %global service_name postgresql.service @@ -108,7 +108,9 @@ Patch2: postgresql-logging.patch Patch5: postgresql-var-run-socket.patch Patch8: postgresql-external-libpq.patch Patch9: postgresql-server-pg_config.patch +Patch10: postgresql-12.5-contrib-dblink-expected-out.patch +BuildRequires: make BuildRequires: gcc BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk BuildRequires: perl(ExtUtils::Embed), perl-devel @@ -391,6 +393,7 @@ goal of accelerating analytics queries. %patch5 -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. @@ -1116,6 +1119,7 @@ make -C postgresql-setup-%{setup_version} check %{_bindir}/pg_checksums %{_bindir}/postgres %{_bindir}/postgresql-setup +%{_bindir}/postgresql-upgrade %{_bindir}/postmaster %dir %{_datadir}/pgsql %{_datadir}/pgsql/*.sample @@ -1158,6 +1162,7 @@ make -C postgresql-setup-%{setup_version} check %{_mandir}/man1/postgres.* %{_mandir}/man1/postgresql-new-systemd-unit.* %{_mandir}/man1/postgresql-setup.* +%{_mandir}/man1/postgresql-upgrade.* %{_mandir}/man1/postmaster.* %{_sbindir}/postgresql-new-systemd-unit %{_tmpfilesdir}/postgresql.conf @@ -1258,6 +1263,19 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Wed Jan 13 2021 Patrik Novotný - 12.5-1 +- Rebase to upstream release 12.5 + Patch for libpq 13.x build time compatibility + Fixes CVE-2020-25694 + Fixes CVE-2020-25695 + Fixes CVE-2020-25696 + +* Wed Jan 27 2021 Fedora Release Engineering - 12.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Nov 16 2020 Honza Horak - 12.4-4 +- Update postgresql-setup to v8.5 + * Fri Oct 09 2020 Honza Horak - 12.4-3 - Removing problematic requirements on ppc64 arch Resolves: #1882642 diff --git a/sources b/sources index dd56db2..360ec84 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (postgresql-11.9.tar.bz2) = 2c5c2f51aa01f02af4aa0849441767383e30fef69dd52efa442892f39d2456bfa8bf01f633a265e00eca0745e792609d2c1d33f77d8f29a02f5f374c84f2bf6e -SHA512 (postgresql-11.9.tar.bz2.sha256) = 1ab23ad8d37b3876f1d5fce3ceaea268cdac02ffc001eae19c19f49cb28dacbffdadbd3fabb2f5dd8dbd6ebf1d92d33071da1b910f97779d370cd51571efa67a -SHA512 (postgresql-12.4.tar.bz2) = 36daf10878ca153370829178786dd6ee366ab4d4d6dc9c527536740fdb14b688ae4c33f850eb4243a7667d23f87e4bfd1ddee0755447ad4f3996e423e391c2f3 -SHA512 (postgresql-12.4.tar.bz2.sha256) = d5c6d9c6cf189f0ef9c4ebac18782f25c0ff8420d0b063217f4ac250cca4706ec782e983326ffcb23258bcd5bf17b481e53d84aeb85b5744bfd90ea1bd33431a -SHA512 (postgresql-setup-8.4.tar.gz) = eb73767d5c676481598aeb545e15027a29a438aa29480ad414f6af31c9df61138a51f5425999b4b35e776a3dbbb28c887790ea9771abc3328158dd1d34b1dce1 -SHA512 (postgresql-12.4-US.pdf) = e672e6fdd104faf210a083d4c6a4cbec26f980d981bd5c499701ba37161ac3953978c25ab07098e57869a03608dec27b45db636e6b815873bfb4d2b3f53bd3c2 +SHA512 (postgresql-11.10.tar.bz2) = 0cc0e9b0f76e00727dc699ea59a45d760d37d91ec736a62cbc9bda3e38eb1ef1565e4e399dd3ae96bad87f866e56e364f916de7740d8be6e1cfc2bf654dfbb68 +SHA512 (postgresql-11.10.tar.bz2.sha256) = 18ed6c3b51010a62bd0cffa600a23b5c2630bdc0f97fc207212d22be54c1977b53dcacbe7117a8dd5621245ef730e94278cb76bec219ad2767aeefd0f76c2b19 +SHA512 (postgresql-12.5.tar.bz2) = 9895bcb1bb26206500666ab4441e663ef83702d428b85a6ff177a4eaf44b0ae06b35d5c4da2672ccb4ec18296649af95bf2f0aed526afaa6a216a8c2d2c5627e +SHA512 (postgresql-12.5.tar.bz2.sha256) = 5a05064eacb02458b02e57eafb983ffd282536fee390c4f13257f747bb74a2af3d56bd00de01c5c9934f64a7eeedbe0edc7a7f219d17f0ee912f34577b398151 +SHA512 (postgresql-setup-8.5.tar.gz) = 5d31e31f3fdaa1564f6758ad7bcc17ffaac627b4665117d54b81e25e8309c03fc7d7cd53733891f80d3fc874474fa6b6d9a8d4765d1a9b9c31041baa66975241 +SHA512 (postgresql-12.5-US.pdf) = 0fcd669fd521e10b066ffe57f57172f363184b873ef8a01f22c26b8fcd11f40e976ea9a0e765fe8a3590e99361d16e402279634e17721a3c57994d25f9b0df29