gentoo resync : 22.04.2018

3 files changed, 45 insertions, 3 deletions

diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index ec7f2a9d1534..017d6da106c7 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,12 +1,13 @@
 AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 BLAKE2B b54c19d6a465c71d3f7e4ac42ccc0add193b4b50b0047450583ee7c22d652b620e72f218ec5f87048331bd61e232b5ad1d2298f1ffdc17079ccdcf1d8f300aae SHA512 7a63d83db669ea0eba5dd43fb7a65e8a8b6bf6d397bf3884ab84eb5661f2b4fb0f19a9aead2851772d3d84e6b2ec470b67a2589f82fa28f7a27cb9b59d7890d8
 AUX gsoap-2.7.40-shared_libs.patch 6866 BLAKE2B 829a06165291a7887b8dc72b450b38a6f28cce51a6cf55d7d2ba1129a2f96036b5cbcf1a5e3b7d00c63a94674c42ea0b647818b9000e67191a75cf1a5660e0b9 SHA512 289c09f08d5881232fe169d37a0a76b58f8ec823305dd24f62b4cc04d7d1801be5b475ccd87c1f4ec3779c7972cb962a8a196d80e5fff91755d9b76bae0ac941
+AUX gsoap-2.8.51-libressl-2.6-compatibility.patch 1394 BLAKE2B 738e50bf8b8aad35e21b2ac03d9ca18713cbc694c01916163f0f22b8e16c11b156a9c92a209da56016cdc23e0438d23dc99ca7efed1eaec892462e231c9b9cac SHA512 51e1419bb88bf9de32caeaf4f7507eec05a65b4cac9aa02715c933d66c3685c1e611a52dbd1e77219bfffc8bd99c838f3c1e9270520a9e7b46a1651f79f00bab
 AUX gsoap-2.8.52-shared_libs.patch 6582 BLAKE2B beb15d19f782edd0fd0ac518001001f194fc26ef8e7964114809776d3b0dc5359f2cf39e0fe6813650afb7805ae389dc5e26ac4ac4bbe424e81135073ee7bd27 SHA512 7ddbd3c2597892357da0ced383b2286e057e5e3c44eec3fd96b2ecbb4759bb5624c047e77482c495d46796e20d0e587e637f7b3a0ca3a05ceeae40e63fd5049c
 DIST gsoap_2.8.51.zip 34505931 BLAKE2B 6f2d6ee2bd405054dc75105f42f6edeaa2300f1e7e6bea15f9e8f0dfcc2df56b36cddfc8f0a038b029f36a6dd1fd63f39eadb8d7f363335344eb142ec27be726 SHA512 491e31ce6be02c577b6184335672a0805e2287418a7e26d9b0f009aab8af462ddef7d7a1893dc867db5362c5f2a1e0022d0a45865d81e43286ce16c649da6910
 DIST gsoap_2.8.55.zip 32571850 BLAKE2B 6f262c0b65c7704fbf6c0973d766c0cff788745d0f6331afdffc6bbabbbeeea38222f8038d7a96eae63453a721f2b52b1623f4691e7c677489fb8a3c49d80bae SHA512 e0cb6809d5b8e4a068ed937f253844f88d8275e58f7590ca0dd52bede1ea74d5781d35664586f9e29f2e22c508167df8044d45101f0773c9b8d79b80aa188935
 DIST gsoap_2.8.58.zip 32931913 BLAKE2B ab6e1b9f1e3b866199236b471e638a80c3542ce709e5cca75df9b3d5cd06fc498d09e768078a6863c549e721f657723d50bf53274c7d6603da23f1ea7a887879 SHA512 019c428aee0309ac952af349738a062d4e6deae28f2c5d38178bcd2aa3ead76a7a43faf952ca61f15e8928600a46f1a865b7996ded1c32e1749d1036c5354e2b
 DIST gsoap_2.8.59.zip 33109898 BLAKE2B d05ddf0c1e24afc03a33592cf8abef6f0bb6c8a8a216aee9ce7614720a8e3cd015f1e03429113ac8bdc05e6b916fee022914db22d0c29b5c9c4d0fb60c549168 SHA512 d43320e6965c3f17d122ea7aeeecbc0b608dac52204e630c3254d32eadd3c93aaca446c92bb439b98207f8560b2ad6bff220c0502b75ebd18b99e37402570624
 DIST gsoap_2.8.63.zip 32985252 BLAKE2B 6bedf06a98701dd63c13e805f865c3b84cae8c498a9ec1c4dd062e191f217c56cf9667046c5fbf0b33d94c5500e2eb4746eefa7cc909398a8ad891f2cb33e357 SHA512 1941aba9c4a7d5e57e8b8f4f2183ee3c24a9a5c3e93caedfd27a13cbc625dc06e3114f850f0dcddb87dd436a997e1157fb2c6fb20c28f1b0675e634c3d489d96
