From 07cc19d13924132d837e4b077a94d5d6f60fd9a1 Mon Sep 17 00:00:00 2001 From: Filip Januš Date: Aug 16 2021 07:28:07 +0000 Subject: Update to 13.4 Disable postgresql-subtransaction-test.patch no more needed --- diff --git a/postgresql-subtransaction-test.patch b/postgresql-subtransaction-test.patch deleted file mode 100644 index e470e18..0000000 --- a/postgresql-subtransaction-test.patch +++ /dev/null @@ -1,56 +0,0 @@ -Fix subtransaction test for Python 3.10 - -Starting with Python 3.10, the stacktrace looks differently: - - PL/Python function "subtransaction_exit_subtransaction_in_with", line 3, in - - s.__exit__(None, None, None) - + PL/Python function "subtransaction_exit_subtransaction_in_with", line 2, in - + with plpy.subtransaction() as s: -Using try/except specifically makes the error look always the same. - -RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1959080 - -diff -up postgresql-13.2/src/pl/plpython/expected/plpython_subtransaction.out.patchnew postgresql-13.2/src/pl/plpython/expected/plpython_subtransaction.out ---- postgresql-13.2/src/pl/plpython/expected/plpython_subtransaction.out.patchnew 2021-02-08 22:54:11.000000000 +0100 -+++ postgresql-13.2/src/pl/plpython/expected/plpython_subtransaction.out 2021-05-11 21:04:25.085586012 +0200 -@@ -171,8 +171,11 @@ with plpy.subtransaction() as s: - $$ LANGUAGE plpythonu; - CREATE FUNCTION subtransaction_exit_subtransaction_in_with() RETURNS void - AS $$ --with plpy.subtransaction() as s: -- s.__exit__(None, None, None) -+try: -+ with plpy.subtransaction() as s: -+ s.__exit__(None, None, None) -+except ValueError as e: -+ raise ValueError(e) - $$ LANGUAGE plpythonu; - SELECT subtransaction_exit_without_enter(); - ERROR: ValueError: this subtransaction has not been entered -@@ -224,8 +227,8 @@ PL/Python function "subtransaction_enter - SELECT subtransaction_exit_subtransaction_in_with(); - ERROR: ValueError: this subtransaction has already been exited - CONTEXT: Traceback (most recent call last): -- PL/Python function "subtransaction_exit_subtransaction_in_with", line 3, in -- s.__exit__(None, None, None) -+ PL/Python function "subtransaction_exit_subtransaction_in_with", line 6, in -+ raise ValueError(e) - PL/Python function "subtransaction_exit_subtransaction_in_with" - -- Make sure we don't get a "current transaction is aborted" error - SELECT 1 as test; -diff -up postgresql-13.2/src/pl/plpython/sql/plpython_subtransaction.sql.patchnew postgresql-13.2/src/pl/plpython/sql/plpython_subtransaction.sql ---- postgresql-13.2/src/pl/plpython/sql/plpython_subtransaction.sql.patchnew 2021-02-08 22:54:11.000000000 +0100 -+++ postgresql-13.2/src/pl/plpython/sql/plpython_subtransaction.sql 2021-05-11 21:02:34.386415376 +0200 -@@ -121,8 +121,11 @@ $$ LANGUAGE plpythonu; - - CREATE FUNCTION subtransaction_exit_subtransaction_in_with() RETURNS void - AS $$ --with plpy.subtransaction() as s: -- s.__exit__(None, None, None) -+try: -+ with plpy.subtransaction() as s: -+ s.__exit__(None, None, None) -+except ValueError as e: -+ raise ValueError(e) - $$ LANGUAGE plpythonu; - - SELECT subtransaction_exit_without_enter(); diff --git a/postgresql.spec b/postgresql.spec index cc59dd4..d43c35c 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -60,8 +60,8 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 13 -Version: %{majorversion}.3 -Release: 5%{?dist} +Version: %{majorversion}.4 +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,7 +73,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 12 -%global prevversion %{prevmajorversion}.7 +%global prevversion %{prevmajorversion}.8 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release @@ -111,7 +111,6 @@ Patch9: postgresql-server-pg_config.patch # Upstream bug #16971: https://www.postgresql.org/message-id/16971-5d004d34742a3d35%40postgresql.org # rhbz#1940964 Patch10: postgresql-datalayout-mismatch-on-s390.patch -Patch11: postgresql-subtransaction-test.patch Patch12: postgresql-no-libecpg.patch BuildRequires: make @@ -427,7 +426,6 @@ goal of accelerating analytics queries. %endif %patch9 -p1 %patch10 -p1 -%patch11 -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. @@ -1242,6 +1240,11 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Thu Aug 12 2021 Filip Januš - 13.4-1 +- Update to 13.4 +- Disable postgresql-subtransaction-test.patch + now succeeds without patch + * Fri Jul 23 2021 Fedora Release Engineering - 13.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild @@ -1306,7 +1309,7 @@ make -C postgresql-setup-%{setup_version} check Fixes CVE-2020-25695 Fixes CVE-2020-25696 -* Wed Jan 27 2021 Fedora Release Engineering - 12.4-5 +* Wed Jan 07 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 diff --git a/sources b/sources index 61f8db1..3d245f4 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (postgresql-12.7.tar.bz2) = 47ca347df63a441e52e52442074e85d0ebd3a89f7eb037022c4690cbe88b21a6a959092a812b79bb30db47b5975a5d7908318c73b2685683d48b4789d4ae6a44 -SHA512 (postgresql-12.7.tar.bz2.sha256) = ab5e6bad53b95d6c5fb9a9cc506ac41eea230f6869dff42d43a8af33d8b7239667b6f8f1974fe0cf92f1959720f8361b80ccd50666af01a1495cfa75e42af5d5 -SHA512 (postgresql-13.3.tar.bz2) = 1560cc766982a9ea9d33c77835b20e33e11b03acb77fc75d905c565883935a7dbcd27b9b2ab6a0ecdb815261f7c259865cb3dac85c10a3181c3fcaeb4d28bf60 -SHA512 (postgresql-13.3.tar.bz2.sha256) = 5d0297a8e7596cf6305592de8a5c66f587b3d5bd9f4b4d1780357798381482e9653c42557fdde26f62eacf2f814c6d7c9ab8189faa39a5eb532384630fbcfe26 +SHA512 (postgresql-12.8.tar.bz2) = 970fe1041e427ac1c8a786c93e2079b0a9c8b3fcaf9d38877894eb02e8a9afc7cd73d7ac28078c455845a922a1b7d9c1e22cb7990d8d523dd6496af9442fba01 +SHA512 (postgresql-12.8.tar.bz2.sha256) = 0cb605141eb0bc0fa21cdb473a899671e1da71f2ac737967d938e08cf4bcefcf041c4f7a186ae09d7442a3295a54efe8826f81ef6bc4e2173130f2b6198ce0e8 +SHA512 (postgresql-13.4.tar.bz2) = f1faf676ffdcee3e7f2c3b78f4badf44770d6be58090036d119d8fb0688e2b9f9159dd44fe850c179b8e23f256942c05edb8fcc385f0e852d16b37eace785b5a +SHA512 (postgresql-13.4.tar.bz2.sha256) = d29333d45678e17a0b342690e3772414fbb5cb90ac9e4843c42bbebc2167b5de096b2ececb5e43e1e8847e342ad0d9dd7e6a9a36617f3d7add54950da628e318 SHA512 (postgresql-setup-8.5.tar.gz) = 5d31e31f3fdaa1564f6758ad7bcc17ffaac627b4665117d54b81e25e8309c03fc7d7cd53733891f80d3fc874474fa6b6d9a8d4765d1a9b9c31041baa66975241 -SHA512 (postgresql-13.3-US.pdf) = 0700a78d50df0386b991154bb0cc0e96b3e3cfdbe05ca8d931033f01b2f004568c0801f9cf19ac1677e63aaae17bffa1077885a2b985c0f0d1dad850e168b734 +SHA512 (postgresql-13.4-US.pdf) = b5a1837473eb78b1973ed42a9033368e971a09d0460a380d2038114e4a9ad2ca1366e5a09fb3688b52cdf0395cfd85a21fa4644aab9226cae84c96293c17b053