Update to 13.5

Changes:
 - Rebase postgresql to version 13.5
 - Remove already merged upstream patch:
   postgresql-pgcrypto-openssl3-init.patch

postgresql-pgcrypto-openssl3-init.patch

@@ -1,33 +0,0 @@
-Upstream patch: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=135d8687ad
-author	Daniel Gustafsson <dgustafsson@postgresql.org>
-
-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))
-

postgresql.spec

@@ -60,8 +60,8 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 13
-Version: %{majorversion}.4
+Version: %{majorversion}.5
-Release: 5%{?dist}
+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}.8
+%global prevversion %{prevmajorversion}.9
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -112,8 +112,6 @@ Patch9: postgresql-server-pg_config.patch
 # rhbz#1940964
 Patch10: postgresql-datalayout-mismatch-on-s390.patch
 Patch12: postgresql-no-libecpg.patch
-# Upstream patch - it's assumed removal of this patch with the next upstream release
-Patch13: postgresql-pgcrypto-openssl3-init.patch
 # This patch disables deprecated ciphers in the test suite
 Patch14: postgresql-pgcrypto-openssl3-tests.patch
 
@@ -430,7 +428,6 @@ goal of accelerating analytics queries.
 %endif
 %patch9 -p1
 %patch10 -p1
-%patch13 -p1
 %patch14 -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.
@@ -1245,6 +1242,10 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Mon Dec 13 2021 Marek Kulik <mkulik@redhat.com> - 13.5-1
+- Update to 13.5
+  Remove patch postgresql-pgcrypto-openssl3-init.patch - already in upstream
+
 * Thu Nov 18 2021 Marek Kulik <mkulik@redhat.com> - 13.4-5
 - Update postgresql-setup to v8.6
 

sources

@@ -1,6 +1,6 @@
-SHA512 (postgresql-12.8.tar.bz2) = 970fe1041e427ac1c8a786c93e2079b0a9c8b3fcaf9d38877894eb02e8a9afc7cd73d7ac28078c455845a922a1b7d9c1e22cb7990d8d523dd6496af9442fba01
+SHA512 (postgresql-12.9.tar.bz2) = 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f
-SHA512 (postgresql-12.8.tar.bz2.sha256) = 0cb605141eb0bc0fa21cdb473a899671e1da71f2ac737967d938e08cf4bcefcf041c4f7a186ae09d7442a3295a54efe8826f81ef6bc4e2173130f2b6198ce0e8
+SHA512 (postgresql-12.9.tar.bz2.sha256) = e06887f94a470d723c8d65ece5a32358da1881411ad92cc4ef35c9f6e8aa05a0485c729e07ab381cda4b53fe6fdaec1b07c2d0200ee8823ec45849e8a8f277f0
-SHA512 (postgresql-13.4.tar.bz2) = f1faf676ffdcee3e7f2c3b78f4badf44770d6be58090036d119d8fb0688e2b9f9159dd44fe850c179b8e23f256942c05edb8fcc385f0e852d16b37eace785b5a
+SHA512 (postgresql-13.5.tar.bz2) = c76effbca8ee63be48fa3aeb39c7038221848fe83ca2afc4e0904ba8c6a50b89aa2ad37080d4e3be75e9bdc2d6ca6dfefcda334ef55a5e1a8954bb955ce905e5
-SHA512 (postgresql-13.4.tar.bz2.sha256) = d29333d45678e17a0b342690e3772414fbb5cb90ac9e4843c42bbebc2167b5de096b2ececb5e43e1e8847e342ad0d9dd7e6a9a36617f3d7add54950da628e318
+SHA512 (postgresql-13.5.tar.bz2.sha256) = f79b6cbf7b7929de9312ece511fd7dad80b0b3fbfca98613db1d2825c4e77a9bf7cd4e790e2bc6fd827bc95eaf5105ff1df20af4bec2848779d01b1eb9100b81
 SHA512 (postgresql-setup-8.6.tar.gz) = dc687670cd58070512833271d8f3e7e4308c47cba1ad4c93e3d5f61acf07f390ed048f4d7f1567d2826f19a253562e13e56407dcf81a42f42c61ac96d8fe3178
-SHA512 (postgresql-13.4-US.pdf) = b5a1837473eb78b1973ed42a9033368e971a09d0460a380d2038114e4a9ad2ca1366e5a09fb3688b52cdf0395cfd85a21fa4644aab9226cae84c96293c17b053
+SHA512 (postgresql-13.5-US.pdf) = 8b36ab05c7e54eeb13b38bc51fa51727df20578c305573cfc6b9773780999e86e5a3aae07e14062b9cafc9e684a2a699adf7bf69b8d78501c5b9a97502e89e5b