From 49d36e9793573ab563c841fc0aebeb7d62c58859 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Aug 2023 03:50:36 +0100 Subject: gentoo auto-resync : 24:08:2023 - 03:50:35 --- net-wireless/Manifest.gz | Bin 13894 -> 13897 bytes net-wireless/crda/Manifest | 2 +- net-wireless/crda/crda-4.15-r1.ebuild | 94 -------------------- net-wireless/crda/crda-4.15-r2.ebuild | 96 +++++++++++++++++++++ net-wireless/wireless-regdb/Manifest | 2 +- .../wireless-regdb-20230503-r1.ebuild | 80 ----------------- .../wireless-regdb-20230503-r2.ebuild | 81 +++++++++++++++++ 7 files changed, 179 insertions(+), 176 deletions(-) delete mode 100644 net-wireless/crda/crda-4.15-r1.ebuild create mode 100644 net-wireless/crda/crda-4.15-r2.ebuild delete mode 100644 net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild create mode 100644 net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild (limited to 'net-wireless') diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz index 0f3f94ab791f..e655f8919233 100644 Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest index c9e37d79ba48..56dc50948a0f 100644 --- a/net-wireless/crda/Manifest +++ b/net-wireless/crda/Manifest @@ -12,5 +12,5 @@ AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197b DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053 DIST crda-4.15.tar.gz 72907 BLAKE2B c5fe2a625e37a92447a52a477214fe8279201cb729fdb4af9f26e4174923179edf53e35484a34f76707e6801b2b636e38fe043c2a54038b7dd7f14ab97532d45 SHA512 5a5a2c6914529383ae84895a70d2455dbc94939f0bd0f8ee3f7158e768ab4a0123053abf5d87b050dc4104397f246ec2f1c1b97e9b6a7043c65b7aef568af539 EBUILD crda-4.14.ebuild 2131 BLAKE2B 43113fb57584f043a86c1711d2e0d5937c5121dea762a749b9a3d227943f64426b1205bed1f415852855134a9b7683ef933e0fd040479cd6fa5f038832048cde SHA512 afe6c01244ce33710166b91970f44ad933ecc8991ef7f8aecfd879cfde0de17a86336cd99bb31793154bf6fc34014f7d1e95fc1817c3637407f435daeb7a7eb1 -EBUILD crda-4.15-r1.ebuild 2238 BLAKE2B 730bb1e7a4ac1d8500e4e9fa4d88099bab0e78795b55baf69f1b5a83fa01d3be667a4f24c59d316d89e92ac7abfcf7e77b474ab0c4962e3ef7590fce1dd3a649 SHA512 4d9a97cb06093a0bdd2577665b09cbfff0e65454828350f7cbf2e775e1550598ff90bf3ecf02d30cb3522cf06aff06ae786f729efa5b735d882e1dc62f734555 +EBUILD crda-4.15-r2.ebuild 2318 BLAKE2B 59e3143ec1433cee1391d04e5a77e09dc2dfb4c827ed82df06b65159deb4bcc7c1a354b18de2aee98fecf300b6adfaf668bf25d9c0c7057665c8c08bec0485e9 SHA512 152ad909fd77a46e1f31773434301cf029d6432bef9476c0aa468a7dcac084fb6d4cf2b8a4323ade66b84de02a5f17763fd4428f180b732580d7069fafe9151e MISC metadata.xml 342 BLAKE2B 88aa38f713696271570968796b27533c0a990225592a4b553c4d1ff50528bce6bc5c96ab43998950b1391c42051eac0b7ed32eeb9b01458e4112ddfca56fbab7 SHA512 1775a84638c2ccdd1171d073603c2f0fa2d1248c1b2584ac25c26dd2eba0dc3af2800740253ca2083f10c11ad8763c4614cf73cdb695142dc75be79ea1c03675 diff --git a/net-wireless/crda/crda-4.15-r1.ebuild b/net-wireless/crda/crda-4.15-r1.ebuild deleted file mode 100644 index 7f41b1fb732e..000000000000 --- a/net-wireless/crda/crda-4.15-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit toolchain-funcs python-any-r1 udev - -DESCRIPTION="Central Regulatory Domain Agent for wireless networks" -HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda" -SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="gcrypt" - -RDEPEND=" - dev-libs/libnl:3 - net-wireless/wireless-regdb - !gcrypt? ( - dev-libs/openssl:= - ) - gcrypt? ( dev-libs/libgcrypt:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]') - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-no-werror.patch - "${FILESDIR}"/${PN}-cflags.patch - "${FILESDIR}"/${PN}-4.14-python-3.patch - "${FILESDIR}"/${PN}-4.14-openssl-1.1.0-compatibility.patch # bug #652428 - "${FILESDIR}"/${PN}-4.14-do-not-compress-doc.patch - "${FILESDIR}"/${PN}-4.15-no-ldconfig.patch - "${FILESDIR}"/${PN}-4.15-libreg-link.patch # bug #542436 - "${FILESDIR}"/${PN}-4.15-ldflags.patch -) - -python_check_deps() { - python_has_version "dev-python/m2crypto[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - sed -i \ - -e "s:\:$(tc-getPKG_CONFIG):" \ - Makefile || die -} - -_emake() { - # The source hardcodes /usr/lib/crda/ paths (ignoring all make vars - # that look like it should change it). We want to use /usr/lib/ - # anyways as this file is not ABI specific and we want to share it - # among all ABIs rather than pointlessly duplicate it. - # - # The trailing slash on SBINDIR is required by the source. - emake \ - PREFIX="${EPREFIX}/usr" \ - SBINDIR='$(PREFIX)/sbin/' \ - LIBDIR='$(PREFIX)/'"$(get_libdir)" \ - UDEV_RULE_DIR="$(get_udevdir)/rules.d" \ - REG_BIN="${SYSROOT}"/usr/lib/crda/regulatory.bin \ - USE_OPENSSL=$(usex gcrypt 0 1) \ - CC="$(tc-getCC)" \ - V=1 \ - WERROR= \ - "$@" -} - -src_compile() { - _emake all_noverify -} - -src_test() { - _emake verify -} - -src_install() { - _emake DESTDIR="${D}" install - keepdir /etc/wireless-regdb/pubkeys -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/net-wireless/crda/crda-4.15-r2.ebuild b/net-wireless/crda/crda-4.15-r2.ebuild new file mode 100644 index 000000000000..2f0110a44e23 --- /dev/null +++ b/net-wireless/crda/crda-4.15-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit toolchain-funcs python-any-r1 udev + +DESCRIPTION="Central Regulatory Domain Agent for wireless networks" +HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda" +SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="gcrypt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libnl:3 + net-wireless/wireless-regdb + !gcrypt? ( + dev-libs/openssl:= + ) + gcrypt? ( dev-libs/libgcrypt:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]') + test? ( net-wireless/wireless-regdb[crda(+)] ) + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-no-werror.patch + "${FILESDIR}"/${PN}-cflags.patch + "${FILESDIR}"/${PN}-4.14-python-3.patch + "${FILESDIR}"/${PN}-4.14-openssl-1.1.0-compatibility.patch # bug #652428 + "${FILESDIR}"/${PN}-4.14-do-not-compress-doc.patch + "${FILESDIR}"/${PN}-4.15-no-ldconfig.patch + "${FILESDIR}"/${PN}-4.15-libreg-link.patch # bug #542436 + "${FILESDIR}"/${PN}-4.15-ldflags.patch +) + +python_check_deps() { + python_has_version "dev-python/m2crypto[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + sed -i \ + -e "s:\:$(tc-getPKG_CONFIG):" \ + Makefile || die +} + +_emake() { + # The source hardcodes /usr/lib/crda/ paths (ignoring all make vars + # that look like it should change it). We want to use /usr/lib/ + # anyways as this file is not ABI specific and we want to share it + # among all ABIs rather than pointlessly duplicate it. + # + # The trailing slash on SBINDIR is required by the source. + emake \ + PREFIX="${EPREFIX}/usr" \ + SBINDIR='$(PREFIX)/sbin/' \ + LIBDIR='$(PREFIX)/'"$(get_libdir)" \ + UDEV_RULE_DIR="$(get_udevdir)/rules.d" \ + REG_BIN="${SYSROOT}"/usr/lib/crda/regulatory.bin \ + USE_OPENSSL=$(usex gcrypt 0 1) \ + CC="$(tc-getCC)" \ + V=1 \ + WERROR= \ + "$@" +} + +src_compile() { + _emake all_noverify +} + +src_test() { + _emake verify +} + +src_install() { + _emake DESTDIR="${D}" install + keepdir /etc/wireless-regdb/pubkeys +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest index 29686abd4501..2c6e3f3f007c 100644 --- a/net-wireless/wireless-regdb/Manifest +++ b/net-wireless/wireless-regdb/Manifest @@ -1,5 +1,5 @@ DIST wireless-regdb-2022.06.06.tar.xz 26636 BLAKE2B e7695b1d4173ec239645a1f9c0bdd8f9cef92da86d918f3b2a7904487787b1a8b6fce5a75d0b7fad7d8a25f1419a4771e509977a5e3b13dff03bc53e976609f6 SHA512 ee6e79eeef3bf995120d31741bac9592771cbf918401f83d0ee059ba4119f7d9667607c5218bd9eeb0011dd7083264cf39a1a0ad3ebfd37dcfd957b01f248e0d DIST wireless-regdb-2023.05.03.tar.xz 27260 BLAKE2B e880be3bacd7409719ede3e104ea6af870e0fb4edaefa6c61615ca74a8169a159348d631a4c296e273f6cc6e01ced2089e56c10080dd15a7439d8b4510eff7b8 SHA512 9de4852a1d351c11399ca55ea2ad61be23f488c61595b5c5afa3498d76488adc8120c6c77644275c460efcd1bb5bb68fa25597e73bec22ae847321bb55f7af27 EBUILD wireless-regdb-20220606.ebuild 1099 BLAKE2B 2a337f4aed15757ea01d52e31a1989f25ed11a3a1437c117a2dca17c9551c76459e027c295978aa0146be44e5c8d045212c4aa96dd0c9e7b4a72db2458a90861 SHA512 42ad07e183e9e039f5e1ca503fb8a4ef6e25d4ed5c9ba38effa7abff0dbfc9338417d5e1aca314e093752e5c41b7830ff0a1c3ac864db170895e143ef12bb2db -EBUILD wireless-regdb-20230503-r1.ebuild 2805 BLAKE2B d9871c97235805cab48385055e255f8a76e4a78f5db2c55854b7d0e63a86452ad7bfee50eb03e09b4ccbdc0c5466e02cb26e3bde893481f07a82c35f9e0c2a4d SHA512 c116752b5ac08bfb5fd6211cb16308bf83798c6b55dc5713ad4dc0d26835259beaf88dca494545c36a187d8aa471059d78985e435f38f56a16cfc72c6d5cae74 +EBUILD wireless-regdb-20230503-r2.ebuild 2869 BLAKE2B 0fc9439f2b5df536c7723bf66e4461602c9c1e34f9f7d4128ba67ee6c75e9770ef0ed41143e047919a56ae0a921800e66da66c829df3bec9cdee872dc407245d SHA512 d358056a8eae01c465d977032ecc810a3474ffe98e539672c04ce56614cba27b93b421384b83a16f020e4c341e13d660829ecc296207a2783c3a322b2e3e3ae6 MISC metadata.xml 423 BLAKE2B 5efca466ca95efca980dede4352cd67f120440ccac911e1dbd16bc7931ed193a3c08b1794acb77389caea2494f6e6ede0052313fd9ca0ac5ad18b87d0491fdd3 SHA512 97a332381f091c8365992a226eeb4b22c764b6d44fa9ece8ea6fddf299f1e91901690743211a13023652f1cc8d6b5d771f8c2425638fe43891425b5a0753a406 diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild deleted file mode 100644 index d2b51aad6229..000000000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# 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 - if linux_chkconfig_present EXPERT && linux_chkconfig_present CFG80211_CRDA_SUPPORT; then - ewarn "You can safely disable CFG80211_CRDA_SUPPORT" - 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 - - 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-r2.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild new file mode 100644 index 000000000000..4bf9984598e8 --- /dev/null +++ b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild @@ -0,0 +1,81 @@ +# 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" + +#PDEPEND is required here or crda test dep causes circular deps +PDEPEND="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 + if linux_chkconfig_present EXPERT && linux_chkconfig_present CFG80211_CRDA_SUPPORT; then + ewarn "You can safely disable CFG80211_CRDA_SUPPORT" + 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 + + 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 +} -- cgit v1.2.3