gentoo resync : 04.05.2021

4 files changed, 8 insertions, 126 deletions

diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index cd5a08126e86..e13cc45ba5ec 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -2,13 +2,12 @@ AUX wvstreams-4.6.1-_DEFAULT_SOURCE.patch 271 BLAKE2B 9960e2d7db57c7f91e6f1a8709
 AUX wvstreams-4.6.1-autoconf.patch 701 BLAKE2B 1d76fab4056d78be9491439166c6c256352f389abd3d43e33a3af4727c198b82cc8721e14be23a7c4cdca17ef922a30a3ad6e060b4278ac08573c0dda2321d34 SHA512 31262107df38069b64b52b9660f0b5d8a2644a7f59e0e3e03a0502b1590690f039ad19d33ce73c3890b1e3d240658a5119791386db9e5a1f7045ae4650b1349e
 AUX wvstreams-4.6.1-gcc47.patch 1308 BLAKE2B 4c49bb694eb50452f3d158ef9e8c80978614c94d9e482e55434ab3aa9ec62468b7fa87c737d2812f56c8acd6a221234f80548ccae65f20e46d7e7ba2b1ad3748 SHA512 cfac44a0c80d58e67d4a3be17cca3008f6c7bba02b434701fcf07a1209220edf93b4d0dc1f478456e07e28f9e39ab9d19a52a07ad1f9ecd09028ef5446cebfa5
 AUX wvstreams-4.6.1-parallel-make.patch 1882 BLAKE2B 03c40c90d63c72065ad29dcb7436a37e5d5037595c285671a5c7c1b76a74723e63ac7eba024326e7452b4c9af507b2925609faed0496c384c04980044dea28b6 SHA512 d7fffbd7940495f2e34d3317b8f0066f6caa98e213df00bf31e3f42fa6821c9fd017e3052f7ff98303a8d8bb61d9b24a14b87ddd18199038e083e42cf253c17e
-AUX wvstreams-4.6.1_p14-libressl.patch 3457 BLAKE2B f5c1a3ee44007fc3ca7c08be91ed9fbee84939bb09a02d699a2da7aa60238762a0d38fd8be5e7bb3aab891fa8b99f4c0de2a206e6db58fdc12c5adeaebf18700 SHA512 5561021c6ebeb9fc8255eb42be799dc23d32e368cb2662cbb78e5f5258392983bd9b5174954f1262062be1fe5638941255bd612760d1373d5682c139dcaf3ee4
 AUX wvstreams-4.6.1_p14-llvm.patch 11598 BLAKE2B a7f4019da421702ecfedc461079ad39a4b3776b3fb570ae50ddff64c0d2f9d4bd3752050daf1143d7bf86e62c33cb823f4a4f5b76c618f3b51908ff706dd1b9a SHA512 db0856afd7c0bcf976ef697c300817efbb2d4cf22f4c0832e87011025c9b43f7aab64ee335de2acee2dda7a59412a138e44ca89bb8b6df010b871bde427d16e3
 AUX wvstreams-4.6.1_p14-xplc-module.patch 806 BLAKE2B 066262f3e42617dbae0ff982af21933b1567f23119f9f83152afb1f8da8ea79fdc09f6b01a01ecb03626c7007b70d52f921f1f637089a9813d061dcc9de3dc9c SHA512 e1b74f6481cc55b1f6750d08c2f4ae4d11575e99cfd94b5bcc658f54ac4756e885dac98a82eb7f2b6e02d33f1b4ac75b91087640e3195deff8887d752ee2e0c0
 AUX wvstreams-99999-openssl-ldflags.patch 349 BLAKE2B d8df661e5219b7890e338ed21a570194a93d64142ce6e96f81c141cdb4ae33c6e785fe863278347e2b7903df13a5390305a18568fca9880c2ac45534458671ec SHA512 a8b90e1bbda676ba4303c7a31fc896955c3a0aea0ba4d8a69514210a4baa1cc4228de43b648788cfca2e6b607040daaa520568c7d15b258d04b803bba6375637
 AUX wvstreams-99999-soname.patch 273 BLAKE2B ef364e25848b4727a0e8b75f155ac2807f1d8cc976ea72af3191ca25a0dbb5d4345030812fad7af839e1c126db185b6ce48fb50d2211e810954f2f714717854e SHA512 c8388a5ac1e0bbbf1574c97004ae7381a466a7182614cc7345cc3f9639771e6696ce32ce03b98604a05618be03c30cb95079085e7c1c935c42dcfe5e9453f886
 DIST wvstreams_4.6.1-14.debian.tar.xz 21124 BLAKE2B 2af6ec180c3130dd7def733e5ea569fd0a81cd2c2411daca25e6042dcbe78792bafc4b13f1c1fffddb6cd66273f11c62f54b415c975cbea0af052b18ff0955d1 SHA512 93ea7c4fbab542bd552d6e91ae0c49a27ad8aded177ae6474943acb08d204ab31eac49b3f416b4d90a38ea697f3641c09651a64f9c40d12543d454aadf2ad9e4
 DIST wvstreams_4.6.1.orig.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
