gentoo auto-resync : 19:08:2023 - 21:39:30

8 files changed, 84 insertions, 195 deletions

diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 1ef4f559d3c3..81d64930ceb1 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,13 +1,5 @@
-DIST wireless-regdb-2022.02.18.tar.xz 25908 BLAKE2B 1237537a5d9ed249cc53b838b65effa83ceecd06bb76b11388a6c7673cd61322026617f033bea53d024f15a58ca19c4ab51bb624f2ee8fb1f2233b8e99140d4a SHA512 133fadd331dc0bd3f23e7dab54c3dfb1c55d8271bdaf9f393207fccd6c4d1d3d8f6428c1bebad54b2f3fd4837c4b6930b2fb33b3dc07abb53e41bdc8a54d8de4
-DIST wireless-regdb-2022.04.08.tar.xz 26308 BLAKE2B 30d3be06709c9dac3c034ded733f24a2261be06adfb9723cfb5bfec79439b89383be8b2d2acb41ea98c2138532b227b8fc14ba92512fa40b61ae7c3294d9a284 SHA512 328ccd6df67241faf03674820e4f799572764af580254b3aa4c834a9535a2732d303bcfe3ce503404f608074849424f1f8599b0f567dc00d7393dbcff7f07cf8
 DIST wireless-regdb-2022.06.06.tar.xz 26636 BLAKE2B e7695b1d4173ec239645a1f9c0bdd8f9cef92da86d918f3b2a7904487787b1a8b6fce5a75d0b7fad7d8a25f1419a4771e509977a5e3b13dff03bc53e976609f6 SHA512 ee6e79eeef3bf995120d31741bac9592771cbf918401f83d0ee059ba4119f7d9667607c5218bd9eeb0011dd7083264cf39a1a0ad3ebfd37dcfd957b01f248e0d
-DIST wireless-regdb-2022.08.12.tar.xz 26812 BLAKE2B ae84adfcaf66147f1a8bc6646225efe9d1a3b6313e04f82f18f4c5bfb0aa58270c5a5872d808a7267ce918f0343e2772ff38c7829de466bead4c2da4755614cc SHA512 37939229500571a273080c04010e5a131041f345cb817cf0c310de0b162a19e4eb0b90044f80a39dd53d8fef500581969052a9ac536202629e896659ead1cbe7
-DIST wireless-regdb-2023.02.13.tar.xz 27068 BLAKE2B a1d312b1301d27352a3dc5e62b19caa4c3e910014eab392fe298867b2eb8ec8758d59d25ba015689f5831eaa1acad2b74085534367e015a4d9c5926621e5a7c2 SHA512 a5f65fb00e2d3dc09559df864972f94d8b1a76521567a6a486c23d7349cdb7c7f9598fa269f70a1f674517f5f6103e051d5c3e048d5324489ee6e6b2c455fc78
 DIST wireless-regdb-2023.05.03.tar.xz 27260 BLAKE2B e880be3bacd7409719ede3e104ea6af870e0fb4edaefa6c61615ca74a8169a159348d631a4c296e273f6cc6e01ced2089e56c10080dd15a7439d8b4510eff7b8 SHA512 9de4852a1d351c11399ca55ea2ad61be23f488c61595b5c5afa3498d76488adc8120c6c77644275c460efcd1bb5bb68fa25597e73bec22ae847321bb55f7af27
