diff --git a/postgresql-12.20.tar.bz2.sha256 b/postgresql-12.20.tar.bz2.sha256 deleted file mode 100644 index 8f410eae21320dbd03c67e916f62b2046ddc7d33..0000000000000000000000000000000000000000 --- a/postgresql-12.20.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -2d543af3009fec7fd5af35f7a70c95085d3eef6b508e517aa9493e99b15e9ea9 postgresql-12.20.tar.bz2 diff --git a/postgresql-12.20.tar.bz2 b/postgresql-12.21.tar.bz2 similarity index 68% rename from postgresql-12.20.tar.bz2 rename to postgresql-12.21.tar.bz2 index 011ae3fa181dc7b5f11939ee7a4836c1ef989199..9e9f4e22b1907b938a69a229747d45e8fe2616ad 100644 Binary files a/postgresql-12.20.tar.bz2 and b/postgresql-12.21.tar.bz2 differ diff --git a/postgresql-12.21.tar.bz2.sha256 b/postgresql-12.21.tar.bz2.sha256 new file mode 100644 index 0000000000000000000000000000000000000000..3a37451bd8ab989d481b7cdbdc79422b0885b8af --- /dev/null +++ b/postgresql-12.21.tar.bz2.sha256 @@ -0,0 +1 @@ +6c711550ac1cc7828865e5823d9f457e3bdad6f4320177169f90e419be0c27f2 postgresql-12.21.tar.bz2 diff --git a/postgresql-13.16.tar.bz2.sha256 b/postgresql-13.16.tar.bz2.sha256 deleted file mode 100644 index 8b1d6f33bc48848c29913278671ebfacf9a7195a..0000000000000000000000000000000000000000 --- a/postgresql-13.16.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865 postgresql-13.16.tar.bz2 diff --git a/postgresql-13.16-US.pdf b/postgresql-13.17-US.pdf similarity index 87% rename from postgresql-13.16-US.pdf rename to postgresql-13.17-US.pdf index 8daf83a648221d2c16770cea5c8ca5c39a01e239..10f1cd34c1ff34c63feceaf091352e070e77f1fe 100644 Binary files a/postgresql-13.16-US.pdf and b/postgresql-13.17-US.pdf differ diff --git a/postgresql-13.16.tar.bz2 b/postgresql-13.17.tar.bz2 similarity index 69% rename from postgresql-13.16.tar.bz2 rename to postgresql-13.17.tar.bz2 index bfc8e8f0d01c4c4bb58e2b7a7d29aedda3332bc9..b725175b84bc532a9e17703508ffec316caf1455 100644 Binary files a/postgresql-13.16.tar.bz2 and b/postgresql-13.17.tar.bz2 differ diff --git a/postgresql-13.17.tar.bz2.sha256 b/postgresql-13.17.tar.bz2.sha256 new file mode 100644 index 0000000000000000000000000000000000000000..c82bb0d42bab5d66de6a2af7e2fcb0744a505157 --- /dev/null +++ b/postgresql-13.17.tar.bz2.sha256 @@ -0,0 +1 @@ +022b0a6e7bc374a777eece33708895d7b60cae07d492b286b296a49d7395d78b postgresql-13.17.tar.bz2 diff --git a/postgresql-subtransaction-test.patch b/postgresql-subtransaction-test.patch deleted file mode 100644 index e470e18da996986a1b2fc587d7b658f3556e4e95..0000000000000000000000000000000000000000 --- 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 3801112006093dfecdd327eff502863c66ace2cc..6d659e054305f7ab86d1ca2b25201f71e06fb49d 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -35,7 +35,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 13 -Version: %{majorversion}.16 +Version: %{majorversion}.17 Release: 1 # The PostgreSQL license is very similar to other MIT licenses, but the OSI @@ -44,7 +44,7 @@ License: PostgreSQL Url: http://www.postgresql.org/ %global prevmajorversion 12 -%global prevversion %{prevmajorversion}.20 +%global prevversion %{prevmajorversion}.21 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release @@ -80,7 +80,6 @@ Patch8: postgresql-external-libpq.patch Patch9: postgresql-server-pg_config.patch Patch10: postgresql-no-libecpg.patch Patch11: postgresql-datalayout-mismatch-on-s390.patch -Patch14: postgresql-subtransaction-test.patch Patch15: postgresql-13.3-sw.patch Patch17: postgresql-pgcrypto-openssl3-tests.patch @@ -1301,6 +1300,9 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Fri Nov 15 2024 Funda Wang - 13.17-1 +- update to 13.17 (CVE-2024-10976, CVE-2024-10977, CVE-2024-10978, CVE-2024-10979) + * Fri Aug 09 2024 Funda Wang - 13.16-1 - New version 13.16 (CVE-2024-7348)