gentoo resync : 08.01.2021

5 files changed, 8 insertions, 244 deletions

diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index b37cec92c149..6bd850a474b8 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,12 +1,9 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
-AUX iwd-1.8-eapol-prevent-key-reinstallation.patch 2575 BLAKE2B 1e9683e551178ff54f31f9c8e861afb4b1cbe6d2f11188043d2bc6075fb21fe2637db4b13a4b93c900b9450034d28088e525e42ff0cfea08341fb056c7c74fc2 SHA512 e39965ae121e42ff17c1cc05539af1d9005748d05c0fe2ff4ef7884c3b224973a30875961476ecaad7f6f7567e79dd33bc854be05a71b37c4c05a19e2b60fced
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.10.tar.xz 897928 BLAKE2B 1589300201c835b2b14c34a9adefb525173cc2f9c8154f0a5f12da64a1da3d383acf328c5138bb8d4903ff08f339b7d55f02e215896af90aa75d244f61c3de1f SHA512 c128ec764e9d727b4ae1157717826b3219c5d368746f7709a01cb816f077afaa32083052ee2a4ecd09a7fbd36c03ea9ba6bd1a84c2a33210398dd060e9020db5
-DIST iwd-1.8.tar.xz 865668 BLAKE2B ba1be5c1658df950fe28deca6b8c3c9482eda260fbd05f721cb34cadcb2852768086e65e7c74940bc6ddd345d1438624b59bdfe4b6a5323dd122a0cd397008d7 SHA512 f1caa330b3ff18b4598efec596a4b9a22887833218a90d19d59717503679eff71fdb990cb63bd74b8f1523197a366cd803d799259e8002e5cde2745b03d51d8e
-DIST iwd-1.9.tar.xz 883616 BLAKE2B 57dd4a6e00d73bcfb752e1bd3661e97251d1dab4c05638d148ae7031bff35d606063f79e575ed4d3d3a60ff5514eb3fc340e1eec4c2e7074bf8d6d4b79832f6d SHA512 d8762495f7f5a342476653c0cf64c31b3b41a3064a05c4fcf49b9faf4394b0d7a5db6aae6324896bdc8f7b104697fb4c4315f7073a4fde4fc87f8f55d932538b
-EBUILD iwd-1.10.ebuild 4890 BLAKE2B 7113e611b7868ad83ea9921cc1c41a6f0afad8458a327309f75fee0ac91acbd650e6e46c078612aea81b953d6589b5e809fb32ac735a0bb7b0f59f3fa6fc933f SHA512 c5e2504b92a43e1da4f9ebc13eba2e734121b0de595d81d51478884855ea6ff5c85cc3d56f33cba7b682cc135a647763bfdb05d5496c80b3235d3ce28d2329e6
-EBUILD iwd-1.8-r3.ebuild 4477 BLAKE2B d80632f00a31b5f1f751373701f80602d34e8fb8cec14316f5405a76af1df1cbed79f0b786d3f9e3e2bce2d54f7ee72ffcb0595455e9095c87c55b68b9f4b50f SHA512 d9b44088c2a4ddc0b42831ffca847daa1570d72583526a669c2178fff2a8d2c0cbf5415dc6f4d3edc2991fc588951e546de4b67449f721fa4e2ad71d2fd52e1e
-EBUILD iwd-1.9-r1.ebuild 4885 BLAKE2B b648703ecd98f049847a6d9e68e67556648269405db9eee067258ae2cc4a34c493dd9842864226c5184e1512329b65eb1f6b95b561a8f64d28fd2e8c6478db37 SHA512 8e3ab57f8ec33631b4ddb7d0972dfcdef909b3cb382f5ad197b0b5248d2bbb6e38a061968b6603a7182e0a87618a1d3e95ecd75239dddcfbc2d3ea700fe0ab0f
+DIST iwd-1.11.tar.xz 907020 BLAKE2B 3b2c0922745c699ba01a2f46061246fbad6e2c7ea1a2f58cd13b5bf2169e9517652740f2dd872b5a274d74a5b8f1962c8e4696eabe5481a0c4783f202217599e SHA512 09c5e5e105b6107d88eff4238bf023f7bf1a408f522b9f84fac890c123bff2e124b937b81e1559db7fe0720f0ac423dc7d37c1b6d502fc4a7b7403fcd798e01d
+EBUILD iwd-1.10.ebuild 4884 BLAKE2B a68b6fa5e0521bdd9bf432c702defa624a352601411dcfd0a20f36b83426d15bf02f5cc8129219764302698b4be2bf27732b5c728e373832d9ea448ae4748c6a SHA512 c25ce5a1982aed15fa2dc2d92071b2ffcf76f1fd46dde59c54383019e28606e0e3291871af75e6278b44ff7280c37295d475bbfad5fde7f0b381eaa289997eea
+EBUILD iwd-1.11.ebuild 4890 BLAKE2B 6a2d7a1c998fb9b37d495d25feb726cc3bda89985dad75f2808b8eaea3c47de2ce29cb3eafa56acaa61d0283a8f14ea0d0402ee295059e6c0076377a0024d15a SHA512 dc5f5d79ee58c60f176516ce44f11cf1d7582aaddbca6fa21a8764796e129f3efc52f818fa1225fc2f23ff4f1b7327905959c429019ed652926d8f41a3bc78a4
 EBUILD iwd-9999.ebuild 4866 BLAKE2B 56604e640edcc195e7590b17e5b390d2301cf99f222c7046393e50312decd6b162c9d204e33bb5984db3fcf109270ddac0445bf87da4cb7317722584709bdda9 SHA512 c0188ce813cc775f17fd9dfbfb2e0abd8de904a9d4f872750e3342cbe6559f06d8d0c50007e8b48c31a3066c26c3a3773ea4c4a3ee863151250cd58cf2e11b4d
 MISC metadata.xml 832 BLAKE2B 5f9e80bd6e64bb7542509fa934e5fba8f433781f35b0c5e3f0dcae48a4a4cd3ecf23312241358daeccc0429f8bd74651531b7d628ec19f6af16714027ff8ddc2 SHA512 06950191a98edb0453b80500c0c1b7ca879fea962cd13f5ad695923d866edb4aa99753750d67110eac0a790d8ddeff9154add4fc8793d34af35870e13e8a6464