-EBUILD wireless-regdb-20220218.ebuild 1092 BLAKE2B 5a8e4d26468e69a0901fd938bf6681afb86d50c74af038afb57fd992db0359bc748e24bbcb3e2d9997300df62cdaf83a6aff9d73435f1938f1dd84e93947c992 SHA512 849fa96f1cc4ebfe66604af7ab1647846bc9f45c2c4056dbe278c42e9e003a694aad4c6ed0de366e4ca996a18e3cadcece569516f0d5a2cc705130c189b2c4cb
-EBUILD wireless-regdb-20220408.ebuild 1099 BLAKE2B 2a337f4aed15757ea01d52e31a1989f25ed11a3a1437c117a2dca17c9551c76459e027c295978aa0146be44e5c8d045212c4aa96dd0c9e7b4a72db2458a90861 SHA512 42ad07e183e9e039f5e1ca503fb8a4ef6e25d4ed5c9ba38effa7abff0dbfc9338417d5e1aca314e093752e5c41b7830ff0a1c3ac864db170895e143ef12bb2db
 EBUILD wireless-regdb-20220606.ebuild 1099 BLAKE2B 2a337f4aed15757ea01d52e31a1989f25ed11a3a1437c117a2dca17c9551c76459e027c295978aa0146be44e5c8d045212c4aa96dd0c9e7b4a72db2458a90861 SHA512 42ad07e183e9e039f5e1ca503fb8a4ef6e25d4ed5c9ba38effa7abff0dbfc9338417d5e1aca314e093752e5c41b7830ff0a1c3ac864db170895e143ef12bb2db
