gentoo resync : 28.04.2019

3 files changed, 0 insertions, 131 deletions

diff --git a/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch b/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch
deleted file mode 100644
index 1f16302c81be..000000000000
--- a/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b0dfccd2149086cf5d2db44c329664a56b126216 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sun, 6 Jan 2019 20:02:50 +0200
-Subject: [PATCH] idn2: do not use deprecated idn2_to_unicode_8z8z in
- idn2-2.1.0
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- lib/str-idna.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-https://gitlab.com/gnutls/gnutls/merge_requests/864
-
-diff --git a/lib/str-idna.c b/lib/str-idna.c
-index 3bf2db877..95ca9b769 100644
---- a/lib/str-idna.c
-+++ b/lib/str-idna.c
-@@ -145,7 +145,7 @@ int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsig
- 	return ret;
- }
- 
--#ifdef HAVE_LIBIDN2
-+#if defined(HAVE_LIBIDN2) && IDN2_VERSION_NUMBER < 0x02000000
- int _idn2_punycode_decode(
- 	size_t input_length,
- 	const char input[],
-@@ -153,7 +153,7 @@ int _idn2_punycode_decode(
- 	uint32_t output[],
- 	unsigned char case_flags[]);
- 
--static int _idn2_to_unicode_8z8z(const char *src, char **dst)
-+static int idn2_to_unicode_8z8z(const char *src, char **dst, int flags)
- {
- 	int rc, run;
- 	size_t out_len = 0;
-@@ -253,7 +253,7 @@ int gnutls_idna_reverse_map(const char *input, unsigned ilen, gnutls_datum_t *ou
- 
- #ifdef HAVE_LIBIDN2
- 	/* currently libidn2 just converts single labels, thus a wrapper function */
--	rc = _idn2_to_unicode_8z8z((char*)istr.data, &u8);
-+	rc = idn2_to_unicode_8z8z((char*)istr.data, &u8, 0);
- 	if (rc != IDN2_OK) {
- 		gnutls_assert();
- 		_gnutls_debug_log("unable to convert ACE name '%s' to UTF-8 format: %s\n", istr.data, idn2_strerror(rc));
--- 
-2.19.2
-
diff --git a/net-libs/gnutls/files/gnutls-3.6.5-build.patch b/net-libs/gnutls/files/gnutls-3.6.5-build.patch
deleted file mode 100644
index 00c11da4ae7c..000000000000
--- a/net-libs/gnutls/files/gnutls-3.6.5-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b7fdb4125e4eebc5af2155b6d36cf17339a3abf5 Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Date: Tue, 25 Dec 2018 14:44:11 +0300
-Subject: [PATCH] tests: cipher-openssl-compat: don't call
- EVP_CIPHER_CTX_init()
-
-There is no need to call EVP_CIPHER_CTX_init() after
-EVP_CIPHER_CTX_new().
-
-Fixes #658
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
----
- tests/slow/cipher-openssl-compat.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c
-index a4cb3522d..64adf25a4 100644
---- a/tests/slow/cipher-openssl-compat.c
-+++ b/tests/slow/cipher-openssl-compat.c
-@@ -106,7 +106,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher,
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
- 		if (gcipher == GNUTLS_CIPHER_AES_128_CCM
- 		    || gcipher == GNUTLS_CIPHER_AES_256_CCM) {
--			assert(EVP_CIPHER_CTX_init(ctx)==1);
- 			assert(EVP_CipherInit_ex(ctx, evp_cipher, 0, 0, 0, 0) >
- 			       0);
- 
--- 
-2.19.2
-
diff --git a/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch b/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch
deleted file mode 100644
index 16cac8c13b98..000000000000
--- a/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From bfd036b31f2a47ae40e104b2ea1a0e095900cf52 Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Date: Tue, 25 Dec 2018 14:43:56 +0300
-Subject: [PATCH] tests: cipher-openssl-compat: don't fail if OpenSSL doesn't
- provide cipher
-
-LibreSSL does not provide ChaCha20-Poly1305 through EVP_CIPHER
-interface, so let's skip the test if cipher is not available.
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
----
- tests/slow/cipher-openssl-compat.c | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/tests/slow/cipher-openssl-compat.c b/tests/slow/cipher-openssl-compat.c
-index c9b39d026..a4cb3522d 100644
---- a/tests/slow/cipher-openssl-compat.c
-+++ b/tests/slow/cipher-openssl-compat.c
-@@ -38,6 +38,19 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher,
- 
- 	success("cipher: %s\n", ocipher);
- 
-+	/* decrypt with openssl */
-+	evp_cipher = EVP_get_cipherbyname(ocipher);
-+	if (!evp_cipher) {
-+		/* XXX: fix version check later when LibreSSL fixes support for aes-ccm and chacha20-poly1305 */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+		fprintf(stderr, "EVP_get_cipherbyname failed for %s\n", ocipher);
-+		return -1;
-+#else
-+		/* OpenSSL should always work! */
-+		fail("EVP_get_cipherbyname failed for %s\n", ocipher);
-+#endif
-+	}
-+
- 	for (i = 0; i < 32; i++) {	/* try with multiple keys and nonces */
- 		assert(gnutls_rnd
- 		       (GNUTLS_RND_NONCE, orig_plain_data,
-@@ -88,11 +101,6 @@ static int cipher_test(const char *ocipher, gnutls_cipher_algorithm_t gcipher,
- 
- 		gnutls_aead_cipher_deinit(hd);
- 
--		/* decrypt with openssl */
--		evp_cipher = EVP_get_cipherbyname(ocipher);
--		if (!evp_cipher)
--			fail("EVP_get_cipherbyname failed for %s\n", ocipher);
--
- 		ctx = EVP_CIPHER_CTX_new();
- 
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
--- 
-2.19.2
-