diff --git a/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch b/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch
deleted file mode 100644
index dceb808297e3..000000000000
--- a/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From f22ba5aebb569ca54521afd2babdc1f67e3904ea Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
-Date: Wed, 12 Aug 2020 15:17:21 +0400
-Subject: eapol: prevent key reinstallation on retransmitted Msg4/4
-
-Currently an adversary can retransmit EAPOL Msg4/4 to make the AP
-reinstall the PTK. Against older Linux kernels this can subsequently
-be used to decrypt, replay, and possibly decrypt frames. See the
-KRACK attacks research at krackattacks.com for attack scenarios.
-In this case no machine-in-the-middle position is needed to trigger
-the key reinstallation.
-
-Fix this by using the ptk_complete boolean to track when the 4-way
-handshake has completed (similar to its usage for clients). When
-receiving a retransmitted Msg4/4 accept this frame but do not reinstall
-the PTK.
-
-Credits to Chris M. Stone, Sam Thomas, and Tom Chothia of Birmingham
-University to help discover this issue.
----
- src/eapol.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/eapol.c b/src/eapol.c
-index b0036c10..e3581cfe 100644
---- a/src/eapol.c
-+++ b/src/eapol.c
-@@ -1462,7 +1462,6 @@ static void eapol_handle_ptk_2_of_4(struct eapol_sm *sm,
- 	memcpy(sm->handshake->snonce, ek->key_nonce,
- 			sizeof(sm->handshake->snonce));
- 	sm->handshake->have_snonce = true;
--	sm->handshake->ptk_complete = true;
- 
- 	sm->frame_retry = 0;
- 
-@@ -1782,7 +1781,15 @@ static void eapol_handle_ptk_4_of_4(struct eapol_sm *sm,
- 	l_timeout_remove(sm->timeout);
- 	sm->timeout = NULL;
- 
--	handshake_state_install_ptk(sm->handshake);
-+	/*
-+	 * If ptk_complete is set, then we are receiving Message 4 again.
-+	 * This might be a retransmission, so accept but don't install
-+	 * the keys again.
-+	 */
-+	if (!sm->handshake->ptk_complete)
-+		handshake_state_install_ptk(sm->handshake);
-+
-+	sm->handshake->ptk_complete = true;
- }
- 
- static void eapol_handle_gtk_1_of_2(struct eapol_sm *sm,
-@@ -2185,6 +2192,7 @@ static void eapol_auth_key_handle(struct eapol_sm *sm,
- 	size_t frame_len = 4 + L_BE16_TO_CPU(frame->header.packet_len);
- 	const struct eapol_key *ek = eapol_key_validate((const void *) frame,
- 							frame_len, sm->mic_len);
-+	uint16_t key_data_len;
- 
- 	if (!ek)
- 		return;
-@@ -2199,7 +2207,8 @@ static void eapol_auth_key_handle(struct eapol_sm *sm,
- 	if (!sm->handshake->have_anonce)
- 		return; /* Not expecting an EAPoL-Key yet */
- 
--	if (!sm->handshake->ptk_complete)
-+	key_data_len = EAPOL_KEY_DATA_LEN(ek, sm->mic_len);
-+	if (key_data_len != 0)
- 		eapol_handle_ptk_2_of_4(sm, ek);
- 	else
- 		eapol_handle_ptk_4_of_4(sm, ek);
--- 
-cgit 1.2.3-1.el7
-
diff --git a/net-wireless/iwd/iwd-1.10.ebuild b/net-wireless/iwd/iwd-1.10.ebuild
index 68624a7cdd36..c07c53ce4651 100644
--- a/net-wireless/iwd/iwd-1.10.ebuild
+++ b/net-wireless/iwd/iwd-1.10.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/iwd/iwd-1.9-r1.ebuild b/net-wireless/iwd/iwd-1.11.ebuild
index c170b16a7f3c..555a577368d8 100644
--- a/net-wireless/iwd/iwd-1.9-r1.ebuild
+++ b/net-wireless/iwd/iwd-1.11.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.33"
+ELL_REQ="0.35"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/iwd/iwd-1.8-r3.ebuild b/net-wireless/iwd/iwd-1.8-r3.ebuild
deleted file mode 100644
index a8c6fbd6ae43..000000000000
--- a/net-wireless/iwd/iwd-1.8-r3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.32"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-PATCHES=( "${FILESDIR}"/iwd-1.8-eapol-prevent-key-reinstallation.patch )
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~X509_CERTIFICATE_PARSER
-	"
-	if use crda;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
-		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
-	fi
-
-	if use amd64;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-
-	if ! use crda; then
-		if use kernel_linux && kernel_is -lt 4 15; then
-			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
-			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
-		fi
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn ""
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-			ewarn ""
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-}