-EBUILD wireless-regdb-20220812.ebuild 1106 BLAKE2B bb16990e7fd4813be8c29bcd12e5aae4fefb5a90a188c70ebbc9462b5ea3e10a0b2f28d3077e1141798bf388b0ba87113adfd667758bdfc5b5b0483608ef099c SHA512 b0373a5fc8c1f491d43bc16f016e28fa5aa5ace6c73ee0994a9ada71bdb34ffa959ddee19fe5628cf929f955c0d44742adad59794293379c4b36392fa4958f8a
-EBUILD wireless-regdb-20230213.ebuild 1106 BLAKE2B bb16990e7fd4813be8c29bcd12e5aae4fefb5a90a188c70ebbc9462b5ea3e10a0b2f28d3077e1141798bf388b0ba87113adfd667758bdfc5b5b0483608ef099c SHA512 b0373a5fc8c1f491d43bc16f016e28fa5aa5ace6c73ee0994a9ada71bdb34ffa959ddee19fe5628cf929f955c0d44742adad59794293379c4b36392fa4958f8a
-EBUILD wireless-regdb-20230503.ebuild 1115 BLAKE2B 652854f563058cb039720e58f27291a93335aace84d93d92965d9f930616303b17d61aa047d8661c8bc3403f88d154a3eb8ffa362f9b11cce4acc4eb4a0639e2 SHA512 3c97484c5e754fe4105de75c64fdbf6b836ee2432e3c720364c58138d61d7d613a504516a831140493e22f3a908dec349aab73c90110e71d78420fe3a13de967
-MISC metadata.xml 272 BLAKE2B 2a42142ca287ab19668cc11278dac4d0f16bf5b183646b0f06317a6e60568d9328d42baa986af6c692a256b28fdef32f24442faf69ae9b8305d625a3265df298 SHA512 4595277c33cd3d565c652cae1644c4ba131dea25899984629a48dc9a679441c95a7d26527c6fe4578a3e6f616e6f8c25580ee9f785fdcbd699bd43bacd846dd3
+EBUILD wireless-regdb-20230503-r1.ebuild 2777 BLAKE2B eb1d2be6c710d1588a951b5d9e52102266e561efe502ab1c2c9674ab65174a6a4eb9c29c618ff97e0138db7317f0c7af72788ec2262291eac45d8b04f2423ab1 SHA512 a7cd5f5ef6a1a393b23a535c032e0803e86aa439add1c8c0692f7fc55460a1d58aff8a21823589f399cbf6beb1335e9b1c78f2c571416a3863ec02d639c9c423
+MISC metadata.xml 423 BLAKE2B 5efca466ca95efca980dede4352cd67f120440ccac911e1dbd16bc7931ed193a3c08b1794acb77389caea2494f6e6ede0052313fd9ca0ac5ad18b87d0491fdd3 SHA512 97a332381f091c8365992a226eeb4b22c764b6d44fa9ece8ea6fddf299f1e91901690743211a13023652f1cc8d6b5d771f8c2425638fe43891425b5a0753a406
diff --git a/net-wireless/wireless-regdb/metadata.xml b/net-wireless/wireless-regdb/metadata.xml
index a61f7bfb3196..101c017e6f75 100644
--- a/net-wireless/wireless-regdb/metadata.xml
+++ b/net-wireless/wireless-regdb/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<use>
+		<flag name="crda">Use obsolete <pkg>net-wireless/crda</pkg> for regulatory domain loading instead of in-kernel (4.15+) support</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20220218.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220218.ebuild
deleted file mode 100644
index 050550bee28b..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20220218.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild
deleted file mode 100644
index 3f15ef755143..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20220408.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20220812.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220812.ebuild
deleted file mode 100644
index b684d0aeffa7..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20220812.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230213.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230213.ebuild
deleted file mode 100644
index b684d0aeffa7..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20230213.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild
new file mode 100644
index 000000000000..cf490e5d7dd3
--- /dev/null
+++ b/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
+DESCRIPTION="Wireless Regulatory database for Linux"
+HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
+SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="crda"
+
+RDEPEND="crda? ( net-wireless/crda )"
+
+REQUIRED_USE="kernel_linux"
+
+pkg_pretend() {
+	if kernel_is -ge 4 15; then
+		if linux_config_exists; then
+			if linux_chkconfig_builtin CFG80211 &&
+				[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]; then
+				ewarn "REGULATORY DOMAIN PROBLEM:"
+				ewarn "  With CONFIG_CFG80211=y (built-in), the driver(s) 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."
+			fi
+			if ! linux_chkconfig_present CFG80211; then
+				ewarn "REGULARTORY DOMAIN PROBLEM:"
+				ewarn "  With CONFIG_CFG80211 unset, the driver(s) won't be able to load the regulatory.db from"
+				ewarn "  /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m."
+			fi
+		fi
+
+		if has_version net-wireless/crda || use crda; then
+			ewarn "Starting from kernel version 4.15 net-wireless/crda is no longer needed."
+			ewarn "The crda USE flag will be removed on or after Feb 01, 2024"
+		fi
+
+		CONFIG_CHECK="EXPERT ~!CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="You can safely disable CFG80211_CRDA_SUPPORT"
+	else
+		CONFIG_CHECK="~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: \
+please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	check_extra_config
+}
+
+src_compile() {
+	einfo "Recompiling regulatory database(s) from db.txt would break signature verification."
+	einfo "Installing unmodified binary version."
+}
+
+src_install() {
+	if use crda; then
+		# This file is not ABI-specific, and crda itself always hardcodes
+		# this path.  So install into a common location for all ABIs to use.
+		insinto /usr/lib/crda
+		doins regulatory.bin
+
+		insinto /etc/wireless-regdb/pubkeys
+		doins sforshee.key.pub.pem
+	fi
+	# install the files the kernel needs unconditionally,
+	# they are small and kernels get upgraded
+	insinto /lib/firmware
+	doins regulatory.db regulatory.db.p7s
+
+	# regulatory.db.5 is a reference to regulatory.bin.5 so you need both unconditionally
+	doman -i18n= regulatory.db.5 regulatory.bin.5
+	dodoc README db.txt
+}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503.ebuild
deleted file mode 100644
index 5a750ea025a0..000000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20230503.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
-SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-src_compile() {
-	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
-}
-
-src_install() {
-	# This file is not ABI-specific, and crda itself always hardcodes
-	# this path.  So install into a common location for all ABIs to use.
-	insinto /usr/lib/crda
-	doins regulatory.bin
-
-	insinto /etc/wireless-regdb/pubkeys
-	doins sforshee.key.pub.pem
-
-	# Linux 4.15 now complains if the firmware loader
-	# can't find these files #643520
-	insinto /lib/firmware
-	doins regulatory.db
-	doins regulatory.db.p7s
-
-	doman regulatory.bin.5
-	dodoc README db.txt
-}