Update to upstream 3.7.2 release

.gitignore

@@ -133,3 +133,5 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-3.7.0.tar.xz.sig
 /gnutls-3.7.1.tar.xz
 /gnutls-3.7.1.tar.xz.sig
+/gnutls-3.7.2.tar.xz
+/gnutls-3.7.2.tar.xz.sig

gnutls-3.7.1-aggressive-realloc-fixes.patch

@@ -1,84 +0,0 @@
-From e1cf5b8694b23cdc88f4a4a344f8262aa8ab0f8e Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Wed, 10 Mar 2021 16:11:29 +0100
-Subject: [PATCH 1/2] _gnutls_buffer_resize: account for unused area if
- AGGRESSIVE_REALLOC
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
----
- lib/str.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/str.c b/lib/str.c
-index 506fe1721..bc20ebb04 100644
---- a/lib/str.c
-+++ b/lib/str.c
-@@ -155,12 +155,12 @@ int _gnutls_buffer_resize(gnutls_buffer_st * dest, size_t new_size)
- 
- 	unused = MEMSUB(dest->data, dest->allocd);
- 	dest->allocd =
--	    gnutls_realloc_fast(dest->allocd, new_size);
-+	    gnutls_realloc_fast(dest->allocd, new_size + unused);
- 	if (dest->allocd == NULL) {
- 		gnutls_assert();
- 		return GNUTLS_E_MEMORY_ERROR;
- 	}
--	dest->max_length = new_size;
-+	dest->max_length = new_size + unused;
- 	dest->data = dest->allocd + unused;
- 
- 	return 0;
--- 
-2.30.2
-
-
-From 78691bfe4555c4d610b405173987ed7515515d20 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Wed, 10 Mar 2021 16:12:23 +0100
-Subject: [PATCH 2/2] str: suppress -Wunused-function if AGGRESSIVE_REALLOC is
- defined
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
----
- lib/str.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/lib/str.c b/lib/str.c
-index bc20ebb04..8007340f1 100644
---- a/lib/str.c
-+++ b/lib/str.c
-@@ -87,15 +87,6 @@ void _gnutls_buffer_clear(gnutls_buffer_st * str)
- 
- #define MIN_CHUNK 1024
- 
--static void align_allocd_with_data(gnutls_buffer_st * dest)
--{
--	assert(dest->allocd != NULL);
--	assert(dest->data != NULL);
--	if (dest->length)
--		memmove(dest->allocd, dest->data, dest->length);
--	dest->data = dest->allocd;
--}
--
- /**
-  * gnutls_buffer_append_data:
-  * @dest: the buffer to append to
-@@ -168,6 +159,15 @@ int _gnutls_buffer_resize(gnutls_buffer_st * dest, size_t new_size)
- 
- #else
- 
-+static void align_allocd_with_data(gnutls_buffer_st * dest)
-+{
-+	assert(dest->allocd != NULL);
-+	assert(dest->data != NULL);
-+	if (dest->length)
-+		memmove(dest->allocd, dest->data, dest->length);
-+	dest->data = dest->allocd;
-+}
-+
- int _gnutls_buffer_resize(gnutls_buffer_st * dest, size_t new_size)
- {
- 	if (unlikely(dest->data != NULL && dest->allocd == NULL))
--- 
-2.30.2
-

gnutls.spec

@@ -1,9 +1,8 @@
 # This spec file has been automatically updated
-Version:	3.7.1
+Version:	3.7.2
-Release: 3%{?dist}
+Release: 1%{?dist}
 Patch1:	gnutls-3.6.7-no-now-guile.patch
 Patch2:	gnutls-3.2.7-rpath.patch
-Patch3:	gnutls-3.7.1-aggressive-realloc-fixes.patch
 %bcond_with bootstrap
 %bcond_without dane
 %if 0%{?rhel}
@@ -285,6 +284,9 @@ make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null
 %endif
 
 %changelog
+* Sat May 29 2021 Daiki Ueno <dueno@redhat.com> - 3.7.2-1
+- Update to upstream 3.7.2 release
+
 * Sun Mar 28 2021 Daiki Ueno <dueno@redhat.com> - 3.7.1-3
 - Remove %%defattr invocations which are no longer necessary
 - libpkcs11mock1.* is not installed anymore

sources

@@ -1,3 +1,3 @@
-SHA512 (gnutls-3.7.1.tar.xz) = 0fe801f03676c3bd970387f94578c8be7ba6030904989e7d21dffdc726209bab44c8096fbcb6d51fed2de239537bd00df2338ee9c8d984a1c386826b91062a95
+SHA512 (gnutls-3.7.2.tar.xz) = 5d01d561a05379da71e4847e30ba13c2abe09f7a5c4359fd539d8bd19abad0ce87120f82ee7b6264e787bd3edbc5ae16beffa892983cbc3d59f11a1811c10329
-SHA512 (gnutls-3.7.1.tar.xz.sig) = 78327723cd23e515326bee4348f00ef2c11626267a715243d9392490e30d44965fc8997184a348d0c9a5beaf50be4028304a49a0c569a1e9f3998bda9000713d
+SHA512 (gnutls-3.7.2.tar.xz.sig) = fc3314c0ce5fb608352fcd8e19efd14435e4cfa5c0eb843d86febb6053fec7d46774b637037b96c5a621a7001f89d6c110f75bff96f94c2a77caf5d9c3aa9447
 SHA512 (gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg) = a74b92826fd0e5388c9f6d9231959e38b26aeef83138648fab66df951d8e1a4db5302b569d08515d4d6443e5e4f6c466f98319f330c820790260d22a9b9f7173