-EBUILD wvstreams-4.6.1_p14-r1.ebuild 2280 BLAKE2B 9cef63f98d6d05cd4dcbe41dae9d1cd840a0606b9d338850f10ecc3b4c2eaecd4146abf7d1876a0524f1678269c4e39da25f4003c6ce8807ae8b269f8dea62d0 SHA512 982f57b676139b047d320057b3495c60b065fe22dab3107d784576e8f83c7e2b9371318ea42d880347f03e1f26e0789962f23d2ac9d8cb1a09dd5eb2fa995de4
-EBUILD wvstreams-99999.ebuild 1994 BLAKE2B e18ee55f383342113ea3e7015a209bb1ba13baa8dd300f9393c463c379a5d656a595ba3a3efc1fc19fdbc05b18adc03b95c9002c06f8a29b69bee2eb3de8d15f SHA512 a6346862fd514dc5d320c233c85f1ae90111d285ad6e2593546c69f91aeb65b8d753ccbdf8b663e9787a98a81c0e560ef2709cfb5a7c91ea156c96475e704445
+EBUILD wvstreams-4.6.1_p14-r1.ebuild 2165 BLAKE2B 93f6391bea24f679cb0d8cb0128afa122a19a3094a9083b9be3f9b874cd3dbc557930020fe957a234ad0a7a4301369b4aa150133d70c3cc5fcc4aba327b28d08 SHA512 0b0edfe4c519da92c810cd69281f7b0709d6406e3c8a2e93cd9f87923990749afcf09f5f8f18b5278d132aa8dfe7804467c23d79b22f57c24a92bc83f1242967
+EBUILD wvstreams-99999.ebuild 1934 BLAKE2B a267077269d17ec49f2637a9778a7ca44e81512829217a9b6d01af95c091bce510256258075b73aa05e3609c0e8ba808fc4edfdc2805e90d430c8b8b7b6fca5c SHA512 93c8d71cda0ad3e1b3ddcd1ecf4e5e3fb414266b66535a37fd4f751246e454cf7405f46e08c50e8fc7a0c5edc265a4f452ed57767eacb251fc463f8e0de90f7e
 MISC metadata.xml 523 BLAKE2B 3e0995913beec728b71c7c7e160f0a43719cdb6a47ab9d7c5ac72262098a8519e3b273bb20c0485e8d2cbce122c34b3f825bd6ee947bfbb6d793ed32af6a838d SHA512 e882c00a8c9148dbe7c1a2cb1fe8b56b78c9821bacb9ae0541322bd535e03a3074696a285d975a823570e0f09822ff0108340c12ea31aa3226bcc4ec8bf1f993
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1_p14-libressl.patch b/net-libs/wvstreams/files/wvstreams-4.6.1_p14-libressl.patch
deleted file mode 100644
index e897c95bf093..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1_p14-libressl.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From cb8a81da928054c2e8174d671f2abc88f4f35b87 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Mon, 10 Jun 2019 17:07:06 +0300
-Subject: [PATCH] Fix LibreSSL support
-
----
- crypto/wvocsp.cc    | 34 ++++++++++++++++++++++++++++++++++
- crypto/wvx509mgr.cc | 14 ++++++++++++++
- include/wvdigest.h  |  1 +
- 3 files changed, 49 insertions(+)
-
-diff --git a/crypto/wvocsp.cc b/crypto/wvocsp.cc
-index 7d5da072..7a157f90 100644
---- a/crypto/wvocsp.cc
-+++ b/crypto/wvocsp.cc
-@@ -130,6 +130,7 @@ bool WvOCSPResp::signedbycert(const WvX509 &cert) const
- }
- 
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- WvX509 WvOCSPResp::get_signing_cert() const
- {
-     const STACK_OF(X509) *certs = OCSP_resp_get0_certs(bs);
-@@ -143,6 +144,39 @@ WvX509 WvOCSPResp::get_signing_cert() const
- 
-     return WvX509();
- }
-+#else
-+WvX509 WvOCSPResp::get_signing_cert() const
-+{
-+    if (!bs || !sk_X509_num(bs->certs))
-+        return WvX509();
-+
-+    // note: the following bit of code is taken almost verbatim from
-+    // ocsp_vfy.c in OpenSSL 0.9.8. Copyright and attribution should
-+    // properly belong to them
-+
-+    OCSP_RESPID *id = bs->tbsResponseData->responderId;
-+
-+    if (id->type == V_OCSP_RESPID_NAME)
-+    {
-+        X509 *x = X509_find_by_subject(bs->certs, id->value.byName);
-+        if (x)
-+            return WvX509(X509_dup(x));
-+    }
-+
-+    if (id->value.byKey->length != SHA_DIGEST_LENGTH) return NULL;
-+    unsigned char tmphash[SHA_DIGEST_LENGTH];
-+    unsigned char *keyhash = id->value.byKey->data;
-+    for (int i = 0; i < sk_X509_num(bs->certs); i++)
-+    {
-+        X509 *x = sk_X509_value(bs->certs, i);
-+        X509_pubkey_digest(x, EVP_sha1(), tmphash, NULL);
-+        if(!memcmp(keyhash, tmphash, SHA_DIGEST_LENGTH))
-+            return WvX509(X509_dup(x));
-+    }
-+
-+    return WvX509();
-+}
-+#endif /* LIBRESSL_VERSION_NUMBER */
- 
- 
- WvOCSPResp::Status WvOCSPResp::get_status(const WvX509 &cert, 
-diff --git a/crypto/wvx509mgr.cc b/crypto/wvx509mgr.cc
-index 156d3a49..e2bb3ffe 100644
---- a/crypto/wvx509mgr.cc
-+++ b/crypto/wvx509mgr.cc
-@@ -350,8 +350,15 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
-         return false;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     uint32_t ex_flags = X509_get_extension_flags(cert);
-     uint32_t ex_kusage = X509_get_key_usage(cert);
-+#else
-+    X509_check_purpose(cert, -1, -1);
-+    uint32_t ex_flags = cert->ex_flags;
-+    uint32_t ex_kusage = (cert->ex_flags & EXFLAG_KUSAGE) ?
-+                         cert->ex_kusage : UINT32_MAX;
-+#endif
-     if (cert == unsignedcert.cert)
-     {
- 	debug("Self Signing!\n");
-@@ -392,8 +399,15 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
- 
- bool WvX509Mgr::signcrl(WvCRL &crl) const
- {
-+#ifndef LIBRESSL_VERSION_NUMBER
-     uint32_t ex_flags = X509_get_extension_flags(cert);
-     uint32_t ex_kusage = X509_get_key_usage(cert);
-+#else
-+    X509_check_purpose(cert, -1, -1);
-+    uint32_t ex_flags = cert->ex_flags;
-+    uint32_t ex_kusage = (cert->ex_flags & EXFLAG_KUSAGE) ?
-+                         cert->ex_kusage : UINT32_MAX;
-+#endif
-     if (!isok() || !crl.isok())
-     {
-         debug(WvLog::Warning, "Asked to sign CRL, but certificate or CRL (or "
-diff --git a/include/wvdigest.h b/include/wvdigest.h
-index f2eed401..e637fb49 100644
---- a/include/wvdigest.h
-+++ b/include/wvdigest.h
-@@ -10,6 +10,7 @@
- #include "wvencoder.h"
- #include <stdint.h>
- #include <openssl/evp.h>
-+#include <openssl/hmac.h>
- 
- 
- /**
--- 
-2.21.0
-
diff --git a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
index 0769d3c5d002..75080fb06cbf 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
-IUSE="boost +dbus debug doc libressl pam"
+IUSE="boost +dbus debug doc pam"
 
 #Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
 RESTRICT="test"
@@ -27,8 +27,7 @@ RDEPEND="
 	sys-libs/readline:0=
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
-	!libressl? ( >=dev-libs/openssl-1.1:0= )
-	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/openssl-1.1:0=
 	pam? ( sys-libs/pam )
 "
 DEPEND="
@@ -52,7 +51,6 @@ src_prepare() {
 	default
 
 	eapply $(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series)
-	eapply "${FILESDIR}"/${P}-libressl.patch # bug 687096
 
 	eautoreconf
 }
diff --git a/net-libs/wvstreams/wvstreams-99999.ebuild b/net-libs/wvstreams/wvstreams-99999.ebuild
index 5933265d2de8..f7736a033dd8 100644
--- a/net-libs/wvstreams/wvstreams-99999.ebuild
+++ b/net-libs/wvstreams/wvstreams-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,14 +12,13 @@ EGIT_REPO_URI="https://github.com/apenwarr/wvstreams"
 LICENSE="GPL-2"
 SLOT="0/5.0"
 KEYWORDS=""
-IUSE="+dbus debug doc libressl pam static-libs +zlib"
+IUSE="+dbus debug doc pam static-libs +zlib"
 
 RDEPEND="
 	sys-libs/readline:0=
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
-	!libressl? ( <dev-libs/openssl-1.1:0= )
-	libressl? ( dev-libs/libressl:0= )
+	<dev-libs/openssl-1.1:0=
 	pam? ( sys-libs/pam )
 "
 DEPEND="