gentoo resync : 04.05.2021

3 files changed, 3 insertions, 64 deletions

diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 9519aaeb9287..6b11fade5911 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -1,4 +1,3 @@
-AUX libnice-0.1.15-libressl.patch 1961 BLAKE2B 7e06399def0beb5c744d97fc6ed3a73eb9f5e5ec005339aac12ef5de7d0a2fd32efa146c9fbc5c542fc870e406d250c6c80a21e8c262092012a1db7049e0fd19 SHA512 745db3ad3c7a3fa855587ba4848549578e327a7741c2e3c6731c2a15852d9385f17c92ae98a3ddd0485f371eea070c527a63a20ba86424bf37ca2f690cc0f409
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
-EBUILD libnice-0.1.15.ebuild 1720 BLAKE2B 2c7679c69ec3d63aeccbe7ee63b1435f9e2b584405c4f79d6227483c248c4e827ebd9c093f166d652aa2500c45c0a67f39eabc2101f94b82c4e489649640205b SHA512 5f3232f225f1ab0cc1385d2ca9b63309035126557c4e9203a10caa246aa048d0608ca6b49d30928a77945ec87f48f376bfde5af8d7f96dc54eefda88d42606f2
+EBUILD libnice-0.1.15.ebuild 1525 BLAKE2B 42103c33903d394e10a91216d165a7f918f4cabf09260e16b8493f609008aab0ddc059529f1a1c12a76a37bce0944648f6652d0ca7b2f5cf3952ae5345b0ba0e SHA512 ab583376f8ef51d5e4aaf35208292789c6825ae00a2f4491d12ae05ae77ffaef6e134f204f7d12101b6b23a3cbf54fffc9330d070bc6ea0b1b8ab0c1263e4151
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/files/libnice-0.1.15-libressl.patch b/net-libs/libnice/files/libnice-0.1.15-libressl.patch
deleted file mode 100644
index 6c38069bceb8..000000000000
--- a/net-libs/libnice/files/libnice-0.1.15-libressl.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 926afef019ca9f297cebbe13479159ac5c087f00 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Fri, 15 Feb 2019 20:45:34 +0200
-Subject: [PATCH] stun: Fix LibreSSL support
-
-Closes #71
----
- stun/stunhmac.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/stun/stunhmac.c b/stun/stunhmac.c
-index c7d1432..c9d183f 100644
---- a/stun/stunhmac.c
-+++ b/stun/stunhmac.c
-@@ -75,7 +75,8 @@ void stun_sha1 (const uint8_t *msg, size_t len, size_t msg_len, uint8_t *sha,
-   assert (ret == 1);
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-   HMAC_CTX stackctx;
-   HMAC_CTX *ctx = &stackctx;
-   HMAC_CTX_init (ctx);
-@@ -101,7 +102,8 @@ void stun_sha1 (const uint8_t *msg, size_t len, size_t msg_len, uint8_t *sha,
- 
-   TRY (HMAC_Final (ctx, sha, NULL));
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-   HMAC_CTX_cleanup (ctx);
- #else
-   HMAC_CTX_free (ctx);
-@@ -172,7 +174,8 @@ void stun_hash_creds (const uint8_t *realm, size_t realm_len,
- #ifdef HAVE_OPENSSL
-   EVP_MD_CTX *ctx;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-   ctx = EVP_MD_CTX_create ();
- #else
-   ctx = EVP_MD_CTX_new ();
-@@ -186,7 +189,8 @@ void stun_hash_creds (const uint8_t *realm, size_t realm_len,
-   EVP_DigestUpdate (ctx, password_trimmed, password_len);
-   EVP_DigestFinal_ex (ctx, md5, NULL);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-   EVP_MD_CTX_destroy (ctx);
- #else
-   EVP_MD_CTX_free (ctx);
--- 
-2.20.1
-
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
index aee3c3ffebd8..54444f474e5d 100644
--- a/net-libs/libnice/libnice-0.1.15.ebuild
+++ b/net-libs/libnice/libnice-0.1.15.ebuild
@@ -11,15 +11,14 @@ SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+gnutls +introspection libressl +upnp"
+IUSE="+gnutls +introspection +upnp"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 	gnutls? ( >=net-libs/gnutls-2.12.0:0=[${MULTILIB_USEDEP}] )
 	!gnutls? (
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) )
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 	upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
@@ -28,8 +27,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${P}-libressl.patch" ) # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/50
-
 multilib_src_configure() {
 	# gstreamer plugin split off into media-plugins/gst-plugins-libnice
 	ECONF_SOURCE=${S} \