gentoo resync : 04.05.2021

4 files changed, 6 insertions, 73 deletions

diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 4a3f280edc2f..179d8a919edd 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,4 +1,3 @@
-AUX freeradius-3.0.18-libressl.patch 2503 BLAKE2B 45b5ca45af2bb145f5876892d02686f0896fb0cdafdf0deb00789e5c927c74b4a6793b9084208a3ae282947241d949ef1a84c621bbd7c9c90907624062d1a1cd SHA512 4dd638736c23af2428481ff6f1dd247f29ee11205bc88b9f59347a9d0baa504f67bc4139c854e52a8ca95a39ab70e72c54bcc58a18f752b07f62bf029626204a
 AUX freeradius-3.0.20-py3-fixes.patch 15422 BLAKE2B 29f10c53b02603c2c854c0100056c01e02c1282a78731e67453101dc6be49d64f57e1f39b8a32459034939a1d47c74bca48270f119095deaa067942b2c2d3b5c SHA512 5a565aa55fab059995870c78f176fa525fca4bd8732c2a2ecc4f625a6635979a51b3fc53999fb7741bc2da37a6260afa43350f61490f0b3548ced5bc81dfdaea
 AUX freeradius-3.0.20-systemd-service.patch 2162 BLAKE2B 3aa32e5a15efa223aab7880b0cb651edca6695a3727b4df7692f656d1f34366a2a16c364c2a5b544a0ad04bca795be269d4d7dc37bc4c3c6d28387bc3e411ad8 SHA512 8a9f5ecaf559132932ed2e46151ff41e5570df3e844f33ee49004ace0aa7b458a6000ec0d1ed01c34b6236c3dde2ca72cb1031b4badcfa4d6826dbf16ca28259
 AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1c82f199e3962db57f3042498cf135b3a29c8a730695ed99612e490e0b3253f0644462d28f61215d SHA512 4142869fb61b2938232002c9cb5b843590785560da7db4f2b2a9c9d55c76d0e2d4a6cb946a5347dfa505cd82f5e86c7315cf71f3443a86632090cf4bd025748a
@@ -7,6 +6,6 @@ AUX radius.init-r3 734 BLAKE2B ba6918cf5da5ad29ca8062045c3318c2bb30e0a803bc6e6bb
 AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b728e3080e81470a9b4124af49459c69070d9c3ed67a95c7593b6d01f0259403fa9ceee43abd541f7c SHA512 8b05604a72a6a0dea3e654f36b13e1ed517d0c277d128475bcca768204d720b3cd9730e5776371818b8deb0f9fd099458bf5a3276ea9b61e3dbacafaaa527892
 DIST freeradius-server-3.0.20.tar.gz 5002727 BLAKE2B f481ad22105694a4af3f0f0c1b4f6e395e8da0fe65274e32ebeed07e3c9b1869029e6ffbc655cfa41d5de2a1dcba54acee33a7a10d28bfbfce791b7ccd0fc57a SHA512 513ed0a5d9e6b9a8d89a9b02c86ff528a9ff14d928f4c1040ca44702465abd711588fe6afa35554cb2c8e8bd7f19dd5be3dbc78445c62c7b00bf5cbc4c621312
 DIST freeradius-server-3.0.21.tar.gz 5028506 BLAKE2B 3ccf9704a1f8b1ec5f6f066a475083fe7cefa793e8f53ecd287866fc505a832bf8031a4d07c2e07f79da6c6fb82e6a3435b0154d1f135167ebddfc9b8d401544 SHA512 85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa
-EBUILD freeradius-3.0.20-r1.ebuild 7626 BLAKE2B 4e2a9cb5d8039b9f5e541b8fc4d5de56b154c95506fdb29fb7c01ef8439426ebfc19f517e098026c9571bf7ebe055f7c667150cfe4f9d489708c0591218e45e5 SHA512 f0ab313d62eec7facacdef399a73c3ace318a4207dbd8fe75323ab51664b31f0e77e0fc7adce637d24252165edb0ea886d3bebb8f288f7850c92caa572356938
-EBUILD freeradius-3.0.21-r1.ebuild 7478 BLAKE2B fc6116ecb6644e0e47ab86fa372db61d331e6d5ef27ba5f01d8f64e3bb220ff7bd755ac3b15ae7a4b75767ba384f170ffc623354489acabfe07a6fc4a14b61f5 SHA512 2ada19e2d51b44f6d784a78d1a6414695b6b63d4a99139c90e0b7e2a584000932f0c8b3094d42f7e597c8f78239d1b8d1ea511cbb089597e9e3ee1a94d72efe8
+EBUILD freeradius-3.0.20-r1.ebuild 7522 BLAKE2B 8a4af6f6a3eac63ce3e3ee9e92298a09c19a7ff5aa3ab32e48c8581c3c9ac74ae2856d80b771cf0998161e1a7a4e79924c52186fdd481f156f583bcf12d9a218 SHA512 8d632a2ec8793b4a6712ac71b5e84594bb0175a53546170de6eb6d013cb46530bb2561b57a7a130da182c2e3c03de3776eb4fc733248fe1c7ae12b05d17b2dd7
+EBUILD freeradius-3.0.21-r1.ebuild 7417 BLAKE2B 2017eb36e370a7117699b163a5d3dd2a3e951d7d852707545499984054c16ff8e80104645622a90ac4ee0221abeee703c956d6f8047fea16c8e1031ba2645bb6 SHA512 c57617e02d3b5cf3c3b749af414bf3d24ec998ac861fb2fec771fd52096746c4052cf13f3929af07a79570f06bd5a23a9d62edf8aed3db652c0083df98adbaff
 MISC metadata.xml 894 BLAKE2B 462f2bc696550e919723d5a6435c11a8b217b183aef0f623737bbf446f43153da33840478bc10c45277d253d82e4186a4a85661565edcc37d03b924f60220fc9 SHA512 0cadbf858cab18860ad4934c0d1163bc149f3616395420568357c1cd959b635d5c5835216fde2cd799718010e16e13fc3acc746108a49b9c5d19cc5b64581347
