gentoo resync : 22.01.2019

4 files changed, 92 insertions, 1 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index ec0aeff828be..45ed02dc2798 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,7 +1,9 @@
 AUX gnutls-3.5.19-idn2.patch 1569 BLAKE2B a6b309be79e09bd873f3ad305a4517c675f127bb54df6d9dd22854b8a8591a1551b3163bfb8596296b323a9a15008d5676ed132e1eaf36e59c6267c81f2552e9 SHA512 b39a091b55413b1be9042b898eaf37c57d6cc3485bcab25169b68b1c19f249b2489609afc5fe08f7103800687c01b1580124dd6433013ca9f89e5a5e47c4cd3e
+AUX gnutls-3.6.5-build.patch 1039 BLAKE2B 68db1ec474c173086b3beac504aa5cb6966c963e18cc8a2afbb3ba1b9399ddf405f2afa52124049edacab4a2244f00d4dbdb5028257dcfd69ccb37ae6d8455f6 SHA512 718e2d811251396facc5be449bd1390c305202c554ddd74498224c988a8f4f2d6141664be2504f833a598aae505198ad6a3c4cf5ace89739638488198d43818d
+AUX gnutls-3.6.5-libressl.patch 1844 BLAKE2B b86f019f07cad8369a57cc829d45098be27feaef9898e0029ce3e953653ef0cb65b3b03c995fbd61eb5a2553044a08091a4a0cc0483ce2399bb5f94ab4c625cc SHA512 7a5831992a46c8a894ee4fa29c290fdb010407a749065c7dda1e67a1d2dda0940c03400f3fcb3c74dbea54835fa805575c749b43fcfd3121557ddd0bab95d142
 DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
 DIST gnutls-3.6.5.tar.xz 8192888 BLAKE2B 1d305d49c461657b921a51e6c3577e8aea76ba2a4ecbb0ba165ca1f452560b691f12733e3b3ef6d1206096a7393a6fdd05bedb5d5653c7e18e14c5c2f5993de2 SHA512 127f053ce45c63cd745fa5a654a2d8e4fbc322f5e17dcc3740fb2e7b376dd18dad59318d66e6e93e37d6a179fca4b35cf2ae62d13be5645cd2d06badd79d4dce
 EBUILD gnutls-3.5.19-r1.ebuild 4076 BLAKE2B fc87e54e6220a9cd053aa99da22d0ea9510c2c08b09b6034d31a13e3629d091d454b23123b0b07bd8e2151f5b8748e2f611fb7a9db6a5e24753c8d8068a8208c SHA512 9631e193f752dcb8bcef414cea69672f09c3b1abc505fb27182c61808ad71f8a448555670fb12196b1781539fa5be05814aa8bdc5ede1d0981f31a0f30cda23c
 EBUILD gnutls-3.5.19.ebuild 4145 BLAKE2B 4da053f06d49a5e1e109cbb5691e51c7fe6c012a46bd68d7da329fbf5ce15080229013da2afe8d4f53ba91fb67fc511b64e71156dcb0282e03b09eae183d3811 SHA512 4856b74e9bcf1716c2202c94e075dbb2ac3f9077bd0d083dbd3a17f44d79a93e206de19b0f584b4bcc5f9436ab44cd6e88e2d828487edaa102fb2911905d3ff7
-EBUILD gnutls-3.6.5.ebuild 4098 BLAKE2B f0252c6227e83959a75651d588f7ebc0196f39e9dc46777df184591bd775c43829b368299cb3a359c6563e315e4760184689ba14efea77deb2182846d5ee453a SHA512 839195aae4cc28f7067d39ea158d9de17e432a68b960656b774a2fa260ca6117bd4b4d48940ce545673bcc2fe218e1202ad78b4de57639cfe69f88349cac5d95
+EBUILD gnutls-3.6.5.ebuild 4178 BLAKE2B 5c96edf0869162b0c675b567827269e424fd7e6c32f2a15ec59cbcb2632eb830dfefc1445f0a64d5ae5e2ee6ffb79d43a5bb57b8ecc3de295bc732f6da6aaf09 SHA512 19f72f1e92ff14263397ef949065f4d536457e1b8a760cf7b736368d22cc1791ed9ffa4e8b4525efe0f84887905cc405b7d9e023c2b13324c7b680594e944fb1
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/files/gnutls-3.6.5-build.patch b/net-libs/gnutls/files/gnutls-3.6.5-build.patch
new file mode 100644
index 000000000000..00c11da4ae7c
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.6.5-build.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000000..16cac8c13b98
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.6.5-libressl.patch
@@ -0,0 +1,53 @@
+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
+
diff --git a/net-libs/gnutls/gnutls-3.6.5.ebuild b/net-libs/gnutls/gnutls-3.6.5.ebuild
index 0e4f46b96b24..9d141a5165c5 100644
--- a/net-libs/gnutls/gnutls-3.6.5.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.5.ebuild
@@ -53,6 +53,11 @@ DOCS=(
 
 HTML_DOCS=()
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
 pkg_setup() {
 	# bug#520818
 	export TZ=UTC