From 2a2b0e6224c94aaa56adeb7f2c54ef3b6ac6cd86 Mon Sep 17 00:00:00 2001 From: Marek Kulik Date: Mon, 6 Dec 2021 15:04:47 +0000 Subject: [PATCH] Update postgresql to 13.5 --- postgresql-pgcrypto-openssl3-init.patch | 33 ------------------------- postgresql.spec | 12 +++++---- sources | 10 ++++---- 3 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 postgresql-pgcrypto-openssl3-init.patch diff --git a/postgresql-pgcrypto-openssl3-init.patch b/postgresql-pgcrypto-openssl3-init.patch deleted file mode 100644 index 7656ba5..0000000 --- a/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/postgresql.spec b/postgresql.spec index f5958f6..5d84b56 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -62,8 +62,8 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 13 -Version: %{majorversion}.3 -Release: 11%{?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,7 +75,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}.9 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion} %global precise_version %{?epoch:%epoch:}%version-%release @@ -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,10 @@ 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) diff --git a/sources b/sources index 1784620..597bf51 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.9.tar.bz2) = 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f +SHA512 (postgresql-12.9.tar.bz2.sha256) = e06887f94a470d723c8d65ece5a32358da1881411ad92cc4ef35c9f6e8aa05a0485c729e07ab381cda4b53fe6fdaec1b07c2d0200ee8823ec45849e8a8f277f0 +SHA512 (postgresql-13.5.tar.bz2) = c76effbca8ee63be48fa3aeb39c7038221848fe83ca2afc4e0904ba8c6a50b89aa2ad37080d4e3be75e9bdc2d6ca6dfefcda334ef55a5e1a8954bb955ce905e5 +SHA512 (postgresql-13.5.tar.bz2.sha256) = f79b6cbf7b7929de9312ece511fd7dad80b0b3fbfca98613db1d2825c4e77a9bf7cd4e790e2bc6fd827bc95eaf5105ff1df20af4bec2848779d01b1eb9100b81 SHA512 (postgresql-setup-8.6.tar.gz) = dc687670cd58070512833271d8f3e7e4308c47cba1ad4c93e3d5f61acf07f390ed048f4d7f1567d2826f19a253562e13e56407dcf81a42f42c61ac96d8fe3178 -SHA512 (postgresql-13.3-US.pdf) = 0700a78d50df0386b991154bb0cc0e96b3e3cfdbe05ca8d931033f01b2f004568c0801f9cf19ac1677e63aaae17bffa1077885a2b985c0f0d1dad850e168b734 +SHA512 (postgresql-13.5-US.pdf) = 8b36ab05c7e54eeb13b38bc51fa51727df20578c305573cfc6b9773780999e86e5a3aae07e14062b9cafc9e684a2a699adf7bf69b8d78501c5b9a97502e89e5b