diff --git a/net-dialup/freeradius/files/freeradius-3.0.18-libressl.patch b/net-dialup/freeradius/files/freeradius-3.0.18-libressl.patch
deleted file mode 100644
index 129e251d87b3..000000000000
--- a/net-dialup/freeradius/files/freeradius-3.0.18-libressl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 39e4ac0cf8d415b41dc2ff1fc329de0522b135ca Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Wed, 24 Apr 2019 09:16:12 +0300
-Subject: [PATCH] Fix build to LibreSSL
-
-Upstream-Status: Inappropriate
-[https://github.com/FreeRADIUS/freeradius-server/commit/9652affe38f41ba2484e013cf9d2c0bcb8c80d67]
-Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
----
- src/main/tls.c                                    | 9 ++++++---
- src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c | 3 ++-
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/main/tls.c b/src/main/tls.c
-index 9726953234..840724bf61 100644
---- a/src/main/tls.c
-+++ b/src/main/tls.c
-@@ -1579,7 +1579,8 @@ done:
- 	return 0;
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+  (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090100fL)
- static SSL_SESSION *cbtls_get_session(SSL *ssl, unsigned char *data, int len, int *copy)
- #else
- static SSL_SESSION *cbtls_get_session(SSL *ssl, const unsigned char *data, int len, int *copy)
-@@ -3379,14 +3380,16 @@ post_ca:
- 		 */
- 		SSL_CTX_sess_set_cache_size(ctx, conf->session_cache_size);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+/* Not implemented in LibreSSL 2.9.1 */
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- 		SSL_CTX_set_num_tickets(ctx, 1);
- #endif
- 
- 	} else {
- 		SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+/* Not implemented in LibreSSL 2.9.1 */
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- 		/*
- 		 *	This controls the number of stateful or stateless tickets
- 		 *	generated with TLS 1.3.  In OpenSSL 1.1.1 it's also
-diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
-index fa9c58f3c3..a53341fc20 100644
---- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
-+++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
-@@ -44,7 +44,8 @@ static int openssl_get_keyblock_size(REQUEST *request, SSL *ssl)
- {
- 	const EVP_CIPHER *c;
- 	const EVP_MD *h;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+  (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090100fL)
- 	int md_size;
- 
- 	if (ssl->enc_read_ctx == NULL || ssl->enc_read_ctx->cipher == NULL ||
--- 
-2.21.0
-
diff --git a/net-dialup/freeradius/freeradius-3.0.20-r1.ebuild b/net-dialup/freeradius/freeradius-3.0.20-r1.ebuild
index c51cbce499e3..2912599acd81 100644
--- a/net-dialup/freeradius/freeradius-3.0.20-r1.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.20-r1.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="
-	debug firebird iodbc kerberos ldap libressl memcached mysql mongodb odbc oracle pam
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
 	pcap postgres python readline redis rest samba sqlite ssl systemd
 "
 RESTRICT="test firebird? ( bindist )"
@@ -56,8 +56,7 @@ RDEPEND="acct-group/radius
 	samba? ( net-fs/samba )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[-bindist] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[-bindist]
 	)
 	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}"
@@ -67,7 +66,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.18-libressl.patch
 	"${FILESDIR}"/${P}-systemd-service.patch
 	# Fix rlm_python3 build
 	# Backport from rlm_python changes to rlm_python3
diff --git a/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild b/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
index 0dac0d7ae67d..2706b9bc43ef 100644
--- a/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="
-	debug firebird iodbc kerberos ldap libressl memcached mysql mongodb odbc oracle pam
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
 	pcap postgres python readline redis rest samba sqlite ssl systemd
 "
 RESTRICT="test firebird? ( bindist )"
@@ -56,8 +56,7 @@ RDEPEND="acct-group/radius
 	samba? ( net-fs/samba )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[-bindist] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[-bindist]
 	)
 	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}"