-EBUILD gsoap-2.8.51.ebuild 1636 BLAKE2B 45be6a22238369d019f5b8e8efe2c11c9db8e38171fbf90000fdd730648d2d1343c11b2eb9aded9fec714ea961248eb715e102bb720932cc9a65490339bd57e2 SHA512 b7dd63458a2ba950a066cb2ad498bd0c7def67b0bde38e90a20ab89bc71a17e8d39f7edb27cd21d721a0646cb351b26aed241b624e1718fb565e1d71d51d3b36
+EBUILD gsoap-2.8.51.ebuild 1793 BLAKE2B ac37c5aad219f159d1341f13d20ab187d70fd87619930ab13df8fd127f46ea15793c6d1f74def667c2a2f3384037193877d662eebdac7f73e530b8ebf7d9fe6b SHA512 45b0dc686746e51454340f1c8d59fb803e94666b50db4d2cc6b10ed31f0cb09daa3d1cd46f851b6fababb2363e1e14de5da6bf978a3b41b172170385d06db76f
 EBUILD gsoap-2.8.55.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
 EBUILD gsoap-2.8.58.ebuild 1635 BLAKE2B 274bb41081cd7b6a7f9ab784be172b58bedba873f66f2a0896e86e353b72f9ec3c5e5eea3109cdbf2a26ad8cb02a8b7380220de365fe2ee6656f0cf039a737ce SHA512 9b7161fb76128c0ac50c29b8f3675e423bd24f5ca3e28d6923ab833594a8c13fe8fabc431ae7c9a00dd25f1222f6a50d7b50c411dae2d7e02dc5fb67e59fc4e2
 EBUILD gsoap-2.8.59.ebuild 1635 BLAKE2B 108f7d24270342c82c34c3ef000814a2af1de429230744aba9a819a988bc16619e79b3a59efd72939c57503698d3921b8ab8339a3c9ea7c2f1a5242c43ac8b7a SHA512 786bbd285e707c55acba1b1a357d51583cea9e1040673ebf35264d0d5d2ae8af1eb65e61123ce1b36865c57f20a942ed0e9deeab7c98ad2603a3bf7f730a9bc3
diff --git a/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch b/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch
new file mode 100644
index 000000000000..8f13a39d32c6
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch
@@ -0,0 +1,38 @@
+--- a/gsoap/plugin/smdevp.c	2018-04-20 15:45:25.112658174 +0000
++++ b/gsoap/plugin/smdevp.c	2018-04-20 15:47:58.826360980 +0000
+@@ -479,7 +479,7 @@
+   /* allocate and init the OpenSSL HMAC or EVP_MD context */
+   if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
+   {
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+     data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX));
+     if (data->ctx)
+       HMAC_CTX_init((HMAC_CTX*)data->ctx);
+@@ -489,7 +489,7 @@
+   }
+   else
+   {
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+     data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX));
+     if (data->ctx)
+       EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx);
+@@ -642,7 +642,7 @@
+       *len = (int)n;
+   }
+   /* cleanup */
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+   if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
+     HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
+   else
+@@ -687,7 +687,7 @@
+     }
+     if (data->ctx)
+     {
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+       if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
+         HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
+       else
diff --git a/net-libs/gsoap/gsoap-2.8.51.ebuild b/net-libs/gsoap/gsoap-2.8.51.ebuild
index 345507edae77..5dd67d3686ff 100644
--- a/net-libs/gsoap/gsoap-2.8.51.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ RDEPEND="
 	gnutls? ( net-libs/gnutls )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
+		libressl? ( dev-libs/libressl:0= )
 	)
 "
 DEPEND="${RDEPEND}
@@ -41,6 +41,9 @@ src_prepare() {
 	# enable shared libs https://bugs.gentoo.org/583398
 	eapply "${FILESDIR}/${PN}-2.7.40-shared_libs.patch"
 
+	# fix building with libressl-2.6.x.  This will not be needed when 2.7.x goes stable
+	eapply "${FILESDIR}/${PN}-2.8.51-libressl-2.6-compatibility.patch"
+
 	eautoreconf
 }