From 98a27b6f59a0a429ba4664054b7ef7c3a3da2850 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 11 Jan 2022 13:00:24 -0500 Subject: [PATCH] import postgresql-13.5-1.el9 --- .gitignore | 8 ++--- .postgresql.metadata | 8 ++--- SOURCES/postgresql-12.7.tar.bz2.sha256 | 1 - SOURCES/postgresql-12.9.tar.bz2.sha256 | 1 + SOURCES/postgresql-13.3.tar.bz2.sha256 | 1 - SOURCES/postgresql-13.5.tar.bz2.sha256 | 1 + .../postgresql-pgcrypto-openssl3-init.patch | 33 ------------------- SPECS/postgresql.spec | 17 ++++++---- 8 files changed, 21 insertions(+), 49 deletions(-) delete mode 100644 SOURCES/postgresql-12.7.tar.bz2.sha256 create mode 100644 SOURCES/postgresql-12.9.tar.bz2.sha256 delete mode 100644 SOURCES/postgresql-13.3.tar.bz2.sha256 create mode 100644 SOURCES/postgresql-13.5.tar.bz2.sha256 delete mode 100644 SOURCES/postgresql-pgcrypto-openssl3-init.patch diff --git a/.gitignore b/.gitignore index 1bd8ee2..5132134 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/postgresql-12.7.tar.bz2 -SOURCES/postgresql-13.3-US.pdf -SOURCES/postgresql-13.3.tar.bz2 -SOURCES/postgresql-setup-8.5.tar.gz +SOURCES/postgresql-12.9.tar.bz2 +SOURCES/postgresql-13.5-US.pdf +SOURCES/postgresql-13.5.tar.bz2 +SOURCES/postgresql-setup-8.6.tar.gz diff --git a/.postgresql.metadata b/.postgresql.metadata index 9b686c1..d83b6da 100644 --- a/.postgresql.metadata +++ b/.postgresql.metadata @@ -1,4 +1,4 @@ -e7071caed1f31a0b6d7579ea66e00342e8ebe146 SOURCES/postgresql-12.7.tar.bz2 -0f1150c6be91f6fcfdd4d98b506da4f98c422534 SOURCES/postgresql-13.3-US.pdf -7a775f95367613ed5f7e4cd632586f9628475a92 SOURCES/postgresql-13.3.tar.bz2 -3f6ff4a7c424f15034b35380a8669b52d7fb3940 SOURCES/postgresql-setup-8.5.tar.gz +a79d8428850da50a65451e5e44771844c7f166d5 SOURCES/postgresql-12.9.tar.bz2 +7e450e4c325b1d8873ec831593cef2329429a3cc SOURCES/postgresql-13.5-US.pdf +9321e2b01d1ffb15adae06945cb2c5f9dd671bc9 SOURCES/postgresql-13.5.tar.bz2 +9e12ee26bf41d3831f83049b51ae5da76de2ce12 SOURCES/postgresql-setup-8.6.tar.gz diff --git a/SOURCES/postgresql-12.7.tar.bz2.sha256 b/SOURCES/postgresql-12.7.tar.bz2.sha256 deleted file mode 100644 index 7bbec0d..0000000 --- a/SOURCES/postgresql-12.7.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995 postgresql-12.7.tar.bz2 diff --git a/SOURCES/postgresql-12.9.tar.bz2.sha256 b/SOURCES/postgresql-12.9.tar.bz2.sha256 new file mode 100644 index 0000000..5eae283 --- /dev/null +++ b/SOURCES/postgresql-12.9.tar.bz2.sha256 @@ -0,0 +1 @@ +89fda2de33ed04a98548e43f3ee5f15b882be17505d631fe0dd1a540a2b56dce postgresql-12.9.tar.bz2 diff --git a/SOURCES/postgresql-13.3.tar.bz2.sha256 b/SOURCES/postgresql-13.3.tar.bz2.sha256 deleted file mode 100644 index 7898d34..0000000 --- a/SOURCES/postgresql-13.3.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1 postgresql-13.3.tar.bz2 diff --git a/SOURCES/postgresql-13.5.tar.bz2.sha256 b/SOURCES/postgresql-13.5.tar.bz2.sha256 new file mode 100644 index 0000000..834e50e --- /dev/null +++ b/SOURCES/postgresql-13.5.tar.bz2.sha256 @@ -0,0 +1 @@ +9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3 postgresql-13.5.tar.bz2 diff --git a/SOURCES/postgresql-pgcrypto-openssl3-init.patch b/SOURCES/postgresql-pgcrypto-openssl3-init.patch deleted file mode 100644 index 7656ba5..0000000 --- a/SOURCES/postgresql-pgcrypto-openssl3-init.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream patch: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=135d8687ad -author Daniel Gustafsson - -The PX layer in pgcrypto is handling digest padding on its own uniformly -for all backend implementations. Starting with OpenSSL 3.0.0, DecryptUpdate -doesn't flush the last block in case padding is enabled so explicitly -disable it as we don't use it. - -This will be backpatched to all supported version once there is sufficient -testing in the buildfarm of OpenSSL 3. - -diff -ur postgresql-14rc1/contrib/pgcrypto/openssl.c postgresql-p/contrib/pgcrypto/openssl.c ---- postgresql-14rc1/contrib/pgcrypto/openssl.c 2021-09-20 17:33:01.000000000 -0400 -+++ postgresql-p/contrib/pgcrypto/openssl.c 2021-10-06 04:07:24.628836908 -0400 -@@ -379,6 +379,8 @@ - { - if (!EVP_DecryptInit_ex(od->evp_ctx, od->evp_ciph, NULL, NULL, NULL)) - return PXE_CIPHER_INIT; -+ if (!EVP_CIPHER_CTX_set_padding(od->evp_ctx, 0)) -+ return PXE_CIPHER_INIT; - if (!EVP_CIPHER_CTX_set_key_length(od->evp_ctx, od->klen)) - return PXE_CIPHER_INIT; - if (!EVP_DecryptInit_ex(od->evp_ctx, NULL, NULL, od->key, od->iv)) -@@ -403,6 +405,8 @@ - { - if (!EVP_EncryptInit_ex(od->evp_ctx, od->evp_ciph, NULL, NULL, NULL)) - return PXE_CIPHER_INIT; -+ if (!EVP_CIPHER_CTX_set_padding(od->evp_ctx, 0)) -+ return PXE_CIPHER_INIT; - if (!EVP_CIPHER_CTX_set_key_length(od->evp_ctx, od->klen)) - return PXE_CIPHER_INIT; - if (!EVP_EncryptInit_ex(od->evp_ctx, NULL, NULL, od->key, od->iv)) - diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec index a70fbca..5d84b56 100644 --- a/SPECS/postgresql.spec +++ b/SPECS/postgresql.spec @@ -62,8 +62,8 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 13 -Version: %{majorversion}.3 -Release: 10%{?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. @@ -75,11 +75,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 12 -%global prevversion %{prevmajorversion}.7 +%global prevversion %{prevmajorversion}.9 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release -%global setup_version 8.5 +%global setup_version 8.6 %global service_name postgresql.service @@ -111,7 +111,6 @@ Patch5: postgresql-var-run-socket.patch Patch8: postgresql-external-libpq.patch Patch9: postgresql-server-pg_config.patch Patch12: postgresql-no-libecpg.patch -Patch13: postgresql-pgcrypto-openssl3-init.patch Patch14: postgresql-pgcrypto-openssl3-tests.patch BuildRequires: make @@ -427,7 +426,6 @@ goal of accelerating analytics queries. %patch12 -p1 %endif %patch9 -p1 -%patch13 -p1 %patch14 -p1 # We used to run autoconf here, but there's no longer any real need to, @@ -1221,6 +1219,13 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Tue Nov 30 2021 Marek Kulik - 13.5-1 +- Update to 13.5 (#2023301) + Remove patch postgresql-pgcrypto-openssl3-init.patch - Already in upstream + +* Mon Nov 29 2021 Marek Kulik - 13.3-11 +- Update postgresql-setup to 8.6 (#2027278) + * Wed Oct 13 2021 Ondrej Dubaj - 13.3-10 - Release bum due to gating configuration