diff options
Diffstat (limited to 'net-wireless')
391 files changed, 6033 insertions, 8193 deletions
diff --git a/net-wireless/aic8800/Manifest b/net-wireless/aic8800/Manifest new file mode 100644 index 000000000000..8f1cc433fd6e --- /dev/null +++ b/net-wireless/aic8800/Manifest @@ -0,0 +1 @@ +DIST aic8800-1.0.3.deb 535400 BLAKE2B 0e337bded43f99a00fb3d786742418d7faf0adf3d6e517933d4d4a82e7e723e5f45798991238a02fb1836529a5d72cc56181356939eb150feb4c26f14dcd762e SHA512 0917ac4f5a594adb68c084f38bedacb92f3c0700d13dda497943d199bd883c18fc624ffc579091b40fdc6322dc2e5b81cc21add06b27ae8364ee2f8f9f119a7d diff --git a/net-wireless/aic8800/aic8800-1.0.3.ebuild b/net-wireless/aic8800/aic8800-1.0.3.ebuild new file mode 100644 index 000000000000..79471e659a08 --- /dev/null +++ b/net-wireless/aic8800/aic8800-1.0.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit linux-mod-r1 udev unpacker + +DESCRIPTION="aic8800 driver for AICSemi AIC8800/8801/8800DC/8800DW/8800FC Wifi/Bluetooth" +HOMEPAGE="https://www.aicsemi.com/ https://linux.brostrend.com/troubleshooting/source-code/" + +SRC_URI="https://linux.brostrend.com/${PN}-dkms.deb -> ${P}.deb" + +LICENSE="GPL-2+ firmware? ( freedist )" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="+firmware udev" + +CONFIG_CHECK="~MAC80211 ~BT_HCIBTUSB" + +BDEPEND+=" + $(unpacker_src_uri_depends)" + +S="${WORKDIR}/usr/src/${P}" + +src_compile() { + MODULES_MAKEARGS+=( + KDIR="${KV_OUT_DIR}" + ) + emake "${MODULES_MAKEARGS[@]}" +} + +src_install() { + linux_moduleinto kernel/drivers/net/wireless/${PN} + linux_domodule aic8800_fdrv/aic8800_fdrv.ko aic_load_fw/aic_load_fw.ko + modules_post_process + if use firmware; then + insinto /lib/firmware + doins -r "${WORKDIR}/lib/firmware/aic8800DC" + fi + if use udev; then + # install udev rules for USB mode switching + udev_newrules "${WORKDIR}/lib/udev/rules.d/aic.rules" 99-aic-modeswitch.rules + fi +} + +pkg_postinst() { + if use udev; then + udev_reload + fi + linux-mod-r1_pkg_postinst +} + +pkg_postrm() { + if use udev; then + udev_reload + fi +} diff --git a/net-wireless/aic8800/metadata.xml b/net-wireless/aic8800/metadata.xml new file mode 100644 index 000000000000..567331d7b4af --- /dev/null +++ b/net-wireless/aic8800/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chithanh@gentoo.org</email> + <name>ChÃ-Thanh Christopher Nguyá»…n</name> + </maintainer> + <longdescription>Upstream out-of-tree aic8800 linux driver for the following chips: +AIC8800 AIC8801 AIC8800DC AIC8800DW AIC8800FC</longdescription> + <use> + <flag name="firmware">Install device firmware</flag> + </use> +</pkgmetadata> diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest index bba09ffd901b..55cb590f4361 100644 --- a/net-wireless/aircrack-ng/Manifest +++ b/net-wireless/aircrack-ng/Manifest @@ -1 +1 @@ -DIST aircrack-ng-1.6_p20200722.tar.gz 7602785 BLAKE2B 67426a8f1d683fa374e8aa3dfd78ec860f622127f37080f0b3acba6fd7e05088203a60a9c7fd6265835b7b52697fd7d2660a5efb79c3c72d7098a081dd83ecfe SHA512 dc7c80099bdcd6c68c5e06e4668453c0c594c66d57079ed77c27467e4d2307ca63ea9671966e06feb6b698020b683f6830d401701e4472acbf0edb4f22bb1f75 +DIST aircrack-ng-1.7.tar.gz 7740634 BLAKE2B 4461af7b698d30c96e6f93494d5ee658bf8d7144d8b165e9b8aee1766a35dddded3bbb738237e1100dcf22167125aa7cf9149288bba1607fe778470b04596cb2 SHA512 3e6433cba1d6b122701245e8904480de9957dad033c1642cc45b30339e9391ffa21b39b2cc712bcba79bc2c2e26f2964be8f28a27081dc4bb323792cb7df2478 diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild deleted file mode 100644 index 9db871ae620b..000000000000 --- a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_OPTIONAL=1 - -inherit toolchain-funcs distutils-r1 flag-o-matic autotools - -DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys" -HOMEPAGE="http://www.aircrack-ng.org" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git" -else - #SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz" - COMMIT="5a02ac4818b30d2e87b3e18e497a5f9e5319394f" - SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental" - -DEPEND="net-libs/libpcap - sys-apps/hwloc:0= - dev-libs/openssl:0= - netlink? ( dev-libs/libnl:3 ) - pcre? ( dev-libs/libpcre ) - airdrop-ng? ( ${PYTHON_DEPS} ) - airgraph-ng? ( ${PYTHON_DEPS} ) - experimental? ( sys-libs/zlib ) - sqlite? ( >=dev-db/sqlite-3.4 )" -RDEPEND="${DEPEND}" -PDEPEND="kernel_linux? ( - net-wireless/iw - net-wireless/wireless-tools - sys-apps/ethtool - sys-apps/usbutils - sys-apps/pciutils ) - sys-apps/hwids - airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" - -REQUIRED_USE=" - airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) - airgraph-ng? ( ${PYTHON_REQUIRED_USE} )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - STATIC_LIBDIR_NAME="$(get_libdir)" \ - --disable-asan \ - --enable-shared \ - --disable-static \ - --without-opt \ - $(use_enable netlink libnl) \ - $(use_with experimental) \ - $(use_with sqlite sqlite3) -} - -src_compile() { - if [[ $($(tc-getCC) --version) == clang* ]] ; then - #https://bugs.gentoo.org/show_bug.cgi?id=472890 - filter-flags -frecord-gcc-switches - fi - - default - - if use airgraph-ng; then - cd "${S}/scripts/airgraph-ng" - distutils-r1_src_compile - fi - if use airdrop-ng; then - cd "${S}/scripts/airdrop-ng" - distutils-r1_src_compile - fi -} - -src_install() { - default - - if use airgraph-ng; then - cd "${S}/scripts/airgraph-ng" - distutils-r1_src_install - fi - if use airdrop-ng; then - cd "${S}/scripts/airdrop-ng" - distutils-r1_src_install - fi - - # we don't need aircrack-ng's oui updater, we have our own - rm "${ED}"/usr/sbin/airodump-ng-oui-update - find "${D}" -xtype f -name '*.la' -delete || die -} - -pkg_postinst() { - # Message is (c) FreeBSD - # http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5 - if use kernel_FreeBSD ; then - einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor" - einfo "mode of your wireless card. So do not care about what the manpages say about" - einfo "airmon-ng, airodump-ng sets monitor mode automatically." - echo - einfo "To return from monitor mode, issue the following command:" - einfo " ifconfig \${INTERFACE} -mediaopt monitor" - einfo - einfo "For aireplay-ng you need FreeBSD >= 7.0." - fi -} diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.7-r3.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.7-r3.ebuild new file mode 100644 index 000000000000..b2c8188ff021 --- /dev/null +++ b/net-wireless/aircrack-ng/aircrack-ng-1.7-r3.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_OPTIONAL=1 + +inherit distutils-r1 autotools + +DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys" +HOMEPAGE="http://www.aircrack-ng.org" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git" +else + MY_PV=${PV/_/-} + SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2" +SLOT="0" + +IUSE="+airdrop-ng +airgraph-ng +experimental +netlink +pcre +sqlite test" + +CDEPEND="net-libs/libpcap + sys-apps/hwloc:0= + dev-libs/libbsd + dev-libs/openssl:0= + netlink? ( dev-libs/libnl:3 ) + pcre? ( dev-libs/libpcre ) + airdrop-ng? ( ${PYTHON_DEPS} ) + airgraph-ng? ( ${PYTHON_DEPS} ) + experimental? ( sys-libs/zlib ) + sqlite? ( >=dev-db/sqlite-3.4:3 ) + " +DEPEND="${CDEPEND} + test? ( dev-tcltk/expect ) + " +RDEPEND="${CDEPEND} + kernel_linux? ( + net-wireless/iw + net-wireless/wireless-tools + sys-apps/ethtool + sys-apps/usbutils + sys-apps/pciutils ) + sys-apps/hwdata + airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" +BDEPEND="airdrop-ng? ( ${DISTUTILS_DEPS} ) + airgraph-ng? ( ${DISTUTILS_DEPS} )" + +REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) + airgraph-ng? ( ${PYTHON_REQUIRED_USE} )" + +RESTRICT="!test? ( test )" + +src_prepare() { + default + eautoreconf + if use airgraph-ng || use airdrop-ng; then + distutils-r1_src_prepare + fi +} + +src_configure() { + econf \ + STATIC_LIBDIR_NAME="$(get_libdir)" \ + --disable-asan \ + --enable-shared \ + --disable-static \ + --without-opt \ + --with-duma=no \ + $(use_enable netlink libnl) \ + $(use_with experimental) \ + $(use_with sqlite sqlite3) +} + +python_compile() { + if use airgraph-ng; then + cd "${S}/scripts/airgraph-ng" || die + distutils-r1_python_compile + fi + if use airdrop-ng; then + if [ -d "${BUILD_DIR}"/build ]; then + rm -r "${BUILD_DIR}"/build || die + fi + cd "${S}/scripts/airdrop-ng" || die + distutils-r1_python_compile + fi +} + +src_compile() { + default + if use airgraph-ng || use airdrop-ng; then + distutils-r1_src_compile + fi +} + +src_install() { + default + if use airgraph-ng || use airdrop-ng; then + distutils-r1_src_install + fi + + # we don't need aircrack-ng's oui updater, we have our own + rm "${ED}"/usr/sbin/airodump-ng-oui-update || die + find "${D}" -xtype f -name '*.la' -delete || die +} diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild index 9677624aa58d..3571d86d4cda 100644 --- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild +++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_OPTIONAL=1 -inherit toolchain-funcs distutils-r1 flag-o-matic autotools +inherit distutils-r1 autotools DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys" HOMEPAGE="http://www.aircrack-ng.org" @@ -16,41 +17,52 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git" else MY_PV=${PV/_/-} - SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz" + SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" SLOT="0" -IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental" +IUSE="+airdrop-ng +airgraph-ng +experimental +netlink +pcre +sqlite test" -DEPEND="net-libs/libpcap +CDEPEND="net-libs/libpcap sys-apps/hwloc:0= + dev-libs/libbsd dev-libs/openssl:0= netlink? ( dev-libs/libnl:3 ) - pcre? ( dev-libs/libpcre ) + pcre? ( dev-libs/libpcre2:= ) airdrop-ng? ( ${PYTHON_DEPS} ) airgraph-ng? ( ${PYTHON_DEPS} ) experimental? ( sys-libs/zlib ) - sqlite? ( >=dev-db/sqlite-3.4 )" -RDEPEND="${DEPEND}" -PDEPEND="kernel_linux? ( + sqlite? ( >=dev-db/sqlite-3.4:3 ) + " +DEPEND="${CDEPEND} + test? ( dev-tcltk/expect ) + " +RDEPEND="${CDEPEND} + kernel_linux? ( net-wireless/iw net-wireless/wireless-tools sys-apps/ethtool sys-apps/usbutils sys-apps/pciutils ) - sys-apps/hwids + sys-apps/hwdata airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" +BDEPEND="airdrop-ng? ( ${DISTUTILS_DEPS} ) + airgraph-ng? ( ${DISTUTILS_DEPS} )" -REQUIRED_USE=" - airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) +REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) airgraph-ng? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + src_prepare() { default eautoreconf + if use airgraph-ng || use airdrop-ng; then + distutils-r1_src_prepare + fi } src_configure() { @@ -60,57 +72,40 @@ src_configure() { --enable-shared \ --disable-static \ --without-opt \ + --with-duma=no \ $(use_enable netlink libnl) \ $(use_with experimental) \ $(use_with sqlite sqlite3) } -src_compile() { - if [[ $($(tc-getCC) --version) == clang* ]] ; then - #https://bugs.gentoo.org/show_bug.cgi?id=472890 - filter-flags -frecord-gcc-switches - fi - - default - +python_compile() { if use airgraph-ng; then - cd "${S}/scripts/airgraph-ng" - distutils-r1_src_compile + cd "${S}/scripts/airgraph-ng" || die + distutils-r1_python_compile fi if use airdrop-ng; then - cd "${S}/scripts/airdrop-ng" + if [ -d "${BUILD_DIR}"/build ]; then + rm -r "${BUILD_DIR}"/build || die + fi + cd "${S}/scripts/airdrop-ng" || die + distutils-r1_python_compile + fi +} + +src_compile() { + default + if use airgraph-ng || use airdrop-ng; then distutils-r1_src_compile fi } src_install() { default - - if use airgraph-ng; then - cd "${S}/scripts/airgraph-ng" - distutils-r1_src_install - fi - if use airdrop-ng; then - cd "${S}/scripts/airdrop-ng" + if use airgraph-ng || use airdrop-ng; then distutils-r1_src_install fi # we don't need aircrack-ng's oui updater, we have our own - rm "${ED}"/usr/sbin/airodump-ng-oui-update + rm "${ED}"/usr/sbin/airodump-ng-oui-update || die find "${D}" -xtype f -name '*.la' -delete || die } - -pkg_postinst() { - # Message is (c) FreeBSD - # http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5 - if use kernel_FreeBSD ; then - einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor" - einfo "mode of your wireless card. So do not care about what the manpages say about" - einfo "airmon-ng, airodump-ng sets monitor mode automatically." - echo - einfo "To return from monitor mode, issue the following command:" - einfo " ifconfig \${INTERFACE} -mediaopt monitor" - einfo - einfo "For aireplay-ng you need FreeBSD >= 7.0." - fi -} diff --git a/net-wireless/airspy/Manifest b/net-wireless/airspy/Manifest index d75e5208ce9f..ca4303b22e84 100644 --- a/net-wireless/airspy/Manifest +++ b/net-wireless/airspy/Manifest @@ -1,2 +1 @@ DIST airspy-1.0.10.tar.gz 238863 BLAKE2B 1cd257140094205ed5c9e574b6b77b297ff88d50e3dada639d6daea4aa6969a9470f7e68d505a88e04dd42b978263b83abb0d8f37399fdf0093823b9c24150a7 SHA512 61ea82e8b9892053b6fdccd7de05f248145bb5da0d4f63bb31d3a815fa739b248662a875d53d88de260cfa2a98ef266ea165ba50397e67822ea21ca273c93b24 -DIST airspy-1.0.9.tar.gz 216852 BLAKE2B 14cc4743b4398fec6fc6defe257b38c620ccca812c8e4da580fe78a99ac0e7a1b104cc05e83ba7b1423586e182da1a77d152485c515f41b4a52ff533e19d9903 SHA512 95030a39f687b0b72115d0279725845637240d8e8639fc2fb7b4b79d24be7aec85243d6d0e0643af358e7b4cf1e81b55b3c093b888411a47c7ed8a59a2aa497c diff --git a/net-wireless/airspy/airspy-1.0.10.ebuild b/net-wireless/airspy/airspy-1.0.10.ebuild index d214c535ef76..36b566530a43 100644 --- a/net-wireless/airspy/airspy-1.0.10.ebuild +++ b/net-wireless/airspy/airspy-1.0.10.ebuild @@ -1,29 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake udev DESCRIPTION="Usemode driver and associated tools for airspy" HOMEPAGE="http://www.airspy.com" -if [[ ${PV} == 9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/airspy/host.git" else SRC_URI="https://github.com/airspy/host/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/airspyone_host-${PV}" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-2+" SLOT="0" IUSE="+udev" -DEPEND="virtual/udev - virtual/libusb:1" -RDEPEND="${DEPEND}" +RDEPEND=" + virtual/udev + virtual/libusb:1" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-1.0.10-remove-static-libs.patch ) src_configure() { local mycmakeargs=( @@ -36,11 +39,15 @@ src_install() { cmake_src_install if use udev; then - udev_newrules "${ED}/etc/udev/rules.d/52-airspy.rules" 52-airspy.rules - rm -rf "${ED}/etc" + udev_newrules "${ED}"/etc/udev/rules.d/52-airspy.rules 52-airspy.rules + rm -r "${ED}"/etc || die fi } pkg_postinst() { use udev && udev_reload } + +pkg_postrm() { + use udev && udev_reload +} diff --git a/net-wireless/airspy/airspy-1.0.9.ebuild b/net-wireless/airspy/airspy-1.0.9.ebuild deleted file mode 100644 index d214c535ef76..000000000000 --- a/net-wireless/airspy/airspy-1.0.9.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake udev - -DESCRIPTION="Usemode driver and associated tools for airspy" -HOMEPAGE="http://www.airspy.com" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/airspy/host.git" -else - SRC_URI="https://github.com/airspy/host/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/airspyone_host-${PV}" - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+udev" - -DEPEND="virtual/udev - virtual/libusb:1" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DINSTALL_UDEV_RULES=$(usex udev) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use udev; then - udev_newrules "${ED}/etc/udev/rules.d/52-airspy.rules" 52-airspy.rules - rm -rf "${ED}/etc" - fi -} - -pkg_postinst() { - use udev && udev_reload -} diff --git a/net-wireless/airspy/airspy-9999.ebuild b/net-wireless/airspy/airspy-9999.ebuild index d214c535ef76..36b566530a43 100644 --- a/net-wireless/airspy/airspy-9999.ebuild +++ b/net-wireless/airspy/airspy-9999.ebuild @@ -1,29 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake udev DESCRIPTION="Usemode driver and associated tools for airspy" HOMEPAGE="http://www.airspy.com" -if [[ ${PV} == 9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/airspy/host.git" else SRC_URI="https://github.com/airspy/host/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/airspyone_host-${PV}" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-2+" SLOT="0" IUSE="+udev" -DEPEND="virtual/udev - virtual/libusb:1" -RDEPEND="${DEPEND}" +RDEPEND=" + virtual/udev + virtual/libusb:1" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-1.0.10-remove-static-libs.patch ) src_configure() { local mycmakeargs=( @@ -36,11 +39,15 @@ src_install() { cmake_src_install if use udev; then - udev_newrules "${ED}/etc/udev/rules.d/52-airspy.rules" 52-airspy.rules - rm -rf "${ED}/etc" + udev_newrules "${ED}"/etc/udev/rules.d/52-airspy.rules 52-airspy.rules + rm -r "${ED}"/etc || die fi } pkg_postinst() { use udev && udev_reload } + +pkg_postrm() { + use udev && udev_reload +} diff --git a/net-wireless/airspy/files/airspy-1.0.10-remove-static-libs.patch b/net-wireless/airspy/files/airspy-1.0.10-remove-static-libs.patch new file mode 100644 index 000000000000..ce4befc6cc29 --- /dev/null +++ b/net-wireless/airspy/files/airspy-1.0.10-remove-static-libs.patch @@ -0,0 +1,41 @@ +--- a/libairspy/src/CMakeLists.txt ++++ b/libairspy/src/CMakeLists.txt +@@ -57,16 +57,7 @@ + ) + endif( ${WIN32} ) + +-# Static library +-add_library(airspy-static STATIC ${c_sources}) +-if(MSVC) +- set_target_properties(airspy-static PROPERTIES OUTPUT_NAME "airspy_static") +-else() +- set_target_properties(airspy-static PROPERTIES OUTPUT_NAME "airspy") +-endif() +- + set_target_properties(airspy PROPERTIES CLEAN_DIRECT_OUTPUT 1) +-set_target_properties(airspy-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + + # Dependencies + target_link_libraries(airspy ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -82,10 +73,6 @@ + LIBRARY DESTINATION lib${LIB_SUFFIX} + COMPONENT sharedlibs + ) +- install(TARGETS airspy-static +- ARCHIVE DESTINATION lib${LIB_SUFFIX} +- COMPONENT staticlibs +- ) + install(FILES ${c_headers} + DESTINATION include/${PROJECT_NAME} + COMPONENT headers +@@ -97,10 +84,6 @@ + DESTINATION bin + COMPONENT sharedlibs + ) +- install(TARGETS airspy-static +- DESTINATION bin +- COMPONENT staticlibs +- ) + install(FILES ${c_headers} + DESTINATION include/${PROJECT_NAME} + COMPONENT headers diff --git a/net-wireless/airspy/metadata.xml b/net-wireless/airspy/metadata.xml index 193aff4c505d..46b75f40ee14 100644 --- a/net-wireless/airspy/metadata.xml +++ b/net-wireless/airspy/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="person"> <email>zerochaos@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">airspy/host</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/airtraf/airtraf-1.1-r4.ebuild b/net-wireless/airtraf/airtraf-1.1-r4.ebuild index 2409649ad21f..453bad727a0e 100644 --- a/net-wireless/airtraf/airtraf-1.1-r4.ebuild +++ b/net-wireless/airtraf/airtraf-1.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,8 +40,8 @@ src_prepare() { src_compile() { # parallel make (bug #297331) emake -C src -j1 \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild b/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild index 10a4760079ce..52a67071ac0b 100644 --- a/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild +++ b/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://bues.ch/b43/fwcutter/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 x86" src_compile() { emake CC="$(tc-getCC)" V=1 diff --git a/net-wireless/bdaddr/Manifest b/net-wireless/bdaddr/Manifest new file mode 100644 index 000000000000..180301cd51cb --- /dev/null +++ b/net-wireless/bdaddr/Manifest @@ -0,0 +1,2 @@ +DIST bdaddr-0_p20210511-idiomatic-makefile-r1.patch 883 BLAKE2B 805f5faf7bc1260f7f415eb92d02e0269ec6b753e31106f81970c28e1692226ce2f6fb08eb05438b190a321a6789fe600fd9ae6006a1fb54d92a96f55a6db80c SHA512 1938644c359c061966e1278bf97cd622cfa9c74eac7e5c0373df1ce0bc6b36a3034e47bb95601d31d28ec2a0627e0e2b3bb2174d1613368fbf2f2eb0ec237043 +DIST bdaddr-0_p20210511.tar.gz 5236 BLAKE2B a445586cc016f57f1922d6cff9dcf3141d35122a0dd4a3c338cc98515dadcf40265c3f4dcb2da03d3cd4214ab3d57172d78677afe9099d380e1241677d13b486 SHA512 956e1207c4b082d6322ab0ce9cdc76c9c2c9f17fe4ecb3d03b4839025b49f102a4e35b05e2489eca3fee6fc4a611d942e598c97cab7db6b530e895818e33a150 diff --git a/net-wireless/bdaddr/bdaddr-0_p20210511.ebuild b/net-wireless/bdaddr/bdaddr-0_p20210511.ebuild new file mode 100644 index 000000000000..8686e8e58f20 --- /dev/null +++ b/net-wireless/bdaddr/bdaddr-0_p20210511.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Utility for changing the Bluetooth device address" +HOMEPAGE="https://github.com/thxomas/bdaddr" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/thxomas/bdaddr" +else + MY_COMMIT=53dae3f6a33bca202ddae0e7b14beeaf2d7d653b + SRC_URI=" + https://github.com/thxomas/bdaddr/archive/${MY_COMMIT}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" + S="${WORKDIR}/${PN}-${MY_COMMIT}" +fi + +# https://github.com/thxomas/bdaddr/pull/6 +SRC_URI+=" + https://github.com/Flowdalic/bdaddr/commit/85eeb2a13ab664432ce357cdb0641163fc541a99.patch + -> ${PN}-0_p20210511-idiomatic-makefile-r1.patch +" + +LICENSE="GPL-2+" +SLOT="0" + +COMMON_DEPEND=" + net-wireless/bluez:= +" +RDEPEND=" + ${COMMON_DEPEND} + sys-apps/hwdata +" +DEPEND=" + ${COMMON_DEPEND} +" +BDEPEND="dev-go/go-md2man" + +PATCHES=( + "${DISTDIR}"/${PN}-0_p20210511-idiomatic-makefile-r1.patch +) + +src_compile() { + emake + + go-md2man -in README.md -out ${PN}.1 || die +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + dosym ../hwdata/oui.txt usr/share/misc/oui.txt +} diff --git a/net-wireless/bdaddr/metadata.xml b/net-wireless/bdaddr/metadata.xml new file mode 100644 index 000000000000..b25bbf170df9 --- /dev/null +++ b/net-wireless/bdaddr/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <name>Florian Schmaus</name> + <email>flow@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">thxomas/bdaddr</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild b/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild index 7cdf02f656b7..df8e5625539a 100644 --- a/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild +++ b/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild @@ -1,24 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="bladeRF FX3 firmware images" -HOMEPAGE="http://nuand.com/fx3.php" +HOMEPAGE="https://nuand.com/fx3.php" #firmware is open source, but uses a proprietary toolchain to build #automated builds from git are available, but likely unneeded #http://hoopycat.com/bladerf_builds/ -SRC_URI="http://nuand.com/fx3/bladeRF_fw_v${PV}.img" +SRC_URI="https://nuand.com/fx3/bladeRF_fw_v${PV}.img" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 ~arm ~riscv x86" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" - S="${DISTDIR}" src_unpack() { diff --git a/net-wireless/bladerf-fpga/Manifest b/net-wireless/bladerf-fpga/Manifest index df0324be8eaa..75c272b2dd5f 100644 --- a/net-wireless/bladerf-fpga/Manifest +++ b/net-wireless/bladerf-fpga/Manifest @@ -1,4 +1,8 @@ DIST hostedx115-0.12.0.rbf 3571462 BLAKE2B a89693c1d53b81e59b7801246afdbee8bc30eda8ac1770b6bbd251445d1e6db36b81c8b34af008c0eb923fe7f661faa3f7d6535fb87047312db042b5ecf44cee SHA512 84161ac1b1d569b93d67e563f4c8800b6e9c376dabe463c457d9cbad2b628519e36eced0120553015922290b817bbb0c0fc9ca66aae17719f8124193af00a996 +DIST hostedx115-0.15.0.rbf 3571462 BLAKE2B dd2359a9ab290e22163430b3948726c434613512ca09569582ca880c4a3077533d06eaa7407b58bbc8ba9de150f03d2de719a68ca58b6baac3712f26ff9afa3a SHA512 e75ca3329e16915c106ebf9afae1e707487be0f5029c12a9ced91d25c5c87b1637efb20d66432c8dcb095415c453eeefe8782a2591fe6cb18cf2a5e4dc121473 DIST hostedx40-0.12.0.rbf 1191788 BLAKE2B 47396bcade3cb2df3769569c5176dfbe8c9b717d02d62101d76d8e0ecdfa8df499966e072dd1b6ad54b03c4448e86fdad0c7e190ed30fbffb579b6282a2b1160 SHA512 1c963d5b4d3ecade5e9565202ce2563493806b44319f2b9b00325f17164f0207396b1546826afc19767f9207b3d526b90e74bef7e0d38be15ba6c81fdeb12c41 +DIST hostedx40-0.15.0.rbf 1191788 BLAKE2B 7c2de49366162cdb0a3fff36c3cdd9bd7979a65074cfd38b7a5996a88aa0a7b78775bf0781f81b1dfa1bd9c2809fe87555f351836dfbed5585409fcf7ddd4a08 SHA512 c0c4be0b0b9c5dd5230731f2c9d4e4c551000890f8eb919a71ac3fceea3e89f0c50ee51abec2542af13614c7789f13a5baf3d8273f6ab7a6da5669bcac64441f DIST hostedxA4-0.12.0.rbf 2632660 BLAKE2B 25f434bcb434df420be3c6a4c0bb3d3f48189e81b36f7bf8d775856080e8552fd4a62690fec31dc1b13ba66057b2261ca749706183f0e4063068c62dcd909634 SHA512 5e3bf78c8f87648df241a234d2bcbad1c8ed066a2b31a7b8f529c2401e140603d47f37b72c9631308d29daaa4f56f77dbff0f1dab8071a55e66e385c1d3a9bd6 +DIST hostedxA4-0.15.0.rbf 2632660 BLAKE2B 0e701bc927135cab2dd4a3c3cfdbea8c129288006782b4fdb897e7fb872a9fd15ce845efc7e18b04893fcf3fa8d19243a89515d771558daa30724ca7861ac1d1 SHA512 d0aa92ef8c5c9a92d3353c89f0fa35a46aaf9fc89e602ce6170663d2164845120ab02c8d276229f6adee40a557cd9692c848d0776ae7a63df373ad421637134c DIST hostedxA9-0.12.0.rbf 12858972 BLAKE2B 29d3c5d12c232333a7e2cb2e9ef580a7a350a0d04287cf2d068894d4b185a0f8256cfe87269738978ab0f0fabafa28921ca6ff13b8067d61fafb46a30ca230b7 SHA512 990199f980ebdda58f40bd72823585b3091d829b2974e84ab925576b7d1db2dfeef1d0934763636b92baee982470cc2fcff85dfa9bb2c6254b7021274703e4aa +DIST hostedxA9-0.15.0.rbf 12858972 BLAKE2B f03358e8fdd4b933fdf8aad6bd7eaa6e86e418abbd657cfa8775d80574e32135f9a63a62c2eb445ed30c994b179c0b952f44636357ee2a3e4561474dea3b5e39 SHA512 ccfaf4f3555954fd3de80120d47e57f37a47c5ef80798aed72dd3d1e027f6d5271a57ec3c4f1099745eb44925686338345ef144218bc15187926db45d299644b diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild index 10f806c6a60a..22d922941b88 100644 --- a/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild +++ b/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild @@ -1,27 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="bladeRF FPGA bitstreams" -HOMEPAGE="http://nuand.com/fpga.php" +HOMEPAGE="https://nuand.com/fpga.php" #fpga code is open source, but uses a proprietary toolchain to build #automated builds from git are available, but likely unneeded #http://hoopycat.com/bladerf_builds/ -SRC_URI="xA4? ( http://nuand.com/fpga/v${PV}/hostedxA4.rbf -> hostedxA4-${PV}.rbf ) - xA9? ( http://nuand.com/fpga/v${PV}/hostedxA9.rbf -> hostedxA9-${PV}.rbf ) - x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf ) - x115? ( http://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )" +SRC_URI="xA4? ( https://nuand.com/fpga/v${PV}/hostedxA4.rbf -> hostedxA4-${PV}.rbf ) + xA9? ( https://nuand.com/fpga/v${PV}/hostedxA9.rbf -> hostedxA9-${PV}.rbf ) + x40? ( https://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf ) + x115? ( https://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 ~arm ~riscv x86" IUSE="+xA4 +xA9 +x40 +x115" -DEPEND="" -RDEPEND="${DEPEND}" - S="${DISTDIR}" src_unpack() { diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.15.0.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.15.0.ebuild new file mode 100644 index 000000000000..5d613704947d --- /dev/null +++ b/net-wireless/bladerf-fpga/bladerf-fpga-0.15.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="bladeRF FPGA bitstreams" +HOMEPAGE="https://nuand.com/fpga.php" + +#fpga code is open source, but uses a proprietary toolchain to build +#automated builds from git are available, but likely unneeded +#http://hoopycat.com/bladerf_builds/ +SRC_URI="xA4? ( https://nuand.com/fpga/v${PV}/hostedxA4.rbf -> hostedxA4-${PV}.rbf ) + xA9? ( https://nuand.com/fpga/v${PV}/hostedxA9.rbf -> hostedxA9-${PV}.rbf ) + x40? ( https://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf ) + x115? ( https://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~riscv ~x86" +IUSE="+xA4 +xA9 +x40 +x115" + +S="${DISTDIR}" + +src_unpack() { + true +} + +src_install() { + insinto /usr/share/Nuand/bladeRF/ + use xA4 && newins hostedxA4-${PV}.rbf hostedxA4.rbf + use xA9 && newins hostedxA9-${PV}.rbf hostedxA9.rbf + use x40 && newins hostedx40-${PV}.rbf hostedx40.rbf + use x115 && newins hostedx115-${PV}.rbf hostedx115.rbf +} diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest index 05da6cefc697..28d785a9e6d9 100644 --- a/net-wireless/bladerf/Manifest +++ b/net-wireless/bladerf/Manifest @@ -1,2 +1,3 @@ DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02 DIST bladerf-2021.03.tar.gz 2261864 BLAKE2B b4e58e370c1e515162f01a0da3985b5ba3c210a8a045bd531e618a9da8e4e66e74a8ccca9138cf6427b512f9c4423bd4151cc63d70a5e218c2a24980afa73972 SHA512 76ebb6501ad9286c7a52a0540f991f7848e396b4d75104bf7186ffac5e3142aa79914352238c8a9e0b4453910c171218c0e861092f228202d0b236939fecc325 +DIST bladerf-2023.02.tar.gz 2308710 BLAKE2B 1cbc7eb7eb63a336e12ab2eae29760dc32e187005b93bb4c10032244649651484dbbb68644d2a9abca5488840134b336bfa54fdeb5f6331e9c440a9b5f302227 SHA512 af03141712886ea76952a5eea9ffb67b511b8ea196f2cf3349dab339b1964b3f296410acdc070304ffab71eb011830131373ad8c3b00a6cfec2773283082cc0d diff --git a/net-wireless/bladerf/bladerf-2021.03.ebuild b/net-wireless/bladerf/bladerf-2021.03-r1.ebuild index ac1bd5fa0b1e..84e327b78d20 100644 --- a/net-wireless/bladerf/bladerf-2021.03.ebuild +++ b/net-wireless/bladerf/bladerf-2021.03-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake udev +inherit cmake flag-o-matic udev DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand" HOMEPAGE="https://nuand.com/" @@ -29,15 +29,16 @@ else S="${WORKDIR}/${MY_PN}-${MY_PV}" SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \ https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz" - KEYWORDS="amd64 ~arm x86" + KEYWORDS="amd64 ~arm ~riscv x86" fi -CDEPEND=">=dev-libs/libusb-1.0.16 +BDEPEND="doc? ( app-text/doxygen )" +CDEPEND=">=dev-libs/libusb-1.0.16:1 tecla? ( dev-libs/libtecla )" DEPEND="${CDEPEND} virtual/pkgconfig" -RDEPEND="${CDEPEND}" -PDEPEND=">=net-wireless/bladerf-firmware-2.4.0 +RDEPEND="${CDEPEND} + >=net-wireless/bladerf-firmware-2.4.0 >=net-wireless/bladerf-fpga-0.12.0" src_unpack() { @@ -50,7 +51,12 @@ src_unpack() { } src_configure() { - mycmakeargs=( + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861872 + # https://github.com/Nuand/bladeRF/issues/903 + filter-lto + + local mycmakeargs=( -DVERSION_INFO_OVERRIDE:STRING="${PV}" -DBUILD_DOCUMENTATION="$(usex doc)" -DENABLE_LIBTECLA="$(usex tecla)" @@ -59,3 +65,10 @@ src_configure() { ) cmake_src_configure } + +pkg_postinst() { + udev_reload +} +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/bladerf/bladerf-2023.02.ebuild b/net-wireless/bladerf/bladerf-2023.02.ebuild new file mode 100644 index 000000000000..74c85125258c --- /dev/null +++ b/net-wireless/bladerf/bladerf-2023.02.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic udev + +DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand" +HOMEPAGE="https://nuand.com/" + +#lib is LGPL and cli tools are GPL +LICENSE="GPL-2+ LGPL-2.1+" + +SLOT="0/${PV}" + +#maintainer notes: +#doc use flag, looks like it can't be disabled right now and will +# always build if pandoc and help2man are installed +# also ignores when deps are missing and just disables docs +IUSE="doc +tecla" + +MY_PN="bladeRF" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git" +else + MY_PV=${PV/\_/-} + S="${WORKDIR}/${MY_PN}-${MY_PV}" + SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \ + https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi + +BDEPEND="doc? ( app-text/doxygen )" +CDEPEND=">=dev-libs/libusb-1.0.16:1 + tecla? ( dev-libs/libtecla )" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + >=net-wireless/bladerf-firmware-2.4.0 + >=net-wireless/bladerf-fpga-0.15.0" + +PATCHES=( "${FILESDIR}/bladerf-cmake-glob.patch" ) + +src_unpack() { + if [ "${PV}" = "9999" ]; then + git-r3_src_unpack + else + default + mv "${WORKDIR}/no-OS-0bba46e6f6f75785a65d425ece37d0a04daf6157/ad9361" "${S}/thirdparty/analogdevicesinc/no-OS/" || die + fi +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861872 + # https://github.com/Nuand/bladeRF/issues/903 + filter-lto + + local mycmakeargs=( + -DVERSION_INFO_OVERRIDE:STRING="${PV}" + -DBUILD_DOCUMENTATION="$(usex doc)" + -DENABLE_LIBTECLA="$(usex tecla)" + -DTREAT_WARNINGS_AS_ERRORS=OFF + -DUDEV_RULES_PATH="$(get_udevdir)"/rules.d + ) + cmake_src_configure +} + +pkg_postinst() { + udev_reload +} +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/bladerf/bladerf-9999.ebuild b/net-wireless/bladerf/bladerf-9999.ebuild index 09bf7b568186..9723f8fcbe5b 100644 --- a/net-wireless/bladerf/bladerf-9999.ebuild +++ b/net-wireless/bladerf/bladerf-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake udev +inherit cmake flag-o-matic udev DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand" HOMEPAGE="https://nuand.com/" @@ -29,15 +29,16 @@ else S="${WORKDIR}/${MY_PN}-${MY_PV}" SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \ https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi -CDEPEND=">=dev-libs/libusb-1.0.16 +BDEPEND="doc? ( app-text/doxygen )" +CDEPEND=">=dev-libs/libusb-1.0.16:1 tecla? ( dev-libs/libtecla )" DEPEND="${CDEPEND} virtual/pkgconfig" -RDEPEND="${CDEPEND}" -PDEPEND=">=net-wireless/bladerf-firmware-2.4.0 +RDEPEND="${CDEPEND} + >=net-wireless/bladerf-firmware-2.4.0 >=net-wireless/bladerf-fpga-0.12.0" src_unpack() { @@ -50,7 +51,12 @@ src_unpack() { } src_configure() { - mycmakeargs=( + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861872 + # https://github.com/Nuand/bladeRF/issues/903 + filter-lto + + local mycmakeargs=( -DVERSION_INFO_OVERRIDE:STRING="${PV}" -DBUILD_DOCUMENTATION="$(usex doc)" -DENABLE_LIBTECLA="$(usex tecla)" @@ -59,3 +65,10 @@ src_configure() { ) cmake_src_configure } + +pkg_postinst() { + udev_reload +} +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/bladerf/files/bladerf-cmake-glob.patch b/net-wireless/bladerf/files/bladerf-cmake-glob.patch new file mode 100644 index 000000000000..61a28468af19 --- /dev/null +++ b/net-wireless/bladerf/files/bladerf-cmake-glob.patch @@ -0,0 +1,40 @@ +From 12699a5cf89a00d63637eafc108515990d27c8fc Mon Sep 17 00:00:00 2001 +From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org> +Date: Thu, 16 Feb 2023 12:04:13 -0500 +Subject: [PATCH] use file(GLOB) instead of just globbing + +While *.h works for make, it fails when using ninja. This fixes the bug +using cmake's file(GLOB) as suggested by DarthGandalf in +gentoo-dev-help on irc + +https://bugs.gentoo.org/800791 +--- + host/libraries/libbladeRF/CMakeLists.txt | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt +index 4000a1555..f280b07cd 100644 +--- a/host/libraries/libbladeRF/CMakeLists.txt ++++ b/host/libraries/libbladeRF/CMakeLists.txt +@@ -540,13 +540,17 @@ if(BUILD_LIBBLADERF_DOCUMENTATION) + + set(LOGO_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/doc/images/logo.png") + ++ file(GLOB INCLUDE_H ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h) ++ file(GLOB DOC_DOX ${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/*.dox) ++ file(GLOB DOC_EXAMPLES ${CMAKE_CURRENT_SOURCE_DIR}/doc/examples/*) ++ file(GLOB DOC_IMAGES ${CMAKE_CURRENT_SOURCE_DIR}/doc/images/*) + set(DOXYGEN_SOURCE_FILES + ${CMAKE_CURRENT_BINARY_DIR}/doc/doxygen/Doxyfile +- ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/*.dox ++ ${INCLUDE_H} ++ ${DOC_DOX} + ${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/layout.xml +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/examples/* +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/images/* ++ ${DOC_EXAMPLES} ++ ${DOC_IMAGES} + ) + + configure_file( diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest deleted file mode 100644 index 54e934943563..000000000000 --- a/net-wireless/blueberry/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST blueberry-1.4.2.tar.gz 1414169 BLAKE2B cd55e2bb572efb2badeab1667324df67c35f5833c53755c76c0793c07e8427c7d4714135014dad90aeaddc806c798f2b89960a051a15f668d214bb95cc0943e3 SHA512 5c2fb94e842cd1229682305f0054061724b958406ea15a64495ca418aa7da73c38b45ddc43c27a193aef995ab860cad985e3369e3dac53d2098463e6e4250493 diff --git a/net-wireless/blueberry/blueberry-1.4.2.ebuild b/net-wireless/blueberry/blueberry-1.4.2.ebuild deleted file mode 100644 index d4077a454e74..000000000000 --- a/net-wireless/blueberry/blueberry-1.4.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -inherit gnome2-utils python-single-r1 xdg-utils - -DESCRIPTION="A Bluetooth configuration tool" -HOMEPAGE="https://github.com/linuxmint/blueberry" -SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] - dev-python/xapp[${PYTHON_USEDEP}] - ') - >=net-wireless/gnome-bluetooth-3.14[introspection] - net-wireless/bluez[obex] - net-wireless/bluez-tools - || ( - >=sys-apps/util-linux-2.31_rc1 - net-wireless/rfkill - ) - x11-libs/libnotify[introspection] - x11-misc/wmctrl" -DEPEND="${RDEPEND}" - -src_prepare() { - default - python_fix_shebang usr/lib -} - -src_install() { - doins -r etc - exeinto /usr/bin - doexe usr/bin/* - exeinto /usr/lib/blueberry - doexe usr/lib/blueberry/* - insinto /usr - doins -r usr/share -} - -pkg_postinst() { - gnome2_schemas_update - xdg_icon_cache_update -} - -pkg_postrm() { - gnome2_schemas_update - xdg_icon_cache_update -} diff --git a/net-wireless/blueberry/metadata.xml b/net-wireless/blueberry/metadata.xml deleted file mode 100644 index 0540c3e40a16..000000000000 --- a/net-wireless/blueberry/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>olivier.laurantin@laposte.net</email> - <name>Olivier Laurantin</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="github">linuxmint/blueberry</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest index 1c344ecfbf1f..9a944340b460 100644 --- a/net-wireless/blueman/Manifest +++ b/net-wireless/blueman/Manifest @@ -1 +1 @@ -DIST blueman-2.2.2.tar.xz 1560516 BLAKE2B fb82044971fb51ed7732f7638872e3bdbc7259a4fd4f3cc26f5567cfce378319ef3346376d3f07ceab92d2d002ff6455cc7c43345da7f660c3dc9f6b5ab57980 SHA512 b95f82c8a1bc8a77755f56944852a92da3bb58ecf646da75cfc6b6b50af679a3a8efb881f7917e6bb8b3645b1d3ab95b52ecd3c13ff0891ce999b59fe6d24488 +DIST blueman-2.3.5.tar.xz 1544232 BLAKE2B 454a5369cecd429dcbff84108ef5440c61e3740d54de30e85cef941f9bd55ef3f032aa4774b161cd145eecc53061d2d104ea6d6ec12516beb2f2b3579c074ccb SHA512 678261dc0a795ca79b43614f4fc6ad436b44690d0ce4dbf15f55dba4834a25a5c1956bf658d568a3318828863b3bb089689d0dc4fef8963ed2b27cf0f1144580 diff --git a/net-wireless/blueman/blueman-2.2.2.ebuild b/net-wireless/blueman/blueman-2.3.5.ebuild index 71f26470d8fb..c798557ce30f 100644 --- a/net-wireless/blueman/blueman-2.2.2.ebuild +++ b/net-wireless/blueman/blueman-2.3.5.ebuild @@ -1,54 +1,60 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=no +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager" -HOMEPAGE="https://github.com/blueman-project/blueman" +HOMEPAGE="https://github.com/blueman-project/blueman/" if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/blueman-project/blueman.git" else - SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz" + SRC_URI=" + https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz + " S=${WORKDIR}/${P/_/.} - KEYWORDS="amd64 arm arm64 ppc ppc64 x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi # icons are GPL-2 # source files are mixed GPL-3+ and GPL-2+ LICENSE="GPL-3+ GPL-2" SLOT="0" -IUSE="appindicator network nls policykit pulseaudio" +IUSE="network nls policykit pulseaudio" DEPEND=" $(python_gen_cond_dep ' dev-python/pygobject:3[${PYTHON_USEDEP}] ') >=net-wireless/bluez-5:= - ${PYTHON_DEPS}" +" BDEPEND=" $(python_gen_cond_dep ' dev-python/cython[${PYTHON_USEDEP}] ') virtual/pkgconfig - nls? ( dev-util/intltool sys-devel/gettext )" -RDEPEND="${DEPEND} + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${DEPEND} $(python_gen_cond_dep ' dev-python/pycairo[${PYTHON_USEDEP}] ') sys-apps/dbus - x11-libs/gtk+:3[introspection] + x11-libs/gtk+:3[introspection,X] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) - appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( @@ -58,24 +64,29 @@ RDEPEND="${DEPEND} || ( net-dns/dnsmasq net-misc/dhcp - >=net-misc/networkmanager-0.8 + >=net-misc/networkmanager-0.8[introspection] ) ) - policykit? ( sys-auth/polkit ) + policykit? ( + sys-auth/polkit + ) pulseaudio? ( || ( - media-sound/pulseaudio[bluetooth] - media-sound/pulseaudio-modules-bt + media-sound/pulseaudio-daemon[bluetooth] + media-video/pipewire[bluetooth] + <media-sound/pulseaudio-15.99.1[bluetooth] ) ) " -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - pkg_pretend() { if use network; then - local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES - ~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE" + local CONFIG_CHECK=" + ~BRIDGE + ~IP_NF_IPTABLES + ~IP_NF_NAT + ~IP_NF_TARGET_MASQUERADE + " check_extra_config fi } @@ -85,19 +96,22 @@ pkg_setup() { } src_prepare() { - default - # replace py-compile to fix py3 - [[ ${PV} == 9999 ]] && eautoreconf || eautomake + if [[ ${PV} == 9999 ]]; then + eautoreconf + else + # remove this when upstream switches to automake with .pyc fix + eautomake + fi + distutils-r1_src_prepare } -src_configure() { +python_configure() { local myconf=( --disable-runtime-deps-check --disable-static --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" --with-systemduserunitdir="$(systemd_get_userunitdir)" --with-dhcp-config="/etc/dhcp/dhcpd.conf" - $(use_enable appindicator) $(use_enable policykit polkit) $(use_enable nls) $(use_enable pulseaudio) @@ -108,7 +122,17 @@ src_configure() { econf "${myconf[@]}" } -src_install() { +python_compile() { + default +} + +python_test() { + # import tests are not very valuable and fail if /dev/rfkill + # does not exist + "${EPYTHON}" -m unittest -v test/test_gobject.py || die +} + +python_install() { default if use policykit; then diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild index 093410dceb50..65fe1c7ffb7d 100644 --- a/net-wireless/blueman/blueman-9999.ebuild +++ b/net-wireless/blueman/blueman-9999.ebuild @@ -1,54 +1,60 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=no +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager" -HOMEPAGE="https://github.com/blueman-project/blueman" +HOMEPAGE="https://github.com/blueman-project/blueman/" if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/blueman-project/blueman.git" else - SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz" + SRC_URI=" + https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz + " S=${WORKDIR}/${P/_/.} - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" fi # icons are GPL-2 # source files are mixed GPL-3+ and GPL-2+ LICENSE="GPL-3+ GPL-2" SLOT="0" -IUSE="appindicator network nls policykit pulseaudio" +IUSE="network nls policykit pulseaudio" DEPEND=" $(python_gen_cond_dep ' dev-python/pygobject:3[${PYTHON_USEDEP}] ') >=net-wireless/bluez-5:= - ${PYTHON_DEPS}" +" BDEPEND=" $(python_gen_cond_dep ' dev-python/cython[${PYTHON_USEDEP}] ') virtual/pkgconfig - nls? ( dev-util/intltool sys-devel/gettext )" -RDEPEND="${DEPEND} + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${DEPEND} $(python_gen_cond_dep ' dev-python/pycairo[${PYTHON_USEDEP}] ') sys-apps/dbus - x11-libs/gtk+:3[introspection] + x11-libs/gtk+:3[introspection,X] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) - appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( @@ -58,24 +64,26 @@ RDEPEND="${DEPEND} || ( net-dns/dnsmasq net-misc/dhcp - >=net-misc/networkmanager-0.8 + >=net-misc/networkmanager-0.8[introspection] ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( - media-sound/pulseaudio[bluetooth] - media-sound/pulseaudio-modules-bt + media-video/pipewire[bluetooth] + media-sound/pulseaudio-daemon[bluetooth] ) ) " -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - pkg_pretend() { if use network; then - local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES - ~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE" + local CONFIG_CHECK=" + ~BRIDGE + ~IP_NF_IPTABLES + ~IP_NF_NAT + ~IP_NF_TARGET_MASQUERADE + " check_extra_config fi } @@ -85,19 +93,22 @@ pkg_setup() { } src_prepare() { - default - # replace py-compile to fix py3 - [[ ${PV} == 9999 ]] && eautoreconf || eautomake + if [[ ${PV} == 9999 ]]; then + eautoreconf + else + # remove this when upstream switches to automake with .pyc fix + eautomake + fi + distutils-r1_src_prepare } -src_configure() { +python_configure() { local myconf=( --disable-runtime-deps-check --disable-static --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" --with-systemduserunitdir="$(systemd_get_userunitdir)" --with-dhcp-config="/etc/dhcp/dhcpd.conf" - $(use_enable appindicator) $(use_enable policykit polkit) $(use_enable nls) $(use_enable pulseaudio) @@ -108,7 +119,17 @@ src_configure() { econf "${myconf[@]}" } -src_install() { +python_compile() { + default +} + +python_test() { + # import tests are not very valuable and fail if /dev/rfkill + # does not exist + "${EPYTHON}" -m unittest -v test/test_gobject.py || die +} + +python_install() { default if use policykit; then diff --git a/net-wireless/bluez-hcidump/Manifest b/net-wireless/bluez-hcidump/Manifest deleted file mode 100644 index 25d88d51fa38..000000000000 --- a/net-wireless/bluez-hcidump/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bluez-hcidump-2.5.tar.xz 157072 BLAKE2B e0ceb98f42a61f56ebf0a5a6adf3c95c6525106bf0491cff042f9938ab32819446be352f80dac0c26b44bfedeec58dadeb87caaf740a6ce150e91a6ca905bf2e SHA512 20e05bba1ea53fa774311fb0c24263c8837818b598ea8519539d0792cad7888330feb5c717c327630d6f6985eb0813de99a30994c3ef108fa128b484487ea3f2 diff --git a/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild b/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild deleted file mode 100644 index caee60711fc1..000000000000 --- a/net-wireless/bluez-hcidump/bluez-hcidump-2.5.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Bluetooth HCI packet analyzer" -HOMEPAGE="http://www.bluez.org/" -SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="" - -RDEPEND=">=net-wireless/bluez-4.98" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" diff --git a/net-wireless/bluez-hcidump/metadata.xml b/net-wireless/bluez-hcidump/metadata.xml deleted file mode 100644 index c300b31b6a76..000000000000 --- a/net-wireless/bluez-hcidump/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>pacho@gentoo.org</email> - <name>Pacho Ramos</name> - </maintainer> -</pkgmetadata> diff --git a/net-wireless/bluez-tools/Manifest b/net-wireless/bluez-tools/Manifest index d2efe655a73e..e73715c1b798 100644 --- a/net-wireless/bluez-tools/Manifest +++ b/net-wireless/bluez-tools/Manifest @@ -1 +1 @@ -DIST bluez-tools-0_p20161212.tar.gz 126613 BLAKE2B 474393862049a893280eeb0b7f466a1b1165a14d0ab33cbd9d3ca805a15eef237761aa3038423de85280bcaaf1385c3c7ab313d4cc3199f284aba86d8e5ed16e SHA512 ab5dd4a223348aab29fae22f552afae989b74d56c3fa46fd5587c100d63309649a10a87591bc040082545f45b7bb95360fcf6a48812012edbdb93570b0e166f7 +DIST bluez-tools-0_p20201025.tar.gz 126646 BLAKE2B 6deea6a12ee1050cbe12592fe202be60f032a7ee9a8f790537ef24c3a2562d90abf88f69690e6dd53f16841a256fc82dcfb078b2d708531ca6c50f63b6e84274 SHA512 631dfa7ee7e1bfe487db90f9df692c4136d6258ddd34cda269e3a9538a3c8fe8bad3bac595e57d74789df2da4e15fa0ca7b83374e7f6457695701852b3744b12 diff --git a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild b/net-wireless/bluez-tools/bluez-tools-0_p20201025.ebuild index 6585af370e24..755069585081 100644 --- a/net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild +++ b/net-wireless/bluez-tools/bluez-tools-0_p20201025.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="A set of tools to manage bluetooth devices for linux" HOMEPAGE="https://github.com/khvzak/bluez-tools" -COMMIT="97efd293491ad7ec96a655665339908f2478b3d1" +COMMIT="f65321736475429316f07ee94ec0deac8e46ec4a" SRC_URI="https://github.com/khvzak/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" @@ -23,8 +23,6 @@ DEPEND="${RDEPEND}" DOCS=( AUTHORS README ) -PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" ) - S="${WORKDIR}/${PN}-${COMMIT}" src_prepare() { diff --git a/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch b/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch deleted file mode 100644 index 6bfaa57fa19a..000000000000 --- a/net-wireless/bluez-tools/files/bluez-tools-0_p20161212-gcc-10.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/lib/agent-helper.c 2016-12-12 09:18:08.000000000 +0100 -+++ b/src/lib/agent-helper.c 2020-01-30 22:23:27.555951515 +0100 -@@ -33,6 +33,8 @@ - - #include "agent-helper.h" - -+gboolean agent_need_unregister; -+ - static const gchar *_bt_agent_introspect_xml = "<node name=\"/org/blueztools\">\n\t<interface name=\"org.bluez.Agent1\">\n\t\t<method name=\"Release\">\n\t\t</method>\n\t\t<method name=\"RequestPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"out\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"RequestPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"out\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t\t<arg name=\"entered\" direction=\"in\" type=\"q\"/>\n\t\t</method>\n\t\t<method name=\"RequestConfirmation\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"RequestAuthorization\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t</method>\n\t\t<method name=\"AuthorizeService\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"uuid\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"Cancel\">\n\t\t</method>\n\t</interface>\n</node>\n"; - static guint _bt_agent_registration_id = 0; - static GHashTable *_pin_hash_table = NULL; ---- a/src/lib/agent-helper.h 2016-12-12 09:18:08.000000000 +0100 -+++ b/src/lib/agent-helper.h 2020-01-30 22:22:15.463751152 +0100 -@@ -35,7 +35,7 @@ - #define AGENT_DBUS_INTERFACE "org.bluez.Agent1" - #define AGENT_PATH "/org/blueztools" - --gboolean agent_need_unregister; -+extern gboolean agent_need_unregister; - - void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error); - void unregister_agent_callbacks(GError **error); -@@ -44,4 +44,4 @@ - } - #endif - --#endif /* __AGENT_HELPER_H */ -\ Pas de fin de ligne à la fin du fichier -+#endif /* __AGENT_HELPER_H */ diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 06862e50f8e9..4f894bc5d6dd 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,3 +1,2 @@ -DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3 -DIST bluez-5.60.tar.xz 2124312 BLAKE2B 52cd08192cbfb7adc2e11f270442af62307dbf3cb940554f77e1ec4c30036ca1c05970d7d48719d3036173135f2b14123f2d0aad8147f0a919773d211238a11e SHA512 069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b -DIST bluez-5.61.tar.xz 2137412 BLAKE2B 2fc1b44f726d48b4a0e8bbecc664077db1db69bbc87c66e9d7ac85d7b2e066de8b349c18597a5ba140c5fcb1ef867ee3980ebdd839ded69ae30491fb7b836940 SHA512 a2318637258f9db0bf05fecbfbea2c3ca5e21867378e28ab4c77f658fe42f10c8c607939f2b437ec40d1ceb00b99f7916c0275faaedd9edd247f7dc91329937a +DIST bluez-5.72.tar.xz 2390792 BLAKE2B b5d1bc290c9bad5aa32de16433c34d0ac5aed7164077ef941a0bf90eddc5e22a6cf19f972bcae33061b41e3c344f7abeb65a11b6013c13fd53059ac93d83240a SHA512 1c6560f60ac0654d7c25ed8ab2f0f3a3a9ca8688ee28e1c476ffc7ae38737e739d27bbb88789c86b03fc600a8a68496d90a7b395ec393dd2bbf69be62357991a +DIST bluez-5.73.tar.xz 2408088 BLAKE2B 69c5b8c23039108403631da86c29d62869f2311bb34eeb471779fae094bbf8738193389fb8792b779b10eaeca5b02723c86f2b98c435bbd2c23a3d317df76070 SHA512 20090da036d3d614706b14a757b02acf138859d8f0476aa7f68d57635dfb3632ce7d8bb3456320904d72333d1314a5fe14dcb8ece307e6d31ce6d2d516de25e8 diff --git a/net-wireless/bluez/bluez-5.58-r1.ebuild b/net-wireless/bluez/bluez-5.58-r1.ebuild deleted file mode 100644 index 18c11b1754e9..000000000000 --- a/net-wireless/bluez/bluez-5.58-r1.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) - -inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org" -SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/3" -KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86" -IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" - -# Since this release all remaining extra-tools need readline support, but this could -# change in the future, hence, this REQUIRED_USE constraint could be dropped -# again in the future. -REQUIRED_USE=" - extra-tools? ( deprecated readline ) - test? ( ${PYTHON_REQUIRED_USE} ) - test-programs? ( ${PYTHON_REQUIRED_USE} ) -" - -TEST_DEPS="${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/dbus-python-1[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - virtual/pkgconfig - test? ( ${TEST_DEPS} ) -" -DEPEND=" - >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] - >=sys-apps/hwids-20121202.2 - btpclient? ( >=dev-libs/ell-0.39 ) - cups? ( net-print/cups:= ) - mesh? ( - >=dev-libs/ell-0.39 - >=dev-libs/json-c-0.13:= - sys-libs/readline:0= - ) - midi? ( media-libs/alsa-lib ) - obex? ( dev-libs/libical:= ) - readline? ( sys-libs/readline:0= ) - systemd? ( - >=sys-apps/dbus-1.6:=[user-session=] - sys-apps/systemd - ) - !systemd? ( >=sys-apps/dbus-1.6:= ) - udev? ( >=virtual/udev-172 ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-bluetooth ) - test-programs? ( ${TEST_DEPS} ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # rfkill: Fix reading from rfkill socket - "${FILESDIR}"/${P}-rfkill.patch - - # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) - # http://www.spinics.net/lists/linux-bluetooth/msg58739.html - # https://bugs.gentoo.org/539844 - "${FILESDIR}"/${PN}-udevadm-path-r1.patch - - # Fedora patches - # http://www.spinics.net/lists/linux-bluetooth/msg40136.html - "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch -) - -pkg_setup() { - # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html - # to prevent bugs like: - # https://bugzilla.kernel.org/show_bug.cgi?id=196621 - CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER - ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~RFKILL ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER" - # https://bugzilla.kernel.org/show_bug.cgi?id=196621 - # https://bugzilla.kernel.org/show_bug.cgi?id=206815 - if use mesh || use test; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER - ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_USER_API_HASH - ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC" - fi - linux-info_pkg_setup - - if use test || use test-programs; then - python-single-r1_pkg_setup - fi - - if ! use udev; then - ewarn - ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" - ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," - ewarn "and hid2hci will not be available." - ewarn - fi -} - -src_prepare() { - default - - # http://www.spinics.net/lists/linux-bluetooth/msg38490.html - if ! use user-session || ! use systemd; then - eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch - fi - - eautoreconf - - if use cups; then - # Only not .am to not need to run eautoreconf only because of this - sed -i \ - -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ - Makefile.{in,tools} || die - fi - - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - # readline is automagic when client is enabled - # --enable-client always needs readline, bug #504038 - # --enable-mesh is handled in the same way - ac_cv_header_readline_readline_h=$(multilib_native_usex readline) - ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) - ) - - if ! multilib_is_native_abi; then - myconf+=( - # deps not used for the library - {DBUS,GLIB}_{CFLAGS,LIBS}=' ' - ) - fi - - econf \ - --localstatedir=/var \ - --disable-android \ - --enable-datafiles \ - --enable-optimization \ - $(use_enable debug) \ - --enable-pie \ - --enable-threads \ - --enable-library \ - --enable-tools \ - --enable-manpages \ - --enable-monitor \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - $(multilib_native_use_enable btpclient) \ - $(multilib_native_use_enable btpclient external-ell) \ - $(multilib_native_use_enable cups) \ - $(multilib_native_use_enable deprecated) \ - $(multilib_native_use_enable experimental) \ - $(multilib_native_use_enable mesh) \ - $(multilib_native_use_enable mesh external-ell) \ - $(multilib_native_use_enable midi) \ - $(multilib_native_use_enable obex) \ - $(multilib_native_use_enable readline client) \ - $(multilib_native_use_enable systemd) \ - $(multilib_native_use_enable test-programs test) \ - $(multilib_native_use_enable udev) \ - $(multilib_native_use_enable udev hid2hci) \ - $(multilib_native_use_enable udev sixaxis) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - emake -f Makefile -f - libs \ - <<<'libs: $(lib_LTLIBRARIES)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && default -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - - # Only install extra-tools when relevant USE flag is enabled - if use extra-tools; then - ewarn "Upstream doesn't support using this tools and their bugs are" - ewarn "likely to be ignored forever, also they can break without" - ewarn "previous announcement." - ewarn "Upstream also states all this tools are not really needed," - ewarn "then, if you still need to rely on them, you must ask them" - ewarn "to either install that tool by default or add the needed" - ewarn "functionality to the existing 'official' tools." - ewarn "Please report this issues to:" - ewarn "http://www.bluez.org/development/lists/" - - # Upstream doesn't install this, bug #524640 - # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 - # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 - dobin tools/btmgmt - # gatttool is only built with readline, bug #530776 - # https://bugzilla.redhat.com/show_bug.cgi?id=1141909 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486 - # https://bugs.archlinux.org/task/37686 - dobin attrib/gatttool - # https://bugzilla.redhat.com/show_bug.cgi?id=1699680 - dobin tools/avinfo - fi - - # Not installed by default after being built, bug #666756 - use btpclient && dobin tools/btpclient - - # Unittests are not that useful once installed, so make them optional - if use test-programs; then - # Drop python2 only test tools - # https://bugzilla.kernel.org/show_bug.cgi?id=206819 - rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die - # https://bugzilla.kernel.org/show_bug.cgi?id=206821 - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die - # https://bugzilla.kernel.org/show_bug.cgi?id=206823 - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server || die - - python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test - - for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do - dosym "${i}" /usr/bin/bluez-"${i##*/}" - done - fi - else - emake DESTDIR="${D}" \ - install-pkgincludeHEADERS \ - install-libLTLIBRARIES \ - install-pkgconfigDATA - fi -} - -multilib_src_install_all() { - # We need to ensure obexd can be spawned automatically by systemd - # when user-session is enabled: - # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 - # https://bugs.gentoo.org/show_bug.cgi?id=577842 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 - # https://bugs.archlinux.org/task/45816 - # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 - # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 - if use user-session && use systemd; then - ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service - fi - - find "${D}" -name '*.la' -type f -delete || die - - keepdir /var/lib/bluetooth - - # Upstream don't want people to play with them - # But we keep installing them due to 'historical' reasons - insinto /etc/bluetooth - local d - for d in input network; do - doins profiles/${d}/${d}.conf - done - # Setup auto enable as Fedora does for allowing to use - # keyboards/mouse as soon as possible - sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die - doins src/main.conf - - newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth - newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth - - einstalldocs - use doc && dodoc doc/*.txt - # Install .json files as examples to be used by meshctl - if use mesh; then - dodoc tools/mesh-gatt/*.json - local DOC_CONTENTS="Some example .json files were installed into - /usr/share/doc/${PF} to be used with meshctl. Feel free to - uncompress and copy them to ~/.config/meshctl to use them." - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - use udev && udev_reload - systemd_reenable bluetooth.service - - has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" - use mesh && readme.gentoo_print_elog -} diff --git a/net-wireless/bluez/bluez-5.61.ebuild b/net-wireless/bluez/bluez-5.72.ebuild index 95941e34b204..06b68087328b 100644 --- a/net-wireless/bluez/bluez-5.61.ebuild +++ b/net-wireless/bluez/bluez-5.72.ebuild @@ -1,24 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal +inherit autotools flag-o-matic linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org" +HOMEPAGE="http://www.bluez.org https://github.com/bluez/bluez" SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0/3" -KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86" -IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86" +IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev" # Since this release all remaining extra-tools need readline support, but this could # change in the future, hence, this REQUIRED_USE constraint could be dropped # again in the future. +# btpclient needs mesh, bug #790587 REQUIRED_USE=" + btpclient? ( mesh ) extra-tools? ( deprecated readline ) test? ( ${PYTHON_REQUIRED_USE} ) test-programs? ( ${PYTHON_REQUIRED_USE} ) @@ -37,7 +39,6 @@ BDEPEND=" " DEPEND=" >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] - >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( @@ -48,11 +49,8 @@ DEPEND=" midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) - systemd? ( - >=sys-apps/dbus-1.6:=[user-session=] - sys-apps/systemd - ) - !systemd? ( >=sys-apps/dbus-1.6:= ) + systemd? ( sys-apps/systemd ) + >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 ) " RDEPEND="${DEPEND} @@ -66,14 +64,12 @@ PATCHES=( # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) # http://www.spinics.net/lists/linux-bluetooth/msg58739.html # https://bugs.gentoo.org/539844 + # https://github.com/bluez/bluez/issues/268 "${FILESDIR}"/${PN}-udevadm-path-r1.patch # Fedora patches - # http://www.spinics.net/lists/linux-bluetooth/msg40136.html - "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch - - # https://marc.info/?l=linux-bluetooth&m=161498090629584&w=2 - "${FILESDIR}"/${PN}-5.60-glibc-2.34.patch + # https://lore.kernel.org/linux-bluetooth/20220901110719.176944-1-hadess@hadess.net/T/#m9c08d004cd5422783ee1d93154f42303bba9169f + "${FILESDIR}"/${PN}-5.66-power-state-adapter-property.patch ) pkg_setup() { @@ -81,12 +77,14 @@ pkg_setup() { # to prevent bugs like: # https://bugzilla.kernel.org/show_bug.cgi?id=196621 CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER - ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL" + ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER + ~UHID ~RFKILL" # https://bugzilla.kernel.org/show_bug.cgi?id=196621 # https://bugzilla.kernel.org/show_bug.cgi?id=206815 if use mesh || use test; then CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER - ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC" + ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC + ~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS" fi linux-info_pkg_setup @@ -107,7 +105,7 @@ src_prepare() { default # http://www.spinics.net/lists/linux-bluetooth/msg38490.html - if ! use user-session || ! use systemd; then + if ! use systemd; then eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch fi @@ -124,6 +122,9 @@ src_prepare() { } multilib_src_configure() { + # unit/test-vcp test fails with LTO (bug #925745) + filter-lto + local myconf=( # readline is automagic when client is enabled # --enable-client always needs readline, bug #504038 @@ -248,8 +249,8 @@ multilib_src_install_all() { # https://bugs.archlinux.org/task/45816 # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 - if use user-session && use systemd; then - ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service + if use systemd; then + dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service fi find "${D}" -name '*.la' -type f -delete || die @@ -273,14 +274,6 @@ multilib_src_install_all() { einstalldocs use doc && dodoc doc/*.txt - # Install .json files as examples to be used by meshctl - if use mesh; then - dodoc tools/mesh-gatt/*.json - local DOC_CONTENTS="Some example .json files were installed into - /usr/share/doc/${PF} to be used with meshctl. Feel free to - uncompress and copy them to ~/.config/meshctl to use them." - readme.gentoo_create_doc - fi } pkg_postinst() { @@ -288,5 +281,8 @@ pkg_postinst() { systemd_reenable bluetooth.service has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" - use mesh && readme.gentoo_print_elog +} + +pkg_postrm() { + use udev && udev_reload } diff --git a/net-wireless/bluez/bluez-5.60.ebuild b/net-wireless/bluez/bluez-5.73.ebuild index a86c0dde25ae..1bd115cef414 100644 --- a/net-wireless/bluez/bluez-5.60.ebuild +++ b/net-wireless/bluez/bluez-5.73.ebuild @@ -1,24 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal +inherit autotools flag-o-matic linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org" +HOMEPAGE="http://www.bluez.org https://github.com/bluez/bluez" SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0/3" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86" -IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev" # Since this release all remaining extra-tools need readline support, but this could # change in the future, hence, this REQUIRED_USE constraint could be dropped # again in the future. +# btpclient needs mesh, bug #790587 REQUIRED_USE=" + btpclient? ( mesh ) extra-tools? ( deprecated readline ) test? ( ${PYTHON_REQUIRED_USE} ) test-programs? ( ${PYTHON_REQUIRED_USE} ) @@ -37,7 +39,6 @@ BDEPEND=" " DEPEND=" >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] - >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( @@ -48,12 +49,9 @@ DEPEND=" midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) - systemd? ( - >=sys-apps/dbus-1.6:=[user-session=] - sys-apps/systemd - ) - !systemd? ( >=sys-apps/dbus-1.6:= ) - udev? ( >=virtual/udev-172 ) + systemd? ( sys-apps/systemd ) + >=sys-apps/dbus-1.6:= + udev? ( >=virtual/udev-196 ) " RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-bluetooth ) @@ -66,14 +64,8 @@ PATCHES=( # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) # http://www.spinics.net/lists/linux-bluetooth/msg58739.html # https://bugs.gentoo.org/539844 + # https://github.com/bluez/bluez/issues/268 "${FILESDIR}"/${PN}-udevadm-path-r1.patch - - # Fedora patches - # http://www.spinics.net/lists/linux-bluetooth/msg40136.html - "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch - - # https://marc.info/?l=linux-bluetooth&m=161498090629584&w=2 - "${FILESDIR}"/${PN}-5.60-glibc-2.34.patch ) pkg_setup() { @@ -81,12 +73,14 @@ pkg_setup() { # to prevent bugs like: # https://bugzilla.kernel.org/show_bug.cgi?id=196621 CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER - ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL" + ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER + ~UHID ~RFKILL" # https://bugzilla.kernel.org/show_bug.cgi?id=196621 # https://bugzilla.kernel.org/show_bug.cgi?id=206815 if use mesh || use test; then CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER - ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC" + ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC + ~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS" fi linux-info_pkg_setup @@ -106,24 +100,17 @@ pkg_setup() { src_prepare() { default - # http://www.spinics.net/lists/linux-bluetooth/msg38490.html - if ! use user-session || ! use systemd; then - eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch - fi - + # https://github.com/bluez/bluez/issues/773 + eapply "${FILESDIR}"/${P}-configure-cups.patch eautoreconf - if use cups; then - # Only not .am to not need to run eautoreconf only because of this - sed -i \ - -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ - Makefile.{in,tools} || die - fi - multilib_copy_sources } multilib_src_configure() { + # unit/test-vcp test fails with LTO (bug #925745) + filter-lto + local myconf=( # readline is automagic when client is enabled # --enable-client always needs readline, bug #504038 @@ -248,8 +235,8 @@ multilib_src_install_all() { # https://bugs.archlinux.org/task/45816 # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 - if use user-session && use systemd; then - ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service + if use systemd; then + dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service fi find "${D}" -name '*.la' -type f -delete || die @@ -273,14 +260,6 @@ multilib_src_install_all() { einstalldocs use doc && dodoc doc/*.txt - # Install .json files as examples to be used by meshctl - if use mesh; then - dodoc tools/mesh-gatt/*.json - local DOC_CONTENTS="Some example .json files were installed into - /usr/share/doc/${PF} to be used with meshctl. Feel free to - uncompress and copy them to ~/.config/meshctl to use them." - readme.gentoo_create_doc - fi } pkg_postinst() { @@ -288,5 +267,8 @@ pkg_postinst() { systemd_reenable bluetooth.service has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" - use mesh && readme.gentoo_print_elog +} + +pkg_postrm() { + use udev && udev_reload } diff --git a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch b/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch deleted file mode 100644 index 004a3895aa09..000000000000 --- a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f7861d27fbcbc519f57d8496aa9486f487908821 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Sat, 9 Nov 2013 18:13:43 +0100 -Subject: [PATCH 1/5] obex: Use GLib helper function to manipulate paths - -Instead of trying to do it by hand. This also makes sure that -relative paths aren't used by the agent. ---- - obexd/src/manager.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/obexd/src/manager.c b/obexd/src/manager.c -index cec8a39..f18896e 100644 ---- a/obexd/src/manager.c -+++ b/obexd/src/manager.c -@@ -651,14 +651,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data) - DBUS_TYPE_STRING, &name, - DBUS_TYPE_INVALID)) { - /* Splits folder and name */ -- const char *slash = strrchr(name, '/'); -+ gboolean is_relative = !g_path_is_absolute(name); - DBG("Agent replied with %s", name); -- if (!slash) { -- agent->new_name = g_strdup(name); -+ if (is_relative) { -+ agent->new_name = g_path_get_basename(name); - agent->new_folder = NULL; - } else { -- agent->new_name = g_strdup(slash + 1); -- agent->new_folder = g_strndup(name, slash - name); -+ agent->new_name = g_path_get_basename(name); -+ agent->new_folder = g_path_get_dirname(name); - } - } - --- -1.8.4.2 - diff --git a/net-wireless/bluez/files/bluez-5.58-rfkill.patch b/net-wireless/bluez/files/bluez-5.58-rfkill.patch deleted file mode 100644 index dd7f2f978e72..000000000000 --- a/net-wireless/bluez/files/bluez-5.58-rfkill.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 382646b490c1c336dd32f9186293616ceb4d808b Mon Sep 17 00:00:00 2001 -From: Benjamin Berg <bberg@redhat.com> -Date: Mon, 3 May 2021 14:45:00 +0200 -Subject: [PATCH 1/2] rfkill: Fix reading from rfkill socket - -The kernel will always send exactly one event, but the size of the -passed struct will depend on the length of the submitted read() and the -kernel version. i.e. the interface can be extended and we need to expect -for a read to be longer than expected if we ask for it. - -Fix this by only requesting the needed length and explicitly check the -length against the V1 version of the structure to make the code a bit -more future proof in case the internal copy of the struct is updated to -contain new fields. ---- - src/rfkill.c | 24 +++++++++++------------- - 1 file changed, 11 insertions(+), 13 deletions(-) - -diff --git a/src/rfkill.c b/src/rfkill.c -index ec9fcdfdd..2099c5ac5 100644 ---- a/src/rfkill.c -+++ b/src/rfkill.c -@@ -53,12 +53,12 @@ struct rfkill_event { - uint8_t soft; - uint8_t hard; - }; -+#define RFKILL_EVENT_SIZE_V1 8 - - static gboolean rfkill_event(GIOChannel *chan, - GIOCondition cond, gpointer data) - { -- unsigned char buf[32]; -- struct rfkill_event *event = (void *) buf; -+ struct rfkill_event event = { 0 }; - struct btd_adapter *adapter; - char sysname[PATH_MAX]; - ssize_t len; -@@ -69,34 +69,32 @@ static gboolean rfkill_event(GIOChannel *chan, - - fd = g_io_channel_unix_get_fd(chan); - -- memset(buf, 0, sizeof(buf)); -- -- len = read(fd, buf, sizeof(buf)); -+ len = read(fd, &event, sizeof(event)); - if (len < 0) { - if (errno == EAGAIN) - return TRUE; - return FALSE; - } - -- if (len != sizeof(struct rfkill_event)) -+ if (len < RFKILL_EVENT_SIZE_V1) - return TRUE; - - DBG("RFKILL event idx %u type %u op %u soft %u hard %u", -- event->idx, event->type, event->op, -- event->soft, event->hard); -+ event.idx, event.type, event.op, -+ event.soft, event.hard); - -- if (event->soft || event->hard) -+ if (event.soft || event.hard) - return TRUE; - -- if (event->op != RFKILL_OP_CHANGE) -+ if (event.op != RFKILL_OP_CHANGE) - return TRUE; - -- if (event->type != RFKILL_TYPE_BLUETOOTH && -- event->type != RFKILL_TYPE_ALL) -+ if (event.type != RFKILL_TYPE_BLUETOOTH && -+ event.type != RFKILL_TYPE_ALL) - return TRUE; - - snprintf(sysname, sizeof(sysname) - 1, -- "/sys/class/rfkill/rfkill%u/name", event->idx); -+ "/sys/class/rfkill/rfkill%u/name", event.idx); - - fd = open(sysname, O_RDONLY); - if (fd < 0) --- -2.31.1 - diff --git a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch deleted file mode 100644 index 1e846100285d..000000000000 --- a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Wed, 3 Mar 2021 08:57:36 +0100 -Subject: [PATCH] media: rename local function conflicting with pause(2) - -profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have '_Bool(void *)' - 1284 | static bool pause(void *user_data) - | ^~~~~ -In file included from /usr/include/bits/sigstksz.h:24, - from /usr/include/signal.h:315, - from /usr/include/glib-2.0/glib/gbacktrace.h:36, - from /usr/include/glib-2.0/glib.h:34, - from profiles/audio/media.c:21: -/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type 'int(void)' - 478 | extern int pause (void); - | ^~~~~ ---- - profiles/audio/media.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/profiles/audio/media.c b/profiles/audio/media.c -index c84bbe22dc..3d8c4b69c3 100644 ---- a/profiles/audio/media.c -+++ b/profiles/audio/media.c -@@ -1281,7 +1281,7 @@ static bool stop(void *user_data) - return media_player_send(mp, "Stop"); - } - --static bool pause(void *user_data) -+static bool pause_play(void *user_data) - { - struct media_player *mp = user_data; - -@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = { - .set_volume = set_volume, - .play = play, - .stop = stop, -- .pause = pause, -+ .pause = pause_play, - .next = next, - .previous = previous, - }; diff --git a/net-wireless/bluez/files/bluez-5.66-power-state-adapter-property.patch b/net-wireless/bluez/files/bluez-5.66-power-state-adapter-property.patch new file mode 100644 index 000000000000..566d7c08b591 --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.66-power-state-adapter-property.patch @@ -0,0 +1,28 @@ +From 70309219acd4c81e3a9e2b3652d2d93eb08b0aee Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Wed, 31 Aug 2022 11:16:34 +0200 +Subject: [PATCH 6/6] adapter: Remove experimental flag for PowerState + +Now that the feature has been tested, that the API is deemed adequate +and the reliability sufficient. +--- + src/adapter.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/adapter.c b/src/adapter.c +index 8fb2acdc8..841096d7f 100644 +--- a/src/adapter.c ++++ b/src/adapter.c +@@ -3864,8 +3864,7 @@ static const GDBusPropertyTable adapter_properties[] = { + { "Alias", "s", property_get_alias, property_set_alias }, + { "Class", "u", property_get_class }, + { "Powered", "b", property_get_powered, property_set_powered }, +- { "PowerState", "s", property_get_power_state, NULL, NULL, +- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, ++ { "PowerState", "s", property_get_power_state }, + { "Discoverable", "b", property_get_discoverable, + property_set_discoverable }, + { "DiscoverableTimeout", "u", property_get_discoverable_timeout, +-- +2.37.2 + diff --git a/net-wireless/bluez/files/bluez-5.73-configure-cups.patch b/net-wireless/bluez/files/bluez-5.73-configure-cups.patch new file mode 100644 index 000000000000..1ab1f96915ee --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.73-configure-cups.patch @@ -0,0 +1,35 @@ +From b2237fe8efed9aee25a46934f028373cd0632daa Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gmx.de> +Date: Fri, 22 Mar 2024 09:08:24 +0100 +Subject: [PATCH] configure.ac: Fix --disable-cups + +or else we get: + configure: error: conditional "CUPS_SERVERBIN" was never defined. + Usually this means the macro was only invoked conditionally. + +Fixes: #773 +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9ebc250cf..047ec1a7f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -249,12 +249,12 @@ AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no") + if (test "${enable_cups}" != "no"); then + AC_MSG_CHECKING([cups directory]) + cups_serverbin=`$PKG_CONFIG cups --variable=cups_serverbin` +- AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") +- if (test "${cups_serverbin}" != ""); then +- AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) +- fi + AC_MSG_RESULT([${cups_serverbin}]) + fi ++AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") ++AS_IF([test "${cups_serverbin}" != ""],[ ++ AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) ++]) + + AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh], + [enable Mesh profile support]), [enable_mesh=${enableval}]) diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml index 60e3ee745e9e..8b306bf6658d 100644 --- a/net-wireless/bluez/metadata.xml +++ b/net-wireless/bluez/metadata.xml @@ -17,10 +17,10 @@ <flag name="midi">Enable MIDI support</flag> <flag name="obex">Enable OBEX transfer support</flag> <flag name="test-programs">Install tools for testing of various Bluetooth functions</flag> - <flag name="user-session">Allow compatibility with user-session semantics for session bus under systemd</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:bluez:bluez</remote-id> <remote-id type="cpe">cpe:/a:bluez:bluez-libs</remote-id> + <remote-id type="github">bluez/bluez</remote-id> </upstream> </pkgmetadata> diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r7.ebuild index 118df993b314..efe1beb913de 100644 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild +++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r7.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -inherit linux-info linux-mod +EAPI=8 +inherit linux-mod-r1 DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver" HOMEPAGE="https://www.broadcom.com/support/802.11" @@ -11,35 +10,37 @@ SRC_BASE="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35 SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz ) amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz ) https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_${PV}.txt -> README-${P}.txt" -S="${WORKDIR}" LICENSE="Broadcom" +SLOT="0" KEYWORDS="-* ~amd64 ~x86" RESTRICT="mirror" DEPEND="virtual/linux-sources" +RDEPEND="" + +S="${WORKDIR}" PATCHES=( - "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" - "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" - "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" - "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" - "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" - "${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch" - "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch" - "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch" - "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch" - "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch" - "${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch" - "${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.1.patch" - "${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.6.patch" - "${FILESDIR}/${PN}-6.30.223.271-r6-linux-5.9.patch" + "${FILESDIR}/001-null-pointer-fix.patch" + "${FILESDIR}/002-rdtscl.patch" + "${FILESDIR}/003-linux47.patch" + "${FILESDIR}/004-linux48.patch" + "${FILESDIR}/005-debian-fix-kernel-warnings.patch" + "${FILESDIR}/006-linux411.patch" + "${FILESDIR}/007-linux412.patch" + "${FILESDIR}/008-linux415.patch" + "${FILESDIR}/009-fix_mac_profile_discrepancy.patch" + "${FILESDIR}/010-linux56.patch" + "${FILESDIR}/011-linux59.patch" + "${FILESDIR}/012-linux517.patch" + "${FILESDIR}/013-linux518.patch" + "${FILESDIR}/014-linux414.patch" + "${FILESDIR}/015-linux600.patch" + "${FILESDIR}/016-linux601.patch" ) -MODULE_NAMES="wl(net/wireless)" -MODULESD_WL_ALIASES=("wlan0 wl") - pkg_pretend() { ewarn ewarn "If you are stuck using this unmaintained driver (likely in a MacBook)," @@ -60,7 +61,7 @@ pkg_setup() { # make checks non-fatal. The correct fix is blackisting ssb and, perhaps # b43 via udev rules. Moreover, previous fix broke binpkgs support. CONFIG_CHECK="~!B43 ~!BCMA ~!SSB ~!X86_INTEL_LPSS" - CONFIG_CHECK2="~LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" + CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP" ERROR_B43="B43: If you insist on building this, you must blacklist it!" ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!" ERROR_SSB="SSB: If you insist on building this, you must blacklist it!" @@ -81,14 +82,22 @@ pkg_setup() { CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP" fi - linux-mod_pkg_setup + linux-mod-r1_pkg_setup +} + +src_compile() { + local modlist=( wl ) + local modargs=( + -C ${KV_DIR} M="${S}" + ) - BUILD_PARAMS="-C ${KV_DIR} M=${S}" - BUILD_TARGETS="wl.ko" + linux-mod-r1_src_compile } src_install() { - linux-mod_src_install + linux-mod-r1_src_install + insinto /etc/modprobe.d + newins "${FILESDIR}"/broadcom-sta-modules.conf wl.conf dodoc "${DISTDIR}/README-${P}.txt" } diff --git a/net-wireless/broadcom-sta/files/001-null-pointer-fix.patch b/net-wireless/broadcom-sta/files/001-null-pointer-fix.patch new file mode 100644 index 000000000000..0ebe1e242243 --- /dev/null +++ b/net-wireless/broadcom-sta/files/001-null-pointer-fix.patch @@ -0,0 +1,48 @@ +Description: Fixing null pointer crash + +Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773713 +Bug-Ubuntu: https://launchpad.net/bugs/1415880 +Last-Update: 2015-08-18 + +--- + src/wl/sys/wl_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 860b935..295156f 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -2157,8 +2157,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev) + wlif = WL_DEV_IF(dev); + wl = WL_INFO(dev); + ++ skb->prev = NULL; + if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) { +- skb->prev = NULL; + + TXQ_LOCK(wl); + +-- +1.9.1 + +--- a/src/wl/sys/wl_linux.a 2023-04-16 23:06:52.255588442 -0500 ++++ b/src/wl/sys/wl_linux.c 2023-04-16 23:07:22.315309655 -0500 +@@ -737,9 +737,6 @@ + dev->name, device, + WL_ALL_PASSIVE_ENAB(wl) ? ", Passive Mode" : "", EPI_VERSION_STR); + +-#ifdef BCMDBG +- printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")"); +-#endif + printf("\n"); + + wl_found++; +@@ -2098,7 +2095,7 @@ + wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b) + { + bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit, +- __DATE__, __TIME__, EPI_VERSION_STR); ++ "X", "Y", EPI_VERSION_STR); + } + + #if defined(BCMDBG) diff --git a/net-wireless/broadcom-sta/files/002-rdtscl.patch b/net-wireless/broadcom-sta/files/002-rdtscl.patch new file mode 100644 index 000000000000..1b9862cc3d8d --- /dev/null +++ b/net-wireless/broadcom-sta/files/002-rdtscl.patch @@ -0,0 +1,22 @@ +Since Linux 4.3, rdtscl() is no longer available and native_read_tsc() +is renamed to rdtsc(). Move the macro contents in-line and call the +new function. References: + +https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a +https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=4ea1636b04dbd66536fa387bae2eea463efc705b + +diff -ru a/src/shared/linux_osl.c b/src/shared/linux_osl.c +--- a/src/shared/linux_osl.c 2015-09-19 01:47:15.000000000 +0300 ++++ b/src/shared/linux_osl.c 2015-11-21 15:20:30.585902518 +0200 +@@ -932,7 +932,11 @@ + uint cycles; + + #if defined(__i386__) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) ++ cycles = (u32)rdtsc(); ++#else + rdtscl(cycles); ++#endif + #else + cycles = 0; + #endif diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.7.patch b/net-wireless/broadcom-sta/files/003-linux47.patch index 566680a09140..566680a09140 100644 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.7.patch +++ b/net-wireless/broadcom-sta/files/003-linux47.patch diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.8.patch b/net-wireless/broadcom-sta/files/004-linux48.patch index 20e8a9ae49d2..20e8a9ae49d2 100644 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.8.patch +++ b/net-wireless/broadcom-sta/files/004-linux48.patch diff --git a/net-wireless/broadcom-sta/files/005-debian-fix-kernel-warnings.patch b/net-wireless/broadcom-sta/files/005-debian-fix-kernel-warnings.patch new file mode 100644 index 000000000000..e9bf66a959b8 --- /dev/null +++ b/net-wireless/broadcom-sta/files/005-debian-fix-kernel-warnings.patch @@ -0,0 +1,161 @@ +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -1968,7 +1968,7 @@ + + if (dtoh32(bi->length) > WL_BSS_INFO_MAX) { + WL_DBG(("Beacon is larger than buffer. Discarding\n")); +- return err; ++ return -E2BIG; + } + notif_bss_info = kzalloc(sizeof(*notif_bss_info) + sizeof(*mgmt) - sizeof(u8) + + WL_BSS_INFO_MAX, GFP_KERNEL); +@@ -1992,9 +1992,15 @@ + beacon_proberesp->capab_info = cpu_to_le16(bi->capability); + wl_rst_ie(wl); + +- wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length); +- wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX - ++ err = wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length); ++ if (err) ++ goto inform_single_bss_out; ++ ++ err = wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX - + offsetof(struct wl_cfg80211_bss_info, frame_buf)); ++ if (err) ++ goto inform_single_bss_out; ++ + notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, u.beacon.variable) + + wl_get_ielen(wl); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) +@@ -2006,14 +2012,14 @@ + #endif + if (freq == 0) { + WL_ERR(("Invalid channel, fail to chcnage channel to freq\n")); +- kfree(notif_bss_info); +- return -EINVAL; ++ err = -EINVAL; ++ goto inform_single_bss_out; + } + channel = ieee80211_get_channel(wiphy, freq); + if (unlikely(!channel)) { + WL_ERR(("ieee80211_get_channel error\n")); +- kfree(notif_bss_info); +- return -EINVAL; ++ err = -EINVAL; ++ goto inform_single_bss_out; + } + + WL_DBG(("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM\n", +@@ -2021,28 +2027,37 @@ + mgmt->u.beacon.capab_info, &bi->BSSID)); + + signal = notif_bss_info->rssi * 100; +- cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt, +- le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL); +- if (unlikely(!cbss)) { +- WL_ERR(("cfg80211_inform_bss_frame error\n")); +- kfree(notif_bss_info); +- return -EINVAL; +- } + +- notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); +- notify_ielen = le32_to_cpu(bi->ie_length); ++ if (!wl->scan_request) { ++ cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt, ++ le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL); ++ if (unlikely(!cbss)) { ++ WL_ERR(("cfg80211_inform_bss_frame error\n")); ++ err = -ENOMEM; ++ goto inform_single_bss_out; ++ } ++ } else { ++ notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); ++ notify_ielen = le32_to_cpu(bi->ie_length); + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) +- cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), +- 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, +- (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++ cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), ++ 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, ++ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); + #else +- cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet), +- 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, +- (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++ cbss = cfg80211_inform_bss(wiphy, channel, ++ wl->active_scan ? ++ CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON, ++ (const u8 *)(bi->BSSID.octet), 0, ++ beacon_proberesp->capab_info, ++ beacon_proberesp->beacon_int, ++ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); + #endif +- +- if (unlikely(!cbss)) +- return -ENOMEM; ++ if (unlikely(!cbss)) { ++ WL_ERR(("cfg80211_inform_bss error\n")); ++ err = -ENOMEM; ++ goto inform_single_bss_out; ++ } ++ } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) + cfg80211_put_bss(wiphy, cbss); +@@ -2050,6 +2065,7 @@ + cfg80211_put_bss(cbss); + #endif + ++inform_single_bss_out: + kfree(notif_bss_info); + + return err; +@@ -2316,6 +2332,9 @@ + if (err) + goto update_bss_info_out; + ++ bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid, ++ ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); ++ + ie = ((u8 *)bi) + bi->ie_offset; + ie_len = bi->ie_length; + } else { +@@ -2328,11 +2347,18 @@ + ie_len = bss->len_information_elements; + #endif + wl->conf->channel = *bss->channel; ++ } ++ ++ if (bss) { + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) + cfg80211_put_bss(wiphy, bss); + #else + cfg80211_put_bss(bss); + #endif ++ } else { ++ WL_DBG(("Could not update BSS\n")); ++ err = -EINVAL; ++ goto update_bss_info_out; + } + + tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM); +@@ -2360,10 +2386,17 @@ + struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); + s32 err = 0; + +- wl_get_assoc_ies(wl); ++ err = wl_get_assoc_ies(wl); ++ if (err) ++ return err; ++ + memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN); + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); +- wl_update_bss_info(wl); ++ ++ err = wl_update_bss_info(wl); ++ if (err) ++ return err; ++ + cfg80211_roamed(ndev, + #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) + &wl->conf->channel, diff --git a/net-wireless/broadcom-sta/files/006-linux411.patch b/net-wireless/broadcom-sta/files/006-linux411.patch new file mode 100644 index 000000000000..7a2e8c0c6cb0 --- /dev/null +++ b/net-wireless/broadcom-sta/files/006-linux411.patch @@ -0,0 +1,27 @@ +diff -u sys0/wl_cfg80211_hybrid.c sys/wl_cfg80211_hybrid.c +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -39,6 +39,10 @@ + #include <proto/802.11.h> + #include <wl_cfg80211_hybrid.h> + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++#include <linux/sched/signal.h> ++#endif ++ + #define EVENT_TYPE(e) dtoh32((e)->event_type) + #define EVENT_FLAGS(e) dtoh16((e)->flags) + #define EVENT_STATUS(e) dtoh32((e)->status) +diff -u sys0/wl_linux.c sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -2915,7 +2915,9 @@ + if (skb == NULL) return; + + skb->dev = wl->monitor_dev; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + skb->dev->last_rx = jiffies; ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) + skb_reset_mac_header(skb); + #else diff --git a/net-wireless/broadcom-sta/files/007-linux412.patch b/net-wireless/broadcom-sta/files/007-linux412.patch new file mode 100644 index 000000000000..1673f063cdb5 --- /dev/null +++ b/net-wireless/broadcom-sta/files/007-linux412.patch @@ -0,0 +1,78 @@ +From 0b888bf115612074df99654140a1980111c29748 Mon Sep 17 00:00:00 2001 +From: Antoine Cotten <tonio.cotten@gmail.com> +Date: Fri, 7 Jul 2017 15:17:47 +0200 +Subject: [PATCH] Apply patch from Debian bug #867258 + +Compile fix with kernel 4.12 +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867258 +--- + src/wl/sys/wl_cfg80211_hybrid.c | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) + +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index c46944a..1a9840a 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -53,7 +53,11 @@ u32 wl_dbg_level = WL_DBG_ERR; + #endif + + static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, +- enum nl80211_iftype type, u32 *flags, struct vif_params *params); ++ enum nl80211_iftype type, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) ++ u32 *flags, ++#endif ++ struct vif_params *params); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) + static s32 + wl_cfg80211_scan(struct wiphy *wiphy, +@@ -466,8 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) + + static s32 + wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, +- enum nl80211_iftype type, u32 *flags, +- struct vif_params *params) ++ enum nl80211_iftype type, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) ++ u32 *flags, ++#endif ++ struct vif_params *params) + { + struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); + struct wireless_dev *wdev; +@@ -2387,6 +2394,15 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + const wl_event_msg_t *e, void *data) + { + struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ struct cfg80211_roam_info roam_info = { ++ .bssid = wl->profile->bssid, ++ .req_ie = conn_info->req_ie, ++ .req_ie_len = conn_info->req_ie_len, ++ .resp_ie = conn_info->resp_ie, ++ .resp_ie_len = conn_info->resp_ie_len, ++ }; ++#endif + s32 err = 0; + + err = wl_get_assoc_ies(wl); +@@ -2401,12 +2417,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + return err; + + cfg80211_roamed(ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ &roam_info, ++#else + #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) + &wl->conf->channel, + #endif + (u8 *)&wl->bssid, + conn_info->req_ie, conn_info->req_ie_len, +- conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); ++ conn_info->resp_ie, conn_info->resp_ie_len, ++#endif ++ GFP_KERNEL); + WL_DBG(("Report roaming result\n")); + + set_bit(WL_STATUS_CONNECTED, &wl->status); + diff --git a/net-wireless/broadcom-sta/files/008-linux415.patch b/net-wireless/broadcom-sta/files/008-linux415.patch new file mode 100644 index 000000000000..1bced2f68ab1 --- /dev/null +++ b/net-wireless/broadcom-sta/files/008-linux415.patch @@ -0,0 +1,46 @@ +--- a/src/wl/sys/wl_linux.c 2017-07-17 00:11:24.000000000 +0100 ++++ b/src/wl/sys/wl_linux.c 2018-01-27 09:49:47.057799596 +0000 +@@ -93,7 +93,11 @@ + + #include <wlc_wowl.h> + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static void wl_timer(struct timer_list *tl); ++#else + static void wl_timer(ulong data); ++#endif + static void _wl_timer(wl_timer_t *t); + static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); + +@@ -2297,10 +2301,17 @@ + atomic_dec(&t->wl->callbacks); + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static void ++wl_timer(struct timer_list *tl) ++{ ++ wl_timer_t *t = (wl_timer_t *)tl; ++#else + static void + wl_timer(ulong data) + { + wl_timer_t *t = (wl_timer_t *)data; ++#endif + + if (!WL_ALL_PASSIVE_ENAB(t->wl)) + _wl_timer(t); +@@ -2352,9 +2363,13 @@ + + bzero(t, sizeof(wl_timer_t)); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ timer_setup(&t->timer, wl_timer, 0); ++#else + init_timer(&t->timer); + t->timer.data = (ulong) t; + t->timer.function = wl_timer; ++#endif + t->wl = wl; + t->fn = fn; + t->arg = arg; diff --git a/net-wireless/broadcom-sta/files/009-fix_mac_profile_discrepancy.patch b/net-wireless/broadcom-sta/files/009-fix_mac_profile_discrepancy.patch new file mode 100644 index 000000000000..4260eba5057a --- /dev/null +++ b/net-wireless/broadcom-sta/files/009-fix_mac_profile_discrepancy.patch @@ -0,0 +1,14 @@ +--- a/src/wl/sys/wl_cfg80211_hybrid.c 2015-09-19 00:47:30.000000000 +0200 ++++ b/src/wl/sys/wl_cfg80211_hybrid.c 2018-11-14 14:06:03.313487995 +0100 +@@ -1444,11 +1444,10 @@ + s32 rate; + s32 err = 0; + + if (memcmp(mac, wl->profile->bssid, ETHER_ADDR_LEN)) { + WL_ERR(("Wrong Mac address, mac = %pM profile =%pM\n", mac, wl->profile->bssid)); +- return -ENOENT; + } + + err = wl_dev_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate)); + if (err) { + WL_DBG(("Could not get rate (%d)\n", err)); diff --git a/net-wireless/broadcom-sta/files/010-linux56.patch b/net-wireless/broadcom-sta/files/010-linux56.patch new file mode 100644 index 000000000000..f8d5783819cd --- /dev/null +++ b/net-wireless/broadcom-sta/files/010-linux56.patch @@ -0,0 +1,55 @@ +diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c +index 6157d18..8237ec7 100644 +--- a/src/shared/linux_osl.c ++++ b/src/shared/linux_osl.c +@@ -942,7 +942,7 @@ osl_getcycles(void) + void * + osl_reg_map(uint32 pa, uint size) + { +- return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); ++ return (ioremap((unsigned long)pa, (unsigned long)size)); + } + + void +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 0d05100..2ed1f0d 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -582,7 +582,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs, + } + wl->bcm_bustype = bustype; + +- if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { ++ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { + WL_ERROR(("wl%d: ioremap() failed\n", unit)); + goto fail; + } +@@ -772,7 +772,7 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + if ((val & 0x0000ff00) != 0) + pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); + bar1_size = pci_resource_len(pdev, 2); +- bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2), ++ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2), + bar1_size); + wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev, + pdev->irq, bar1_addr, bar1_size); +@@ -3335,12 +3335,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++static struct proc_ops wl_fops = { ++ .proc_read = wl_proc_read, ++ .proc_write = wl_proc_write, ++}; ++#else + static const struct file_operations wl_fops = { + .owner = THIS_MODULE, + .read = wl_proc_read, + .write = wl_proc_write, + }; + #endif ++#endif + + static int + wl_reg_proc_entry(wl_info_t *wl) diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r6-linux-5.9.patch b/net-wireless/broadcom-sta/files/011-linux59.patch index 6ef476464c0c..6ef476464c0c 100644 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r6-linux-5.9.patch +++ b/net-wireless/broadcom-sta/files/011-linux59.patch diff --git a/net-wireless/broadcom-sta/files/012-linux517.patch b/net-wireless/broadcom-sta/files/012-linux517.patch new file mode 100644 index 000000000000..6f23316691c8 --- /dev/null +++ b/net-wireless/broadcom-sta/files/012-linux517.patch @@ -0,0 +1,80 @@ +From 31b7849092c43805c7fbaf7518b99874aa1b310c Mon Sep 17 00:00:00 2001 +From: Joan Bruguera <joanbrugueram@gmail.com> +Date: Wed, 12 Jan 2022 20:49:20 +0100 +Subject: [PATCH] Tentative fix for broadcom-wl 6.30.223.271 driver for Linux 5.17-rc1 + +Set netdev->dev_addr through dev_addr_mod + PDE_DATA fix + +Since Linux 5.17 netdev->dev_addr is const and must be changed through +dev_addr_mod, otherwise a warning is logged in dmesg and bad things may happen. + +NB: The #if is not wrong, dev_addr_mod is defined since Linux 5.15-rc1 + +Plus a trivial fix for PDE_DATA. + +Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-28 on Arch Linux. + +See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=adeef3e32146a8d2a73c399dc6f5d76a449131b1 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d78351c6f5442435f81549f0207ece28aa +--- + src/wl/sys/wl_linux.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index e491df7..e4614fb 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -93,6 +93,10 @@ struct iw_statistics *wl_get_wireless_stats(struct net_device *dev); + + #include <wlc_wowl.h> + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)) ++#define PDE_DATA pde_data ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + static void wl_timer(struct timer_list *tl); + #else +@@ -490,6 +494,12 @@ wl_if_setup(struct net_device *dev) + #endif + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) ++static inline void eth_hw_addr_set(struct net_device *dev, const void *addr) { ++ memcpy(dev->dev_addr, addr, ETHER_ADDR_LEN); ++} ++#endif ++ + static wl_info_t * + wl_attach(uint16 vendor, uint16 device, ulong regs, + uint bustype, void *btparam, uint irq, uchar* bar1_addr, uint32 bar1_size) +@@ -634,7 +644,7 @@ wl_attach(uint16 vendor, uint16 device, ulong regs, + WL_ERROR(("wl%d: Error setting MAC ADDRESS\n", unit)); + } + #endif +- bcopy(&wl->pub->cur_etheraddr, dev->dev_addr, ETHER_ADDR_LEN); ++ eth_hw_addr_set(dev, wl->pub->cur_etheraddr.octet); + + online_cpus = 1; + +@@ -1835,7 +1845,7 @@ wl_set_mac_address(struct net_device *dev, void *addr) + + WL_LOCK(wl); + +- bcopy(sa->sa_data, dev->dev_addr, ETHER_ADDR_LEN); ++ eth_hw_addr_set(dev, sa->sa_data); + err = wlc_iovar_op(wl->wlc, "cur_etheraddr", NULL, 0, sa->sa_data, ETHER_ADDR_LEN, + IOV_SET, (WL_DEV_IF(dev))->wlcif); + WL_UNLOCK(wl); +@@ -3010,7 +3020,7 @@ _wl_add_monitor_if(wl_task_t *task) + else + dev->type = ARPHRD_IEEE80211_RADIOTAP; + +- bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN); ++ eth_hw_addr_set(dev, wl->dev->dev_addr); + + #if defined(WL_USE_NETDEV_OPS) + dev->netdev_ops = &wl_netdev_monitor_ops; +-- +2.35.1 + diff --git a/net-wireless/broadcom-sta/files/013-linux518.patch b/net-wireless/broadcom-sta/files/013-linux518.patch new file mode 100644 index 000000000000..d837429a6899 --- /dev/null +++ b/net-wireless/broadcom-sta/files/013-linux518.patch @@ -0,0 +1,71 @@ +diff -u -r a/src/shared/linux_osl.c b/src/shared/linux_osl.c +--- a/src/shared/linux_osl.c 2022-05-24 20:51:15.662604980 +0000 ++++ b/src/shared/linux_osl.c 2022-05-24 21:13:38.264472425 +0000 +@@ -599,6 +599,8 @@ + va = kmalloc(size, GFP_ATOMIC | __GFP_ZERO); + if (va) + *pap = (ulong)__virt_to_phys(va); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) ++ va = dma_alloc_coherent(&((struct pci_dev *)osh->pdev)->dev, size, (dma_addr_t*)pap, GFP_ATOMIC); + #else + va = pci_alloc_consistent(osh->pdev, size, (dma_addr_t*)pap); + #endif +@@ -612,6 +614,8 @@ + + #ifdef __ARM_ARCH_7A__ + kfree(va); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) ++ dma_free_coherent(&((struct pci_dev *)osh->pdev)->dev, size, va, (dma_addr_t)pa); + #else + pci_free_consistent(osh->pdev, size, va, (dma_addr_t)pa); + #endif +@@ -623,7 +627,11 @@ + int dir; + + ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) ++ dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE; ++#else + dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE; ++#endif + + #if defined(__ARM_ARCH_7A__) && defined(BCMDMASGLISTOSL) + if (dmah != NULL) { +@@ -641,7 +649,11 @@ + ASSERT(totsegs + nsegs <= MAX_DMA_SEGS); + sg->page_link = 0; + sg_set_buf(sg, PKTDATA(osh, skb), PKTLEN(osh, skb)); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) ++ dma_map_single(&((struct pci_dev *)osh->pdev)->dev, PKTDATA(osh, skb), PKTLEN(osh, skb), dir); ++#else + pci_map_single(osh->pdev, PKTDATA(osh, skb), PKTLEN(osh, skb), dir); ++#endif + } + totsegs += nsegs; + totlen += PKTLEN(osh, skb); +@@ -656,7 +668,11 @@ + } + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) ++ return (dma_map_single(&((struct pci_dev *)osh->pdev)->dev, va, size, dir)); ++#else + return (pci_map_single(osh->pdev, va, size, dir)); ++#endif + } + + void BCMFASTPATH +@@ -665,8 +681,13 @@ + int dir; + + ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) ++ dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE; ++ dma_unmap_single(&((struct pci_dev *)osh->pdev)->dev, (uint32)pa, size, dir); ++#else + dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE; + pci_unmap_single(osh->pdev, (uint32)pa, size, dir); ++#endif + } + + #if defined(BCMDBG_ASSERT) diff --git a/net-wireless/broadcom-sta/files/014-linux414.patch b/net-wireless/broadcom-sta/files/014-linux414.patch new file mode 100644 index 000000000000..0576aa5cf97c --- /dev/null +++ b/net-wireless/broadcom-sta/files/014-linux414.patch @@ -0,0 +1,37 @@ +From: Gerardo Esteban Malazdrewicz <gerardo@malazdrewicz.com.ar> +Date: Fri, 29 Dec 2017 23:44:24 -0400 +Subject: linux414 +Origin: https://bugs.debian.org/885885 + +linux 4.14 changed the kernel_read function prototype. +--- + src/shared/linux_osl.c | 12 +++++++++++- + 1 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c +index 9adc392..b24a973 100644 +--- a/src/shared/linux_osl.c ++++ b/src/shared/linux_osl.c +@@ -1076,11 +1076,21 @@ osl_os_get_image_block(char *buf, int len, void *image) + { + struct file *fp = (struct file *)image; + int rdlen; ++ loff_t pos; + + if (!image) + return 0; + +- rdlen = kernel_read(fp, fp->f_pos, buf, len); ++ pos = fp->f_pos; ++ rdlen = kernel_read(fp, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) ++ pos, ++#endif ++ buf, len ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++ ,&pos ++#endif ++ ); + if (rdlen > 0) + fp->f_pos += rdlen; + diff --git a/net-wireless/broadcom-sta/files/015-linux600.patch b/net-wireless/broadcom-sta/files/015-linux600.patch new file mode 100644 index 000000000000..8645907bbae4 --- /dev/null +++ b/net-wireless/broadcom-sta/files/015-linux600.patch @@ -0,0 +1,31 @@ +From 933540c63f33e6ac2825d65c4b681ef3387d9146 Mon Sep 17 00:00:00 2001 +From: Antoine Cotten <hello@acotten.com> +Date: Mon, 15 Aug 2022 17:53:51 +0200 +Subject: [PATCH] cfg80211_roam_info compat for MLO APIs in Linux >= 6.0 + +The 'bssid' struct field is now under 'links.bssid'. + +See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=efbabc11650040c64884ff3019b88c7bcc0ceb1d + +Original patch by Joan Bruguera: +https://gist.github.com/joanbm/207210d74637870c01ef5a3c262a597d +--- + src/wl/sys/wl_cfg80211_hybrid.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index 5e9e6d3..5ec35c5 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -2412,7 +2412,11 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) + struct cfg80211_roam_info roam_info = { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) + .bssid = wl->profile->bssid, ++#else ++ .links[0].bssid = wl->profile->bssid, ++#endif + .req_ie = conn_info->req_ie, + .req_ie_len = conn_info->req_ie_len, + .resp_ie = conn_info->resp_ie, diff --git a/net-wireless/broadcom-sta/files/016-linux601.patch b/net-wireless/broadcom-sta/files/016-linux601.patch new file mode 100644 index 000000000000..721967d275c2 --- /dev/null +++ b/net-wireless/broadcom-sta/files/016-linux601.patch @@ -0,0 +1,90 @@ +diff -Nurp -u -r a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +--- a/src/wl/sys/wl_cfg80211_hybrid.c 2022-12-12 00:23:30.821615599 +0000 ++++ b/src/wl/sys/wl_cfg80211_hybrid.c 2022-12-12 00:35:47.854975024 +0000 +@@ -105,14 +105,28 @@ static s32 wl_cfg80211_get_tx_power(stru + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm); + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, ++ struct net_device *dev, int link_id, u8 key_idx, bool unicast, ++ bool multicast); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) + static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, + struct net_device *dev, u8 key_idx, bool unicast, bool multicast); + #else + static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, + struct net_device *dev, u8 key_idx); + #endif +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, ++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, ++ struct key_params *params); ++static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, ++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr); ++static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, ++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, ++ void *cookie, ++ void (*callback) (void *cookie, struct key_params *params)); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, + u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params); + static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, +@@ -1161,7 +1175,12 @@ static s32 wl_cfg80211_get_tx_power(stru + return err; + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++static s32 ++wl_cfg80211_config_default_key(struct wiphy *wiphy, ++ struct net_device *dev, int link_id, u8 key_idx, bool unicast, ++ bool multicast) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) + static s32 + wl_cfg80211_config_default_key(struct wiphy *wiphy, + struct net_device *dev, u8 key_idx, bool unicast, bool multicast) +@@ -1186,7 +1205,12 @@ wl_cfg80211_config_default_key(struct wi + return 0; + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++static s32 ++wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, ++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, ++ struct key_params *params) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 + wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, + u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params) +@@ -1307,7 +1331,11 @@ wl_cfg80211_add_key(struct wiphy *wiphy, + return err; + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++static s32 ++wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, ++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 + wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, + u8 key_idx, bool pairwise, const u8 *mac_addr) +@@ -1350,7 +1378,13 @@ wl_cfg80211_del_key(struct wiphy *wiphy, + return err; + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++static s32 ++wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, ++ int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, ++ void *cookie, ++ void (*callback) (void *cookie, struct key_params * params)) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) + static s32 + wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, + u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie, diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-eth-to-wlan.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-eth-to-wlan.patch deleted file mode 100644 index b23914a0b3d6..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-eth-to-wlan.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c ---- a/src/wl/sys/wl_linux.c 2013-08-01 09:52:22.000000000 +0300 -+++ b/src/wl/sys/wl_linux.c 2013-09-27 09:20:11.495023471 +0300 -@@ -235,7 +235,7 @@ - #define to_str(s) #s - #define quote_str(s) to_str(s) - --#define BRCM_WLAN_IFNAME eth%d -+#define BRCM_WLAN_IFNAME wlan%d - - static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); - diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-gcc.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-gcc.patch deleted file mode 100644 index b5d7e858d78f..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-gcc.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN a/src/wl/sys/wl_iw.h b/src/wl/sys/wl_iw.h ---- a/src/wl/sys/wl_iw.h 2013-08-01 09:52:22.000000000 +0300 -+++ b/src/wl/sys/wl_iw.h 2013-09-27 09:36:07.808067913 +0300 -@@ -21,6 +21,7 @@ - #ifndef _wl_iw_h_ - #define _wl_iw_h_ - -+#include <linux/semaphore.h> - #include <linux/wireless.h> - - #include <typedefs.h> diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch deleted file mode 100644 index d5b97fe87ebe..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Makefile 2013-04-28 22:42:59.000000000 +0200 -+++ b/Makefile 2013-04-28 22:45:53.000000000 +0200 -@@ -128,9 +128,9 @@ - - EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped - --KBASE ?= /lib/modules/`uname -r` -+KBASE ?= /lib/modules/${KV_FULL} - KBUILD_DIR ?= $(KBASE)/build --MDEST_DIR ?= $(KBASE)/kernel/drivers/net/wireless -+MDEST_DIR ?= ${D}$(KBASE)/kernel/drivers/net/wireless - - all: - KBUILD_NOPEDANTIC=1 make -C $(KBUILD_DIR) M=`pwd` diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-Wno-date-time.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-Wno-date-time.patch deleted file mode 100644 index f93e3f1d3a3f..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r3-Wno-date-time.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile 2014-06-26 10:42:08.000000000 +0000 -+++ b/Makefile 2014-07-17 22:44:01.662297228 +0000 -@@ -126,6 +126,8 @@ - EXTRA_CFLAGS += -I$(src)/src/shared/bcmwifi/include - #EXTRA_CFLAGS += -DBCMDBG_ASSERT -DBCMDBG_ERR - -+EXTRA_CFLAGS += -Wno-date-time -+ - EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped - - KBASE ?= /lib/modules/`uname -r` diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch deleted file mode 100644 index 9a0e7136c53b..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/wl/sys/wl_linux.c 2014-06-26 12:42:08.000000000 +0200 -+++ b/src/wl/sys/wl_linux.c 2015-01-22 01:44:58.580453805 +0100 -@@ -2157,8 +2159,8 @@ - wlif = WL_DEV_IF(dev); - wl = WL_INFO(dev); - -+ skb->prev = NULL; - if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) { -- skb->prev = NULL; - - TXQ_LOCK(wl); - diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch deleted file mode 100644 index 588f77ad16f2..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN a/src/shared/linux_osl.c b/src/shared/linux_osl.c ---- a/src/shared/linux_osl.c 2015-11-26 12:16:23.343091098 -0800 -+++ b/src/shared/linux_osl.c 2015-11-26 12:17:08.657092739 -0800 -@@ -932,7 +932,11 @@ - uint cycles; - - #if defined(__i386__) -- rdtscl(cycles); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) -+ cycles = (u32)rdtsc(); -+#else -+ rdtscl(cycles); -+#endif - #else - cycles = 0; - #endif diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.11.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.11.patch deleted file mode 100644 index a779f8c84cfd..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.11.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c -index a9671e2..da36405 100644 ---- a/src/wl/sys/wl_cfg80211_hybrid.c -+++ b/src/wl/sys/wl_cfg80211_hybrid.c -@@ -30,6 +30,9 @@ - #include <linux/kthread.h> - #include <linux/netdevice.h> - #include <linux/ieee80211.h> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+#include <linux/sched/signal.h> -+#endif - #include <net/cfg80211.h> - #include <linux/nl80211.h> - #include <net/rtnetlink.h> -diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c -index 489c9f5..f8278ad 100644 ---- a/src/wl/sys/wl_linux.c -+++ b/src/wl/sys/wl_linux.c -@@ -117,6 +117,9 @@ int wl_found = 0; - - typedef struct priv_link { - wl_if_t *wlif; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+ unsigned long last_rx; -+#endif - } priv_link_t; - - #define WL_DEV_IF(dev) ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif) -@@ -2450,6 +2453,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) - { - struct sk_buff *oskb = (struct sk_buff *)p; - struct sk_buff *skb; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+ priv_link_t *priv_link; -+#endif - uchar *pdata; - uint len; - -@@ -2916,7 +2922,13 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) - if (skb == NULL) return; - - skb->dev = wl->monitor_dev; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+ priv_link = MALLOC(wl->osh, sizeof(priv_link_t)); -+ priv_link = netdev_priv(skb->dev); -+ priv_link->last_rx = jiffies; -+#else - skb->dev->last_rx = jiffies; -+#endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) - skb_reset_mac_header(skb); - #else diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.12.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.12.patch deleted file mode 100644 index 94c6253f803e..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.12.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ru work.orig/src/wl/sys/wl_cfg80211_hybrid.c work.patched/src/wl/sys/wl_cfg80211_hybrid.c ---- work.orig/src/wl/sys/wl_cfg80211_hybrid.c 2017-06-10 15:50:27.328823384 -0700 -+++ work.patched/src/wl/sys/wl_cfg80211_hybrid.c 2017-06-10 15:52:40.540809187 -0700 -@@ -52,8 +52,13 @@ - u32 wl_dbg_level = WL_DBG_ERR; - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, -+ enum nl80211_iftype type, struct vif_params *params); -+#else - static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, - enum nl80211_iftype type, u32 *flags, struct vif_params *params); -+#endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) - static s32 - wl_cfg80211_scan(struct wiphy *wiphy, -@@ -466,7 +471,11 @@ - - static s32 - wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+ enum nl80211_iftype type, -+#else - enum nl80211_iftype type, u32 *flags, -+#endif - struct vif_params *params) - { - struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); -@@ -2361,12 +2370,26 @@ - const wl_event_msg_t *e, void *data) - { - struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+ struct cfg80211_roam_info roam_info = {}; -+#endif - s32 err = 0; - - wl_get_assoc_ies(wl); - memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN); - memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); - wl_update_bss_info(wl); -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) -+ roam_info.channel = &wl->conf->channel, -+ roam_info.bssid = (u8 *)&wl->bssid, -+ roam_info.req_ie = conn_info->req_ie, -+ roam_info.req_ie_len = conn_info->req_ie_len, -+ roam_info.resp_ie = conn_info->resp_ie, -+ roam_info.resp_ie_len = conn_info->resp_ie_len, -+ -+ cfg80211_roamed(ndev, &roam_info, GFP_KERNEL); -+#else - cfg80211_roamed(ndev, - #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) - &wl->conf->channel, -@@ -2374,6 +2397,7 @@ - (u8 *)&wl->bssid, - conn_info->req_ie, conn_info->req_ie_len, - conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); -+#endif - WL_DBG(("Report roaming result\n")); - - set_bit(WL_STATUS_CONNECTED, &wl->status); diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.15.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.15.patch deleted file mode 100644 index 91c4d89519c1..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r4-linux-4.15.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c -index 489c9f5..f8278ad 100644 ---- a/src/wl/sys/wl_linux.c -+++ b/src/wl/sys/wl_linux.c -@@ -93,7 +93,11 @@ - - #include <wlc_wowl.h> - -+#ifdef HAVE_TIMER_SETUP -+static void wl_timer(struct timer_list *list); -+#else - static void wl_timer(ulong data); -+#endif - static void _wl_timer(wl_timer_t *t); - static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); - -@@ -2296,12 +2300,17 @@ - - atomic_dec(&t->wl->callbacks); - } -- -+#ifdef HAVE_TIMER_SETUP -+static void -+wl_timer(struct timer_list *list) -+{ -+ wl_timer_t *t = from_timer(t,list,timer); -+#else - static void - wl_timer(ulong data) - { - wl_timer_t *t = (wl_timer_t *)data; -- -+#endif - if (!WL_ALL_PASSIVE_ENAB(t->wl)) - _wl_timer(t); - else -@@ -2351,10 +2360,13 @@ - } - - bzero(t, sizeof(wl_timer_t)); -- -+#ifdef HAVE_TIMER_SETUP -+ timer_setup(&t->timer, wl_timer,0); -+#else - init_timer(&t->timer); - t->timer.data = (ulong) t; - t->timer.function = wl_timer; -+#endif - t->wl = wl; - t->fn = fn; - t->arg = arg; -diff --git a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h -index 489c9f5..f8278ad 100644 ---- a/src/wl/sys/wl_linux.h -+++ b/src/wl/sys/wl_linux.h -@@ -190,3 +190,7 @@ - extern struct net_device * wl_netdev_get(wl_info_t *wl); - - #endif -+ -+#if defined(timer_setup) && defined(from_timer) -+#define HAVE_TIMER_SETUP -+#endif diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch deleted file mode 100644 index fcee46ea3d02..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 20bb1a6da26c496572ee63d310cdf69a2f1553f8 Mon Sep 17 00:00:00 2001 -From: Seth Forshee <seth.forshee@canonical.com> -Date: Fri, 17 May 2019 20:32:20 +0000 -Subject: [PATCH] add support for linux 5.1 - -get_ds() was removed and replaced universally with KERNEL_DS. -Provide a version of get_ds() to do likewise for 5.1 and later. - -Signed-off-by: Seth Forshee <seth.forshee@canonical.com> ---- - src/include/linuxver.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/include/linuxver.h b/src/include/linuxver.h -index b05bc32..2b88b30 100644 ---- a/src/include/linuxver.h -+++ b/src/include/linuxver.h -@@ -591,4 +591,9 @@ do { \ - #define netdev_priv(dev) dev->priv - #endif - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)) -+#include <linux/uaccess.h> -+#define get_ds() (KERNEL_DS) -+#endif -+ - #endif --- -2.20.1 diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.6.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.6.patch deleted file mode 100644 index 71264346f86e..000000000000 --- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.6.patch +++ /dev/null @@ -1,88 +0,0 @@ -From: Herman van Hazendonk <github.com@herrie.org> -Date: Tue, 31 Mar 2020 17:09:55 +0200 -Subject: [PATCH] Add fixes for 5.6 kernel -Origin: https://salsa.debian.org/Herrie82-guest/broadcom-sta/-/merge_requests/1 - -Use ioremap instead of ioremap_nocache and proc_ops instead of -file_operations on Linux kernel 5.6 and above. - -<rosh> Patch amended to adapt i386 arch. ---- - src/shared/linux_osl.c | 6 +++++- - src/wl/sys/wl_linux.c | 21 ++++++++++++++++++++- - 2 files changed, 25 insertions(+), 2 deletions(-) - -diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c -index b24a973..9bce9b1 100644 ---- a/src/shared/linux_osl.c -+++ b/src/shared/linux_osl.c -@@ -946,7 +946,11 @@ osl_getcycles(void) - void * - osl_reg_map(uint32 pa, uint size) - { -- return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) -+ return (ioremap((unsigned long)pa, (unsigned long)size)); -+ #else -+ return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); -+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ - } - - void -diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c -index ab7b883..10621c2 100644 ---- a/src/wl/sys/wl_linux.c -+++ b/src/wl/sys/wl_linux.c -@@ -590,10 +590,17 @@ wl_attach(uint16 vendor, uint16 device, ulong regs, - } - wl->bcm_bustype = bustype; - -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) -+ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { -+ WL_ERROR(("wl%d: ioremap() failed\n", unit)); -+ goto fail; -+ } -+ #else - if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { - WL_ERROR(("wl%d: ioremap() failed\n", unit)); - goto fail; - } -+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ - - wl->bar1_addr = bar1_addr; - wl->bar1_size = bar1_size; -@@ -780,8 +787,13 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) - if ((val & 0x0000ff00) != 0) - pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); - bar1_size = pci_resource_len(pdev, 2); -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) -+ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2), -+ bar1_size); -+ #else - bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2), - bar1_size); -+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ - wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev, - pdev->irq, bar1_addr, bar1_size); - -@@ -3354,12 +3366,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t - } - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) -+static const struct proc_ops wl_fops = { -+ .proc_read = wl_proc_read, -+ .proc_write = wl_proc_write, -+}; -+#else - static const struct file_operations wl_fops = { - .owner = THIS_MODULE, - .read = wl_proc_read, - .write = wl_proc_write, - }; --#endif -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) */ - - static int - wl_reg_proc_entry(wl_info_t *wl) diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-modules.conf b/net-wireless/broadcom-sta/files/broadcom-sta-modules.conf new file mode 100644 index 000000000000..458947e335b4 --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-modules.conf @@ -0,0 +1,17 @@ +# modprobe.d configuration file for WL + +# Internal Aliases - Do not edit +# ------------------------------ +alias wlan0 wl + + +# Configurable module parameters +# ------------------------------ +# passivemode: (int) +# wl_txq_thresh: (int) +# oneonly: (int) +# piomode: (int) +# instance_base: (int) +# nompc: (int) +# intf_name: (string) + diff --git a/net-wireless/btcrack/btcrack-9999.ebuild b/net-wireless/btcrack/btcrack-9999.ebuild deleted file mode 100644 index 9aa142b12e9b..000000000000 --- a/net-wireless/btcrack/btcrack-9999.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="linux port of Thierry Zollers' BTCrack" -HOMEPAGE="https://github.com/mikeryan/btcrack" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/mikeryan/btcrack.git" - inherit git-r3 -else - #SRC_URI="" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -src_install() { - emake DESTDIR="${ED}" PREFIX=/usr install -} diff --git a/net-wireless/btcrack/metadata.xml b/net-wireless/btcrack/metadata.xml deleted file mode 100644 index 0855ab30c943..000000000000 --- a/net-wireless/btcrack/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - </maintainer> - <upstream> - <remote-id type="github">mikeryan/btcrack</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-wireless/crackle/crackle-0.1.ebuild b/net-wireless/crackle/crackle-0.1-r1.ebuild index c7a694212e40..6c0f1f76dee8 100644 --- a/net-wireless/crackle/crackle-0.1.ebuild +++ b/net-wireless/crackle/crackle-0.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit epatch +inherit toolchain-funcs DESCRIPTION="Crackle cracks BLE Encryption (AKA Bluetooth Smart)" HOMEPAGE="http://lacklustre.net/projects/crackle/" @@ -12,15 +12,18 @@ SRC_URI="http://lacklustre.net/projects/crackle/${P}.tgz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="net-libs/libpcap" RDEPEND="${DEPEND}" RESTRICT="test" -src_prepare() { - epatch "${FILESDIR}"/flags.patch +PATCHES=( + "${FILESDIR}"/flags.patch +) + +src_configure() { + tc-export CC } src_install() { diff --git a/net-wireless/crackle/crackle-9999.ebuild b/net-wireless/crackle/crackle-9999.ebuild deleted file mode 100644 index 6e8816d85087..000000000000 --- a/net-wireless/crackle/crackle-9999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Crackle cracks BLE Encryption (AKA Bluetooth Smart)" -HOMEPAGE="http://lacklustre.net/projects/crackle/" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/mikeryan/crackle.git" - inherit git-r3 -else - SRC_URI="http://lacklustre.net/projects/crackle/${P}.tgz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND} - test? ( dev-lang/perl )" - -src_install() { - DESTDIR="${ED}" PREFIX=/usr emake install -} diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest deleted file mode 100644 index ea5835025eb5..000000000000 --- a/net-wireless/crda/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053 diff --git a/net-wireless/crda/crda-4.14.ebuild b/net-wireless/crda/crda-4.14.ebuild deleted file mode 100644 index e67a2c2d0c3b..000000000000 --- a/net-wireless/crda/crda-4.14.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -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 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="gcrypt" - -RDEPEND="!gcrypt? ( - dev-libs/openssl:0= - ) - gcrypt? ( dev-libs/libgcrypt:0= ) - dev-libs/libnl:3 - net-wireless/wireless-regdb" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]') - virtual/pkgconfig" - -python_check_deps() { - has_version -b "dev-python/m2crypto[${PYTHON_USEDEP}]" -} - -PATCHES=( - "${FILESDIR}"/${PN}-no-ldconfig.patch - "${FILESDIR}"/${PN}-no-werror.patch - "${FILESDIR}"/${PN}-cflags.patch - "${FILESDIR}"/${PN}-libreg-link.patch #542436 - "${FILESDIR}"/${PN}-4.14-python-3.patch - "${FILESDIR}"/${PN}-4.14-openssl-1.1.0-compatibility.patch #652428 - "${FILESDIR}"/${PN}-ldflags.patch - "${FILESDIR}"/${PN}-4.14-do-not-compress-doc.patch -) - -src_prepare() { - default - sed -i \ - -e "s:\<pkg-config\>:$(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 -} diff --git a/net-wireless/crda/files/crda-4.14-do-not-compress-doc.patch b/net-wireless/crda/files/crda-4.14-do-not-compress-doc.patch deleted file mode 100644 index 428bafbde44f..000000000000 --- a/net-wireless/crda/files/crda-4.14-do-not-compress-doc.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/Makefile b/Makefile -index 335d17d..683a379 100644 ---- a/Makefile -+++ b/Makefile -@@ -157,11 +157,7 @@ verify: $(REG_BIN) regdbdump - LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) \ - ./regdbdump $(REG_BIN) >/dev/null - --%.gz: % -- @$(NQ) ' GZIP' $< -- $(Q)gzip < $< > $@ -- --install: install-libreg install-libreg-headers crda crda.8.gz regdbdump.8.gz -+install: install-libreg install-libreg-headers crda crda.8 regdbdump.8 - $(NQ) ' INSTALL crda' - $(Q)$(MKDIR) $(DESTDIR)/$(SBINDIR) - $(Q)$(INSTALL) -m 755 -t $(DESTDIR)/$(SBINDIR) crda -@@ -177,13 +173,13 @@ install: install-libreg install-libreg-headers crda crda.8.gz regdbdump.8.gz - $(Q)$(INSTALL) -m 644 -t \ - $(DESTDIR)/$(UDEV_RULE_DIR)/ \ - udev/$(UDEV_LEVEL)regulatory.rules -- $(NQ) ' INSTALL crda.8.gz' -+ $(NQ) ' INSTALL crda.8' - $(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/ -- $(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(MANDIR)/man8/ crda.8.gz -- $(NQ) ' INSTALL regdbdump.8.gz' -- $(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(MANDIR)/man8/ regdbdump.8.gz -+ $(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(MANDIR)/man8/ crda.8 -+ $(NQ) ' INSTALL regdbdump.8' -+ $(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(MANDIR)/man8/ regdbdump.8 - - clean: - $(Q)rm -f $(LIBREG) crda regdbdump intersect db2rd optimize \ -- *.o *~ *.pyc keys.c *.gz \ -+ *.o *~ *.pyc keys.c \ - udev/$(UDEV_LEVEL)regulatory.rules udev/regulatory.rules.parsed diff --git a/net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch b/net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch deleted file mode 100644 index 41b567af384f..000000000000 --- a/net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch +++ /dev/null @@ -1,308 +0,0 @@ -From 338637ac08c19708eb35523894b44bbe3c726cfa Mon Sep 17 00:00:00 2001 -From: quentin <quentin@minster.io> -Date: Mon, 2 Apr 2018 18:07:50 +0200 -Subject: [PATCH] crda: Fix for OpenSSL 1.1.0: BIGNUM now opaque - -OpenSSL 1.1.0 makes most of OpenSSL's structures opaque, and provides -functions to manipulate them. This means it's no longer possible to -construct an OpenSSL BIGNUM directly from scratch, as was done in -keys-ssl.c. - -Use BN_bin2bn() (available since OpenSSL 0.9.8) to build the bignum from -its big-endian representation as a byte array. - -This also allows factoring the code in utils/key2pub.py as it's now the -same mechanism as with libgcrypt. - -This was tested with OpenSSL 1.1.0g. - -Signed-off-by: Quentin Minster <quentin@minster.io> ---- - Makefile | 12 +++---- - reglib.c | 44 +++++++++++++++++------ - utils/key2pub.py | 107 ++++++------------------------------------------------- - 3 files changed, 49 insertions(+), 114 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -38,18 +38,16 @@ all: all_noverify verify - - all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize - -+$(LIBREG): keys.c -+ - ifeq ($(USE_OPENSSL),1) - CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` - LDLIBS += `pkg-config --libs openssl` - --$(LIBREG): keys-ssl.c -- - else - CFLAGS += -DUSE_GCRYPT - LDLIBS += -lgcrypt - --$(LIBREG): keys-gcrypt.c -- - endif - MKDIR ?= mkdir -p - INSTALL ?= install -@@ -109,10 +107,10 @@ $(REG_BIN): - $(NQ) - $(Q) exit 1 - --keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) -+keys.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - $(NQ) ' GEN ' $@ - $(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem) -- $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ -+ $(Q)./utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) $@ - - $(LIBREG): regdb.h reglib.h reglib.c - $(NQ) ' CC ' $@ -@@ -187,5 +185,5 @@ install: install-libreg install-libreg-headers crda crda.8.gz regdbdump.8.gz - - clean: - $(Q)rm -f $(LIBREG) crda regdbdump intersect db2rd optimize \ -- *.o *~ *.pyc keys-*.c *.gz \ -+ *.o *~ *.pyc keys.c *.gz \ - udev/$(UDEV_LEVEL)regulatory.rules udev/regulatory.rules.parsed ---- a/reglib.c -+++ b/reglib.c -@@ -22,6 +22,7 @@ - #include <openssl/rsa.h> - #include <openssl/sha.h> - #include <openssl/pem.h> -+#include <openssl/bn.h> - #endif - - #ifdef USE_GCRYPT -@@ -30,12 +31,8 @@ - - #include "reglib.h" - --#ifdef USE_OPENSSL --#include "keys-ssl.c" --#endif -- --#ifdef USE_GCRYPT --#include "keys-gcrypt.c" -+#if defined(USE_OPENSSL) || defined(USE_GCRYPT) -+#include "keys.c" - #endif - - int debug = 0; -@@ -81,7 +78,8 @@ reglib_array_len(size_t baselen, unsigned int elemcount, size_t elemlen) - #ifdef USE_OPENSSL - int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen) - { -- RSA *rsa; -+ RSA *rsa = NULL; -+ BIGNUM *rsa_e = NULL, *rsa_n = NULL; - uint8_t hash[SHA_DIGEST_LENGTH]; - unsigned int i; - int ok = 0; -@@ -102,15 +100,35 @@ int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen) - goto out; - } - -- rsa->e = &keys[i].e; -- rsa->n = &keys[i].n; -+ rsa_e = BN_bin2bn(keys[i].e, keys[i].len_e, NULL); -+ if (!rsa_e) { -+ fprintf(stderr, "Failed to convert value for RSA e.\n"); -+ goto out; -+ } -+ rsa_n = BN_bin2bn(keys[i].n, keys[i].len_n, NULL); -+ if (!rsa_n) { -+ fprintf(stderr, "Failed to convert value for RSA n.\n"); -+ goto out; -+ } -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ rsa->e = rsa_e; -+ rsa->n = rsa_n; -+#else -+ if (RSA_set0_key(rsa, rsa_n, rsa_e, NULL) != 1) { -+ fprintf(stderr, "Failed to set RSA key.\n"); -+ goto out; -+ } -+#endif -+ /* BIGNUMs now owned by the RSA object */ -+ rsa_e = NULL; -+ rsa_n = NULL; - - ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH, - db + dblen, siglen, rsa) == 1; - -- rsa->e = NULL; -- rsa->n = NULL; - RSA_free(rsa); -+ rsa = NULL; - } - if (!ok && (pubkey_dir = opendir(PUBKEY_DIR))) { - while (!ok && (nextfile = readdir(pubkey_dir))) { -@@ -123,6 +141,7 @@ int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen) - ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH, - db + dblen, siglen, rsa) == 1; - RSA_free(rsa); -+ rsa = NULL; - fclose(keyfile); - } - } -@@ -133,6 +152,9 @@ int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen) - fprintf(stderr, "Database signature verification failed.\n"); - - out: -+ RSA_free(rsa); -+ BN_free(rsa_e); -+ BN_free(rsa_n); - return ok; - } - #endif /* USE_OPENSSL */ ---- a/utils/key2pub.py -+++ b/utils/key2pub.py -@@ -9,84 +9,7 @@ except ImportError as e: - sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n') - sys.exit(1) - --def print_ssl_64(output, name, val): -- while val[0:1] == b'\0': -- val = val[1:] -- while len(val) % 8: -- val = b'\0' + val -- vnew = [] -- while len(val): -- vnew.append((val[0:1], val[1:2], val[2:3], val[3:4], val[4:5], val[5:6], val[6:7], val[7:8])) -- val = val[8:] -- vnew.reverse() -- output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) -- idx = 0 -- for v1, v2, v3, v4, v5, v6, v7, v8 in vnew: -- if not idx: -- output.write('\t') -- output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8))) -- idx += 1 -- if idx == 2: -- idx = 0 -- output.write('\n') -- if idx: -- output.write('\n') -- output.write('};\n\n') -- --def print_ssl_32(output, name, val): -- while val[0:1] == b'\0': -- val = val[1:] -- while len(val) % 4: -- val = b'\0' + val -- vnew = [] -- while len(val): -- vnew.append((val[0:1], val[1:2], val[2:3], val[3:4])) -- val = val[4:] -- vnew.reverse() -- output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) -- idx = 0 -- for v1, v2, v3, v4 in vnew: -- if not idx: -- output.write('\t') -- output.write('0x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4))) -- idx += 1 -- if idx == 4: -- idx = 0 -- output.write('\n') -- if idx: -- output.write('\n') -- output.write('};\n\n') -- --def print_ssl(output, name, val): -- import struct -- output.write('#include <stdint.h>\n') -- if len(struct.pack('@L', 0)) == 8: -- return print_ssl_64(output, name, val) -- else: -- return print_ssl_32(output, name, val) -- --def print_ssl_keys(output, n): -- output.write(r''' --struct pubkey { -- struct bignum_st e, n; --}; -- --#define KEY(data) { \ -- .d = data, \ -- .top = sizeof(data)/sizeof(data[0]), \ --} -- --#define KEYS(e,n) { KEY(e), KEY(n), } -- --static struct pubkey keys[] = { --''') -- for n in range(n + 1): -- output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) -- output.write('};\n') -- pass -- --def print_gcrypt(output, name, val): -- output.write('#include <stdint.h>\n') -+def print_bignum(output, name, val): - while val[0:1] == b'\0': - val = val[1:] - output.write('static const uint8_t %s[%d] = {\n' % (name, len(val))) -@@ -103,11 +26,11 @@ def print_gcrypt(output, name, val): - output.write('\n') - output.write('};\n\n') - --def print_gcrypt_keys(output, n): -+def print_keys(output, n): - output.write(r''' - struct key_params { - const uint8_t *e, *n; -- uint32_t len_e, len_n; -+ const uint32_t len_e, len_n; - }; - - #define KEYS(_e, _n) { \ -@@ -120,25 +43,17 @@ static const struct key_params __attribute__ ((unused)) keys[] = { - for n in range(n + 1): - output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) - output.write('};\n') -- - --modes = { -- '--ssl': (print_ssl, print_ssl_keys), -- '--gcrypt': (print_gcrypt, print_gcrypt_keys), --} - --try: -- mode = sys.argv[1] -- files = sys.argv[2:-1] -- outfile = sys.argv[-1] --except IndexError: -- mode = None -+files = sys.argv[1:-1] -+outfile = sys.argv[-1] - --if not mode in modes: -- print('Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys()))) -+if len(files) == 0: -+ print('Usage: %s input-file... output-file' % sys.argv[0]) - sys.exit(2) - - output = open(outfile, 'w') -+output.write('#include <stdint.h>\n\n\n') - - # load key - idx = 0 -@@ -148,10 +63,10 @@ for f in files: - except RSA.RSAError: - key = RSA.load_key(f) - -- modes[mode][0](output, 'e_%d' % idx, key.e[4:]) -- modes[mode][0](output, 'n_%d' % idx, key.n[4:]) -+ print_bignum(output, 'e_%d' % idx, key.e[4:]) -+ print_bignum(output, 'n_%d' % idx, key.n[4:]) - idx += 1 - --modes[mode][1](output, idx - 1) -+print_keys(output, idx - 1) - - output.close() diff --git a/net-wireless/crda/files/crda-4.14-python-3.patch b/net-wireless/crda/files/crda-4.14-python-3.patch deleted file mode 100644 index df22a6a4bd44..000000000000 --- a/net-wireless/crda/files/crda-4.14-python-3.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/utils/key2pub.py b/utils/key2pub.py -index 9bb04cd..632e6a6 100755 ---- a/utils/key2pub.py -+++ b/utils/key2pub.py -@@ -3,20 +3,20 @@ - import sys - try: - from M2Crypto import RSA --except ImportError, e: -+except ImportError as e: - sys.stderr.write('ERROR: Failed to import the "M2Crypto" module: %s\n' % e.message) - sys.stderr.write('Please install the "M2Crypto" Python module.\n') - sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n') - sys.exit(1) - - def print_ssl_64(output, name, val): -- while val[0] == '\0': -+ while val[0:1] == b'\0': - val = val[1:] - while len(val) % 8: -- val = '\0' + val -+ val = b'\0' + val - vnew = [] - while len(val): -- vnew.append((val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7])) -+ vnew.append((val[0:1], val[1:2], val[2:3], val[3:4], val[4:5], val[5:6], val[6:7], val[7:8])) - val = val[8:] - vnew.reverse() - output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) -@@ -34,13 +34,13 @@ def print_ssl_64(output, name, val): - output.write('};\n\n') - - def print_ssl_32(output, name, val): -- while val[0] == '\0': -+ while val[0:1] == b'\0': - val = val[1:] - while len(val) % 4: -- val = '\0' + val -+ val = b'\0' + val - vnew = [] - while len(val): -- vnew.append((val[0], val[1], val[2], val[3], )) -+ vnew.append((val[0:1], val[1:2], val[2:3], val[3:4])) - val = val[4:] - vnew.reverse() - output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) -@@ -80,21 +80,21 @@ struct pubkey { - - static struct pubkey keys[] = { - ''') -- for n in xrange(n + 1): -+ for n in range(n + 1): - output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) - output.write('};\n') - pass - - def print_gcrypt(output, name, val): - output.write('#include <stdint.h>\n') -- while val[0] == '\0': -+ while val[0:1] == b'\0': - val = val[1:] - output.write('static const uint8_t %s[%d] = {\n' % (name, len(val))) - idx = 0 - for v in val: - if not idx: - output.write('\t') -- output.write('0x%.2x, ' % ord(v)) -+ output.write('0x%.2x, ' % (v if sys.version_info[0] >=3 else ord(v))) - idx += 1 - if idx == 8: - idx = 0 -@@ -117,7 +117,7 @@ struct key_params { - - static const struct key_params __attribute__ ((unused)) keys[] = { - ''') -- for n in xrange(n + 1): -+ for n in range(n + 1): - output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) - output.write('};\n') - -@@ -135,7 +135,7 @@ except IndexError: - mode = None - - if not mode in modes: -- print 'Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys())) -+ print('Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys()))) - sys.exit(2) - - output = open(outfile, 'w') -@@ -153,3 +153,5 @@ for f in files: - idx += 1 - - modes[mode][1](output, idx - 1) -+ -+output.close() diff --git a/net-wireless/crda/files/crda-cflags.patch b/net-wireless/crda/files/crda-cflags.patch deleted file mode 100644 index 6edbded822cc..000000000000 --- a/net-wireless/crda/files/crda-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c5b0741ea7fc12e9f6a2a309296ed412a999d0f7 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Wed, 4 Mar 2015 14:09:50 -0500 -Subject: [PATCH] clean up CFLAGS handling - -Rather than append -O2 -g all the time to the user's CFLAGS (and thus -clobbering whatever they have set up), initialize the default value to -that and let the user override it entirely. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 5f988f4..8e345a1 100644 ---- a/Makefile -+++ b/Makefile -@@ -26,9 +26,9 @@ PUBKEY_DIR?=pubkeys - RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys - - WERROR = -Werror --CFLAGS += -O2 -fpic -+CFLAGS ?= -O2 -g -+CFLAGS += -fpic - CFLAGS += -std=gnu99 -Wall $(WERROR) -pedantic --CFLAGS += -Wall -g - LDLIBREG += -lreg - LDLIBS += $(LDLIBREG) - LDLIBS += -lm --- -2.3.1 - diff --git a/net-wireless/crda/files/crda-ldflags.patch b/net-wireless/crda/files/crda-ldflags.patch deleted file mode 100644 index 13592127e928..000000000000 --- a/net-wireless/crda/files/crda-ldflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -# https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/patch/?id=9856751feaf7b102547cea678a5da6c94252d83d -# https://bugs.gentoo.org/678450 -# https://bugs.gentoo.org/596352 - ---- a/Makefile -+++ b/Makefile -@@ -114,9 +114,9 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - $(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem) - $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ - --$(LIBREG): regdb.h reglib.h reglib.c -+$(LIBREG): reglib.c regdb.h reglib.h - $(NQ) ' CC ' $@ -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS)) -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(filter-out -lreg,$(LDLIBS)) - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' diff --git a/net-wireless/crda/files/crda-libreg-link.patch b/net-wireless/crda/files/crda-libreg-link.patch deleted file mode 100644 index 0aa1b6e87a39..000000000000 --- a/net-wireless/crda/files/crda-libreg-link.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/542436 - -From f56ab87b25f2228a67ac592a1c18793c72dd03eb Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 7 Mar 2015 22:29:33 -0500 -Subject: [PATCH crda] libreg: link against crypto libs - -Since libreg uses funcs from the crypto lib, make sure we link them. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8e345a1..77708e6 100644 ---- a/Makefile -+++ b/Makefile -@@ -117,7 +117,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - - $(LIBREG): regdb.h reglib.h reglib.c - $(NQ) ' CC ' $@ -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS)) - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' --- -2.3.1 - diff --git a/net-wireless/crda/files/crda-no-ldconfig.patch b/net-wireless/crda/files/crda-no-ldconfig.patch deleted file mode 100644 index a5cc42084d53..000000000000 --- a/net-wireless/crda/files/crda-no-ldconfig.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b11d83df189670defe4a29c624f2930351c13df2 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Wed, 4 Mar 2015 13:56:36 -0500 -Subject: [PATCH] do not run ldconfig - -Let the distro/user deal with ldconfig updating. Running it blindly like -this breaks DESTDIR installs as `ldconfig` only operates on system paths. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a3ead30..46c683d 100644 ---- a/Makefile -+++ b/Makefile -@@ -127,7 +127,6 @@ install-libreg: - $(NQ) ' INSTALL libreg' - $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ -- $(Q)ldconfig - - %.o: %.c regdb.h $(LIBREG) - $(NQ) ' CC ' $@ --- -2.3.1 - diff --git a/net-wireless/crda/files/crda-no-werror.patch b/net-wireless/crda/files/crda-no-werror.patch deleted file mode 100644 index 6abb78c984e4..000000000000 --- a/net-wireless/crda/files/crda-no-werror.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 37384d22ba0ab622a5848a9a794084e6064fc905 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Wed, 4 Mar 2015 14:03:44 -0500 -Subject: [PATCH] allow people to turn off -Werror - -Forcing -Werror at build time easily breaks across compiler settings, -compiler versions, architectures, C libraries, etc... Add a knob so -distro peeps can turn it off. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 46c683d..5f988f4 100644 ---- a/Makefile -+++ b/Makefile -@@ -25,8 +25,9 @@ UDEV_RULE_DIR?=/lib/udev/rules.d/ - PUBKEY_DIR?=pubkeys - RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys - -+WERROR = -Werror - CFLAGS += -O2 -fpic --CFLAGS += -std=gnu99 -Wall -Werror -pedantic -+CFLAGS += -std=gnu99 -Wall $(WERROR) -pedantic - CFLAGS += -Wall -g - LDLIBREG += -lreg - LDLIBS += $(LDLIBREG) --- -2.3.1 - diff --git a/net-wireless/crda/metadata.xml b/net-wireless/crda/metadata.xml deleted file mode 100644 index f7a0690daf3b..000000000000 --- a/net-wireless/crda/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - </maintainer> - <use> - <flag name="gcrypt">Use libgcrypt instead of openssl for key checking</flag> - </use> -</pkgmetadata> diff --git a/net-wireless/dump1090/dump1090-6.1.ebuild b/net-wireless/dump1090/dump1090-6.1.ebuild index 04ee546dcf91..0d8aaf94604b 100644 --- a/net-wireless/dump1090/dump1090-6.1.ebuild +++ b/net-wireless/dump1090/dump1090-6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,6 +28,10 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-6.1-libdir.patch +) + src_prepare() { default sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die diff --git a/net-wireless/dump1090/files/dump1090-6.1-libdir.patch b/net-wireless/dump1090/files/dump1090-6.1-libdir.patch new file mode 100644 index 000000000000..b55fa95d2ea3 --- /dev/null +++ b/net-wireless/dump1090/files/dump1090-6.1-libdir.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile b/Makefile +index d4a5ff6..5d69505 100644 +--- a/Makefile ++++ b/Makefile +@@ -99,9 +99,9 @@ ifeq ($(RTLSDR), yes) + ifdef RTLSDR_PREFIX + CPPFLAGS += -I$(RTLSDR_PREFIX)/include + ifeq ($(STATIC), yes) +- LIBS_SDR += -L$(RTLSDR_PREFIX)/lib -Wl,-Bstatic -lrtlsdr -Wl,-Bdynamic $(LIBS_USB) ++ LIBS_SDR += -Wl,-Bstatic -lrtlsdr -Wl,-Bdynamic $(LIBS_USB) + else +- LIBS_SDR += -L$(RTLSDR_PREFIX)/lib -lrtlsdr $(LIBS_USB) ++ LIBS_SDR += -lrtlsdr $(LIBS_USB) + endif + else + # some packaged .pc files are massively broken, try to handle it diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest index b80dfc7b5403..69b8a0e4dfbc 100644 --- a/net-wireless/gnome-bluetooth/Manifest +++ b/net-wireless/gnome-bluetooth/Manifest @@ -1 +1,2 @@ -DIST gnome-bluetooth-3.34.5.tar.xz 353936 BLAKE2B 40300752830f71d436591e22a64a282745d8419ee46de534f76c4871a86a4c8f7b2203e3ddc4ca08d26348b97bf4a68315802ffa09c69265c55001e4806c7f1e SHA512 48431b3d19083705a6623442c5cd2d6c14962cdf30fc599ba47dceb6612b80142af77e1b6df142b530cb1015638081a06de38a3034177e0d05a354c40f19d9e5 +DIST gnome-bluetooth-42.7.tar.xz 304736 BLAKE2B 6b3eed3d93184c01a98307458ac1570ce97b46fea116d24ec54aa499aa45ce3245cb7982d8fda01d731ff0455b450c6513a86d52a6f7d7ee724726e476ddfd78 SHA512 dcbc5f54c2eb9eea29fea91e3c2c60ab3b6bf23effbe79df54dfc91834dda10fef144fb3abf6dc8a4651b5cc18bc666d4ab0574be793d31d199d1514e96c2a59 +DIST gnome-bluetooth-42.8.tar.xz 304908 BLAKE2B c487e0c278b316ecdcbdd39421389ce95024b06bf0e350d59dcac06d7a7e8b982da12b1088701e479d0b5c64b123899a5351a00c477208946bb1f44f3c8f30a6 SHA512 1c3d1db874b54ebae3cf59e526db8ff71131daea0c994abeefd95b51abf590bbba0baa8314ebbd1d3efe7973021327c7b8257163ed8f0567fe610b4e0c3dba88 diff --git a/net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules b/net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules deleted file mode 100644 index 506574082122..000000000000 --- a/net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules +++ /dev/null @@ -1,11 +0,0 @@ -# Get access to /dev/rfkill for users -# See https://bugzilla.redhat.com/show_bug.cgi?id=514798 -# -# Updated for udev >= 154 -# http://bugs.debian.org/582188 -# https://bugzilla.redhat.com/show_bug.cgi?id=588660 - -ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end" -ACTION!="add|change", GOTO="gnome_bluetooth_end" -KERNEL=="rfkill", GROUP="plugdev", MODE="0664", TAG+="udev-acl" -LABEL="gnome_bluetooth_end" diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.7.ebuild index a1ab5dbfcbec..8949df16f0f7 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.7.ebuild @@ -1,33 +1,37 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -inherit gnome.org gnome2-utils meson python-any-r1 udev xdg +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +inherit gnome.org meson python-any-r1 xdg DESCRIPTION="Bluetooth graphical utilities integrated with GNOME" HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth" LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" -SLOT="2/13" # subslot = libgnome-bluetooth soname version -IUSE="gtk-doc +introspection test" +SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version +IUSE="gtk-doc +introspection sendto test" RESTRICT="!test? ( test )" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" DEPEND=" >=dev-libs/glib-2.44:2 - >=x11-libs/gtk+-3.12:3[introspection?] - media-libs/libcanberra[gtk3] + >=gui-libs/gtk-4.4:4[introspection?] + media-libs/gsound + >=gui-libs/libadwaita-1.1:1 >=x11-libs/libnotify-0.7.0 - virtual/libudev + virtual/libudev:= + >=sys-power/upower-0.99.14:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) " RDEPEND="${DEPEND} acct-group/plugdev virtual/udev >=net-wireless/bluez-5 + sendto? ( !net-wireless/gnome-bluetooth:2 ) " BDEPEND=" + ${PYTHON_DEPS} dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils @@ -35,7 +39,7 @@ BDEPEND=" virtual/pkgconfig test? ( $(python_gen_any_dep ' - dev-python/python-dbusmock[${PYTHON_USEDEP}] + >=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}] dev-python/dbus-python[${PYTHON_USEDEP}] ') ) @@ -43,33 +47,25 @@ BDEPEND=" python_check_deps() { if use test; then - has_version -b "dev-python/python-dbusmock[${PYTHON_USEDEP}]" && - has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" + python_has_version ">=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]" && + python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" fi } pkg_setup() { - use test && python-any-r1_pkg_setup + # Check for python is unconditional + python-any-r1_pkg_setup } src_configure() { local emesonargs=( - -Dicon_update=false + $(meson_use sendto) $(meson_use gtk-doc gtk_doc) $(meson_use introspection) ) meson_src_configure } -src_install() { - meson_src_install - udev_dorules "${FILESDIR}"/61-${PN}.rules -} - pkg_postinst() { xdg_pkg_postinst - if ! has_version 'sys-apps/systemd[acl]' ; then - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to control bluetooth transmitter." - fi } diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.8.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.8.ebuild new file mode 100644 index 000000000000..bb80dbb3a638 --- /dev/null +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.8.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +inherit gnome.org gnome2-utils meson python-any-r1 xdg + +DESCRIPTION="Bluetooth graphical utilities integrated with GNOME" +HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth" + +LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" +SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version +IUSE="gtk-doc +introspection sendto test" +RESTRICT="!test? ( test )" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-libs/glib-2.44:2 + >=gui-libs/gtk-4.4:4[introspection?] + media-libs/gsound + >=gui-libs/libadwaita-1.1:1 + >=x11-libs/libnotify-0.7.0 + virtual/libudev:= + >=sys-power/upower-0.99.14:= + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +RDEPEND="${DEPEND} + acct-group/plugdev + virtual/udev + >=net-wireless/bluez-5 + sendto? ( !net-wireless/gnome-bluetooth:2 ) +" +BDEPEND=" + ${PYTHON_DEPS} + dev-libs/libxml2:2 + dev-util/gdbus-codegen + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.9 ) + virtual/pkgconfig + test? ( + $(python_gen_any_dep ' + >=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + ') + ) +" + +python_check_deps() { + if use test; then + python_has_version ">=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]" && + python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + # Check for python is unconditional + python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_use sendto) + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + ) + meson_src_configure +} + +src_test() { + # Workaround test failures caused by flatpak being installed that adds to XDG_DATA_DIRS + gnome2_environment_reset + export XDG_DATA_DIRS="${EPREFIX}"/usr/share + + meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst +} diff --git a/net-wireless/gnome-bluetooth/metadata.xml b/net-wireless/gnome-bluetooth/metadata.xml index 7b343b06be8a..ee2f33268bb2 100644 --- a/net-wireless/gnome-bluetooth/metadata.xml +++ b/net-wireless/gnome-bluetooth/metadata.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="sendto">Build the bluetooth-sendto application to send files to various locations/devices</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gnome-bluetooth</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 1ba5c22b436d..a4b6695b28f1 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1 +1 @@ -DIST gnuradio-3.8.4.0.tar.gz 3395297 BLAKE2B 454724e61306bee4991f8a44c80963080b632f767cbb70e00ee518aa096f150a9bb5c29304b9c30a84ab537b8b19ccd2955806fadb88a6cc4d24a8531e8c0127 SHA512 80d34c6351947f45decf8ba09288d4fc4c411c8d286d2765fad59da421b99c15a4c7b7c25a17c89dacfafd872f13ba8d9a8d84d89a35568e5b088f77fcaaae67 +DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd diff --git a/net-wireless/gnuradio/files/PR7093.patch b/net-wireless/gnuradio/files/PR7093.patch new file mode 100644 index 000000000000..98581054d49d --- /dev/null +++ b/net-wireless/gnuradio/files/PR7093.patch @@ -0,0 +1,76 @@ +From 677d22b5226a3edb274c252cc3aa727a16de3c68 Mon Sep 17 00:00:00 2001 +From: Clayton Smith <argilo@gmail.com> +Date: Tue, 23 Jan 2024 18:28:46 -0500 +Subject: [PATCH] filter: Fix undefined behaviour in fir_filter_with_buffer + +Signed-off-by: Clayton Smith <argilo@gmail.com> +--- + gr-filter/lib/fir_filter_with_buffer.cc | 9 ++++++--- + gr-filter/lib/qa_fir_filter_with_buffer.cc | 6 +++--- + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc +index 4fc571ec57d..f6cb3b20854 100644 +--- a/gr-filter/lib/fir_filter_with_buffer.cc ++++ b/gr-filter/lib/fir_filter_with_buffer.cc +@@ -52,7 +52,8 @@ void fir_filter_with_buffer_fff::set_taps(const std::vector<float>& taps) + for (int i = 0; i < d_naligned; i++) { + d_aligned_taps[i].clear(); + d_aligned_taps[i].resize(d_ntaps + d_naligned - 1); +- std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]); ++ std::copy( ++ std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i); + } + + d_idx = 0; +@@ -157,7 +158,8 @@ void fir_filter_with_buffer_ccc::set_taps(const std::vector<gr_complex>& taps) + for (int i = 0; i < d_naligned; i++) { + d_aligned_taps[i].clear(); + d_aligned_taps[i].resize(d_ntaps + d_naligned - 1); +- std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]); ++ std::copy( ++ std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i); + } + + d_idx = 0; +@@ -261,7 +263,8 @@ void fir_filter_with_buffer_ccf::set_taps(const std::vector<float>& taps) + for (int i = 0; i < d_naligned; i++) { + d_aligned_taps[i].clear(); + d_aligned_taps[i].resize(d_ntaps + d_naligned - 1); +- std::copy(std::begin(d_taps), std::end(d_taps), &d_aligned_taps[i][i]); ++ std::copy( ++ std::begin(d_taps), std::end(d_taps), std::begin(d_aligned_taps[i]) + i); + } + + d_idx = 0; +diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc +index 32f5c6780fc..72cdd9fa1c0 100644 +--- a/gr-filter/lib/qa_fir_filter_with_buffer.cc ++++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc +@@ -107,7 +107,7 @@ void test_decimate(unsigned int decimate) + } + + // build filter +- vector<tap_type> f1_taps(&taps[0], &taps[n]); ++ vector<tap_type> f1_taps(taps.begin(), taps.begin() + n); + kernel::fir_filter_with_buffer_fff f1(f1_taps); + + // zero the output, then do the filtering +@@ -198,7 +198,7 @@ void test_decimate(unsigned int decimate) + } + + // build filter +- vector<tap_type> f1_taps(&taps[0], &taps[n]); ++ vector<tap_type> f1_taps(taps.begin(), taps.begin() + n); + kernel::fir_filter_with_buffer_ccc f1(f1_taps); + + // zero the output, then do the filtering +@@ -287,7 +287,7 @@ void test_decimate(unsigned int decimate) + } + + // build filter +- vector<tap_type> f1_taps(&taps[0], &taps[n]); ++ vector<tap_type> f1_taps(taps.begin(), taps.begin() + n); + kernel::fir_filter_with_buffer_ccf f1(f1_taps); + + // zero the output, then do the filtering diff --git a/net-wireless/gnuradio/gnuradio-3.8.4.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild index 9f0a184fbeca..407afc6b82ff 100644 --- a/net-wireless/gnuradio/gnuradio-3.8.4.0.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) CMAKE_BUILD_TYPE="None" -inherit cmake python-single-r1 virtualx xdg-utils +inherit cmake desktop python-single-r1 virtualx xdg-utils DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" HOMEPAGE="https://www.gnuradio.org/" @@ -14,18 +14,16 @@ SLOT="0/${PV}" if [[ ${PV} =~ "9999" ]]; then EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git" - EGIT_BRANCH="maint-3.8" + EGIT_BRANCH="maint-3.10" inherit git-r3 else SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi -IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq" +IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq" -#RESTRICT="!test? ( test )" -#Tests are known broken right now -RESTRICT="test" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} audio? ( || ( alsa oss jack portaudio ) ) @@ -46,19 +44,28 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} " RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]') + $(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]') + dev-libs/gmp:= dev-libs/log4cpp:= - $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]') + $(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]') + dev-libs/spdlog:= + dev-libs/libfmt:= sci-libs/fftw:3.0= - sci-libs/mpir:= sci-libs/volk:= + media-libs/libsndfile + sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) - ctrlport? ( $(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]') ) + ctrlport? ( + $(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]') + ) fec? ( sci-libs/gsl:= dev-python/scipy ) - filter? ( dev-python/scipy ) + filter? ( + dev-python/scipy + $(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]') + ) grc? ( $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] @@ -67,15 +74,23 @@ RDEPEND="${PYTHON_DEPS} x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) + iio? ( + net-libs/libiio:= + net-libs/libad9361-iio:= + !net-wireless/gr-iio + ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( $(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]') dev-qt/qtcore:5 dev-qt/qtgui:5 - x11-libs/qwt:6[qt5(+)] + x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) + soapy? ( + $(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]') + ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( @@ -93,28 +108,28 @@ RDEPEND="${PYTHON_DEPS} ) wavelet? ( sci-libs/gsl:= - dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) " -#That's right, it can't build if gnuradio 3.7 is installed -#Both due to build failure, and then file collision due to bundled volk DEPEND="${RDEPEND} - !!<net-wireless/gnuradio-3.8 app-text/docbook-xml-dtd:4.2 - >=dev-lang/swig-3.0.5 + $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') virtual/pkgconfig doc? ( - >=app-doc/doxygen-1.5.7.1 + >=app-text/doxygen-1.5.7.1 + <dev-libs/mathjax-3 ) grc? ( x11-misc/xdg-utils ) + modtool? ( $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) " +PATCHES=( "${FILESDIR}/PR7093.patch" ) + src_prepare() { xdg_environment_reset #534582 @@ -127,39 +142,43 @@ src_prepare() { } src_configure() { - mycmakeargs=( + local mycmakeargs=( -DENABLE_DEFAULT=OFF - -DENABLE_VOLK=OFF - -DENABLE_INTERNAL_VOLK=OFF -DENABLE_GNURADIO_RUNTIME=ON -DENABLE_PYTHON=ON -DENABLE_GR_BLOCKS=ON - -DENABLE_GR_FFT=ON - -DENABLE_GR_AUDIO=ON -DENABLE_GR_ANALOG="$(usex analog)" + -DENABLE_GR_AUDIO=ON -DENABLE_GR_CHANNELS="$(usex channels)" -DENABLE_GR_CTRLPORT="$(usex ctrlport)" -DENABLE_GR_DIGITAL="$(usex digital)" -DENABLE_DOXYGEN="$(usex doc)" -DENABLE_GR_DTV="$(usex dtv)" -DENABLE_GR_FEC="$(usex fec)" + -DENABLE_GR_FFT=ON -DENABLE_GR_FILTER="$(usex filter)" -DENABLE_GRC="$(usex grc)" + -DENABLE_GR_IIO="$(usex iio)" -DENABLE_GR_MODTOOL="$(usex modtool)" + -DENABLE_GR_BLOCKTOOL="$(usex modtool)" + -DENABLE_GR_NETWORK="$(usex network)" + -DENABLE_GR_PDU=ON -DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)" -DENABLE_TESTING="$(usex test)" + -DENABLE_GR_QTGUI="$(usex qt5)" + -DENABLE_GR_SOAPY="$(usex soapy)" -DENABLE_GR_TRELLIS="$(usex trellis)" -DENABLE_GR_UHD="$(usex uhd)" -DENABLE_GR_UTILS="$(usex utils)" + -DENABLE_GR_VIDEO_SDL="$(usex sdl)" -DENABLE_GR_VOCODER="$(usex vocoder)" -DENABLE_GR_WAVELET="$(usex wavelet)" - -DENABLE_GR_QTGUI="$(usex qt5)" - -DENABLE_GR_VIDEO_SDL="$(usex sdl)" -DENABLE_GR_ZEROMQ="$(usex zeromq)" -DSYSCONFDIR="${EPREFIX}"/etc -DPYTHON_EXECUTABLE="${PYTHON}" -DGR_PYTHON_DIR="$(python_get_sitedir)" -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DMATHJAX2_ROOT="${EPREFIX}/usr/share/mathjax" ) cmake_src_configure } @@ -186,14 +205,16 @@ src_install() { rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die # Install icons, menu items and mime-types for GRC - #if use grc ; then - # local fd_path="${S}/grc/scripts/freedesktop" - # insinto /usr/share/mime/packages - # doins "${fd_path}/${PN}-grc.xml" - - # domenu "${fd_path}/"*.desktop - # doicon "${fd_path}/"*.png - #fi + if use grc ; then + local fd_path="${S}/grc/scripts/freedesktop" + insinto /usr/share/mime/packages + doins "${fd_path}/${PN}-grc.xml" + + domenu "${fd_path}/${PN}-grc.desktop" + for size in 16 24 32 48 64 128 256; do + newicon -s $size "${fd_path}/"grc-icon-$size.png ${PN}-grc.png + done + fi python_fix_shebang "${ED}" # Remove incorrectly byte-compiled Python files and replace @@ -202,7 +223,8 @@ src_install() { } src_test() { - virtx cmake_src_test + # skip test which needs internet + virtx cmake_src_test -E metainfo_test --output-on-failure } pkg_postinst() { diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index c7bc68e24c4f..04191082fbfe 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) CMAKE_BUILD_TYPE="None" -inherit cmake python-single-r1 virtualx xdg-utils desktop +inherit cmake desktop python-single-r1 virtualx xdg-utils DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" HOMEPAGE="https://www.gnuradio.org/" @@ -14,18 +14,16 @@ SLOT="0/${PV}" if [[ ${PV} =~ "9999" ]]; then EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git" - EGIT_BRANCH="maint-3.8" + EGIT_BRANCH="maint-3.10" inherit git-r3 else - SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi -IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq" +IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq" -#RESTRICT="!test? ( test )" -#Tests are known broken right now -RESTRICT="test" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} audio? ( || ( alsa oss jack portaudio ) ) @@ -46,18 +44,28 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} " RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]') + $(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]') + dev-libs/gmp:= dev-libs/log4cpp:= - $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]') + $(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]') + dev-libs/spdlog:= + dev-libs/libfmt:= sci-libs/fftw:3.0= - sci-libs/mpir:= sci-libs/volk:= + media-libs/libsndfile + sys-libs/libunwind alsa? ( media-libs/alsa-lib:= ) + ctrlport? ( + $(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]') + ) fec? ( sci-libs/gsl:= dev-python/scipy ) - filter? ( dev-python/scipy ) + filter? ( + dev-python/scipy + $(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]') + ) grc? ( $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] @@ -66,15 +74,23 @@ RDEPEND="${PYTHON_DEPS} x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) + iio? ( + net-libs/libiio:= + net-libs/libad9361-iio:= + !net-wireless/gr-iio + ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( $(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]') dev-qt/qtcore:5 dev-qt/qtgui:5 - x11-libs/qwt:6[qt5(+)] + x11-libs/qwt:6=[qt5(+)] dev-qt/qtwidgets:5 ) + soapy? ( + $(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]') + ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( @@ -88,27 +104,25 @@ RDEPEND="${PYTHON_DEPS} ) vocoder? ( media-sound/gsm - >=media-libs/codec2-0.8.1 + >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= - dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) " -#That's right, it can't build if gnuradio 3.7 is installed -#Both due to build failure, and then file collision due to bundled volk DEPEND="${RDEPEND} - !<net-wireless/gnuradio-3.8 app-text/docbook-xml-dtd:4.2 - >=dev-lang/swig-3.0.5 + $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') virtual/pkgconfig doc? ( - >=app-doc/doxygen-1.5.7.1 + >=app-text/doxygen-1.5.7.1 + <dev-libs/mathjax-3 ) grc? ( x11-misc/xdg-utils ) + modtool? ( $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) @@ -126,38 +140,43 @@ src_prepare() { } src_configure() { - mycmakeargs=( + local mycmakeargs=( -DENABLE_DEFAULT=OFF - -DENABLE_VOLK=OFF - -DENABLE_INTERNAL_VOLK=OFF -DENABLE_GNURADIO_RUNTIME=ON -DENABLE_PYTHON=ON -DENABLE_GR_BLOCKS=ON - -DENABLE_GR_FFT=ON - -DENABLE_GR_AUDIO=ON -DENABLE_GR_ANALOG="$(usex analog)" + -DENABLE_GR_AUDIO=ON -DENABLE_GR_CHANNELS="$(usex channels)" + -DENABLE_GR_CTRLPORT="$(usex ctrlport)" -DENABLE_GR_DIGITAL="$(usex digital)" -DENABLE_DOXYGEN="$(usex doc)" -DENABLE_GR_DTV="$(usex dtv)" -DENABLE_GR_FEC="$(usex fec)" + -DENABLE_GR_FFT=ON -DENABLE_GR_FILTER="$(usex filter)" -DENABLE_GRC="$(usex grc)" + -DENABLE_GR_IIO="$(usex iio)" -DENABLE_GR_MODTOOL="$(usex modtool)" + -DENABLE_GR_BLOCKTOOL="$(usex modtool)" + -DENABLE_GR_NETWORK="$(usex network)" + -DENABLE_GR_PDU=ON -DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)" -DENABLE_TESTING="$(usex test)" + -DENABLE_GR_QTGUI="$(usex qt5)" + -DENABLE_GR_SOAPY="$(usex soapy)" -DENABLE_GR_TRELLIS="$(usex trellis)" -DENABLE_GR_UHD="$(usex uhd)" -DENABLE_GR_UTILS="$(usex utils)" + -DENABLE_GR_VIDEO_SDL="$(usex sdl)" -DENABLE_GR_VOCODER="$(usex vocoder)" -DENABLE_GR_WAVELET="$(usex wavelet)" - -DENABLE_GR_QTGUI="$(usex qt5)" - -DENABLE_GR_VIDEO_SDL="$(usex sdl)" -DENABLE_GR_ZEROMQ="$(usex zeromq)" -DSYSCONFDIR="${EPREFIX}"/etc -DPYTHON_EXECUTABLE="${PYTHON}" -DGR_PYTHON_DIR="$(python_get_sitedir)" -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DMATHJAX2_ROOT="${EPREFIX}/usr/share/mathjax" ) cmake_src_configure } @@ -189,18 +208,21 @@ src_install() { insinto /usr/share/mime/packages doins "${fd_path}/${PN}-grc.xml" - domenu "${fd_path}/"*.desktop - doicon "${fd_path}/"*.png + domenu "${fd_path}/${PN}-grc.desktop" + for size in 16 24 32 48 64 128 256; do + newicon -s $size "${fd_path}/"grc-icon-$size.png ${PN}-grc.png + done fi python_fix_shebang "${ED}" # Remove incorrectly byte-compiled Python files and replace - find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die + find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die python_optimize } src_test() { - virtx cmake_src_test + # skip test which needs internet + virtx cmake_src_test -E metainfo_test --output-on-failure } pkg_postinst() { diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml index fdcbd394e398..619ce7994007 100644 --- a/net-wireless/gnuradio/metadata.xml +++ b/net-wireless/gnuradio/metadata.xml @@ -15,8 +15,11 @@ <flag name="fec">enable block for convolutional encoding using the CCSDS standard polynomial ("Voyager")</flag> <flag name="filter">enable filter signal processing blocks</flag> <flag name="grc">enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag> + <flag name="iio">enable enable support for IIO devices</flag> <flag name="modtool">enable modtool for editing GNU Radio modules and components</flag> + <flag name="network">enable block for networking support</flag> <flag name="performance-counters">enable block performance counters</flag> + <flag name="soapy">enable support for SoapySDR blocks</flag> <flag name="trellis">enable trellis blocks for FSM</flag> <flag name="uhd">install UHD source and sink blocks</flag> <flag name="utils">install scripts to enable viewing and analysis of files produced by flow graphs</flag> diff --git a/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild b/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild index e82cf16252f2..1dd0562fa966 100644 --- a/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild +++ b/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit multilib udev +inherit udev DESCRIPTION="gobi_loader is a firmware loader for Qualcomm Gobi USB chipsets" HOMEPAGE="https://www.codon.org.uk/~mjg59/gobi_loader/" diff --git a/net-wireless/gqrx-scanner/Manifest b/net-wireless/gqrx-scanner/Manifest index 2fcbb5d6a380..9668830f3dc2 100644 --- a/net-wireless/gqrx-scanner/Manifest +++ b/net-wireless/gqrx-scanner/Manifest @@ -1 +1 @@ -DIST gqrx-scanner-1.0.2.tar.gz 18068 BLAKE2B e03a25cebe40d0a27c50ce0ae18303aea9b5b4b1a429a2026884e1731566fd198cdbf00e82ba4eb1487ad81c945399593f89e96a7d04777f87a4e26fe2fe5293 SHA512 a7f6b24154bf9355080df48dddb8ea4dbf7f145aed338973b7ba06584f8576ec691cb5c0e379750cbc91c572ca94e0edd4f4e8867866352a66b9aedf61d62dab +DIST gqrx-scanner-1.0.4.tar.gz 18602 BLAKE2B 6c45424a08f7c192ff09712d809fcacf6a99fcfb370039321ebddf9d4a357c56eba2cf040661bcc212b47ad61227965c7654cc035b3122249faed8c90a4d3b04 SHA512 9c47686ae38927193f5689f6f946f6ef28798823ecebeec075f852566dcf118cf46fd4c138116071c60fa2d926673962517900758d73f9e5c53637e5fe3d7139 diff --git a/net-wireless/gqrx-scanner/gqrx-scanner-1.0.2.ebuild b/net-wireless/gqrx-scanner/gqrx-scanner-1.0.4.ebuild index c81e152f8c17..f88678e92090 100644 --- a/net-wireless/gqrx-scanner/gqrx-scanner-1.0.2.ebuild +++ b/net-wireless/gqrx-scanner/gqrx-scanner-1.0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -11,10 +11,7 @@ SRC_URI="https://github.com/neural75/gqrx-scanner/archive/v${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~riscv ~x86" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" -PDEPEND="net-wireless/gqrx" +RDEPEND="net-wireless/gqrx" diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest index c3b71ff40c63..d3c03753c7f7 100644 --- a/net-wireless/gqrx/Manifest +++ b/net-wireless/gqrx/Manifest @@ -1 +1,2 @@ -DIST gqrx-2.14.6.tar.gz 1346684 BLAKE2B fd31692ad0dfcb3eaa3ea0ca8a9a26282ae45c290997b016f0a9f7e750969f42b2084619efd342da8c28d608da1cd3477c2c1cb6cc334f9d53f74dbff4e5d0c5 SHA512 d8019a6094da1f6d63eda08b9f22390dd638eb191910d911437e46f40d81087b3c68f3948ccb9060025a91cd1e1d4e1be42d92ccdf8869f5588ac7d428e5489d +DIST gqrx-2.16.tar.gz 3608271 BLAKE2B 0523be1f678c8966a0f973776ed4db71b9856334df528996a1790f74454124e72a3cbe51ae75dae3b5d02794a5dde8c0d06a0ea69d5886bd5678f630504c84df SHA512 b2a2035f22b927667dd36e838dedc3db119c916eea0b9c70f37f5f6c1826ce04f05de6c459aeb84cf71bca39c036e96380b8c9531ad035558de7759864ac8569 +DIST gqrx-2.17.2.tar.gz 3620793 BLAKE2B a8354212c5084160315581840a19a28f737d2492f16aad2f58f4e508e0ac4dfda7fa139eccd38694ebd0777a4c2062f984840baa2cc2313524e0566e695dc638 SHA512 7e387dd909d0dda710e8fb7766bcd6f26abc2a6bef73d2bdf4d9c96b8cf698d3b6c6c1b2fbd51e91f907f446bb1e551b9fb99503851e02777599193717a72e35 diff --git a/net-wireless/gqrx/gqrx-2.14.6.ebuild b/net-wireless/gqrx/gqrx-2.16.ebuild index ff4d8f5d0842..2cf2b96d63cd 100644 --- a/net-wireless/gqrx/gqrx-2.14.6.ebuild +++ b/net-wireless/gqrx/gqrx-2.16.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -9,11 +9,11 @@ DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt" HOMEPAGE="https://gqrx.dk/" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/csete/gqrx.git" + EGIT_REPO_URI="https://github.com/gqrx-sdr/gqrx.git" inherit git-r3 else - SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="https://github.com/gqrx-sdr/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-3" @@ -21,19 +21,22 @@ SLOT="0" IUSE="gr-audio portaudio pulseaudio" REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )" -DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] +RDEPEND=" + >=net-wireless/gnuradio-3.10:0=[audio,analog,filter,network] >=net-wireless/gr-osmosdr-0.1.0:= - dev-libs/boost:= - dev-libs/log4cpp:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sci-libs/volk:= - pulseaudio? ( media-sound/pulseaudio:= ) + pulseaudio? ( media-libs/libpulse ) portaudio? ( media-libs/portaudio:= )" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + dev-libs/boost:= + dev-libs/log4cpp:= +" +BDEPEND="" src_configure() { if use pulseaudio; then diff --git a/net-wireless/gqrx/gqrx-2.17.2.ebuild b/net-wireless/gqrx/gqrx-2.17.2.ebuild new file mode 100644 index 000000000000..eaecd1663e78 --- /dev/null +++ b/net-wireless/gqrx/gqrx-2.17.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt" +HOMEPAGE="https://gqrx.dk/" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/gqrx-sdr/gqrx.git" + inherit git-r3 +else + SRC_URI="https://github.com/gqrx-sdr/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="gr-audio portaudio pulseaudio qt6" +REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )" + +RDEPEND=" + >=net-wireless/gnuradio-3.10:0=[audio,analog,filter,network] + >=net-wireless/gr-osmosdr-0.1.0:= + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtsvg:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + ) + sci-libs/volk:= + pulseaudio? ( media-libs/libpulse ) + portaudio? ( media-libs/portaudio:= )" +DEPEND="${RDEPEND} + dev-libs/boost:= + dev-libs/log4cpp:= +" +BDEPEND="" + +src_configure() { + if use pulseaudio; then + LINUX_AUDIO_BACKEND=Pulseaudio + elif use portaudio; then + LINUX_AUDIO_BACKEND=Portaudio + elif use gr-audio; then + LINUX_AUDIO_BACKEND=Gr-audio + fi + + local mycmakeargs=( + -DFORCE_QT6="$(usex qt6)" + -DFORCE_QT5="$(usex !qt6)" + "-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}" + ) + cmake_src_configure +} + +src_install() { + dobin "${BUILD_DIR}"/src/gqrx +} diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild index ff4d8f5d0842..eaecd1663e78 100644 --- a/net-wireless/gqrx/gqrx-9999.ebuild +++ b/net-wireless/gqrx/gqrx-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -9,31 +9,40 @@ DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt" HOMEPAGE="https://gqrx.dk/" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/csete/gqrx.git" + EGIT_REPO_URI="https://github.com/gqrx-sdr/gqrx.git" inherit git-r3 else - SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="https://github.com/gqrx-sdr/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-3" SLOT="0" -IUSE="gr-audio portaudio pulseaudio" +IUSE="gr-audio portaudio pulseaudio qt6" REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )" -DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] +RDEPEND=" + >=net-wireless/gnuradio-3.10:0=[audio,analog,filter,network] >=net-wireless/gr-osmosdr-0.1.0:= - dev-libs/boost:= - dev-libs/log4cpp:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 + qt6? ( + dev-qt/qtbase:6 + dev-qt/qtsvg:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + ) sci-libs/volk:= - pulseaudio? ( media-sound/pulseaudio:= ) + pulseaudio? ( media-libs/libpulse ) portaudio? ( media-libs/portaudio:= )" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + dev-libs/boost:= + dev-libs/log4cpp:= +" +BDEPEND="" src_configure() { if use pulseaudio; then @@ -45,6 +54,8 @@ src_configure() { fi local mycmakeargs=( + -DFORCE_QT6="$(usex qt6)" + -DFORCE_QT5="$(usex !qt6)" "-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}" ) cmake_src_configure diff --git a/net-wireless/gqrx/metadata.xml b/net-wireless/gqrx/metadata.xml index 32b6803fdaea..d9c43c9d0981 100644 --- a/net-wireless/gqrx/metadata.xml +++ b/net-wireless/gqrx/metadata.xml @@ -13,6 +13,6 @@ <flag name="gr-audio">Use audio support from <pkg>net-wireless/gnuradio</pkg></flag> </use> <upstream> - <remote-id type="github">csete/gqrx</remote-id> + <remote-id type="github">gqrx-sdr/gqrx</remote-id> </upstream> </pkgmetadata> diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest index 38844029068b..d7d0deab500c 100644 --- a/net-wireless/gr-ieee802154/Manifest +++ b/net-wireless/gr-ieee802154/Manifest @@ -1 +1 @@ -DIST gr-ieee802154-0.0_p20200812.tar.gz 94491 BLAKE2B bfea628afb191fa88b2ffba7b99bccb05c5bc22e4799db85082ec5d0f1ccb98826a1aca728e8e5c096cd78d11ea7cf2b8ddf46b1783b33f2bd87da75d8f25c84 SHA512 5e012980436b7fff7226bbd9897b0eeceff60fa678fb41c4a83e59cd10b8d441eda2b378fa5d5767e0f24980863a6a756f5457e5cae346827481eb089fa719a9 +DIST gr-ieee802154-0.0_p20210719.tar.gz 155040 BLAKE2B c198de71391ddc2ad32255476b8b9ba0e13bd3eb3c674b21846174cd3d8804c68e407f4e019cc164b1d10eae5ee672ae31a5f23a450d08abd477aa244ef479fb SHA512 77f746832bfaec53ad6439b69de8712fb444d7b45fdc9937445c6df5d6a5a9a19363ab180c063b6c0647dff8c0404797d190730124a2248418e0fee5daff26f7 diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild index f58d5031539e..3965c4c7a1e3 100644 --- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20200812.ebuild +++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 @@ -12,8 +12,9 @@ HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4" if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git" + EGIT_BRANCH="maint-3.9" else - COMMIT="c5e55146fadffa9288ed6de52c6c3ccc936688af" + COMMIT="1a2999ce2778df279870f028a4ce15d94e60fbd9" SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}" KEYWORDS="~amd64 ~x86" @@ -22,15 +23,17 @@ fi LICENSE="GPL-3" SLOT="0/${PV}" -RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] +RDEPEND="net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' - dev-libs/boost:=[${PYTHON_USEDEP}] + dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] ') dev-libs/gmp + dev-libs/spdlog:= sci-libs/volk:= ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - dev-lang/swig:0" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/swig" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -44,7 +47,7 @@ src_prepare() { } src_configure() { - mycmakeargs=( + local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" -DGR_PKG_DOC_DIR="/usr/share/doc/${P}" ) @@ -53,5 +56,8 @@ src_configure() { src_install() { cmake_src_install + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || die python_optimize } diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild index f58d5031539e..3f784616f50d 100644 --- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild +++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 @@ -12,8 +12,9 @@ HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4" if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git" + EGIT_BRANCH="maint-3.9" else - COMMIT="c5e55146fadffa9288ed6de52c6c3ccc936688af" + COMMIT="1a2999ce2778df279870f028a4ce15d94e60fbd9" SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}" KEYWORDS="~amd64 ~x86" @@ -22,15 +23,17 @@ fi LICENSE="GPL-3" SLOT="0/${PV}" -RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] +RDEPEND="net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' - dev-libs/boost:=[${PYTHON_USEDEP}] + dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] ') - dev-libs/gmp + dev-libs/gmp:= + dev-libs/spdlog:= sci-libs/volk:= ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - dev-lang/swig:0" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/swig" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -44,7 +47,7 @@ src_prepare() { } src_configure() { - mycmakeargs=( + local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" -DGR_PKG_DOC_DIR="/usr/share/doc/${P}" ) @@ -53,5 +56,8 @@ src_configure() { src_install() { cmake_src_install + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || die python_optimize } diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest deleted file mode 100644 index cd98bcee556d..000000000000 --- a/net-wireless/gr-iio/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gr-iio-0.3_p20191219.tar.gz 56149 BLAKE2B 9f95d3eadd1e7c87145093571442064d66a9ae72b2d49bdfb8a437757ede3ea7968184686741de45d9d5cadfd95d87c098f6262ff642a37cd5efbd0d14be061b SHA512 9664ce7e45c91389ce9bca0224451c592101a99f2a5ac6122ab822df8e0e8fb595fb8d0f55589237e76e9d3c49534c14902c1d991b75141decfa2e5cf983527c diff --git a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild b/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild deleted file mode 100644 index 0f3c49b650fd..000000000000 --- a/net-wireless/gr-iio/gr-iio-0.3_p20191219-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit cmake python-single-r1 - -DESCRIPTION="GNU Radio IIO Blocks" -HOMEPAGE="https://github.com/analogdevicesinc/gr-iio" -if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio" - EGIT_BRANCH="upgrade-3.8" - inherit git-r3 -else - COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb" - SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~x86" -fi -LICENSE="GPL-3+" -SLOT="0" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND="${PYTHON_DEPS} - =net-wireless/gnuradio-3.8*:= - dev-libs/boost:= - net-libs/libiio:= - dev-libs/gmp - sci-libs/volk:= - net-libs/libad9361-iio:=" - -DEPEND="${RDEPEND} - sys-devel/flex:= - sys-devel/bison:= - dev-util/cppunit:= - dev-lang/swig:0" - -src_install() { - cmake_src_install - python_optimize -} diff --git a/net-wireless/gr-iio/gr-iio-9999.ebuild b/net-wireless/gr-iio/gr-iio-9999.ebuild deleted file mode 100644 index 0f3c49b650fd..000000000000 --- a/net-wireless/gr-iio/gr-iio-9999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit cmake python-single-r1 - -DESCRIPTION="GNU Radio IIO Blocks" -HOMEPAGE="https://github.com/analogdevicesinc/gr-iio" -if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio" - EGIT_BRANCH="upgrade-3.8" - inherit git-r3 -else - COMMIT="733c8a05e74b7d10fbaef502cc82d025ae35a1fb" - SRC_URI="https://github.com/analogdevicesinc/gr-iio/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~x86" -fi -LICENSE="GPL-3+" -SLOT="0" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND="${PYTHON_DEPS} - =net-wireless/gnuradio-3.8*:= - dev-libs/boost:= - net-libs/libiio:= - dev-libs/gmp - sci-libs/volk:= - net-libs/libad9361-iio:=" - -DEPEND="${RDEPEND} - sys-devel/flex:= - sys-devel/bison:= - dev-util/cppunit:= - dev-lang/swig:0" - -src_install() { - cmake_src_install - python_optimize -} diff --git a/net-wireless/gr-iio/metadata.xml b/net-wireless/gr-iio/metadata.xml deleted file mode 100644 index 9a8912883720..000000000000 --- a/net-wireless/gr-iio/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - </maintainer> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> - <upstream> - <remote-id type="github">analogdevicesinc/gr-iio</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest index 18a1da7d9444..3b9786696d0a 100644 --- a/net-wireless/gr-iqbal/Manifest +++ b/net-wireless/gr-iqbal/Manifest @@ -1 +1 @@ -DIST gr-iqbal-0.38.2.tar.gz 106408 BLAKE2B 8c9eb0880f527708cb304d9b70d0ab46c1f430aecf520366f85f3b74e1e1e2b612360cebc0dc9d6431f42adf2602baaaf1ebbe3b58ad08791d30f9604c96fd6c SHA512 39ca96769c3d7910c6ca7da973fdfbab816b45ec339adb5bbf32d07d2e967fb3e7265e907f9abbdf4e2b754dc03e9eac970c0cef3df4f07470ec4ba947900cb6 +DIST gr-iqbal-0.38.2_p20210108.tar.gz 84577 BLAKE2B f12ab4965e5f896698843c9ef8907cd8263f6fba3365ea26420750ab221106a3fbbee6750cf587299a9528cecbb504c23d4f2085596683cb85eb6f6fb7ab814b SHA512 b9866f6ff3d6dba1e94428efed029356e436059fa1d6cb7f4c3da0b37842c025161f1532da6048c9b9cc5ce426eea14622ac6680176cff52f85bc0b2fda8c698 diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.38.2_p20210108.ebuild index 3ace7a599591..66f36f6206a3 100644 --- a/net-wireless/gr-iqbal/gr-iqbal-0.38.2.ebuild +++ b/net-wireless/gr-iqbal/gr-iqbal-0.38.2_p20210108.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9}) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 @@ -13,8 +13,10 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git" else - SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + COMMIT="fbee239a6fb36dd2fb564f6e6a0d393c4bc844db" + SRC_URI="https://github.com/osmocom/gr-iqbal/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-3" @@ -22,7 +24,7 @@ SLOT="0/${PV}" IUSE="doc" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] +RDEPEND=">=net-wireless/gnuradio-3.9.0.0:0=[${PYTHON_SINGLE_USEDEP}] net-libs/libosmo-dsp:= dev-libs/boost:= ${PYTHON_DEPS}" @@ -37,5 +39,7 @@ src_configure() { src_install() { cmake_src_install + find "${D}" -name '__init__.py[co]' -delete || die python_optimize + mv "${ED}/usr/share/doc/gr-iqbalance" "${ED}/usr/share/doc/${P}" } diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild index 3ace7a599591..66f36f6206a3 100644 --- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild +++ b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9}) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 @@ -13,8 +13,10 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git" else - SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + COMMIT="fbee239a6fb36dd2fb564f6e6a0d393c4bc844db" + SRC_URI="https://github.com/osmocom/gr-iqbal/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-3" @@ -22,7 +24,7 @@ SLOT="0/${PV}" IUSE="doc" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] +RDEPEND=">=net-wireless/gnuradio-3.9.0.0:0=[${PYTHON_SINGLE_USEDEP}] net-libs/libosmo-dsp:= dev-libs/boost:= ${PYTHON_DEPS}" @@ -37,5 +39,7 @@ src_configure() { src_install() { cmake_src_install + find "${D}" -name '__init__.py[co]' -delete || die python_optimize + mv "${ED}/usr/share/doc/gr-iqbalance" "${ED}/usr/share/doc/${P}" } diff --git a/net-wireless/gr-iqbal/metadata.xml b/net-wireless/gr-iqbal/metadata.xml index a8b192c43911..aedc4e1d37ae 100644 --- a/net-wireless/gr-iqbal/metadata.xml +++ b/net-wireless/gr-iqbal/metadata.xml @@ -2,11 +2,14 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> -<email>zerochaos@gentoo.org</email> -<name>Rick Farina</name> + <email>zerochaos@gentoo.org</email> + <name>Rick Farina</name> </maintainer> <maintainer type="project"> -<email>radio@gentoo.org</email> -<name>Radio</name> + <email>radio@gentoo.org</email> + <name>Radio</name> </maintainer> +<upstream> + <remote-id type="github">osmocom/gr-iqbal</remote-id> +</upstream> </pkgmetadata> diff --git a/net-wireless/gr-m2k/gr-m2k-9999.ebuild b/net-wireless/gr-m2k/gr-m2k-9999.ebuild deleted file mode 100644 index da37a557cf45..000000000000 --- a/net-wireless/gr-m2k/gr-m2k-9999.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit cmake python-single-r1 - -DESCRIPTION="A C++ library for interfacing with the ADALM2000" -HOMEPAGE="https://github.com/analogdevicesinc/gr-m2k" -if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-m2k.git" - inherit git-r3 -else - COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4" - SRC_URI="https://github.com/analogdevicesinc/gr-m2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~x86" -fi -LICENSE="GPL-3+" -SLOT="0" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:= - =net-wireless/gnuradio-3.8*:= - net-libs/libiio - net-wireless/libm2k - " -DEPEND="${RDEPEND} - dev-lang/swig -" - -src_configure() { - mycmakeargs=( - -DCMAKE_SKIP_BUILD_RPATH=TRUE - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - #this seems to not compile things - python_optimize -} diff --git a/net-wireless/gr-m2k/metadata.xml b/net-wireless/gr-m2k/metadata.xml deleted file mode 100644 index 652cb6b13447..000000000000 --- a/net-wireless/gr-m2k/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - </maintainer> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> - <upstream> - <remote-id type="github">analogdevicesinc/gr-m2k</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest index 436343f9a5f7..5c2f7e00a90c 100644 --- a/net-wireless/gr-osmosdr/Manifest +++ b/net-wireless/gr-osmosdr/Manifest @@ -1 +1 @@ -DIST gr-osmosdr-0.2.3.tar.gz 252727 BLAKE2B 04fe86496c09a274058bfd812fc14d7843d7e9db2648cf2cf5292e50494a859e22b1ab211f7078f2b6964c786c5f5ad5c3c9d2dd44ec5fc96d240b96f2cb63f4 SHA512 3c82a39972a309aa5b023b9c5e61f1fc80b797380b7a6c6c23cd4fe278cfaba3ab3019f32d38ebc01300868bb892f6aaaa7f12c9ee9b7ab5ba3e38817a40bf3e +DIST gr-osmosdr-0.2.5.tar.gz 267914 BLAKE2B cec3790513a8e050610cb4b7f928c7b1d47e5b34e372f577c7f90a929a7353e2d7a86d04b8fcde57b24cc08554c5bee7257c052263de55e0f5ba3201f19a275c SHA512 d1c126d94accbd292624022df6ff7febecb1c73c3a1a0c3e8d0e3e4d882076df5b77ad14d79966a150e2c9d889c391239b1dc831acf49cdf891a19db7f830901 diff --git a/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch deleted file mode 100644 index 7699c81fed32..000000000000 --- a/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ecca19615c588f771a131432f7161156efc274c2 Mon Sep 17 00:00:00 2001 -From: lain <code@hacktheinter.net> -Date: Tue, 30 Jul 2019 15:59:38 -0700 -Subject: [PATCH] Quick patch to use xtrx_open_string() instead of the removed - xtrx_open_list(). - ---- - lib/xtrx/xtrx_obj.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/xtrx/xtrx_obj.cc b/lib/xtrx/xtrx_obj.cc -index 1d58de5..5c73259 100644 ---- a/lib/xtrx/xtrx_obj.cc -+++ b/lib/xtrx/xtrx_obj.cc -@@ -68,7 +68,7 @@ xtrx_obj::xtrx_obj(const std::string &path, unsigned loglevel, bool lmsreset) - unsigned xtrxflag = (loglevel & XTRX_O_LOGLVL_MASK) | ((lmsreset) ? XTRX_O_RESET : 0); - std::cerr << "xtrx_obj::xtrx_obj = " << xtrxflag << std::endl; - -- int res = xtrx_open_list(path.c_str(), NULL, &_obj); -+ int res = xtrx_open_string(path.c_str(), &_obj); - if (res < 0) { - std::stringstream message; - message << "Couldn't open " ": Error: " << -res; diff --git a/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch new file mode 100644 index 000000000000..2bf79b1fe20e --- /dev/null +++ b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96a2c90..a3836f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,9 +187,7 @@ find_package(Doxygen) + + # Python + ########## +- +-find_package(PythonLibs 3) +-find_package(pybind11) ++include(GrPybind) + + GR_REGISTER_COMPONENT("Python support" ENABLE_PYTHON + PYTHONLIBS_FOUND diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5-r1.ebuild index f7033fd6e361..23381a80024d 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5-r1.ebuild @@ -1,30 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf" -HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR" +HOMEPAGE=" + https://sdr.osmocom.org/trac/wiki/GrOsmoSDR + https://gitea.osmocom.org/sdr/gr-osmosdr +" if [[ ${PV} == 9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" + EGIT_REPO_URI="https://gitea.osmocom.org/sdr/gr-osmosdr.git" else - SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="https://gitea.osmocom.org/sdr/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" + S="${WORKDIR}/${PN}" fi LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx" +IUSE="airspy bladerf doc hackrf iqbalance rtlsdr sdrplay soapy uhd xtrx" RDEPEND="${PYTHON_DEPS} dev-libs/boost:= dev-libs/log4cpp - =net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] + net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] sci-libs/volk:= airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) @@ -36,14 +40,17 @@ RDEPEND="${PYTHON_DEPS} uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] ) xtrx? ( net-wireless/libxtrx ) " -DEPEND="${RDEPEND} - dev-lang/swig +DEPEND="${RDEPEND}" + +BDEPEND=" + $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') + doc? ( app-text/doxygen ) " REQUIRED_USE="${PYTHON_REQUIRED_USE}" PATCHES=( - "${FILESDIR}/${P}-use_xtrx_open_string.patch" + "${FILESDIR}/${PN}-0.2.3_p20210128-fix-enable-python.patch" ) src_configure() { @@ -55,7 +62,7 @@ src_configure() { -DENABLE_BLADERF="$(usex bladerf ON OFF)" -DENABLE_HACKRF="$(usex hackrf ON OFF)" -DENABLE_IQBALANCE="$(usex iqbalance ON OFF)" - -DENABLE_PYTHON="$(usex python ON OFF)" + -DENABLE_PYTHON=ON -DENABLE_RTL="$(usex rtlsdr ON OFF)" -DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)" -DENABLE_SDRPLAY="$(usex sdrplay ON OFF)" @@ -63,6 +70,7 @@ src_configure() { -DENABLE_SOAPY="$(usex soapy ON OFF)" -DENABLE_UHD="$(usex uhd ON OFF)" -DENABLE_XTRX="$(usex xtrx ON OFF)" + -DENABLE_DOXYGEN="$(usex doc ON OFF)" ) cmake_src_configure @@ -70,9 +78,7 @@ src_configure() { src_install() { cmake_src_install - if use python; then - python_fix_shebang "${ED}"/usr/bin - python_optimize - fi - mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" + find "${ED}" -name '*.py[oc]' -delete || die + python_fix_shebang "${ED}"/usr/bin + python_optimize } diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild index 13f977a568d6..23381a80024d 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild @@ -1,30 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf" -HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR" +HOMEPAGE=" + https://sdr.osmocom.org/trac/wiki/GrOsmoSDR + https://gitea.osmocom.org/sdr/gr-osmosdr +" if [[ ${PV} == 9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" + EGIT_REPO_URI="https://gitea.osmocom.org/sdr/gr-osmosdr.git" else - SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="https://gitea.osmocom.org/sdr/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" + S="${WORKDIR}/${PN}" fi LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd" +IUSE="airspy bladerf doc hackrf iqbalance rtlsdr sdrplay soapy uhd xtrx" -#xtrx? ( net-wireless/libxtrx ) RDEPEND="${PYTHON_DEPS} dev-libs/boost:= - =net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] + dev-libs/log4cpp + net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] sci-libs/volk:= airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) @@ -34,13 +38,22 @@ RDEPEND="${PYTHON_DEPS} sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] ) + xtrx? ( net-wireless/libxtrx ) " DEPEND="${RDEPEND}" +BDEPEND=" + $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') + doc? ( app-text/doxygen ) + " + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +PATCHES=( + "${FILESDIR}/${PN}-0.2.3_p20210128-fix-enable-python.patch" +) + src_configure() { - #-DENABLE_XTRX="$(usex xtrx ON OFF)" local mycmakeargs=( -DENABLE_DEFAULT=OFF -DPYTHON_EXECUTABLE="${PYTHON}" @@ -49,14 +62,15 @@ src_configure() { -DENABLE_BLADERF="$(usex bladerf ON OFF)" -DENABLE_HACKRF="$(usex hackrf ON OFF)" -DENABLE_IQBALANCE="$(usex iqbalance ON OFF)" - -DENABLE_PYTHON="$(usex python ON OFF)" + -DENABLE_PYTHON=ON -DENABLE_RTL="$(usex rtlsdr ON OFF)" -DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)" -DENABLE_SDRPLAY="$(usex sdrplay ON OFF)" -DENABLE_NONFREE="$(usex sdrplay ON OFF)" -DENABLE_SOAPY="$(usex soapy ON OFF)" -DENABLE_UHD="$(usex uhd ON OFF)" - -DENABLE_XTRX=OFF + -DENABLE_XTRX="$(usex xtrx ON OFF)" + -DENABLE_DOXYGEN="$(usex doc ON OFF)" ) cmake_src_configure @@ -64,9 +78,7 @@ src_configure() { src_install() { cmake_src_install - if use python; then - python_fix_shebang "${ED}"/usr/bin - python_optimize - fi - mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" + find "${ED}" -name '*.py[oc]' -delete || die + python_fix_shebang "${ED}"/usr/bin + python_optimize } diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml index 24c34cfdeb22..034011869409 100644 --- a/net-wireless/gr-osmosdr/metadata.xml +++ b/net-wireless/gr-osmosdr/metadata.xml @@ -2,18 +2,18 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> + <email>radio@gentoo.org</email> + <name>Radio</name> </maintainer> -<use> - <flag name="airspy">Build with Airspy support</flag> - <flag name="bladerf">Build with Nuand BladeRF support</flag> - <flag name="hackrf">Build with Great Scott Gadgets HackRF support</flag> - <flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag> - <flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag> - <flag name="sdrplay">Enable support for SDRplay devices through <pkg>net-wireless/sdrplay</pkg></flag> - <flag name="soapy">Build with SoapySDR support</flag> - <flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag> - <flag name="xtrx">Build with xtrx Hardware Driver support</flag> -</use> + <use> + <flag name="airspy">Build with Airspy support through <pkg>net-wireless/airspy</pkg></flag> + <flag name="bladerf">Build with Nuand BladeRF support through <pkg>net-wireless/bladerf</pkg></flag> + <flag name="hackrf">Build with Great Scott Gadgets HackRF support through <pkg>net-libs/libhackrf</pkg></flag> + <flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal through <pkg>net-wireless/gr-iqbal</pkg></flag> + <flag name="rtlsdr">Build with Realtek RTL2832U support through <pkg>net-wireless/rtl-sdr</pkg></flag> + <flag name="sdrplay">Enable support for SDRplay devices through <pkg>net-wireless/sdrplay</pkg></flag> + <flag name="soapy">Build with SoapySDR support through <pkg>net-wireless/soapysdr</pkg></flag> + <flag name="uhd">Build with Ettus Research USRP Hardware Driver support through <pkg>net-wireless/uhd</pkg></flag> + <flag name="xtrx">Build with xtrx Hardware Driver support through <pkg>net-wireless/libxtrx</pkg></flag> + </use> </pkgmetadata> diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest index d99d756e1194..fbb4636fd5a8 100644 --- a/net-wireless/gr-paint/Manifest +++ b/net-wireless/gr-paint/Manifest @@ -1 +1 @@ -DIST gr-paint-0.0_p20200517.tar.gz 1588114 BLAKE2B dffae6fdd6832ef7a39911b5f20d385e1691021e49659c36244c4aa1086fa74f4f59aceb4f208a24dd76854455183644c8f7db7e6ed0600664dc02f08e6682c5 SHA512 00b508b08baafd02e69197028a6408da81f5d1bf3dfe6d3229f248d60503ccec48f3fa0491bb785ed1ece40ea90d34544bc3b62e4506459488d56540b9d519c2 +DIST gr-paint-0.0_p20230427.tar.gz 2094691 BLAKE2B 1dfa5fce3d24911dd9802bd322d4e9916a13066e69e5a0b57201f679a4b9bb985d7ee570e1d3881ecced257927ceb9a3b3845bd60422f407a753482dd35bf0a3 SHA512 7be52c524cdfde8a9620102c9b8cbdd813443c7bd9db1466ec3b73c588bb685fdd917fd2d8c602237b1b0450922d8a058ba9d2d507194a7b1ed4efe0c8f0a5f5 diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild deleted file mode 100644 index aad1eb07b45d..000000000000 --- a/net-wireless/gr-paint/gr-paint-0.0_p20200517-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/drmpeg/gr-paint38.git" -else - COMMIT="9cb4eabe3b570ccd1f53837681607d73501b5c1e" - SRC_URI="https://github.com/drmpeg/gr-paint38/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}38-${COMMIT}" - KEYWORDS="~amd64" -fi -inherit cmake python-single-r1 - -DESCRIPTION="Paints monochrome images into the waterfall of a receiver" -HOMEPAGE="https://github.com/drmpeg/gr-paint" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="doc" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -#< drmpeg> What tests? -RESTRICT="test" - -DEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[${PYTHON_USEDEP}] - ') - dev-libs/gmp - sci-libs/volk:= - =net-wireless/gnuradio-3.8*:=[${PYTHON_SINGLE_USEDEP}] -" -RDEPEND="${DEPEND} - media-gfx/imagemagick -" -BDEPEND=" - dev-lang/swig - dev-util/cppunit - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -src_configure() { - local mycmakeargs=( - -DENABLE_DOXYGEN=$(usex doc) - -DPYTHON_EXECUTABLE="${PYTHON}" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_optimize -} diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20230427.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20230427.ebuild new file mode 100644 index 000000000000..73b6850eeac2 --- /dev/null +++ b/net-wireless/gr-paint/gr-paint-0.0_p20230427.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/drmpeg/gr-paint.git" +else + COMMIT="995e888fdd575853349b5c72824c216dace74937" + SRC_URI="https://github.com/drmpeg/gr-paint/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="~amd64" +fi +inherit cmake python-single-r1 + +DESCRIPTION="Paints monochrome images into the waterfall of a receiver" +HOMEPAGE="https://github.com/drmpeg/gr-paint" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="doc" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +#< drmpeg> What tests? +RESTRICT="test" + +DEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[python,${PYTHON_USEDEP}] + ') + dev-libs/gmp + dev-libs/spdlog:= + sci-libs/volk:= + sci-libs/fftw + >=net-wireless/gnuradio-3.9:=[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') +" + +RDEPEND="${DEPEND}" + +BDEPEND=" + $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') + virtual/pkgconfig + doc? ( app-text/doxygen ) +" + +src_configure() { + local mycmakeargs=( + -DENABLE_DOXYGEN=$(usex doc) + -DPYTHON_EXECUTABLE="${PYTHON}" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + find "${D}" -name '*.py[oc]' -delete || die + python_optimize + mv "${ED}/usr/share/doc/gr-paint" "${ED}/usr/share/doc/${P}" +} diff --git a/net-wireless/gr-paint/gr-paint-9999.ebuild b/net-wireless/gr-paint/gr-paint-9999.ebuild deleted file mode 100644 index aad1eb07b45d..000000000000 --- a/net-wireless/gr-paint/gr-paint-9999.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/drmpeg/gr-paint38.git" -else - COMMIT="9cb4eabe3b570ccd1f53837681607d73501b5c1e" - SRC_URI="https://github.com/drmpeg/gr-paint38/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}38-${COMMIT}" - KEYWORDS="~amd64" -fi -inherit cmake python-single-r1 - -DESCRIPTION="Paints monochrome images into the waterfall of a receiver" -HOMEPAGE="https://github.com/drmpeg/gr-paint" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="doc" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -#< drmpeg> What tests? -RESTRICT="test" - -DEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[${PYTHON_USEDEP}] - ') - dev-libs/gmp - sci-libs/volk:= - =net-wireless/gnuradio-3.8*:=[${PYTHON_SINGLE_USEDEP}] -" -RDEPEND="${DEPEND} - media-gfx/imagemagick -" -BDEPEND=" - dev-lang/swig - dev-util/cppunit - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -src_configure() { - local mycmakeargs=( - -DENABLE_DOXYGEN=$(usex doc) - -DPYTHON_EXECUTABLE="${PYTHON}" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_optimize -} diff --git a/net-wireless/gr-rds/Manifest b/net-wireless/gr-rds/Manifest index 737150379392..a6de4e1ee9bf 100644 --- a/net-wireless/gr-rds/Manifest +++ b/net-wireless/gr-rds/Manifest @@ -1 +1 @@ -DIST gr-rds-0.0_p20200807.tar.gz 210730 BLAKE2B be2ded79a744d97572f754458fbab6c4091eb9096fa01238e09cfb1703d50fc1f228000b973826456fe4fae7577ef4dcc871edb4f72bd4e2daacdf3d01330d03 SHA512 d04944db7c02d3a004beae5be96a42274dcc4503d94bd22b726c664fb49103c41479ce49f7b4f2e6fb86d7b6bdd01873375fd6a7a7cc4b04ec9bf033235743a2 +DIST gr-rds-0.0_p20220804.tar.gz 271652 BLAKE2B 5735f985d3e91c1194545f3e92786e8dd8ac8834a475df11c489673d8bbdfd918fe6b924eb3ce2765e7ec4913a09b4fe390627ba645b8130a81d4b045c98a2d5 SHA512 22e64c1d626a22c76fc71f6b23bfc47abf91adeaad3ce84cc4be688a510a90b69a1490a7a588f23204852e8bb1434882a88f8e496aa50cf944a945aa9f043e5c diff --git a/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild b/net-wireless/gr-rds/gr-rds-0.0_p20220804-r1.ebuild index 2f2eb3797c78..5004055f9d05 100644 --- a/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild +++ b/net-wireless/gr-rds/gr-rds-0.0_p20220804-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{9..11} ) if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/bastibl/${PN}" - EGIT_BRANCH="maint-3.8" + EGIT_BRANCH="maint-3.10" else KEYWORDS="~amd64 ~x86" - COMMIT="ffbe3ea302c32a621f14329b7fcc09e868305e78" + COMMIT="f3646d04c138dc3279528808dcf6f847887e4a4f" SRC_URI="https://github.com/bastibl/gr-rds/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" fi @@ -27,24 +27,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-libs/boost:=[${PYTHON_USEDEP}] + dev-libs/boost:=[python,${PYTHON_USEDEP}] ') - =net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] + net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] " DEPEND="${RDEPEND}" BDEPEND=" dev-lang/swig:0 " -#cppunit is listed in cmake, but only needed for tests and there are no tests -# dev-util/cppunit" - -src_prepare() { - cmake_src_prepare - #although cppunit is not used, it fails if it isn't there, fix it - sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die - sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die - sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die -} src_configure() { local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild b/net-wireless/gr-rds/gr-rds-9999.ebuild index 2f2eb3797c78..5004055f9d05 100644 --- a/net-wireless/gr-rds/gr-rds-9999.ebuild +++ b/net-wireless/gr-rds/gr-rds-9999.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{9..11} ) if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/bastibl/${PN}" - EGIT_BRANCH="maint-3.8" + EGIT_BRANCH="maint-3.10" else KEYWORDS="~amd64 ~x86" - COMMIT="ffbe3ea302c32a621f14329b7fcc09e868305e78" + COMMIT="f3646d04c138dc3279528808dcf6f847887e4a4f" SRC_URI="https://github.com/bastibl/gr-rds/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" fi @@ -27,24 +27,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-libs/boost:=[${PYTHON_USEDEP}] + dev-libs/boost:=[python,${PYTHON_USEDEP}] ') - =net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] + net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] " DEPEND="${RDEPEND}" BDEPEND=" dev-lang/swig:0 " -#cppunit is listed in cmake, but only needed for tests and there are no tests -# dev-util/cppunit" - -src_prepare() { - cmake_src_prepare - #although cppunit is not used, it fails if it isn't there, fix it - sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die - sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die - sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die -} src_configure() { local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) diff --git a/net-wireless/gr-scan/Manifest b/net-wireless/gr-scan/Manifest deleted file mode 100644 index 2a87a9230563..000000000000 --- a/net-wireless/gr-scan/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gr-scan-20160211.tar.xz 17872 BLAKE2B 4dc4d579e4ac3b6e713f577201fb5a0fdedceff98464cebaa4188a3d4c719660dbebbd5a2167fda6a30f3cd82a209699e4be438406bd150fc5e18119cf36599e SHA512 218c39f2143050a7315b01cac723880ef9153165bf2257ec1cb2df4837920f2609d6de98a9dd28b058528a598c4fd1f60c14d0e4ff44f021742e55c9ad50e890 diff --git a/net-wireless/gr-scan/gr-scan-20160211.ebuild b/net-wireless/gr-scan/gr-scan-20160211.ebuild deleted file mode 100644 index 8ac634e2728f..000000000000 --- a/net-wireless/gr-scan/gr-scan-20160211.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Frequency scanner for GNU Radio" -HOMEPAGE="http://git.zx2c4.com/gr-scan/about" -#SRC_URI="http://git.zx2c4.com/${PN}/snapshot/${P}.tar.xz" -COMMIT="25030f6063e796e5cb048ffc1ec7e1914192146b" -SRC_URI="https://git.zx2c4.com/${PN}/snapshot/${PN}-${COMMIT}.tar.xz -> ${P}.tar.xz" -LICENSE="GPL-3" - -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - net-wireless/gnuradio:= - net-wireless/gr-osmosdr:= - dev-libs/boost:= -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_prepare() { - sed -i 's#install -s#install#' Makefile - default -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install -} diff --git a/net-wireless/gr-scan/metadata.xml b/net-wireless/gr-scan/metadata.xml deleted file mode 100644 index 807ec69d81bc..000000000000 --- a/net-wireless/gr-scan/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> -</pkgmetadata> diff --git a/net-wireless/gr-scopy/Manifest b/net-wireless/gr-scopy/Manifest index bac2b331b822..9426081f5c6c 100644 --- a/net-wireless/gr-scopy/Manifest +++ b/net-wireless/gr-scopy/Manifest @@ -1 +1 @@ -DIST gr-scopy-0.0_p20201005.tar.gz 204034 BLAKE2B 17d797822c7920186a6d875119d582fda7b74f9c23248d9821ba172f59b1df1433520e723e4dc6b1eca1f08fb7256893767794b584d7c0bd53aa2ede80cd2b92 SHA512 12c0e76008b0a7570a85707afe28a102541e02f10a55346c76cb7984e8435e20281e6406c86ee22e8b4fbe0211bb6657f88f36bdf6b3b76d4e24b2a3f12e6350 +DIST gr-scopy-0.0_p20220602.tar.gz 213557 BLAKE2B 9dcd1b1beb62fa8f18c478f8990339cbe064a6c60c2e68516f49634d838f42559f2b25527fed78b124b9373be5f9c475c66a4dcc57ea30e69127e7227220742f SHA512 28983f1380943b1cc02c34fe21c7f295e5d4bbf4611fdddc313b9f63624845485a8366bcae6e215d9fe228a51f004d051895af756b157d382c6da2f51a1ca432 diff --git a/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild b/net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild index c81545717d41..923d5095594f 100644 --- a/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild +++ b/net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 @@ -11,9 +11,10 @@ DESCRIPTION="Scopy IIO blocks for GNU Radio" HOMEPAGE="https://github.com/analogdevicesinc/gr-scopy" if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-scopy.git" + EGIT_BRANCH="3.10" inherit git-r3 else - COMMIT="f48b45cabe2a81f491137dbc220032ea65f080c3" + COMMIT="a69ccb22578621a69acc187fc0d006b5a030a744" SRC_URI="https://github.com/analogdevicesinc/gr-scopy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" KEYWORDS="~amd64 ~x86" @@ -23,13 +24,13 @@ SLOT="0" REQUIRED_USE=${PYTHON_REQUIRED_USE} RDEPEND="${PYTHON_DEPS} - =net-wireless/gnuradio-3.8*:= + >=net-wireless/gnuradio-3.9.0.0:=[analog] sci-libs/volk:= - dev-libs/log4cpp:= " DEPEND="${RDEPEND}" src_install() { cmake_src_install python_optimize + mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" } diff --git a/net-wireless/gr-scopy/gr-scopy-9999.ebuild b/net-wireless/gr-scopy/gr-scopy-9999.ebuild index c81545717d41..923d5095594f 100644 --- a/net-wireless/gr-scopy/gr-scopy-9999.ebuild +++ b/net-wireless/gr-scopy/gr-scopy-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 @@ -11,9 +11,10 @@ DESCRIPTION="Scopy IIO blocks for GNU Radio" HOMEPAGE="https://github.com/analogdevicesinc/gr-scopy" if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-scopy.git" + EGIT_BRANCH="3.10" inherit git-r3 else - COMMIT="f48b45cabe2a81f491137dbc220032ea65f080c3" + COMMIT="a69ccb22578621a69acc187fc0d006b5a030a744" SRC_URI="https://github.com/analogdevicesinc/gr-scopy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" KEYWORDS="~amd64 ~x86" @@ -23,13 +24,13 @@ SLOT="0" REQUIRED_USE=${PYTHON_REQUIRED_USE} RDEPEND="${PYTHON_DEPS} - =net-wireless/gnuradio-3.8*:= + >=net-wireless/gnuradio-3.9.0.0:=[analog] sci-libs/volk:= - dev-libs/log4cpp:= " DEPEND="${RDEPEND}" src_install() { cmake_src_install python_optimize + mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" } diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest index d7597c7d3297..872055496e53 100644 --- a/net-wireless/hackrf-tools/Manifest +++ b/net-wireless/hackrf-tools/Manifest @@ -1 +1,2 @@ -DIST hackrf-2021.03.1.tar.xz 13661964 BLAKE2B 0a00b2d24cc6ac7ca36f66e8f5b3029cfd446a6c5b5427f7d25db6dd191693c1e1c010abd85907813d55c6bd367780c70860b4f7e7f83fb9970d425311893780 SHA512 4a88b877a9f6fee0c8d9496eb265655af4baa678e862ca6147596cd3a1d85dd50315da6531efa54d050847ce5068c4726393b4897d40576888d10a898ad57139 +DIST hackrf-2023.01.1.tar.xz 23030956 BLAKE2B f0ea4f92208d1db5b4e1c11231e4420db757c08e28e7a80d79e70b02d868689ddf516bc6f003fc208f60c221c9153412a12fe3cbdf8f58001c1f7cdd26383ac0 SHA512 7c2ef9c5c050e258a0d1695240f9163955cb3ea9ab9163aad6bdbdebfdb82cde9925818ced3323342fe9c4ddb80dcedbc5a7986caaa4e0b7036e8e07bec0296e +DIST hackrf-2024.02.1.tar.xz 21734672 BLAKE2B 493a886719aa90e1b52229beaec45cb9db315dc91d001c275dd3989cde56fe6a312d4fca1c27b4c1366a4653880e74ab3d1e4363ee392d0f93deb631b7fddac4 SHA512 d057574f1e9b1bc2cebcd06773054b7fcba55d44e4c028f4f95e67874b71bd0a83906795a391e283c15d2b21ad7f3e8337be5aa0ee2f6a3c57632a70da10e2e4 diff --git a/net-wireless/hackrf-tools/hackrf-tools-2023.01.1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2023.01.1.ebuild new file mode 100644 index 000000000000..b60dec9c16a1 --- /dev/null +++ b/net-wireless/hackrf-tools/hackrf-tools-2023.01.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="tools for communicating with HackRF SDR platform" +HOMEPAGE="http://greatscottgadgets.com/hackrf/" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/greatscottgadgets/hackrf.git" + inherit git-r3 + EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf" + S="${WORKDIR}/hackrf/host/hackrf-tools" +else + S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools" + SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz" + KEYWORDS="amd64 arm ppc x86" +fi + +LICENSE="BSD" +SLOT="0" + +DEPEND="~net-libs/libhackrf-${PV}:= + sci-libs/fftw:3.0=" +RDEPEND="${DEPEND}" + +src_install() { + cmake_src_install + newsbin "${FILESDIR}/hackrf_easy_flash-r1" hackrf_easy_flash + if [[ ${PV} != "9999" ]] ; then + insinto /usr/share/hackrf + newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" hackrf_jawbreaker_usb-${PV}.bin + newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu + newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin + newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu + newins "${WORKDIR}/hackrf-${PV}/firmware/cpld/sgpio_if/default.xsvf" hackrf_cpld_default-${PV}.xsvf + ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin" + ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin" + ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu" + ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb.dfu" + else + ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this." + ewarn "A hackrf-firmware ebuild is available in the pentoo overlay, if you feel adventurous." + fi +} diff --git a/net-wireless/hackrf-tools/hackrf-tools-2021.03.1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2024.02.1.ebuild index 391540f6c443..8438e9697bb7 100644 --- a/net-wireless/hackrf-tools/hackrf-tools-2021.03.1.ebuild +++ b/net-wireless/hackrf-tools/hackrf-tools-2024.02.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -9,19 +9,18 @@ DESCRIPTION="tools for communicating with HackRF SDR platform" HOMEPAGE="http://greatscottgadgets.com/hackrf/" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/mossmann/hackrf.git" + EGIT_REPO_URI="https://github.com/greatscottgadgets/hackrf.git" inherit git-r3 EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf" S="${WORKDIR}/hackrf/host/hackrf-tools" else S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools" - SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz" + SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz" KEYWORDS="~amd64 ~arm ~ppc ~x86" fi LICENSE="BSD" SLOT="0" -IUSE="" DEPEND="~net-libs/libhackrf-${PV}:= sci-libs/fftw:3.0=" diff --git a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild index 391540f6c443..8438e9697bb7 100644 --- a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild +++ b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -9,19 +9,18 @@ DESCRIPTION="tools for communicating with HackRF SDR platform" HOMEPAGE="http://greatscottgadgets.com/hackrf/" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/mossmann/hackrf.git" + EGIT_REPO_URI="https://github.com/greatscottgadgets/hackrf.git" inherit git-r3 EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf" S="${WORKDIR}/hackrf/host/hackrf-tools" else S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools" - SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz" + SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz" KEYWORDS="~amd64 ~arm ~ppc ~x86" fi LICENSE="BSD" SLOT="0" -IUSE="" DEPEND="~net-libs/libhackrf-${PV}:= sci-libs/fftw:3.0=" diff --git a/net-wireless/horst/horst-5.1.ebuild b/net-wireless/horst/horst-5.1.ebuild index fe07351a1f43..3776eec855a7 100644 --- a/net-wireless/horst/horst-5.1.ebuild +++ b/net-wireless/horst/horst-5.1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit toolchain-funcs vcs-snapshot +EAPI=8 + +inherit toolchain-funcs DESCRIPTION="Small 802.11 wireless LAN analyzer" HOMEPAGE="https://github.com/br101/horst/" SRC_URI="https://github.com/br101/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug +pcap test" @@ -18,15 +19,14 @@ RDEPEND=" sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) " -TDEPEND=" - test? ( sys-devel/sparse ) -" -DEPEND=" - ${RDEPEND} - ${TDEPEND} +DEPEND="${RDEPEND}" +BEDEPEND=" virtual/pkgconfig + test? ( sys-devel/sparse ) " -RESTRICT=test #just semantic tests, no functional tests + +RESTRICT="test" #just semantic tests, no functional tests + PATCHES=( "${FILESDIR}"/${PN}-5.1-CC.patch "${FILESDIR}"/${PN}-5.1-pcap_bufsize.patch diff --git a/net-wireless/horst/horst-9999.ebuild b/net-wireless/horst/horst-9999.ebuild index 493b4bd6edac..d0a33a2fedb9 100644 --- a/net-wireless/horst/horst-9999.ebuild +++ b/net-wireless/horst/horst-9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit git-r3 toolchain-funcs DESCRIPTION="Small 802.11 wireless LAN analyzer" HOMEPAGE="https://github.com/br101/horst/" EGIT_REPO_URI="https://github.com/br101/${PN}/" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="" IUSE="debug +pcap test" RDEPEND=" @@ -18,15 +18,14 @@ RDEPEND=" sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) " -TDEPEND=" - test? ( sys-devel/sparse ) -" -DEPEND=" - ${RDEPEND} - ${TDEPEND} +DEPEND="${RDEPEND}" +BEDEPEND=" virtual/pkgconfig + test? ( sys-devel/sparse ) " + RESTRICT=test #just semantic tests, no functional tests + PATCHES=( "${FILESDIR}"/${PN}-9999-tinfo.patch ) diff --git a/net-wireless/horst/metadata.xml b/net-wireless/horst/metadata.xml index d371a6b37436..0d5f3ae72133 100644 --- a/net-wireless/horst/metadata.xml +++ b/net-wireless/horst/metadata.xml @@ -5,7 +5,7 @@ <email>netmon@gentoo.org</email> </maintainer> <use> -<flag name="pcap">Add support for network packet capture via net-libs/libpcap</flag> +<flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag> </use> <upstream> <remote-id type="github">br101/horst</remote-id> diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest index 5e2d0c597715..c70e3773b0ab 100644 --- a/net-wireless/hostapd/Manifest +++ b/net-wireless/hostapd/Manifest @@ -1,2 +1 @@ -DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c -DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c +DIST hostapd-2.10.tar.gz 2440435 BLAKE2B dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f SHA512 243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f diff --git a/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch deleted file mode 100644 index 0aa8a5ea1de0..000000000000 --- a/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni@codeaurora.org> -Date: Wed, 3 Jun 2020 23:17:35 +0300 -Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to - other networks - -The UPnP Device Architecture 2.0 specification errata ("UDA errata -16-04-2020.docx") addresses a problem with notifications being allowed -to go out to other domains by disallowing such cases. Do such filtering -for the notification callback URLs to avoid undesired connections to -external networks based on subscriptions that any device in the local -network could request when WPS support for external registrars is -enabled (the upnp_iface parameter in hostapd configuration). - -Signed-off-by: Jouni Malinen <jouni@codeaurora.org> ---- - src/wps/wps_er.c | 2 +- - src/wps/wps_upnp.c | 38 ++++++++++++++++++++++++++++++++++++-- - src/wps/wps_upnp_i.h | 3 ++- - 3 files changed, 39 insertions(+), 4 deletions(-) - -diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c -index 6bded14327f8..31d2e50e4cff 100644 ---- a/src/wps/wps_er.c -+++ b/src/wps/wps_er.c -@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, const char *filter) - "with %s", filter); - } - if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text, -- er->mac_addr)) { -+ NULL, er->mac_addr)) { - wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address " - "for %s. Does it have IP address?", er->ifname); - wps_er_deinit(er, NULL, NULL); -diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c -index 6e10e4bc0c3f..7d4b7439940e 100644 ---- a/src/wps/wps_upnp.c -+++ b/src/wps/wps_upnp.c -@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s) - } - - -+static int local_network_addr(struct upnp_wps_device_sm *sm, -+ struct sockaddr_in *addr) -+{ -+ return (addr->sin_addr.s_addr & sm->netmask.s_addr) == -+ (sm->ip_addr & sm->netmask.s_addr); -+} -+ -+ - /* subscr_addr_add_url -- add address(es) for one url to subscription */ - static void subscr_addr_add_url(struct subscription *s, const char *url, - size_t url_len) -@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, - - for (rp = result; rp; rp = rp->ai_next) { - struct subscr_addr *a; -+ struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr; - - /* Limit no. of address to avoid denial of service attack */ - if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) { -@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, - break; - } - -+ if (!local_network_addr(s->sm, addr)) { -+ wpa_printf(MSG_INFO, -+ "WPS UPnP: Ignore a delivery URL that points to another network %s", -+ inet_ntoa(addr->sin_addr)); -+ continue; -+ } -+ - a = os_zalloc(sizeof(*a) + alloc_len); - if (a == NULL) - break; -@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN]) - * @net_if: Selected network interface name - * @ip_addr: Buffer for returning IP address in network byte order - * @ip_addr_text: Buffer for returning a pointer to allocated IP address text -+ * @netmask: Buffer for returning netmask or %NULL if not needed - * @mac: Buffer for returning MAC address - * Returns: 0 on success, -1 on failure - */ - int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, -- u8 mac[ETH_ALEN]) -+ struct in_addr *netmask, u8 mac[ETH_ALEN]) - { - struct ifreq req; - int sock = -1; -@@ -920,6 +937,19 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, - in_addr.s_addr = *ip_addr; - os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr)); - -+ if (netmask) { -+ os_memset(&req, 0, sizeof(req)); -+ os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name)); -+ if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) { -+ wpa_printf(MSG_ERROR, -+ "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)", -+ errno, strerror(errno)); -+ goto fail; -+ } -+ addr = (struct sockaddr_in *) &req.ifr_netmask; -+ netmask->s_addr = addr->sin_addr.s_addr; -+ } -+ - #ifdef __linux__ - os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name)); - if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) { -@@ -1026,11 +1056,15 @@ static int upnp_wps_device_start(struct upnp_wps_device_sm *sm, char *net_if) - - /* Determine which IP and mac address we're using */ - if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text, -- sm->mac_addr)) { -+ &sm->netmask, sm->mac_addr)) { - wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address " - "for %s. Does it have IP address?", net_if); - goto fail; - } -+ wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr " -+ MACSTR, -+ sm->ip_addr_text, inet_ntoa(sm->netmask), -+ MAC2STR(sm->mac_addr)); - - /* Listen for incoming TCP connections so that others - * can fetch our "xml files" from us. -diff --git a/src/wps/wps_upnp_i.h b/src/wps/wps_upnp_i.h -index e87a93232df1..6ead7b4e9a30 100644 ---- a/src/wps/wps_upnp_i.h -+++ b/src/wps/wps_upnp_i.h -@@ -128,6 +128,7 @@ struct upnp_wps_device_sm { - u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */ - char *ip_addr_text; /* IP address of network i.f. we use */ - unsigned ip_addr; /* IP address of network i.f. we use (host order) */ -+ struct in_addr netmask; - int multicast_sd; /* send multicast messages over this socket */ - int ssdp_sd; /* receive discovery UPD packets on socket */ - int ssdp_sd_registered; /* nonzero if we must unregister */ -@@ -158,7 +159,7 @@ struct subscription * subscription_find(struct upnp_wps_device_sm *sm, - const u8 uuid[UUID_LEN]); - void subscr_addr_delete(struct subscr_addr *a); - int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, -- u8 mac[ETH_ALEN]); -+ struct in_addr *netmask, u8 mac[ETH_ALEN]); - - /* wps_upnp_ssdp.c */ - void msearchreply_state_machine_stop(struct advertisement_state_machine *a); --- -2.20.1 - diff --git a/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch deleted file mode 100644 index c7a449e0b5c6..000000000000 --- a/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni@codeaurora.org> -Date: Wed, 3 Jun 2020 22:41:02 +0300 -Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL - path - -More than about 700 character URL ended up overflowing the wpabuf used -for building the event notification and this resulted in the wpabuf -buffer overflow checks terminating the hostapd process. Fix this by -allocating the buffer to be large enough to contain the full URL path. -However, since that around 700 character limit has been the practical -limit for more than ten years, start explicitly enforcing that as the -limit or the callback URLs since any longer ones had not worked before -and there is no need to enable them now either. - -Signed-off-by: Jouni Malinen <jouni@codeaurora.org> ---- - src/wps/wps_upnp.c | 9 +++++++-- - src/wps/wps_upnp_event.c | 3 ++- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c -index 7d4b7439940e..ab685d52ecab 100644 ---- a/src/wps/wps_upnp.c -+++ b/src/wps/wps_upnp.c -@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, - int rerr; - size_t host_len, path_len; - -- /* url MUST begin with http: */ -- if (url_len < 7 || os_strncasecmp(url, "http://", 7)) -+ /* URL MUST begin with HTTP scheme. In addition, limit the length of -+ * the URL to 700 characters which is around the limit that was -+ * implicitly enforced for more than 10 years due to a bug in -+ * generating the event messages. */ -+ if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) { -+ wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL"); - goto fail; -+ } - url += 7; - url_len -= 7; - -diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c -index d7e6edcc6503..08a23612f338 100644 ---- a/src/wps/wps_upnp_event.c -+++ b/src/wps/wps_upnp_event.c -@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e) - struct wpabuf *buf; - char *b; - -- buf = wpabuf_alloc(1000 + wpabuf_len(e->data)); -+ buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) + -+ wpabuf_len(e->data)); - if (buf == NULL) - return NULL; - wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path); --- -2.20.1 - diff --git a/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch deleted file mode 100644 index 9d0376043d0b..000000000000 --- a/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni@codeaurora.org> -Date: Thu, 4 Jun 2020 21:24:04 +0300 -Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more - properly - -While it is appropriate to try to retransmit the event to another -callback URL on a failure to initiate the HTTP client connection, there -is no point in trying the exact same operation multiple times in a row. -Replve the event_retry() calls with event_addr_failure() for these cases -to avoid busy loops trying to repeat the same failing operation. - -These potential busy loops would go through eloop callbacks, so the -process is not completely stuck on handling them, but unnecessary CPU -would be used to process the continues retries that will keep failing -for the same reason. - -Signed-off-by: Jouni Malinen <jouni@codeaurora.org> ---- - src/wps/wps_upnp_event.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c -index 08a23612f338..c0d9e41d9a38 100644 ---- a/src/wps/wps_upnp_event.c -+++ b/src/wps/wps_upnp_event.c -@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s) - - buf = event_build_message(e); - if (buf == NULL) { -- event_retry(e, 0); -+ event_addr_failure(e); - return -1; - } - -@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s) - event_http_cb, e); - if (e->http_event == NULL) { - wpabuf_free(buf); -- event_retry(e, 0); -+ event_addr_failure(e); - return -1; - } - --- -2.20.1 - diff --git a/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch b/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch deleted file mode 100644 index d764a9db016c..000000000000 --- a/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Thu, 29 Aug 2019 11:52:04 +0300 -Subject: [PATCH] AP: Silently ignore management frame from unexpected source - address - -Do not process any received Management frames with unexpected/invalid SA -so that we do not add any state for unexpected STA addresses or end up -sending out frames to unexpected destination. This prevents unexpected -sequences where an unprotected frame might end up causing the AP to send -out a response to another device and that other device processing the -unexpected response. - -In particular, this prevents some potential denial of service cases -where the unexpected response frame from the AP might result in a -connected station dropping its association. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/ap/drv_callbacks.c | 13 +++++++++++++ - src/ap/ieee802_11.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+) - -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c -index 31587685fe3b..34ca379edc3d 100644 ---- a/src/ap/drv_callbacks.c -+++ b/src/ap/drv_callbacks.c -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, - "hostapd_notif_assoc: Skip event with no address"); - return -1; - } -+ -+ if (is_multicast_ether_addr(addr) || -+ is_zero_ether_addr(addr) || -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR -+ " in received indication - ignore this indication silently", -+ __func__, MAC2STR(addr)); -+ return 0; -+ } -+ - random_add_randomness(addr, ETH_ALEN); - - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index c85a28db44b7..e7065372e158 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, - fc = le_to_host16(mgmt->frame_control); - stype = WLAN_FC_GET_STYPE(fc); - -+ if (is_multicast_ether_addr(mgmt->sa) || -+ is_zero_ether_addr(mgmt->sa) || -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR -+ " in received frame - ignore this frame silently", -+ MAC2STR(mgmt->sa)); -+ return 0; -+ } -+ - if (stype == WLAN_FC_STYPE_BEACON) { - handle_beacon(hapd, mgmt, len, fi); - return 1; --- -2.20.1 - diff --git a/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch b/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch deleted file mode 100644 index 8c8ba9335504..000000000000 --- a/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch +++ /dev/null @@ -1,115 +0,0 @@ -From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Sat, 13 Mar 2021 18:19:31 +0200 -Subject: ASN.1: Validate DigestAlgorithmIdentifier parameters - -The supported hash algorithms do not use AlgorithmIdentifier parameters. -However, there are implementations that include NULL parameters in -addition to ones that omit the parameters. Previous implementation did -not check the parameters value at all which supported both these cases, -but did not reject any other unexpected information. - -Use strict validation of digest algorithm parameters and reject any -unexpected value when validating a signature. This is needed to prevent -potential forging attacks. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/tls/pkcs1.c | 21 +++++++++++++++++++++ - src/tls/x509v3.c | 20 ++++++++++++++++++++ - 2 files changed, 41 insertions(+) - -diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c -index bbdb0d7..5761dfe 100644 ---- a/src/tls/pkcs1.c -+++ b/src/tls/pkcs1.c -@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", -+ hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "PKCS #1: Unexpected digest algorithm parameters"); -+ os_free(decrypted); -+ return -1; -+ } - - if (!asn1_oid_equal(&oid, hash_alg)) { - char txt[100], txt2[100]; -diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c -index a8944dd..df337ec 100644 ---- a/src/tls/x509v3.c -+++ b/src/tls/x509v3.c -@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "X509: Unexpected digest algorithm parameters"); -+ os_free(data); -+ return -1; -+ } - - if (x509_sha1_oid(&oid)) { - if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { --- -cgit v0.12 - diff --git a/net-wireless/hostapd/files/hostapd-conf.d b/net-wireless/hostapd/files/hostapd-conf.d new file mode 100644 index 000000000000..7d05735eb3b4 --- /dev/null +++ b/net-wireless/hostapd/files/hostapd-conf.d @@ -0,0 +1,9 @@ +# Space separated List of interfaces which needs to be started before +# hostapd +INTERFACES="wlan0" + +# Space separated list of configuration files +CONFIGS="/etc/hostapd/hostapd.conf" + +# Extra options to pass to hostapd, see hostapd(8) +OPTIONS="" diff --git a/net-wireless/hostapd/files/hostapd-init.d b/net-wireless/hostapd/files/hostapd-init.d new file mode 100644 index 000000000000..3c0fdc9e843b --- /dev/null +++ b/net-wireless/hostapd/files/hostapd-init.d @@ -0,0 +1,38 @@ +#!/sbin/openrc-run +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +pidfile="/run/${SVCNAME}.pid" +command="/usr/sbin/hostapd" +command_args="-P ${pidfile} -B ${OPTIONS} ${CONFIGS}" + +extra_started_commands="reload" + +depend() { + local myneeds= + for iface in ${INTERFACES}; do + myneeds="${myneeds} net.${iface}" + done + + [ -n "${myneeds}" ] && need ${myneeds} + use logger +} + +start_pre() { + local file + + for file in ${CONFIGS}; do + if [ ! -r "${file}" ]; then + eerror "hostapd configuration file (${CONFIG}) not found" + return 1 + fi + done +} + +reload() { + start_pre || return 1 + + ebegin "Reloading ${SVCNAME} configuration" + kill -HUP $(cat ${pidfile}) > /dev/null 2>&1 + eend $? +} diff --git a/net-wireless/hostapd/files/hostapd.service b/net-wireless/hostapd/files/hostapd.service new file mode 100644 index 000000000000..8f0ee8e8f744 --- /dev/null +++ b/net-wireless/hostapd/files/hostapd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator +After=network.target + +[Service] +ExecStart=/usr/sbin/hostapd /etc/hostapd/hostapd.conf + +[Install] +WantedBy=multi-user.target diff --git a/net-wireless/hostapd/hostapd-2.10-r3.ebuild b/net-wireless/hostapd/hostapd-2.10-r3.ebuild new file mode 100644 index 000000000000..209dcdb026ea --- /dev/null +++ b/net-wireless/hostapd/hostapd-2.10-r3.ebuild @@ -0,0 +1,264 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic systemd savedconfig toolchain-funcs + +DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" +HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/" +S="${S}/${PN}" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://w1.fi/hostap.git" +else + if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then + SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz" + else + SRC_URI+=" https://w1.fi/releases/${P}.tar.gz" + fi + + # Never stabilize snapshot ebuilds please + KEYWORDS="amd64 arm arm64 ~mips ppc x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps" + +DEPEND=" + internal-tls? ( dev-libs/libtommath ) + !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) + kernel_linux? ( + net-wireless/wireless-regdb + >=dev-libs/libnl-3.2:3 + ) + netlink? ( net-libs/libnfnetlink ) + sqlite? ( dev-db/sqlite:3 ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-hostapd ) +" +BDEPEND="virtual/pkgconfig" + +pkg_pretend() { + if use internal-tls; then + ewarn "internal-tls implementation is experimental and provides fewer features" + fi +} + +src_unpack() { + # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds + default + + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + fi +} + +src_prepare() { + # Allow users to apply patches to src/drivers for example, + # i.e. anything outside ${S}/${PN} + pushd ../ >/dev/null || die + default + popd >/dev/null || die + + sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ + "${S}/hostapd.conf" || die +} + +src_configure() { + local CONFIG="${S}"/.config + + restore_config "${CONFIG}" + if [[ -f "${CONFIG}" ]]; then + default + return 0 + fi + + # toolchain setup + echo "CC = $(tc-getCC)" > "${CONFIG}" || die + + # EAP authentication methods + echo "CONFIG_EAP=y" >> "${CONFIG}" || die + echo "CONFIG_ERP=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_MD5=y" >> "${CONFIG}" || die + + if use suiteb; then + echo "CONFIG_SUITEB=y" >> "${CONFIG}" || die + echo "CONFIG_SUITEB192=y" >> "${CONFIG}" || die + fi + + if use internal-tls ; then + echo "CONFIG_TLS=internal" >> "${CONFIG}" || die + else + # SSL authentication methods + echo "CONFIG_DPP=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_FAST=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_MSCHAPV2=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_PEAP=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_PWD=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_TLS=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_TTLS=y" >> "${CONFIG}" || die + echo "CONFIG_OWE=y" >> "${CONFIG}" || die + echo "CONFIG_SAE=y" >> "${CONFIG}" || die + echo "CONFIG_TLSV11=y" >> "${CONFIG}" || die + echo "CONFIG_TLSV12=y" >> "${CONFIG}" || die + fi + + if use wps; then + # Enable Wi-Fi Protected Setup + echo "CONFIG_WPS=y" >> "${CONFIG}" || die + echo "CONFIG_WPS2=y" >> "${CONFIG}" || die + echo "CONFIG_WPS_UPNP=y" >> "${CONFIG}" || die + echo "CONFIG_WPS_NFC=y" >> "${CONFIG}" || die + einfo "Enabling Wi-Fi Protected Setup support" + fi + + echo "CONFIG_EAP_IKEV2=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_TNC=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_GTC=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_SIM=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_AKA=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_AKA_PRIME=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_EKE=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_PAX=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_PSK=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_SAKE=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_GPSK=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_GPSK_SHA256=y" >> "${CONFIG}" || die + + einfo "Enabling drivers: " + + # drivers + echo "CONFIG_DRIVER_HOSTAP=y" >> "${CONFIG}" || die + einfo " HostAP driver enabled" + echo "CONFIG_DRIVER_WIRED=y" >> "${CONFIG}" || die + einfo " Wired driver enabled" + echo "CONFIG_DRIVER_NONE=y" >> "${CONFIG}" || die + einfo " None driver enabled" + + einfo " nl80211 driver enabled" + echo "CONFIG_DRIVER_NL80211=y" >> "${CONFIG}" || die + + # epoll + echo "CONFIG_ELOOP_EPOLL=y" >> "${CONFIG}" || die + + # misc + echo "CONFIG_DEBUG_FILE=y" >> "${CONFIG}" || die + echo "CONFIG_PKCS12=y" >> "${CONFIG}" || die + echo "CONFIG_RADIUS_SERVER=y" >> "${CONFIG}" || die + echo "CONFIG_IAPP=y" >> "${CONFIG}" || die + echo "CONFIG_IEEE80211R=y" >> "${CONFIG}" || die + echo "CONFIG_IEEE80211W=y" >> "${CONFIG}" || die + echo "CONFIG_IEEE80211N=y" >> "${CONFIG}" || die + echo "CONFIG_IEEE80211AC=y" >> "${CONFIG}" || die + echo "CONFIG_IEEE80211AX=y" >> "${CONFIG}" || die + echo "CONFIG_OCV=y" >> "${CONFIG}" || die + echo "CONFIG_PEERKEY=y" >> "${CONFIG}" || die + echo "CONFIG_RSN_PREAUTH=y" >> "${CONFIG}" || die + echo "CONFIG_INTERWORKING=y" >> "${CONFIG}" || die + echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> "${CONFIG}" || die + echo "CONFIG_HS20=y" >> "${CONFIG}" || die + echo "CONFIG_WNM=y" >> "${CONFIG}" || die + echo "CONFIG_FST=y" >> "${CONFIG}" || die + echo "CONFIG_FST_TEST=y" >> "${CONFIG}" || die + echo "CONFIG_ACS=y" >> "${CONFIG}" || die + + if use netlink; then + # Netlink support + echo "CONFIG_VLAN_NETLINK=y" >> "${CONFIG}" || die + fi + + if use ipv6; then + # IPv6 support + echo "CONFIG_IPV6=y" >> "${CONFIG}" || die + fi + + if use sqlite; then + # Sqlite support + echo "CONFIG_SQLITE=y" >> "${CONFIG}" || die + fi + + if use kernel_linux; then + echo "CONFIG_LIBNL32=y" >> "${CONFIG}" || die + append-cflags "$($(tc-getPKG_CONFIG) --cflags libnl-3.0)" + fi + + # TODO: Add support for BSD drivers + + default +} + +src_compile() { + emake V=1 + + if ! use internal-tls; then + emake V=1 nt_password_hash + emake V=1 hlr_auc_gw + fi +} + +src_install() { + insinto /etc/${PN} + doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk} + + fperms -R 600 /etc/${PN} + + dosbin ${PN} + dobin ${PN}_cli + + if ! use internal-tls; then + dobin nt_password_hash hlr_auc_gw + fi + + newinitd "${FILESDIR}/${PN}-init.d" ${PN} + newconfd "${FILESDIR}/${PN}-conf.d" ${PN} + systemd_dounit "${FILESDIR}/${PN}.service" + + doman ${PN}{.8,_cli.1} + + dodoc ChangeLog README + use wps && dodoc README-WPS + + docinto examples + dodoc wired.conf + + insinto /etc/log.d/conf/services/ + doins logwatch/${PN}.conf + + exeinto /etc/log.d/scripts/services/ + doexe logwatch/${PN} + + save_config .config +} + +pkg_postinst() { + einfo + einfo "If you are running OpenRC you need to follow this instructions:" + einfo "In order to use ${PN} you need to set up your wireless card" + einfo "for master mode in /etc/conf.d/net and then start" + einfo "/etc/init.d/${PN}." + einfo + einfo "Example configuration:" + einfo + einfo "config_wlan0=( \"192.168.1.1/24\" )" + einfo "channel_wlan0=\"6\"" + einfo "essid_wlan0=\"test\"" + einfo "mode_wlan0=\"master\"" + einfo + + #if [[ -e "${KV_DIR}"/net/mac80211 ]]; then + # einfo "This package now compiles against the headers installed by" + # einfo "the kernel source for the mac80211 driver. You should " + # einfo "re-emerge ${PN} after upgrading your kernel source." + #fi + + if use wps; then + einfo "You have enabled Wi-Fi Protected Setup support, please" + einfo "read the README-WPS file in /usr/share/doc/${PF}" + einfo "for info on how to use WPS" + fi +} diff --git a/net-wireless/hostapd/hostapd-2.9-r6.ebuild b/net-wireless/hostapd/hostapd-2.9-r6.ebuild deleted file mode 100644 index 1b8727055c94..000000000000 --- a/net-wireless/hostapd/hostapd-2.9-r6.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic systemd savedconfig toolchain-funcs - -DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" -HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/" -EXTRAS_VER="2.7-r2" -EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras" -SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz" -S="${S}/${PN}" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://w1.fi/hostap.git" -else - if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then - SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz" - else - SRC_URI+=" https://w1.fi/releases/${P}.tar.gz" - fi - - # Never stabilize snapshot ebuilds please - KEYWORDS="amd64 arm arm64 ~mips ppc x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda" - -DEPEND=" - internal-tls? ( dev-libs/libtommath ) - !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) - kernel_linux? ( - dev-libs/libnl:3 - crda? ( net-wireless/crda ) - ) - netlink? ( net-libs/libnfnetlink ) - sqlite? ( >=dev-db/sqlite-3 )" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -pkg_pretend() { - if use internal-tls; then - ewarn "internal-tls implementation is experimental and provides fewer features" - fi -} - -src_unpack() { - # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds - default - - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - fi -} - -src_prepare() { - # Allow users to apply patches to src/drivers for example, - # i.e. anything outside ${S}/${PN} - pushd ../ >/dev/null || die - default - - # CVE-2019-16275 (bug #696032) - eapply "${FILESDIR}"/${P}-AP-Silently-ignore-management-frame-from-unexpected.patch - # CVE-2020-12695 (bug #727542) - eapply "${FILESDIR}"/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch - eapply "${FILESDIR}"/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch - eapply "${FILESDIR}"/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch - # CVE-2021-30004 (bug #780135) - eapply "${FILESDIR}"/${P}-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch - - popd >/dev/null || die - - sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ - "${S}/hostapd.conf" || die -} - -src_configure() { - local CONFIG="${S}"/.config - - restore_config "${CONFIG}" - if [[ -f "${CONFIG}" ]]; then - default - return 0 - fi - - # toolchain setup - echo "CC = $(tc-getCC)" > ${CONFIG} || die - - # EAP authentication methods - echo "CONFIG_EAP=y" >> ${CONFIG} || die - echo "CONFIG_ERP=y" >> ${CONFIG} || die - echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die - - if use suiteb; then - echo "CONFIG_SUITEB=y" >> ${CONFIG} || die - echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die - fi - - if use internal-tls ; then - echo "CONFIG_TLS=internal" >> ${CONFIG} || die - else - # SSL authentication methods - echo "CONFIG_DPP=y" >> ${CONFIG} || die - echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die - echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die - echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die - echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die - echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die - echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die - echo "CONFIG_OWE=y" >> ${CONFIG} || die - echo "CONFIG_SAE=y" >> ${CONFIG} || die - echo "CONFIG_TLSV11=y" >> ${CONFIG} || die - echo "CONFIG_TLSV12=y" >> ${CONFIG} || die - fi - - if use wps; then - # Enable Wi-Fi Protected Setup - echo "CONFIG_WPS=y" >> ${CONFIG} || die - echo "CONFIG_WPS2=y" >> ${CONFIG} || die - echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die - echo "CONFIG_WPS_NFC=y" >> ${CONFIG} || die - einfo "Enabling Wi-Fi Protected Setup support" - fi - - echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} || die - echo "CONFIG_EAP_TNC=y" >> ${CONFIG} || die - echo "CONFIG_EAP_GTC=y" >> ${CONFIG} || die - echo "CONFIG_EAP_SIM=y" >> ${CONFIG} || die - echo "CONFIG_EAP_AKA=y" >> ${CONFIG} || die - echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} || die - echo "CONFIG_EAP_EKE=y" >> ${CONFIG} || die - echo "CONFIG_EAP_PAX=y" >> ${CONFIG} || die - echo "CONFIG_EAP_PSK=y" >> ${CONFIG} || die - echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} || die - echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} || die - echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} || die - - einfo "Enabling drivers: " - - # drivers - echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} || die - einfo " HostAP driver enabled" - echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die - einfo " Wired driver enabled" - echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die - einfo " None driver enabled" - - einfo " nl80211 driver enabled" - echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die - - # epoll - echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die - - # misc - echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} || die - echo "CONFIG_PKCS12=y" >> ${CONFIG} || die - echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} || die - echo "CONFIG_IAPP=y" >> ${CONFIG} || die - echo "CONFIG_IEEE80211R=y" >> ${CONFIG} || die - echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die - echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die - echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die - echo "CONFIG_OCV=y" >> ${CONFIG} || die - echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die - echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die - echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die - echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} || die - echo "CONFIG_HS20=y" >> ${CONFIG} || die - echo "CONFIG_WNM=y" >> ${CONFIG} || die - echo "CONFIG_FST=y" >> ${CONFIG} || die - echo "CONFIG_FST_TEST=y" >> ${CONFIG} || die - echo "CONFIG_ACS=y" >> ${CONFIG} || die - - if use netlink; then - # Netlink support - echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} || die - fi - - if use ipv6; then - # IPv6 support - echo "CONFIG_IPV6=y" >> ${CONFIG} || die - fi - - if use sqlite; then - # Sqlite support - echo "CONFIG_SQLITE=y" >> ${CONFIG} || die - fi - - # If we are using libnl 2.0 and above, enable support for it - # Removed for now, since the 3.2 version is broken, and we don't - # support it. - if has_version ">=dev-libs/libnl-3.2"; then - echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die - append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0) - fi - - # TODO: Add support for BSD drivers - - default -} - -src_compile() { - emake V=1 - - if ! use internal-tls; then - emake V=1 nt_password_hash - emake V=1 hlr_auc_gw - fi -} - -src_install() { - insinto /etc/${PN} - doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk} - - fperms -R 600 /etc/${PN} - - dosbin ${PN} - dobin ${PN}_cli - - if ! use internal-tls; then - dobin nt_password_hash hlr_auc_gw - fi - - newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN} - newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN} - systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service - - doman ${PN}{.8,_cli.1} - - dodoc ChangeLog README - use wps && dodoc README-WPS - - docinto examples - dodoc wired.conf - - insinto /etc/log.d/conf/services/ - doins logwatch/${PN}.conf - - exeinto /etc/log.d/scripts/services/ - doexe logwatch/${PN} - - save_config .config -} - -pkg_postinst() { - einfo - einfo "If you are running OpenRC you need to follow this instructions:" - einfo "In order to use ${PN} you need to set up your wireless card" - einfo "for master mode in /etc/conf.d/net and then start" - einfo "/etc/init.d/${PN}." - einfo - einfo "Example configuration:" - einfo - einfo "config_wlan0=( \"192.168.1.1/24\" )" - einfo "channel_wlan0=\"6\"" - einfo "essid_wlan0=\"test\"" - einfo "mode_wlan0=\"master\"" - einfo - - #if [[ -e "${KV_DIR}"/net/mac80211 ]]; then - # einfo "This package now compiles against the headers installed by" - # einfo "the kernel source for the mac80211 driver. You should " - # einfo "re-emerge ${PN} after upgrading your kernel source." - #fi - - if use wps; then - einfo "You have enabled Wi-Fi Protected Setup support, please" - einfo "read the README-WPS file in /usr/share/doc/${PF}" - einfo "for info on how to use WPS" - fi -} diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild index dacd094e49ee..b1ed58c052a2 100644 --- a/net-wireless/hostapd/hostapd-9999.ebuild +++ b/net-wireless/hostapd/hostapd-9999.ebuild @@ -1,15 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic systemd savedconfig toolchain-funcs DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/" -EXTRAS_VER="2.7-r2" -EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras" -SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz" S="${S}/${PN}" if [[ ${PV} == 9999 ]]; then @@ -28,18 +25,22 @@ fi LICENSE="BSD" SLOT="0" -IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda" +IUSE="internal-tls ipv6 netlink selinux sqlite +suiteb +wps" DEPEND=" internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) kernel_linux? ( - dev-libs/libnl:3 - crda? ( net-wireless/crda ) + net-wireless/wireless-regdb + >=dev-libs/libnl-3.2:3 ) netlink? ( net-libs/libnfnetlink ) - sqlite? ( >=dev-db/sqlite-3 )" -RDEPEND="${DEPEND}" + sqlite? ( dev-db/sqlite:3 ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-hostapd ) +" BDEPEND="virtual/pkgconfig" pkg_pretend() { @@ -60,9 +61,9 @@ src_unpack() { src_prepare() { # Allow users to apply patches to src/drivers for example, # i.e. anything outside ${S}/${PN} - pushd ../ &>/dev/null || die + pushd ../ >/dev/null || die default - popd &>/dev/null || die + popd >/dev/null || die sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ "${S}/hostapd.conf" || die @@ -78,114 +79,112 @@ src_configure() { fi # toolchain setup - echo "CC = $(tc-getCC)" > ${CONFIG} || die + echo "CC = $(tc-getCC)" > "${CONFIG}" || die # EAP authentication methods - echo "CONFIG_EAP=y" >> ${CONFIG} || die - echo "CONFIG_ERP=y" >> ${CONFIG} || die - echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die + echo "CONFIG_EAP=y" >> "${CONFIG}" || die + echo "CONFIG_ERP=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_MD5=y" >> "${CONFIG}" || die if use suiteb; then - echo "CONFIG_SUITEB=y" >> ${CONFIG} || die - echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die + echo "CONFIG_SUITEB=y" >> "${CONFIG}" || die + echo "CONFIG_SUITEB192=y" >> "${CONFIG}" || die fi if use internal-tls ; then - echo "CONFIG_TLS=internal" >> ${CONFIG} || die + echo "CONFIG_TLS=internal" >> "${CONFIG}" || die else # SSL authentication methods - echo "CONFIG_DPP=y" >> ${CONFIG} || die - echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die - echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die - echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die - echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die - echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die - echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die - echo "CONFIG_OWE=y" >> ${CONFIG} || die - echo "CONFIG_SAE=y" >> ${CONFIG} || die - echo "CONFIG_TLSV11=y" >> ${CONFIG} || die - echo "CONFIG_TLSV12=y" >> ${CONFIG} || die + echo "CONFIG_DPP=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_FAST=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_MSCHAPV2=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_PEAP=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_PWD=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_TLS=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_TTLS=y" >> "${CONFIG}" || die + echo "CONFIG_OWE=y" >> "${CONFIG}" || die + echo "CONFIG_SAE=y" >> "${CONFIG}" || die + echo "CONFIG_TLSV11=y" >> "${CONFIG}" || die + echo "CONFIG_TLSV12=y" >> "${CONFIG}" || die fi if use wps; then # Enable Wi-Fi Protected Setup - echo "CONFIG_WPS=y" >> ${CONFIG} || die - echo "CONFIG_WPS2=y" >> ${CONFIG} || die - echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die - echo "CONFIG_WPS_NFC=y" >> ${CONFIG} || die + echo "CONFIG_WPS=y" >> "${CONFIG}" || die + echo "CONFIG_WPS2=y" >> "${CONFIG}" || die + echo "CONFIG_WPS_UPNP=y" >> "${CONFIG}" || die + echo "CONFIG_WPS_NFC=y" >> "${CONFIG}" || die einfo "Enabling Wi-Fi Protected Setup support" fi - echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} || die - echo "CONFIG_EAP_TNC=y" >> ${CONFIG} || die - echo "CONFIG_EAP_GTC=y" >> ${CONFIG} || die - echo "CONFIG_EAP_SIM=y" >> ${CONFIG} || die - echo "CONFIG_EAP_AKA=y" >> ${CONFIG} || die - echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} || die - echo "CONFIG_EAP_EKE=y" >> ${CONFIG} || die - echo "CONFIG_EAP_PAX=y" >> ${CONFIG} || die - echo "CONFIG_EAP_PSK=y" >> ${CONFIG} || die - echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} || die - echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} || die - echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} || die + echo "CONFIG_EAP_IKEV2=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_TNC=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_GTC=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_SIM=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_AKA=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_AKA_PRIME=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_EKE=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_PAX=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_PSK=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_SAKE=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_GPSK=y" >> "${CONFIG}" || die + echo "CONFIG_EAP_GPSK_SHA256=y" >> "${CONFIG}" || die einfo "Enabling drivers: " # drivers - echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} || die + echo "CONFIG_DRIVER_HOSTAP=y" >> "${CONFIG}" || die einfo " HostAP driver enabled" - echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die + echo "CONFIG_DRIVER_WIRED=y" >> "${CONFIG}" || die einfo " Wired driver enabled" - echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die + echo "CONFIG_DRIVER_NONE=y" >> "${CONFIG}" || die einfo " None driver enabled" einfo " nl80211 driver enabled" - echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die + echo "CONFIG_DRIVER_NL80211=y" >> "${CONFIG}" || die # epoll - echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die + echo "CONFIG_ELOOP_EPOLL=y" >> "${CONFIG}" || die # misc - echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} || die - echo "CONFIG_PKCS12=y" >> ${CONFIG} || die - echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} || die - echo "CONFIG_IAPP=y" >> ${CONFIG} || die - echo "CONFIG_IEEE80211R=y" >> ${CONFIG} || die - echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die - echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die - echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die - echo "CONFIG_OCV=y" >> ${CONFIG} || die - echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die - echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die - echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die - echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} || die - echo "CONFIG_HS20=y" >> ${CONFIG} || die - echo "CONFIG_WNM=y" >> ${CONFIG} || die - echo "CONFIG_FST=y" >> ${CONFIG} || die - echo "CONFIG_FST_TEST=y" >> ${CONFIG} || die - echo "CONFIG_ACS=y" >> ${CONFIG} || die + echo "CONFIG_DEBUG_FILE=y" >> "${CONFIG}" || die + echo "CONFIG_PKCS12=y" >> "${CONFIG}" || die + echo "CONFIG_RADIUS_SERVER=y" >> "${CONFIG}" || die + echo "CONFIG_IAPP=y" >> "${CONFIG}" || die + echo "CONFIG_IEEE80211R=y" >> "${CONFIG}" || die + echo "CONFIG_IEEE80211W=y" >> "${CONFIG}" || die + echo "CONFIG_IEEE80211N=y" >> "${CONFIG}" || die + echo "CONFIG_IEEE80211AC=y" >> "${CONFIG}" || die + echo "CONFIG_IEEE80211AX=y" >> "${CONFIG}" || die + echo "CONFIG_OCV=y" >> "${CONFIG}" || die + echo "CONFIG_PEERKEY=y" >> "${CONFIG}" || die + echo "CONFIG_RSN_PREAUTH=y" >> "${CONFIG}" || die + echo "CONFIG_INTERWORKING=y" >> "${CONFIG}" || die + echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> "${CONFIG}" || die + echo "CONFIG_HS20=y" >> "${CONFIG}" || die + echo "CONFIG_WNM=y" >> "${CONFIG}" || die + echo "CONFIG_FST=y" >> "${CONFIG}" || die + echo "CONFIG_FST_TEST=y" >> "${CONFIG}" || die + echo "CONFIG_ACS=y" >> "${CONFIG}" || die if use netlink; then # Netlink support - echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} || die + echo "CONFIG_VLAN_NETLINK=y" >> "${CONFIG}" || die fi if use ipv6; then # IPv6 support - echo "CONFIG_IPV6=y" >> ${CONFIG} || die + echo "CONFIG_IPV6=y" >> "${CONFIG}" || die fi if use sqlite; then # Sqlite support - echo "CONFIG_SQLITE=y" >> ${CONFIG} || die + echo "CONFIG_SQLITE=y" >> "${CONFIG}" || die fi - # If we are using libnl 2.0 and above, enable support for it - # Removed for now, since the 3.2 version is broken, and we don't - # support it. - if has_version ">=dev-libs/libnl-3.2"; then - echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die - append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0) + if use kernel_linux; then + echo "CONFIG_LIBNL32=y" >> "${CONFIG}" || die + append-cflags "$($(tc-getPKG_CONFIG) --cflags libnl-3.0)" fi # TODO: Add support for BSD drivers @@ -215,9 +214,9 @@ src_install() { dobin nt_password_hash hlr_auc_gw fi - newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN} - newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN} - systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service + newinitd "${FILESDIR}/${PN}-init.d" ${PN} + newconfd "${FILESDIR}/${PN}-conf.d" ${PN} + systemd_dounit "${FILESDIR}/${PN}.service" doman ${PN}{.8,_cli.1} diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml index c002212b0f7c..35e021e46aa7 100644 --- a/net-wireless/hostapd/metadata.xml +++ b/net-wireless/hostapd/metadata.xml @@ -7,7 +7,6 @@ RADIUS Authentication client, RADIUS Accounting client </longdescription> <use> - <flag name="crda">Add CRDA support</flag> <flag name="internal-tls">Use internal TLSv1 implementation instead of depending on OpenSSL or GnuTLS</flag> <flag name="netlink">Adding support for using netlink to create VLANs</flag> <flag name="suiteb">Adding support for NSA Suite B Cryptography</flag> diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest index 99f9ef46df8e..89fc63d9bc7f 100644 --- a/net-wireless/iw/Manifest +++ b/net-wireless/iw/Manifest @@ -1 +1,3 @@ +DIST iw-5.19.tar.xz 152044 BLAKE2B 57c14b3be0b171b80abcbc71a45f392115f62cc0c3f8440185cb05b42f7a7c901653969a4d5200878b7ceb7aea356d9cf02e07a9fbb282b34372c23561f4fe0a SHA512 ff5c23543806c91eda27c91da923737c74cbccd6acc55f1f45114338f518cd959ca292c9255fd75b91dc127ed016eb235dd97af319e30631578eba6cb0823c6c DIST iw-5.9.tar.xz 145296 BLAKE2B d7abe6c65d408a7570227dbe69fe11e1d72a1f502de21d1fcb7dcff6bfe229804020d5c1ebdda42a3694e31cf87c631faf089746f8df4733b0b1a459c185e2af SHA512 08b0c8d92c7e695bb2a107b89c3cc406e8386393b65ecbf96ded6fd757043ccd12bedaa90c14138e03e53f107365d04e229633c1cfa024ecab5fe993578491be +DIST iw-6.7.tar.xz 158928 BLAKE2B f0ed86c35edb9a70549f1fcc1bccc33ca18e20051f8c4db94d7199b6ac51ecae601afd6d6389c94c63337cdda1247a9ca7fbb19c7e27fd7e36b54ee319bace8c SHA512 7370d3b55ce43691ba84913be334c04dcdf9aa44e9556e4214d8016ddf9733b2c555ebdfbdfc814d2eba7da68501503d267ad6353b14f87b81f064f629afbef5 diff --git a/net-wireless/iw/iw-5.19-r1.ebuild b/net-wireless/iw/iw-5.19-r1.ebuild new file mode 100644 index 000000000000..f1bbe2108630 --- /dev/null +++ b/net-wireless/iw/iw-5.19-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="nl80211 configuration utility for wireless devices using the mac80211 stack" +HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw" +SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${P}.tar.xz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + +DEPEND="dev-libs/libnl:=" +RDEPEND=" + ${DEPEND} + net-wireless/wireless-regdb +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + tc-export CC LD PKG_CONFIG + + # do not compress man pages by default. + sed 's@\(iw\.8\)\.gz@\1@' -i Makefile || die +} + +src_compile() { + # Set flags prior so they are honored + CFLAGS="${CFLAGS:+${CFLAGS} }${CPPFLAGS}" + LDFLAGS="${CFLAGS:+${CFLAGS} }${LDFLAGS}" + emake V=1 +} + +src_install() { + emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install +} diff --git a/net-wireless/iw/iw-5.19.ebuild b/net-wireless/iw/iw-5.19.ebuild new file mode 100644 index 000000000000..1cb378874c4f --- /dev/null +++ b/net-wireless/iw/iw-5.19.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="nl80211 configuration utility for wireless devices using the mac80211 stack" +HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw" +SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${P}.tar.xz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" + +RDEPEND="dev-libs/libnl:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + tc-export CC LD PKG_CONFIG + + # do not compress man pages by default. + sed 's@\(iw\.8\)\.gz@\1@' -i Makefile || die +} + +src_compile() { + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${CFLAGS} ${LDFLAGS}" \ + emake V=1 +} + +src_install() { + emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install +} diff --git a/net-wireless/iw/iw-6.7.ebuild b/net-wireless/iw/iw-6.7.ebuild new file mode 100644 index 000000000000..f1bbe2108630 --- /dev/null +++ b/net-wireless/iw/iw-6.7.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="nl80211 configuration utility for wireless devices using the mac80211 stack" +HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw" +SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${P}.tar.xz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + +DEPEND="dev-libs/libnl:=" +RDEPEND=" + ${DEPEND} + net-wireless/wireless-regdb +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + tc-export CC LD PKG_CONFIG + + # do not compress man pages by default. + sed 's@\(iw\.8\)\.gz@\1@' -i Makefile || die +} + +src_compile() { + # Set flags prior so they are honored + CFLAGS="${CFLAGS:+${CFLAGS} }${CPPFLAGS}" + LDFLAGS="${CFLAGS:+${CFLAGS} }${LDFLAGS}" + emake V=1 +} + +src_install() { + emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install +} diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest index a8ed7bc00be9..9c5d03cf30a0 100644 --- a/net-wireless/iwd/Manifest +++ b/net-wireless/iwd/Manifest @@ -1,2 +1,2 @@ -DIST iwd-1.15.tar.xz 940724 BLAKE2B 6dae8a71e15136bcc9d8bb44cc6b152848207d89af2f447f48e834a3feda72a0a018dd1db3cb3a0e92c834cb2a19d8f9e4a9c900d91f96df378772d220205d65 SHA512 71e1f5f1b9d4e09a158b9bf801cee8af5ed8a19a3e80ad677e28ccab29ae10a79ebb7dbeaed60dd24283b6a40dbda8c212400b6d5ac659ed6056588a8663f0d4 -DIST iwd-1.18.tar.xz 961392 BLAKE2B 3c7b0a7996590435d8f8033ab0b6283b2860409064c8617eda51ecbd73102134bbced66bb4e1323b64563e21d52beaa7f88ae5168747a5a2a38355e266f9c3a4 SHA512 85c3e16bb8eb8e564072fab66b30d1636c853706546fcb35723b4b3339bcf969f08ca07bcd458521f044f407513f5d793724b316af4b7819def8400ed88f0d3b +DIST iwd-2.14.tar.xz 1082236 BLAKE2B ae50866ad0b3f0139352467f50b9babf054a91ec3c6298ac79842fa91f6df6802ea2b1e51688dce8d6487210b923a84b546a0afe996df7be9bad5eeb13129a7b SHA512 6af763d8dda4a8e99d96a6c94a72c16d298274fb224cc11912b4ec9eb8c80b599b49145b0fc979f213d14f6af100eb03477b6140272d303277d851eb8c8f9e07 +DIST iwd-2.16.tar.xz 1083684 BLAKE2B d744e85812128274984efe196678866ecdc500c6e5a2f72f01ebae83fd2afe120f789eef46cdc2383f3e67c3206723f2d40eee9073e5424c1cef86609af418da SHA512 29888542f4c92f5cad213bc8dce58fcd74f04659a50a207fc5a550f5c875d649447d7caca7ff322dec3e1e29d9ec50923b2607ac6bd726e59e5a116408e77eb5 diff --git a/net-wireless/iwd/files/iwd-1.17-fix-tests.patch b/net-wireless/iwd/files/iwd-1.17-fix-tests.patch deleted file mode 100644 index cf3de4c1d38f..000000000000 --- a/net-wireless/iwd/files/iwd-1.17-fix-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ed10b00afa3f4c087b46d7ba0b60a47bd05d8b39 Mon Sep 17 00:00:00 2001 -From: Denis Kenzior <denkenz@gmail.com> -Date: Mon, 23 Aug 2021 08:51:35 -0500 -Subject: unit: Fix eapol IP Allocation test failure - -This test was failing due to a change introduced in commit -5c9de0cf23f9 which changed handshake state storage of IPs from host -order to network byte order. Update the test to set IPs in network -byte-order. - -Fixes: 5c9de0cf23f9 ("eapol: Store IP address in network byte order") ---- - unit/test-eapol.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/unit/test-eapol.c b/unit/test-eapol.c -index b6a6adcb..470e0e9f 100644 ---- a/unit/test-eapol.c -+++ b/unit/test-eapol.c -@@ -3802,9 +3802,9 @@ static void eapol_ap_sta_handshake_ip_alloc_ok_test(const void *data) - handshake_state_set_ssid(s.ap_hs, (void *) ssid, strlen(ssid)); - handshake_state_set_pmk(s.ap_hs, psk, 32); - s.ap_hs->support_ip_allocation = true; -- s.ap_hs->client_ip_addr = 0x01020304; -- s.ap_hs->subnet_mask = 0xffff0000; -- s.ap_hs->go_ip_addr = 0x01020305; -+ s.ap_hs->client_ip_addr = L_CPU_TO_BE32(0x01020304); -+ s.ap_hs->subnet_mask = L_CPU_TO_BE32(0xffff0000); -+ s.ap_hs->go_ip_addr = L_CPU_TO_BE32(0x01020305); - - handshake_state_set_authenticator(s.sta_hs, false); - handshake_state_set_event_func(s.sta_hs, test_ap_sta_hs_event, &s); --- -cgit 1.2.3-1.el7 - diff --git a/net-wireless/iwd/files/iwd.initd b/net-wireless/iwd/files/iwd.initd deleted file mode 100644 index 12983c1ab2d0..000000000000 --- a/net-wireless/iwd/files/iwd.initd +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -pidfile="/run/iwd.pid" -command="/usr/libexec/iwd" -command_background="yes" - -depend() { - need dbus - keyword -shutdown -} diff --git a/net-wireless/iwd/iwd-1.15.ebuild b/net-wireless/iwd/iwd-2.14.ebuild index a38be2745d9c..df0197633a75 100644 --- a/net-wireless/iwd/iwd-1.15.ebuild +++ b/net-wireless/iwd/iwd-2.14.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic linux-info systemd #Set this variable to the required external ell version -ELL_REQ="0.41" +ELL_REQ="0.62" 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" + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" MYRST2MAN="RST2MAN=:" fi @@ -22,20 +22,20 @@ 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 -standalone systemd" +IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired" DEPEND=" sys-apps/dbus client? ( sys-libs/readline:0= ) " -[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}" +[[ -z "${ELL_REQ}" ]] || DEPEND+=" >=dev-libs/ell-${ELL_REQ}" RDEPEND=" ${DEPEND} + acct-group/netdev net-wireless/wireless-regdb - crda? ( net-wireless/crda ) + selinux? ( sec-policy/selinux-networkmanager ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) @@ -72,10 +72,6 @@ pkg_setup() { ~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" @@ -99,23 +95,6 @@ pkg_setup() { 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() { @@ -132,16 +111,18 @@ src_prepare() { if [[ ${PV} == *9999* ]] ; then eautoreconf fi + + sed -e "s:Exec=/bin/false:Exec=${EPREFIX}/usr/libexec/iwd:g" -i src/net.connman.iwd.service || die } 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) + "$(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" @@ -152,12 +133,12 @@ src_configure() { } src_compile() { - emake ${MYRST2MAN} + emake "${MYRST2MAN}" } src_install() { - emake DESTDIR="${D}" ${MYRST2MAN} install - keepdir /var/lib/${PN} + emake DESTDIR="${D}" "${MYRST2MAN}" install + keepdir "/var/lib/${PN}" newinitd "${FILESDIR}/iwd.initd-r1" iwd @@ -173,11 +154,14 @@ src_install() { if use standalone ; then local iwdconf="${ED}/etc/iwd/main.conf" dodir /etc/iwd - echo "[General]" > "${iwdconf}" - echo "EnableNetworkConfiguration=true" >> "${iwdconf}" - echo "[Network]" >> "${iwdconf}" - echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}" + cat << EOF > "${iwdconf}" +[General] +EnableNetworkConfiguration=true + +[Network] +NameResolvingService=$(usex systemd systemd resolvconf) +EOF dodir /etc/conf.d - echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd + echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd fi } diff --git a/net-wireless/iwd/iwd-1.18.ebuild b/net-wireless/iwd/iwd-2.16.ebuild index baedea95574d..9fdd8eb4495d 100644 --- a/net-wireless/iwd/iwd-1.18.ebuild +++ b/net-wireless/iwd/iwd-2.16.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic linux-info systemd #Set this variable to the required external ell version -ELL_REQ="0.44" +ELL_REQ="0.63" 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 ~riscv ~sparc ~x86" + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" MYRST2MAN="RST2MAN=:" fi @@ -22,20 +22,20 @@ 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 -standalone systemd" +IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired" DEPEND=" sys-apps/dbus client? ( sys-libs/readline:0= ) " -[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}" +[[ -z "${ELL_REQ}" ]] || DEPEND+=" >=dev-libs/ell-${ELL_REQ}" RDEPEND=" ${DEPEND} + acct-group/netdev net-wireless/wireless-regdb - crda? ( net-wireless/crda ) + selinux? ( sec-policy/selinux-networkmanager ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) @@ -48,8 +48,6 @@ BDEPEND=" [[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils" -PATCHES=( "${FILESDIR}"/iwd-1.17-fix-tests.patch ) - pkg_setup() { CONFIG_CHECK=" ~ASYMMETRIC_KEY_TYPE @@ -74,10 +72,6 @@ pkg_setup() { ~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" @@ -101,23 +95,6 @@ pkg_setup() { 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() { @@ -134,16 +111,18 @@ src_prepare() { if [[ ${PV} == *9999* ]] ; then eautoreconf fi + + sed -e "s:Exec=/bin/false:Exec=${EPREFIX}/usr/libexec/iwd:g" -i src/net.connman.iwd.service || die } 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) + "$(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" @@ -154,12 +133,12 @@ src_configure() { } src_compile() { - emake ${MYRST2MAN} + emake "${MYRST2MAN}" } src_install() { - emake DESTDIR="${D}" ${MYRST2MAN} install - keepdir /var/lib/${PN} + emake DESTDIR="${D}" "${MYRST2MAN}" install + keepdir "/var/lib/${PN}" newinitd "${FILESDIR}/iwd.initd-r1" iwd @@ -175,11 +154,14 @@ src_install() { if use standalone ; then local iwdconf="${ED}/etc/iwd/main.conf" dodir /etc/iwd - echo "[General]" > "${iwdconf}" - echo "EnableNetworkConfiguration=true" >> "${iwdconf}" - echo "[Network]" >> "${iwdconf}" - echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}" + cat << EOF > "${iwdconf}" +[General] +EnableNetworkConfiguration=true + +[Network] +NameResolvingService=$(usex systemd systemd resolvconf) +EOF dodir /etc/conf.d - echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd + echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd fi } diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild index bea6be6a9ea8..2088d90635e5 100644 --- a/net-wireless/iwd/iwd-9999.ebuild +++ b/net-wireless/iwd/iwd-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic linux-info systemd #Set this variable to the required external ell version @@ -12,8 +12,8 @@ if [[ ${PV} == *9999* ]]; then 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" + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" MYRST2MAN="RST2MAN=:" fi @@ -22,8 +22,7 @@ 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 -standalone systemd" +IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired" DEPEND=" sys-apps/dbus @@ -34,8 +33,9 @@ DEPEND=" RDEPEND=" ${DEPEND} + acct-group/netdev net-wireless/wireless-regdb - crda? ( net-wireless/crda ) + selinux? ( sec-policy/selinux-networkmanager ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) @@ -72,10 +72,6 @@ pkg_setup() { ~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" @@ -99,23 +95,6 @@ pkg_setup() { 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() { @@ -132,16 +111,18 @@ src_prepare() { if [[ ${PV} == *9999* ]] ; then eautoreconf fi + + sed -e "s:Exec=/bin/false:Exec=${EPREFIX}/usr/libexec/iwd:g" -i src/net.connman.iwd.service || die } 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) + "$(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" @@ -152,12 +133,12 @@ src_configure() { } src_compile() { - emake ${MYRST2MAN} + emake "${MYRST2MAN}" } src_install() { - emake DESTDIR="${D}" ${MYRST2MAN} install - keepdir /var/lib/${PN} + emake DESTDIR="${D}" "${MYRST2MAN}" install + keepdir "/var/lib/${PN}" newinitd "${FILESDIR}/iwd.initd-r1" iwd @@ -173,11 +154,14 @@ src_install() { if use standalone ; then local iwdconf="${ED}/etc/iwd/main.conf" dodir /etc/iwd - echo "[General]" > "${iwdconf}" - echo "EnableNetworkConfiguration=true" >> "${iwdconf}" - echo "[Network]" >> "${iwdconf}" - echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}" + cat << EOF > "${iwdconf}" +[General] +EnableNetworkConfiguration=true + +[Network] +NameResolvingService=$(usex systemd systemd resolvconf) +EOF dodir /etc/conf.d - echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd + echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd fi } diff --git a/net-wireless/iwd/metadata.xml b/net-wireless/iwd/metadata.xml index 66709b176ed9..af405c7bf0b6 100644 --- a/net-wireless/iwd/metadata.xml +++ b/net-wireless/iwd/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="client">Enable iwctl client tool</flag> - <flag name="crda">Use net-wireless/crda for regulatory domain loading instead of in-kernel (4.15+) support</flag> <flag name="monitor">Enable iwmon monitor tool</flag> <flag name="ofono">Enable support for oFono SIM authentication</flag> <flag name="standalone">Enable standalone mode with built-in DHCP client and DNS handling"</flag> diff --git a/net-wireless/iwgtk/Manifest b/net-wireless/iwgtk/Manifest index 714a9feba838..d54237a239a8 100644 --- a/net-wireless/iwgtk/Manifest +++ b/net-wireless/iwgtk/Manifest @@ -1 +1 @@ -DIST iwgtk-0.4.tar.gz 103988 BLAKE2B 0a848f805509507066e9eb97c1a3ccd1f3e441a6a01789b7ec291a12f67a619227b7845249342c15301c755dd6e3594379a888d278dc71c20cf377322f9969a5 SHA512 7a6d55493fe7cad57dc8338aafe48236c1ececb688a64cbdeb5748c60f5d109ae7912182c6d4df094588baee2aff3bd5481f82a80c4c267283a5067a0127f9e0 +DIST iwgtk-0.9.tar.gz 120055 BLAKE2B 694592b354f529389c0d71f4b81ea7b65a305ac769157e48499414adc91e099ec66880956d80a039b7f68f0d44e0f40f4ac02db350020701471616794a5de399 SHA512 d755d72744051a39dda0b78dc0fb2cc57cbf44cd095ac595d4e83f22a70471a0d69a406636d0a4d5922b533d1c849578779fd7f4c41a0b0e1549dd4e9cc45c4d diff --git a/net-wireless/iwgtk/iwgtk-0.4.ebuild b/net-wireless/iwgtk/iwgtk-0.9.ebuild index eb3eb819b7af..866764df6280 100644 --- a/net-wireless/iwgtk/iwgtk-0.4.ebuild +++ b/net-wireless/iwgtk/iwgtk-0.9.ebuild @@ -1,8 +1,8 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit xdg +EAPI=8 +inherit meson xdg DESCRIPTION="Lightweight, graphical wifi management utility for Linux" HOMEPAGE="https://github.com/J-Lentz/iwgtk" @@ -13,31 +13,19 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" +BDEPEND="app-text/scdoc" + DEPEND=" - dev-libs/atk:0 + app-accessibility/at-spi2-core:2 dev-libs/glib:2 + gui-libs/gtk:4 + media-gfx/qrencode:= x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 x11-libs/pango:0 " RDEPEND=" ${DEPEND} - net-wireless/iwd + >=net-wireless/iwd-1.29 " - -src_prepare() { - default - sed -i \ - -e 's/^CC=/CC?=/' \ - -e 's/^CFLAGS=/CFLAGS:=$(CFLAGS) /' \ - -e 's/^LDLIBS=/LDLIBS:=$(LDFLAGS) /' \ - -e 's/-O3$/${CFLAGS}/' \ - Makefile || die -} - -src_install() { - emake prefix="${ED}/usr" install - gunzip "${ED}/usr/share/man/man1/iwgtk.1.gz" || die -} diff --git a/net-wireless/iwgtk/metadata.xml b/net-wireless/iwgtk/metadata.xml index aa20bff17b1d..504c701a6749 100644 --- a/net-wireless/iwgtk/metadata.xml +++ b/net-wireless/iwgtk/metadata.xml @@ -5,4 +5,7 @@ <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> + <upstream> + <remote-id type="github">J-Lentz/iwgtk</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/jackit/Manifest b/net-wireless/jackit/Manifest deleted file mode 100644 index 523618965c26..000000000000 --- a/net-wireless/jackit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jackit-0.0_p20170918.tar.gz 19104 BLAKE2B 57ba557e8ce0e10af68ed5445dc13ac51661ecd8b7dae7093643968b82d90a3ce3844571b4d84d3355a143382624af1fa16ff6d2432d07a4edc7ed9fd8a4b1fa SHA512 15e11594adf1f95e8b547ca1da9d44d93e263fa8b289a23413492bb9a991fdfc0d20d633c5ba66a9a254f12ad7301793f8456bd9197e1ad4207e5a2dd109babd diff --git a/net-wireless/jackit/jackit-0.0_p20170918-r1.ebuild b/net-wireless/jackit/jackit-0.0_p20170918-r1.ebuild deleted file mode 100644 index 9008ea13a79d..000000000000 --- a/net-wireless/jackit/jackit-0.0_p20170918-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 - -DESCRIPTION="Exploit Code for Mousejack" -HOMEPAGE="https://github.com/insecurityofthings/jackit" -COMMIT="1c057fad102af7daad537421d95e2695caeff2b7" -SRC_URI="https://github.com/insecurityofthings/jackit/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -DEPEND="" -RDEPEND="${DEPEND} - dev-python/tabulate[${PYTHON_USEDEP}] - dev-python/click[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/pyusb[${PYTHON_USEDEP}]" diff --git a/net-wireless/jackit/metadata.xml b/net-wireless/jackit/metadata.xml deleted file mode 100644 index ac07c063c826..000000000000 --- a/net-wireless/jackit/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - </maintainer> - <upstream> - <remote-id type="github">insecurityofthings/jackit</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-wireless/kismet-rest/Manifest b/net-wireless/kismet-rest/Manifest deleted file mode 100644 index fa7f152b34c0..000000000000 --- a/net-wireless/kismet-rest/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kismet-rest-2019.05.02.tar.gz 31844 BLAKE2B 66b2540788f892545100ffbac078559027d4671aef012b59d7cbe4da3fe6865d6f46576ea8f99b84b995718fdfe6a82d1d7724fe9a93fcd932dd0bf45893b66d SHA512 6f5daef441bcf36e17c469dc36e6e7b521b08ba3aba2c89c199fa263bc3eb67b3d9217351a72c94df3902e35695874285cf769bb8c54778c657b83e44a18a6c5 diff --git a/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild b/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild deleted file mode 100644 index 735d1be6422f..000000000000 --- a/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 - -DESCRIPTION="Kismet REST Python API" -HOMEPAGE="https://kismetwireless.net/docs/devel/webui_rest/endpoints/" -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kismetwireless/python-kismet-rest.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/kismetwireless/python-kismet-rest/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/python-${P}" -fi - -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - -DEPEND="dev-python/requests - !<net-wireless/kismet-2019.05.1" -RDEPEND="${DEPEND}" -BDEPEND="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/net-wireless/kismet-rest/kismet-rest-9999.ebuild b/net-wireless/kismet-rest/kismet-rest-9999.ebuild deleted file mode 100644 index 735d1be6422f..000000000000 --- a/net-wireless/kismet-rest/kismet-rest-9999.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 - -DESCRIPTION="Kismet REST Python API" -HOMEPAGE="https://kismetwireless.net/docs/devel/webui_rest/endpoints/" -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kismetwireless/python-kismet-rest.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/kismetwireless/python-kismet-rest/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/python-${P}" -fi - -LICENSE="GPL-2+" -SLOT="0" -IUSE="" - -DEPEND="dev-python/requests - !<net-wireless/kismet-2019.05.1" -RDEPEND="${DEPEND}" -BDEPEND="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/net-wireless/kismet-rest/metadata.xml b/net-wireless/kismet-rest/metadata.xml deleted file mode 100644 index 97eff4632a18..000000000000 --- a/net-wireless/kismet-rest/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - </maintainer> -</pkgmetadata> diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest index 5f77c23f1ae7..1d6244935ae7 100644 --- a/net-wireless/kismet/Manifest +++ b/net-wireless/kismet/Manifest @@ -1,3 +1,3 @@ -DIST kismet-2021-05-R1.tar.xz 10611692 BLAKE2B fc0a145005440c8af5320488e1a4bfe808ad8aeba614c9294b511a8da70ec2d51dbfd2ecc840c9af84e0222967200bb82856b2e008e39f015b455be131f89484 SHA512 edca956c9c04f99e06a09dc23216a908fbac68637246d73430b2d9d3a3ba1c2e8099d263819073d24494dce17bd36c83a2f51c648430a6eea3db7332b07e2fba -DIST kismet-2021-06-R1.tar.xz 10616368 BLAKE2B 22c216355b31224f41991f6caa6ad86cd2549982196cf0dd6f89ef88f92d85f57bd12100a74ebbe3e0cee0140da4bd545b548382d55a4c3ac1403504680c9ca3 SHA512 88d92e2ef3f0513a3a00b573012edbd115f92e5f28f884aead5ab049fad97b328222c2f3cbb49d80c5fcfdab2212934532cf41c100c4d0a5e94c932e1c5e8352 -DIST kismet-2021-08-R1.tar.xz 10621004 BLAKE2B 236a43d2073e380c60dadfc4f611465ffa5c7de2a282fa3f45252368cbc65aaa21ad6d33c504685e39ec7913a36364283f6706d6ad8fcecf2f7922c23a4aa792 SHA512 91e86dc1d3b69aa8cb6dff4c4b8bb959dca128f06d1298effe1b23ed24158ce4285abdf2af838f48588b9e71c69f82538d1a002838c4bc1d053868118e394b7a +DIST kismet-2022-08-R1.tar.xz 10700692 BLAKE2B 9f6b3a651eca34b90e34b8a8357be493a8966cdd5c54f5f1c38383cc3ad74f2c78ab265df882b0a5b985bed98ad61f4741ead7b443d9b79f2769ca7edc72427f SHA512 befca2dcd7016d96a17e97babbd6d88195fa61750ed616d104d10a85828ec160672c33bd2a1eae554d375feb55ea45a040a3e53c4410a3ff8c9bfa4b5c8bcdb1 +DIST kismet-2023-07-R1.tar.xz 11144120 BLAKE2B c43f0665c784ff9245289e624e23cb3eb4ffcb79f050deede50129cf6b07662e817f9c9aaf6cc608395045b5b449b87d22ff314d7dbc8f04b29db2df86dc5f84 SHA512 b8b320b8e09be5be582848ce8a1a66f71a96eccc3c78f52d3f1f18122abbe614ff3b5a55b5fcedf3e6a1fc959a72838adc0d7278ffd6c25a1c179a1caf5584ce +DIST kismet-2023.07.1-stdint-fix.patch 144077 BLAKE2B 77a4ca3da4ed54e567d21c7d8d0a718751802827bcefc1122318c989cde93a2132753c910e6f503e74dac30024111edc788d9df65ef4c4749ab918485d818ee3 SHA512 cb9220cdd5e14d030ef303e28a32dced61916ff64aa5960c412c2355c1b714dc423e34b33ef701e1daa2a22c9562a85a739dc130c4ec5761924338ffb462286b diff --git a/net-wireless/kismet/files/kismet-2022.08.1-sandbox-fix.patch b/net-wireless/kismet/files/kismet-2022.08.1-sandbox-fix.patch new file mode 100644 index 000000000000..358475cbc194 --- /dev/null +++ b/net-wireless/kismet/files/kismet-2022.08.1-sandbox-fix.patch @@ -0,0 +1,147 @@ +From 8264835a935de9c754c0ff28c632695103b2dc2f Mon Sep 17 00:00:00 2001 +From: Mike Kershaw / Dragorn <dragorn@kismetwireless.net> +Date: Fri, 6 Jan 2023 15:22:52 -0500 +Subject: [PATCH] python: Merge patch from Rick Farina / Zero_Chaos to make + gentoo not complain about python build parameters + +--- + capture_bt_geiger/Makefile.in | 4 +++- + capture_freaklabs_zigbee/Makefile.in | 4 +++- + capture_proxy_adsb/Makefile.in | 4 +++- + capture_sdr_rtl433/Makefile.in | 4 +++- + capture_sdr_rtladsb/Makefile.in | 4 +++- + capture_sdr_rtlamr/Makefile.in | 4 +++- + 6 files changed, 18 insertions(+), 6 deletions(-) + +diff --git a/capture_bt_geiger/Makefile.in b/capture_bt_geiger/Makefile.in +index 646069fed..4f644535b 100644 +--- a/capture_bt_geiger/Makefile.in ++++ b/capture_bt_geiger/Makefile.in +@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= .. + + include $(KIS_SRC_DIR)/Makefile.inc + ++DESTDIR ?= / ++ + DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name) + + PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions +@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto + sed -i -E 's/^import kismet_/from . import kismet_/' $@ + + install: +- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)" ++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)" + + clean: + @-$(PYTHON) setup.py clean +diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in +index 646069fed..4f644535b 100644 +--- a/capture_freaklabs_zigbee/Makefile.in ++++ b/capture_freaklabs_zigbee/Makefile.in +@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= .. + + include $(KIS_SRC_DIR)/Makefile.inc + ++DESTDIR ?= / ++ + DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name) + + PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions +@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto + sed -i -E 's/^import kismet_/from . import kismet_/' $@ + + install: +- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)" ++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)" + + clean: + @-$(PYTHON) setup.py clean +diff --git a/capture_proxy_adsb/Makefile.in b/capture_proxy_adsb/Makefile.in +index d16ba601f..96ba6ceca 100644 +--- a/capture_proxy_adsb/Makefile.in ++++ b/capture_proxy_adsb/Makefile.in +@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= .. + + include $(KIS_SRC_DIR)/Makefile.inc + ++DESTDIR ?= / ++ + DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name) + + PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions +@@ -22,7 +24,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto + sed -i -E 's/^import kismet_/from . import kismet_/' $@ + + install: +- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)" ++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)" + + clean: + @-$(PYTHON) setup.py clean +diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in +index 646069fed..4f644535b 100644 +--- a/capture_sdr_rtl433/Makefile.in ++++ b/capture_sdr_rtl433/Makefile.in +@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= .. + + include $(KIS_SRC_DIR)/Makefile.inc + ++DESTDIR ?= / ++ + DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name) + + PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions +@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto + sed -i -E 's/^import kismet_/from . import kismet_/' $@ + + install: +- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)" ++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)" + + clean: + @-$(PYTHON) setup.py clean +diff --git a/capture_sdr_rtladsb/Makefile.in b/capture_sdr_rtladsb/Makefile.in +index d16ba601f..96ba6ceca 100644 +--- a/capture_sdr_rtladsb/Makefile.in ++++ b/capture_sdr_rtladsb/Makefile.in +@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= .. + + include $(KIS_SRC_DIR)/Makefile.inc + ++DESTDIR ?= / ++ + DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name) + + PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions +@@ -22,7 +24,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto + sed -i -E 's/^import kismet_/from . import kismet_/' $@ + + install: +- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)" ++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)" + + clean: + @-$(PYTHON) setup.py clean +diff --git a/capture_sdr_rtlamr/Makefile.in b/capture_sdr_rtlamr/Makefile.in +index 646069fed..4f644535b 100644 +--- a/capture_sdr_rtlamr/Makefile.in ++++ b/capture_sdr_rtlamr/Makefile.in +@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= .. + + include $(KIS_SRC_DIR)/Makefile.inc + ++DESTDIR ?= / ++ + DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name) + + PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions +@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto + sed -i -E 's/^import kismet_/from . import kismet_/' $@ + + install: +- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)" ++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)" + + clean: + @-$(PYTHON) setup.py clean diff --git a/net-wireless/kismet/kismet-2021.06.1.ebuild b/net-wireless/kismet/kismet-2021.06.1.ebuild deleted file mode 100644 index 4d086c30ee7b..000000000000 --- a/net-wireless/kismet/kismet-2021.06.1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -inherit autotools multilib python-single-r1 udev systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" - inherit git-r3 - RESTRICT="strip" -else - MY_P=${P/\./-} - MY_P=${MY_P/_beta/-BETA} - MY_P=${MY_P/./-R} - S=${WORKDIR}/${MY_P/BETA/beta} - - #normally we want an official release - SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" - - #but sometimes we want a git commit - #COMMIT="9ca7e469cf115469f392db7436816151867e1654" - #SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - #S="${WORKDIR}/${PN}-${COMMIT}" - - KEYWORDS="amd64 arm ~arm64 ~ppc x86" -fi - -DESCRIPTION="IEEE 802.11 wireless LAN sniffer" -HOMEPAGE="https://www.kismetwireless.net" - -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -CDEPEND=" - ${PYTHON_DEPS} - acct-user/kismet - acct-group/kismet - networkmanager? ( net-misc/networkmanager:= ) - dev-libs/glib:= - dev-libs/elfutils:= - sys-libs/zlib:= - dev-db/sqlite:= - net-libs/libmicrohttpd:= - net-libs/libwebsockets:=[client] - kernel_linux? ( sys-libs/libcap - dev-libs/libnl:3 - net-libs/libpcap - ) - libusb? ( virtual/libusb:1 ) - dev-libs/protobuf-c:= - dev-libs/protobuf:= - $(python_gen_cond_dep ' - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/websockets[${PYTHON_USEDEP}] - ') - sys-libs/ncurses:= - lm-sensors? ( sys-apps/lm-sensors ) - pcre? ( dev-libs/libpcre ) - suid? ( sys-libs/libcap ) - ubertooth? ( net-wireless/ubertooth:= ) - " - -DEPEND="${CDEPEND} - dev-libs/boost - dev-libs/libfmt - virtual/pkgconfig -" - -RDEPEND="${CDEPEND} - $(python_gen_cond_dep ' - dev-python/pyserial[${PYTHON_USEDEP}] - ') - selinux? ( sec-policy/selinux-kismet ) -" -PDEPEND=" - rtlsdr? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') - net-wireless/rtl-sdr - )" - -src_prepare() { - sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ - conf/kismet_logging.conf || die - - #this was added to quiet macosx builds but it makes gcc builds noisier - sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die - - #sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in - - rm -r boost || die - rm -r fmt || die - - #dev-libs/jsoncpp - #rm -r json || die - #sed -i 's#"json/json.h"#<json/json.h>#' jsoncpp.cc kis_net_beast_httpd.h \ - # log_tools/kismetdb_clean.cc log_tools/kismetdb_dump_devices.cc \ - # log_tools/kismetdb_statistics.cc log_tools/kismetdb_to_gpx.cc \ - # log_tools/kismetdb_to_kml.cc log_tools/kismetdb_to_pcap.cc \ - # log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \ - # trackedelement.h trackedelement_workers.h - - # Don't strip and set correct mangrp - sed -i -e 's| -s||g' \ - -e 's|@mangrp@|root|g' Makefile.in || die - - eapply_user - - #just use set to fix setup.py - find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die - find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die - - if [ "${PV}" = "9999" ]; then - eautoreconf - fi -} - -src_configure() { - econf \ - $(use_enable libusb libusb) \ - $(use_enable pcre) \ - $(use_enable lm-sensors lmsensors) \ - $(use_enable networkmanager libnm) \ - $(use_enable ubertooth) \ - --sysconfdir=/etc/kismet \ - --disable-optimization -} - -src_install() { - emake DESTDIR="${D}" commoninstall - python_optimize - emake DESTDIR="${D}" forceconfigs - use udev && udev_dorules packaging/udev/*.rules - - insinto /usr/share/${PN} - doins Makefile.inc - if [ "${PV}" = "9999" ];then - doins "${FILESDIR}"/gdb - dobin "${FILESDIR}"/kismet-gdb - fi - - dodoc CHANGELOG README* - newinitd "${FILESDIR}"/${PN}.initd-r3 kismet - newconfd "${FILESDIR}"/${PN}.confd-r2 kismet - systemd_dounit packaging/systemd/kismet.service -} - -pkg_preinst() { - if use suid; then - fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth - fowners root:kismet /usr/bin/kismet_cap_linux_wifi - fowners root:kismet /usr/bin/kismet_cap_pcapfile - # Need to set the permissions after chowning. - # See chown(2) - fperms 4550 /usr/bin/kismet_cap_linux_bluetooth - fperms 4550 /usr/bin/kismet_cap_linux_wifi - fperms 4550 /usr/bin/kismet_cap_pcapfile - elog "Kismet has been installed with a setuid-root helper binary" - elog "to enable minimal-root operation. Users need to be part of" - elog "the 'kismet' group to perform captures from physical devices." - fi - if ! use suid; then - ewarn "It is highly discouraged to run a sniffer as root," - ewarn "Please consider enabling the suid use flag and adding" - ewarn "your user to the kismet group." - fi -} - -migrate_config() { - einfo "Kismet Configuration files are now read from /etc/kismet/" - ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf" - if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then - ewarn "Files at /etc/kismet_*.conf will not be read and should be removed" - fi - if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then - mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location" - ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf" - elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then - ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits" - ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf" - fi -} - -pkg_postinst() { - if [ -n "${REPLACING_VERSIONS}" ]; then - for v in ${REPLACING_VERSIONS}; do - if ver_test ${v} -lt 2019.07.2 ; then - migrate_config - break - fi - if ver_test ${v} -eq 9999 ; then - migrate_config - break - fi - done - fi -} diff --git a/net-wireless/kismet/kismet-2021.05.1.ebuild b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild index 4d086c30ee7b..0965409505a7 100644 --- a/net-wireless/kismet/kismet-2021.05.1.ebuild +++ b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools multilib python-single-r1 udev systemd +inherit autotools python-single-r1 udev systemd if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" @@ -40,13 +40,12 @@ CDEPEND=" ${PYTHON_DEPS} acct-user/kismet acct-group/kismet - networkmanager? ( net-misc/networkmanager:= ) - dev-libs/glib:= - dev-libs/elfutils:= + networkmanager? ( net-misc/networkmanager ) + dev-libs/glib:2 + dev-libs/elfutils sys-libs/zlib:= - dev-db/sqlite:= - net-libs/libmicrohttpd:= - net-libs/libwebsockets:=[client] + dev-db/sqlite:3 + net-libs/libwebsockets:=[client,lejp] kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap @@ -58,36 +57,39 @@ CDEPEND=" dev-python/protobuf-python[${PYTHON_USEDEP}] dev-python/websockets[${PYTHON_USEDEP}] ') - sys-libs/ncurses:= - lm-sensors? ( sys-apps/lm-sensors ) + lm-sensors? ( sys-apps/lm-sensors:= ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) - ubertooth? ( net-wireless/ubertooth:= ) + ubertooth? ( net-wireless/ubertooth ) " - -DEPEND="${CDEPEND} - dev-libs/boost - dev-libs/libfmt - virtual/pkgconfig -" - RDEPEND="${CDEPEND} $(python_gen_cond_dep ' dev-python/pyserial[${PYTHON_USEDEP}] ') - selinux? ( sec-policy/selinux-kismet ) -" -PDEPEND=" rtlsdr? ( $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] ') net-wireless/rtl-sdr - )" + ) + selinux? ( sec-policy/selinux-kismet ) +" +#switched back to bundled libfmt-8 +#https://bugs.gentoo.org/895252 +#<dev-libs/libfmt-9 +DEPEND="${CDEPEND} + dev-libs/boost + sys-libs/libcap +" +BDEPEND="virtual/pkgconfig" + +# https://bugs.gentoo.org/872608 +# drop after 2022.08* +PATCHES=( "${FILESDIR}/${P}-sandbox-fix.patch" ) src_prepare() { - sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ - conf/kismet_logging.conf || die + #sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ + # conf/kismet_logging.conf || die #this was added to quiet macosx builds but it makes gcc builds noisier sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die @@ -95,7 +97,9 @@ src_prepare() { #sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in rm -r boost || die - rm -r fmt || die + #switched back to bundled libfmt-8 + #https://bugs.gentoo.org/895252 + #rm -r fmt || die #dev-libs/jsoncpp #rm -r json || die @@ -106,19 +110,16 @@ src_prepare() { # log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \ # trackedelement.h trackedelement_workers.h - # Don't strip and set correct mangrp - sed -i -e 's| -s||g' \ - -e 's|@mangrp@|root|g' Makefile.in || die - eapply_user - #just use set to fix setup.py - find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die - find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die - if [ "${PV}" = "9999" ]; then eautoreconf fi + # drop after 2022.08* + # VERSION was incorrectly removed in 4e490cf0b49a287e964df9c5e5c4067f6918909e upstream + # https://github.com/kismetwireless/kismet/issues/427 + # https://bugs.gentoo.org/864298 + echo "${PV}" > VERSION } src_configure() { @@ -145,7 +146,7 @@ src_install() { dobin "${FILESDIR}"/kismet-gdb fi - dodoc CHANGELOG README* + dodoc README* newinitd "${FILESDIR}"/${PN}.initd-r3 kismet newconfd "${FILESDIR}"/${PN}.confd-r2 kismet systemd_dounit packaging/systemd/kismet.service @@ -175,7 +176,7 @@ pkg_preinst() { migrate_config() { einfo "Kismet Configuration files are now read from /etc/kismet/" ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf" - if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then + if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then ewarn "Files at /etc/kismet_*.conf will not be read and should be removed" fi if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then @@ -200,4 +201,8 @@ pkg_postinst() { fi done fi + udev_reload +} +pkg_postrm() { + udev_reload } diff --git a/net-wireless/kismet/kismet-2021.08.1.ebuild b/net-wireless/kismet/kismet-2023.07.1.ebuild index 45462e528503..d811631a3fe8 100644 --- a/net-wireless/kismet/kismet-2021.08.1.ebuild +++ b/net-wireless/kismet/kismet-2023.07.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools multilib python-single-r1 udev systemd +inherit autotools python-single-r1 udev systemd if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" @@ -18,13 +18,16 @@ else S=${WORKDIR}/${MY_P/BETA/beta} #normally we want an official release - SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" + SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz + https://dev.gentoo.org/~zerochaos/distfiles/${P}-stdint-fix.patch" #but sometimes we want a git commit #COMMIT="9ca7e469cf115469f392db7436816151867e1654" #SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" #S="${WORKDIR}/${PN}-${COMMIT}" + PATCHES=( "${DISTDIR}/${P}-stdint-fix.patch" ) + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" fi @@ -40,13 +43,13 @@ CDEPEND=" ${PYTHON_DEPS} acct-user/kismet acct-group/kismet - networkmanager? ( net-misc/networkmanager:= ) - dev-libs/glib:= - dev-libs/elfutils:= + networkmanager? ( net-misc/networkmanager ) + dev-libs/glib:2 + dev-libs/elfutils + dev-libs/openssl:= sys-libs/zlib:= - dev-db/sqlite:= - net-libs/libmicrohttpd:= - net-libs/libwebsockets:=[client] + dev-db/sqlite:3 + net-libs/libwebsockets:=[client,lejp] kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap @@ -58,36 +61,33 @@ CDEPEND=" dev-python/protobuf-python[${PYTHON_USEDEP}] dev-python/websockets[${PYTHON_USEDEP}] ') - sys-libs/ncurses:= - lm-sensors? ( sys-apps/lm-sensors ) - pcre? ( dev-libs/libpcre ) + lm-sensors? ( sys-apps/lm-sensors:= ) + pcre? ( dev-libs/libpcre2:= ) suid? ( sys-libs/libcap ) - ubertooth? ( net-wireless/ubertooth:= ) + ubertooth? ( net-wireless/ubertooth ) " - -DEPEND="${CDEPEND} - dev-libs/boost - dev-libs/libfmt - virtual/pkgconfig -" - RDEPEND="${CDEPEND} $(python_gen_cond_dep ' dev-python/pyserial[${PYTHON_USEDEP}] ') - selinux? ( sec-policy/selinux-kismet ) -" -PDEPEND=" rtlsdr? ( $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] ') net-wireless/rtl-sdr - )" + ) + selinux? ( sec-policy/selinux-kismet ) +" +DEPEND="${CDEPEND} + dev-libs/boost + =dev-libs/libfmt-9* + sys-libs/libcap +" +BDEPEND="virtual/pkgconfig" src_prepare() { - sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ - conf/kismet_logging.conf || die + #sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ + # conf/kismet_logging.conf || die #this was added to quiet macosx builds but it makes gcc builds noisier sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die @@ -106,15 +106,7 @@ src_prepare() { # log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \ # trackedelement.h trackedelement_workers.h - # Don't strip and set correct mangrp - sed -i -e 's| -s||g' \ - -e 's|@mangrp@|root|g' Makefile.in || die - - eapply_user - - #just use set to fix setup.py - find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die - find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die + default if [ "${PV}" = "9999" ]; then eautoreconf @@ -124,7 +116,9 @@ src_prepare() { src_configure() { econf \ $(use_enable libusb libusb) \ + $(use_enable libusb wifi-coconut) \ $(use_enable pcre) \ + $(use_enable pcre require-pcre2) \ $(use_enable lm-sensors lmsensors) \ $(use_enable networkmanager libnm) \ $(use_enable ubertooth) \ @@ -145,7 +139,7 @@ src_install() { dobin "${FILESDIR}"/kismet-gdb fi - dodoc CHANGELOG README* + dodoc README* newinitd "${FILESDIR}"/${PN}.initd-r3 kismet newconfd "${FILESDIR}"/${PN}.confd-r2 kismet systemd_dounit packaging/systemd/kismet.service @@ -175,7 +169,7 @@ pkg_preinst() { migrate_config() { einfo "Kismet Configuration files are now read from /etc/kismet/" ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf" - if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then + if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then ewarn "Files at /etc/kismet_*.conf will not be read and should be removed" fi if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then @@ -200,4 +194,8 @@ pkg_postinst() { fi done fi + udev_reload +} +pkg_postrm() { + udev_reload } diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild index 45462e528503..84a92eaf262c 100644 --- a/net-wireless/kismet/kismet-9999.ebuild +++ b/net-wireless/kismet/kismet-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools multilib python-single-r1 udev systemd +inherit autotools python-single-r1 udev systemd if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" @@ -33,20 +33,21 @@ HOMEPAGE="https://www.kismetwireless.net" LICENSE="GPL-2" SLOT="0/${PV}" -IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev" +IUSE="libusb lm-sensors mqtt networkmanager +pcre rtlsdr selinux +suid ubertooth udev +wext" REQUIRED_USE="${PYTHON_REQUIRED_USE}" CDEPEND=" ${PYTHON_DEPS} acct-user/kismet acct-group/kismet - networkmanager? ( net-misc/networkmanager:= ) - dev-libs/glib:= - dev-libs/elfutils:= + mqtt? ( app-misc/mosquitto ) + networkmanager? ( net-misc/networkmanager ) + dev-libs/glib:2 + dev-libs/elfutils + dev-libs/openssl:= sys-libs/zlib:= - dev-db/sqlite:= - net-libs/libmicrohttpd:= - net-libs/libwebsockets:=[client] + dev-db/sqlite:3 + net-libs/libwebsockets:=[client,lejp] kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap @@ -58,36 +59,33 @@ CDEPEND=" dev-python/protobuf-python[${PYTHON_USEDEP}] dev-python/websockets[${PYTHON_USEDEP}] ') - sys-libs/ncurses:= - lm-sensors? ( sys-apps/lm-sensors ) - pcre? ( dev-libs/libpcre ) + lm-sensors? ( sys-apps/lm-sensors:= ) + pcre? ( dev-libs/libpcre2:= ) suid? ( sys-libs/libcap ) - ubertooth? ( net-wireless/ubertooth:= ) + ubertooth? ( net-wireless/ubertooth ) " - -DEPEND="${CDEPEND} - dev-libs/boost - dev-libs/libfmt - virtual/pkgconfig -" - RDEPEND="${CDEPEND} $(python_gen_cond_dep ' dev-python/pyserial[${PYTHON_USEDEP}] ') - selinux? ( sec-policy/selinux-kismet ) -" -PDEPEND=" rtlsdr? ( $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] ') net-wireless/rtl-sdr - )" + ) + selinux? ( sec-policy/selinux-kismet ) +" +DEPEND="${CDEPEND} + dev-libs/boost + =dev-libs/libfmt-9* + sys-libs/libcap +" +BDEPEND="virtual/pkgconfig" src_prepare() { - sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ - conf/kismet_logging.conf || die + #sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ + # conf/kismet_logging.conf || die #this was added to quiet macosx builds but it makes gcc builds noisier sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die @@ -106,15 +104,7 @@ src_prepare() { # log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \ # trackedelement.h trackedelement_workers.h - # Don't strip and set correct mangrp - sed -i -e 's| -s||g' \ - -e 's|@mangrp@|root|g' Makefile.in || die - - eapply_user - - #just use set to fix setup.py - find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die - find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die + default if [ "${PV}" = "9999" ]; then eautoreconf @@ -124,10 +114,14 @@ src_prepare() { src_configure() { econf \ $(use_enable libusb libusb) \ + $(use_enable libusb wifi-coconut) \ + $(use_enable mqtt mosquitto) \ $(use_enable pcre) \ + $(use_enable pcre require-pcre2) \ $(use_enable lm-sensors lmsensors) \ $(use_enable networkmanager libnm) \ $(use_enable ubertooth) \ + $(use_enable wext linuxwext) \ --sysconfdir=/etc/kismet \ --disable-optimization } @@ -145,7 +139,7 @@ src_install() { dobin "${FILESDIR}"/kismet-gdb fi - dodoc CHANGELOG README* + dodoc README* newinitd "${FILESDIR}"/${PN}.initd-r3 kismet newconfd "${FILESDIR}"/${PN}.confd-r2 kismet systemd_dounit packaging/systemd/kismet.service @@ -175,7 +169,7 @@ pkg_preinst() { migrate_config() { einfo "Kismet Configuration files are now read from /etc/kismet/" ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf" - if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then + if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then ewarn "Files at /etc/kismet_*.conf will not be read and should be removed" fi if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then @@ -200,4 +194,8 @@ pkg_postinst() { fi done fi + udev_reload +} +pkg_postrm() { + udev_reload } diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml index 06fff9ef465d..9a0418aaa270 100644 --- a/net-wireless/kismet/metadata.xml +++ b/net-wireless/kismet/metadata.xml @@ -7,13 +7,22 @@ </maintainer> <use> <flag name="libusb">Support libusb based capture sources such as mousejack, cc2540(ble), and nrf51822(ble)</flag> + <flag name="mqtt">Enable MQTT support</flag> + <flag name="pcre">Build with pcre support</flag> + <flag name="rtlsdr">Enable rtlsdr based kismet capture sources</flag> <flag name="suid"> Install a setuid root helper binary with limited functionality; this allows running kismet as a normal user, significantly reducing security risks </flag> - <flag name="pcre">Build with pcre support</flag> - <flag name="rtlsdr">Enable rtlsdr based kismet capture sources</flag> <flag name="ubertooth">Enable capture source for ubertooth to sniff bluetooth low energy</flag> + <flag name="wext"> + Enable building kismet with support for the deprecated Linux Wireless Extensions. + This is required for some out of tree and staging drivers, and kismet has not + been well tested with it disabled, so it defaults to on. + </flag> </use> + <upstream> + <remote-id type="github">kismetwireless/kismet</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/kismetdb/Manifest b/net-wireless/kismetdb/Manifest deleted file mode 100644 index a67a53481494..000000000000 --- a/net-wireless/kismetdb/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kismetdb-2019.05.05.tar.gz 31425 BLAKE2B 4aa4ee6924792376e84fb4a4fb86a425319ea21fc10dc5874df35aa551ce444f62dd381359bad994b89defee3fef8f0bed5e80ffc0d18c025bed28b5cb2efa45 SHA512 0b36c1d4dfb0ffb5749c32884ce1b44c1ece196ebaf07db66157aed2c649c2b4dc650a6553a2e263c4518da2f06f1602754917d5db07f3ab39efb63c38dd8327 diff --git a/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild b/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild deleted file mode 100644 index 7eebdb9d6a0e..000000000000 --- a/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 - -DESCRIPTION="Kismetdb database log helper library" -HOMEPAGE="https://kismetwireless.net/" -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://www.kismetwireless.net/git/python-kismet-db.git" -else - SRC_URI="https://github.com/kismetwireless/python-kismet-db/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/python-kismet-db-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/simplekml[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" -BDEPEND="" diff --git a/net-wireless/kismetdb/kismetdb-9999.ebuild b/net-wireless/kismetdb/kismetdb-9999.ebuild deleted file mode 100644 index f711584c7675..000000000000 --- a/net-wireless/kismetdb/kismetdb-9999.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 - -DESCRIPTION="Kismetdb database log helper library" -HOMEPAGE="https://kismetwireless.net/" -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kismetwireless/python-kismet-db.git" -else - SRC_URI="https://github.com/kismetwireless/python-kismet-db/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/python-kismet-db-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/simplekml[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" -BDEPEND="" diff --git a/net-wireless/kismetdb/metadata.xml b/net-wireless/kismetdb/metadata.xml deleted file mode 100644 index 97eff4632a18..000000000000 --- a/net-wireless/kismetdb/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - </maintainer> -</pkgmetadata> diff --git a/net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1-r2.ebuild b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1-r2.ebuild index b844f4cf0b81..970abb1aff48 100644 --- a/net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1-r2.ebuild +++ b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Mobile UI for kismet" HOMEPAGE="https://github.com/elkentaro/KismetMobileDashboard" diff --git a/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild index b844f4cf0b81..970abb1aff48 100644 --- a/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild +++ b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Mobile UI for kismet" HOMEPAGE="https://github.com/elkentaro/KismetMobileDashboard" diff --git a/net-wireless/kismetmobiledashboard/metadata.xml b/net-wireless/kismetmobiledashboard/metadata.xml index 97eff4632a18..63e4bcdc0fdb 100644 --- a/net-wireless/kismetmobiledashboard/metadata.xml +++ b/net-wireless/kismetmobiledashboard/metadata.xml @@ -5,4 +5,7 @@ <email>zerochaos@gentoo.org</email> <name>Rick Farina</name> </maintainer> + <upstream> + <remote-id type="github">elkentaro/KismetMobileDashboard</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/liblms7002m/liblms7002m-0.0_p20200518.ebuild b/net-wireless/liblms7002m/liblms7002m-0.0_p20200518-r1.ebuild index 06521a3518a2..372c55ad3fc9 100644 --- a/net-wireless/liblms7002m/liblms7002m-0.0_p20200518.ebuild +++ b/net-wireless/liblms7002m/liblms7002m-0.0_p20200518-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) -inherit cmake python-single-r1 +PYTHON_COMPAT=( python3_{9..10} ) +inherit cmake python-any-r1 -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" -HOMEPAGE="https://www.gnuradio.org/" -LICENSE="GPL-3" +DESCRIPTION="Compact LMS7002M library suitable for resource-limited MCUs" +HOMEPAGE="https://github.com/xtrx-sdr/liblms7002m" +LICENSE="LGPL-2.1" SLOT="0/${PV}" -if [[ ${PV} =~ "9999" ]]; then +if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/xtrx-sdr/liblms7002m.git" inherit git-r3 else @@ -21,15 +21,18 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +BDEPEND=" + $(python_gen_any_dep ' + dev-python/cheetah3[${PYTHON_USEDEP}] + ') +" -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/cheetah3[${PYTHON_USEDEP}]')" -DEPEND="${RDEPEND}" +python_check_deps() { + python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" +} src_configure() { - mycmakeargs=( + local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) cmake_src_configure diff --git a/net-wireless/liblms7002m/liblms7002m-9999.ebuild b/net-wireless/liblms7002m/liblms7002m-9999.ebuild index edd808aede06..372c55ad3fc9 100644 --- a/net-wireless/liblms7002m/liblms7002m-9999.ebuild +++ b/net-wireless/liblms7002m/liblms7002m-9999.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) -inherit cmake python-single-r1 +PYTHON_COMPAT=( python3_{9..10} ) +inherit cmake python-any-r1 DESCRIPTION="Compact LMS7002M library suitable for resource-limited MCUs" HOMEPAGE="https://github.com/xtrx-sdr/liblms7002m" LICENSE="LGPL-2.1" SLOT="0/${PV}" -if [[ ${PV} =~ "9999" ]]; then +if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/xtrx-sdr/liblms7002m.git" inherit git-r3 else @@ -21,15 +21,18 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +BDEPEND=" + $(python_gen_any_dep ' + dev-python/cheetah3[${PYTHON_USEDEP}] + ') +" -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/cheetah3[${PYTHON_USEDEP}]')" -DEPEND="${RDEPEND}" +python_check_deps() { + python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" +} src_configure() { - mycmakeargs=( + local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) cmake_src_configure diff --git a/net-wireless/liblms7002m/metadata.xml b/net-wireless/liblms7002m/metadata.xml index 0f4d7d8abb50..b0594ad19f80 100644 --- a/net-wireless/liblms7002m/metadata.xml +++ b/net-wireless/liblms7002m/metadata.xml @@ -2,7 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> + <email>radio@gentoo.org</email> + <name>Radio</name> </maintainer> + <upstream> + <remote-id type="github">xtrx-sdr/liblms7002m</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/libm2k/Manifest b/net-wireless/libm2k/Manifest deleted file mode 100644 index ba466716103f..000000000000 --- a/net-wireless/libm2k/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libm2k-0.0_p20201005.tar.gz 590923 BLAKE2B 47b018ca8524a30d2d22c387c45361a3765ef356a481ff144783e459f673f3c00ba122cfc086b4f7d3cef2f6847b9adee3bc1eec4f6ee52eb355a9625b29b7c6 SHA512 60ca79048408e3ee6b09978f417cc8a0b67982fe9ac62563331c96fb503af22b050803f9d10598e9edd02eb3af396c1ad0d16772ae3cd3d16c251bd588a682c8 diff --git a/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild b/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild deleted file mode 100644 index c5b966c0b7f4..000000000000 --- a/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit cmake python-single-r1 udev - -DESCRIPTION="A C++ library for interfacing with the ADALM2000" -HOMEPAGE="https://github.com/analogdevicesinc/libm2k" -if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/analogdevicesinc/libm2k.git" - inherit git-r3 -else - COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4" - SRC_URI="https://github.com/analogdevicesinc/libm2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~x86" -fi -LICENSE="GPL-3+" -SLOT="0" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND="${PYTHON_DEPS} - net-libs/libiio - " -DEPEND="${RDEPEND} - dev-lang/swig -" - -src_configure() { - mycmakeargs=( - -DUDEV_RULES_PATH="$(get_udevdir)"/rules.d - -DCMAKE_SKIP_BUILD_RPATH=TRUE - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - #this seems to not compile things - python_optimize -} diff --git a/net-wireless/libm2k/libm2k-9999.ebuild b/net-wireless/libm2k/libm2k-9999.ebuild deleted file mode 100644 index c5b966c0b7f4..000000000000 --- a/net-wireless/libm2k/libm2k-9999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit cmake python-single-r1 udev - -DESCRIPTION="A C++ library for interfacing with the ADALM2000" -HOMEPAGE="https://github.com/analogdevicesinc/libm2k" -if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/analogdevicesinc/libm2k.git" - inherit git-r3 -else - COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4" - SRC_URI="https://github.com/analogdevicesinc/libm2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~x86" -fi -LICENSE="GPL-3+" -SLOT="0" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND="${PYTHON_DEPS} - net-libs/libiio - " -DEPEND="${RDEPEND} - dev-lang/swig -" - -src_configure() { - mycmakeargs=( - -DUDEV_RULES_PATH="$(get_udevdir)"/rules.d - -DCMAKE_SKIP_BUILD_RPATH=TRUE - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - #this seems to not compile things - python_optimize -} diff --git a/net-wireless/libm2k/metadata.xml b/net-wireless/libm2k/metadata.xml deleted file mode 100644 index c8ced3b22ea1..000000000000 --- a/net-wireless/libm2k/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - </maintainer> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> - <upstream> - <remote-id type="github">analogdevicesinc/libm2k</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild b/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild index 5277ce0e5d1f..e1962c0b6c2e 100644 --- a/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild +++ b/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ DEPEND="${RDEPEND}" src_configure() { #fails to build, not sure why #-DENABLE_SOAPY="$(usex soapy ON OFF)" - mycmakeargs=( + local mycmakeargs=( -DENABLE_SOAPY=OFF ) cmake_src_configure diff --git a/net-wireless/libxtrx/libxtrx-9999.ebuild b/net-wireless/libxtrx/libxtrx-9999.ebuild index 5277ce0e5d1f..e1962c0b6c2e 100644 --- a/net-wireless/libxtrx/libxtrx-9999.ebuild +++ b/net-wireless/libxtrx/libxtrx-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ DEPEND="${RDEPEND}" src_configure() { #fails to build, not sure why #-DENABLE_SOAPY="$(usex soapy ON OFF)" - mycmakeargs=( + local mycmakeargs=( -DENABLE_SOAPY=OFF ) cmake_src_configure diff --git a/net-wireless/libxtrxdsp/libxtrxdsp-0.0_p20200830.ebuild b/net-wireless/libxtrxdsp/libxtrxdsp-0.0_p20200830.ebuild index 6f8a227e202e..d26d7401a283 100644 --- a/net-wireless/libxtrxdsp/libxtrxdsp-0.0_p20200830.ebuild +++ b/net-wireless/libxtrxdsp/libxtrxdsp-0.0_p20200830.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,8 +18,3 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" diff --git a/net-wireless/libxtrxdsp/libxtrxdsp-9999.ebuild b/net-wireless/libxtrxdsp/libxtrxdsp-9999.ebuild index 6f8a227e202e..d26d7401a283 100644 --- a/net-wireless/libxtrxdsp/libxtrxdsp-9999.ebuild +++ b/net-wireless/libxtrxdsp/libxtrxdsp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,8 +18,3 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" diff --git a/net-wireless/libxtrxdsp/metadata.xml b/net-wireless/libxtrxdsp/metadata.xml index 0f4d7d8abb50..642beff65219 100644 --- a/net-wireless/libxtrxdsp/metadata.xml +++ b/net-wireless/libxtrxdsp/metadata.xml @@ -5,4 +5,7 @@ <email>radio@gentoo.org</email> <name>Radio</name> </maintainer> + <upstream> + <remote-id type="github">xtrx-sdr/libxtrxdsp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild b/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild index 6e0b7183d221..dbb429f7470d 100644 --- a/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild +++ b/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Low-level XTRX hardware abstraction library" HOMEPAGE="https://github.com/xtrx-sdr/libxtrxll" @@ -26,7 +26,15 @@ RDEPEND="usb3380? ( net-wireless/libusb3380 )" DEPEND="${RDEPEND}" src_configure() { - mycmakeargs=( + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861932 + # https://github.com/myriadrf/libxtrxll/issues/10 + # + # Do not trust with LTO either + append-flags -fno-strict-aliasing + filter-lto + + local mycmakeargs=( -DENABLE_PCIE=ON -DENABLE_USB3380="$(usex usb3380 ON OFF)" ) diff --git a/net-wireless/libxtrxll/libxtrxll-9999.ebuild b/net-wireless/libxtrxll/libxtrxll-9999.ebuild index 6e0b7183d221..dbb429f7470d 100644 --- a/net-wireless/libxtrxll/libxtrxll-9999.ebuild +++ b/net-wireless/libxtrxll/libxtrxll-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Low-level XTRX hardware abstraction library" HOMEPAGE="https://github.com/xtrx-sdr/libxtrxll" @@ -26,7 +26,15 @@ RDEPEND="usb3380? ( net-wireless/libusb3380 )" DEPEND="${RDEPEND}" src_configure() { - mycmakeargs=( + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861932 + # https://github.com/myriadrf/libxtrxll/issues/10 + # + # Do not trust with LTO either + append-flags -fno-strict-aliasing + filter-lto + + local mycmakeargs=( -DENABLE_PCIE=ON -DENABLE_USB3380="$(usex usb3380 ON OFF)" ) diff --git a/net-wireless/libxtrxll/metadata.xml b/net-wireless/libxtrxll/metadata.xml index e9e20887c2df..11902b1c56c2 100644 --- a/net-wireless/libxtrxll/metadata.xml +++ b/net-wireless/libxtrxll/metadata.xml @@ -8,4 +8,7 @@ <use> <flag name="usb3380">support xtrx usb model</flag> </use> + <upstream> + <remote-id type="github">xtrx-sdr/libxtrxll</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/limesuite/Manifest b/net-wireless/limesuite/Manifest index 0231b60f6da1..b58bad9c75c9 100644 --- a/net-wireless/limesuite/Manifest +++ b/net-wireless/limesuite/Manifest @@ -1 +1,3 @@ -DIST limesuite-19.04.0.tar.gz 5357563 BLAKE2B ac4f97b564968e2e1aca076cbb97d2cd77067c405fbe90e1453be864dd4083cf087363c708d9b3f130c8bad150ad878eb4c648809c2364fef0e669650319d66e SHA512 6e416cee91bd27fe5ac11838fe6a67d1f6d6a790a5844d6bddd79ed7433b65c401aa88cf45f9977af862b8e35bd3caf79d3d3c2e639ab993bbb8e0127a97a598 +DIST limesuite-20.10.0.tar.gz 5421065 BLAKE2B 1b3a6240b334a9d96c3184edc71d9666525906a3a34c03085c869ef2f2cb8d741386a2c14f120a3de50b55d2183006611fa1d79ecce0a353537b1c650d862b11 SHA512 4ff422d04bb8795463da1a3e04dd742701bca89cb9003e3a1af3a97f9aa13a167c6cafa4b36734c3c810d08cec96f4d8aced40413504660f42a9c7208bfa3264 +DIST limesuite-23.10.0.tar.gz 5202380 BLAKE2B e18ce6b95cd2f2cf4c7f12db09a006822a34e64cccd5ab427e19a2b25812985e260708a3d62dec6c41974571593fad4c8c9df510b814cda0da3bdad899fb44d0 SHA512 2f29afce2f00247e509b0a0c994b53ee31c98e2aa43cee12f0529994a532059db7b7bc4bd26f1066995740d5ba6cee3ec4db53e4068b21b330d463953a9b4d9d +DIST limesuite-23.11.0.tar.gz 5202440 BLAKE2B da91e0463f47f51b42f4be74d07e7beb3289649b7075e2a3da9752f7222c035e823ea300e15f52bcaccfde81fbae97b44e03c3bcb0ae3ce38019e88472cecf58 SHA512 0f96f92952af4470d5a9cc407c2d25348123876eab8d589371ad6105f9871dfe6e2317e634509bfd950ffb9ae30338e6fc7936ad9030c1119be442080a5174e7 diff --git a/net-wireless/limesuite/limesuite-19.04.0.ebuild b/net-wireless/limesuite/limesuite-20.10.0.ebuild index 45c0f916b3e4..a3eb577bb40b 100644 --- a/net-wireless/limesuite/limesuite-19.04.0.ebuild +++ b/net-wireless/limesuite/limesuite-20.10.0.ebuild @@ -1,31 +1,34 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 WX_GTK_VER="3.0-gtk3" -inherit cmake-utils wxwidgets +inherit cmake wxwidgets DESCRIPTION="Driver and GUI for LMS7002M-based SDR platforms" HOMEPAGE="https://myriadrf.org/projects/component/limesdr/" SRC_URI="https://github.com/myriadrf/LimeSuite/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/LimeSuite-${PV}" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -S="${WORKDIR}/LimeSuite-${PV}" -DEPEND="x11-libs/fltk +DEPEND=" + x11-libs/fltk:1 x11-libs/wxGTK:${WX_GTK_VER} net-wireless/soapysdr:= virtual/opengl virtual/libusb:1" RDEPEND="${DEPEND}" -BDEPEND="" src_configure() { setup-wxwidgets - cmake-utils_src_configure + + local mycmakeargs=( + -DENABLE_OCTAVE=OFF + -DENABLE_EXAMPLES=OFF + ) + cmake_src_configure } diff --git a/net-wireless/limesuite/limesuite-23.10.0.ebuild b/net-wireless/limesuite/limesuite-23.10.0.ebuild new file mode 100644 index 000000000000..6e42d2d852f0 --- /dev/null +++ b/net-wireless/limesuite/limesuite-23.10.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets + +DESCRIPTION="Driver and GUI for LMS7002M-based SDR platforms" +HOMEPAGE="https://myriadrf.org/projects/component/limesdr/" +SRC_URI="https://github.com/myriadrf/LimeSuite/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/LimeSuite-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + x11-libs/fltk:1 + x11-libs/wxGTK:${WX_GTK_VER} + net-wireless/soapysdr:= + virtual/opengl + virtual/libusb:1" +RDEPEND="${DEPEND}" + +src_configure() { + setup-wxwidgets + + local mycmakeargs=( + -DENABLE_OCTAVE=OFF + -DENABLE_EXAMPLES=OFF + ) + cmake_src_configure +} diff --git a/net-wireless/limesuite/limesuite-23.11.0.ebuild b/net-wireless/limesuite/limesuite-23.11.0.ebuild new file mode 100644 index 000000000000..5dc765b3cd1a --- /dev/null +++ b/net-wireless/limesuite/limesuite-23.11.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +inherit desktop cmake wxwidgets xdg + +DESCRIPTION="Driver and GUI for LMS7002M-based SDR platforms" +HOMEPAGE="https://myriadrf.org/projects/component/limesdr/" +SRC_URI="https://github.com/myriadrf/LimeSuite/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/LimeSuite-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + x11-libs/fltk:1 + x11-libs/wxGTK:${WX_GTK_VER} + net-wireless/soapysdr:= + virtual/opengl + virtual/libusb:1" +RDEPEND="${DEPEND}" + +src_configure() { + setup-wxwidgets + + local mycmakeargs=( + -DENABLE_OCTAVE=OFF + -DENABLE_EXAMPLES=OFF + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # https://github.com/myriadrf/LimeSuite/issues/223 + # Upstream installs icon and desktop files to a central location and has + # a script to move them to the correct locations at postinst time. + for size in 16 22 32 48 64 128; do + newicon -s ${size} Desktop/lime-suite-${size}.png lime-suite.png + done + domenu Desktop/lime-suite.desktop + rm -r "${ED}"/usr/share/Lime/Desktop || die +} diff --git a/net-wireless/linssid/files/linssid-3.6-qwt620.patch b/net-wireless/linssid/files/linssid-3.6-qwt620.patch new file mode 100644 index 000000000000..bea00e1f432d --- /dev/null +++ b/net-wireless/linssid/files/linssid-3.6-qwt620.patch @@ -0,0 +1,48 @@ +From: Luigi Baldoni <aloisio@gmx.com> +Date: 2021-08-04 22:14:02 +0200 +Subject: Fix compatibility with Qwt 6.2.0 +References: https://sourceforge.net/p/linssid/discussion/bugs/thread/3080bf8f4d/ +Upstream: submitted + +Disambiguate function calls after new overloads added in qwt 6.2. +(courtesy of Jari Kuittinen) + +--- + +Index: MainForm.cpp +=================================================================== +--- a/MainForm.cpp ++++ b/MainForm.cpp +@@ -28,6 +28,7 @@ + #include <qwt_plot_curve.h> + #include <qwt_plot_grid.h> + #include <qwt_symbol.h> ++#include <qwt_text.h> + #include <qwt_plot_marker.h> + #include <QPointF> + #include <qwt_scale_draw.h> +@@ -1036,7 +1037,7 @@ void MainForm::fillPlots() { + MainForm::cellDataRay[tbi].signal ) ); + } + } else { +- MainForm::cellDataRay[tbi].pBandCurve->setSamples(0, 0, 0); ++ MainForm::cellDataRay[tbi].pBandCurve->setSamples((double *)nullptr, (double *)nullptr, 0); + } + // now the signal history plot + int ixStart; +@@ -1055,7 +1056,7 @@ void MainForm::fillPlots() { + &(MainForm::cellDataRay[tbi].pHistory->signal[ixStart]), ixLength); + } else { + +- MainForm::cellDataRay[tbi].pTimeCurve->setSamples(0, 0, 0); ++ MainForm::cellDataRay[tbi].pTimeCurve->setSamples((double *)nullptr, (double *)nullptr, 0); + } + } + MainForm::mainFormWidget.chan24Plot->replot(); +@@ -1424,4 +1425,4 @@ int MainForm::MinIntStr(const string &s) + // const std::string whiteSpaces( " \f\n\r\t\v" ); + // std::string::size_type pos = str.find_first_not_of( whiteSpaces ); + // str.erase( pos + 1 ); +-//} +\ No newline at end of file ++//} diff --git a/net-wireless/linssid/linssid-3.6-r1.ebuild b/net-wireless/linssid/linssid-3.6-r2.ebuild index f12ac63ff47b..8e67948519cc 100644 --- a/net-wireless/linssid/linssid-3.6-r1.ebuild +++ b/net-wireless/linssid/linssid-3.6-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qmake-utils xdg-utils DESCRIPTION="Graphical wireless scanning for Linux" HOMEPAGE="https://sourceforge.net/projects/linssid/" SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz" +S="${WORKDIR}/${P}/${PN}-app" LICENSE="GPL-3" SLOT="0" @@ -29,10 +30,10 @@ RDEPEND=" x11-libs/libxkbcommon[X] " -S="${WORKDIR}/${P}/${PN}-app" - DOCS=( README_${PV} ) +PATCHES=( "${FILESDIR}/${PN}-3.6-qwt620.patch" ) + src_prepare() { default diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest index 39bee0406da5..c807ec44615c 100644 --- a/net-wireless/lorcon/Manifest +++ b/net-wireless/lorcon/Manifest @@ -1,2 +1 @@ -DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda SHA512 794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a -DIST lorcon-2020.06.06.tar.gz 506144 BLAKE2B 6fe0d3578b8f91ed9ed0ea12ce110afc6764b694c78c57935b835e4fb8e4c4c81e07f7a8b069583382e91ef760a07bdcf3f9aa51167add052ac1f3f8c0758155 SHA512 1f51dc221d01356b59fd615ebccabb6d00f1999fd9450f6f092f6234635e162f0407e203df9dde4f0f942691cd9395df30377478ec677c910c2d1603228cef30 +DIST lorcon-2020.06.06_p20220216.tar.gz 506368 BLAKE2B 2881af0130f331b2f648c0d29b0d70516770b833ba18b5f9bf6d4eb9eaab2192034ecc840f5e2b323c0e0fb8737dd1e29525b237d95825d60e78e3200f4ac929 SHA512 3f7d5967a1af840f8f6f05872c06d908ce426e7827046b8d86267770da044b48973554ff7a0415756522332055496f00ad078fa6a25a1898d640c925834111ef diff --git a/net-wireless/lorcon/files/lorcon-2020.06.06_p20220216-C99-decls.patch b/net-wireless/lorcon/files/lorcon-2020.06.06_p20220216-C99-decls.patch new file mode 100644 index 000000000000..9643c0f973cf --- /dev/null +++ b/net-wireless/lorcon/files/lorcon-2020.06.06_p20220216-C99-decls.patch @@ -0,0 +1,20 @@ +--- a/drv_mac80211.c ++++ b/drv_mac80211.c +@@ -52,6 +52,7 @@ + #include "lorcon_int.h" + #include "lorcon_packasm.h" + #include "lorcon_endian.h" ++#include "iwcontrol.h" + + #ifndef IEEE80211_RADIOTAP_FLAGS + #define IEEE80211_RADIOTAP_FLAGS (1 << 1) +--- a/drv_madwifing.c ++++ b/drv_madwifing.c +@@ -48,6 +48,7 @@ + #include "ifcontrol_linux.h" + #include "madwifing_control.h" + #include "lorcon_int.h" ++#include "lorcon_packasm.h" + + /* Monitor, inject, and injmon are all the same method, make a new + * mwng VAP */ diff --git a/net-wireless/lorcon/lorcon-2020.06.06.ebuild b/net-wireless/lorcon/lorcon-2020.06.06.ebuild deleted file mode 100644 index 20a4da501628..000000000000 --- a/net-wireless/lorcon/lorcon-2020.06.06.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9}) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 - -DESCRIPTION="A generic library for injecting 802.11 frames" -HOMEPAGE="https://github.com/kismetwireless/lorcon" - -if [[ ${PV} == "9999" ]] ; then - #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git" - EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git" - inherit git-r3 - S="${WORKDIR}"/${P} -else - SRC_URI="https://github.com/kismetwireless/lorcon/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="python" - -DEPEND=" - python? ( ${PYTHON_DEPS} ) - dev-libs/libnl:3= - net-libs/libpcap" -RDEPEND="${DEPEND}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="test" - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-r3_src_unpack - cp -R "${S}/" "${WORKDIR}/all" - fi - default_src_unpack -} - -src_prepare() { - default - use python && distutils-r1_src_prepare -} - -src_configure() { - econf --disable-static -} - -src_compile() { - default_src_compile - if use python; then - LDFLAGS+=" -L${S}/.libs/" - cd pylorcon2 || die - distutils-r1_src_compile - fi -} - -src_install() { - emake DESTDIR="${ED}" install - if use python; then - cd pylorcon2 || die - distutils-r1_src_install - fi - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild index db239c00f95b..f81061543774 100644 --- a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild +++ b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild @@ -1,72 +1,69 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9}) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_OPTIONAL=1 -inherit distutils-r1 +inherit distutils-r1 flag-o-matic DESCRIPTION="A generic library for injecting 802.11 frames" HOMEPAGE="https://github.com/kismetwireless/lorcon" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + #main repo #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git" + #reliable mirror EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git" inherit git-r3 - S="${WORKDIR}"/${P} else - GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772" + GIT_HASH="4a81d6aaa2c6ac7253ecd182ffe97c6c89411196" SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/"${PN}-${GIT_HASH}" + KEYWORDS="amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" SLOT="0" IUSE="python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND=" - python? ( ${PYTHON_DEPS} ) +RDEPEND=" dev-libs/libnl:3= - net-libs/libpcap" -RDEPEND="${DEPEND}" + net-libs/libpcap + python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + python? ( ${DISTUTILS_DEPS} )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="test" - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-r3_src_unpack - cp -R "${S}/" "${WORKDIR}/all" - fi - default_src_unpack -} +PATCHES=( "${FILESDIR}"/${P}-C99-decls.patch ) src_prepare() { default use python && distutils-r1_src_prepare } -src_configure() { - econf --disable-static -} - src_compile() { - default_src_compile + default + if use python; then - LDFLAGS+=" -L${S}/.libs/" + append-ldflags "-L${S}/.libs/" cd pylorcon2 || die distutils-r1_src_compile fi } src_install() { - emake DESTDIR="${ED}" install + default + if use python; then cd pylorcon2 || die distutils-r1_src_install fi + find "${ED}" -name '*.la' -delete || die } diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild index 4a69d22d8690..2d2cb5de6bee 100644 --- a/net-wireless/lorcon/lorcon-9999.ebuild +++ b/net-wireless/lorcon/lorcon-9999.ebuild @@ -1,72 +1,67 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9}) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..12} ) DISTUTILS_OPTIONAL=1 -inherit distutils-r1 +inherit distutils-r1 flag-o-matic DESCRIPTION="A generic library for injecting 802.11 frames" HOMEPAGE="https://github.com/kismetwireless/lorcon" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then + #main repo #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git" + #reliable mirror EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git" inherit git-r3 - S="${WORKDIR}"/${P} else - GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772" + GIT_HASH="4a81d6aaa2c6ac7253ecd182ffe97c6c89411196" SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/"${PN}-${GIT_HASH}" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" SLOT="0" IUSE="python" - -DEPEND=" - python? ( ${PYTHON_DEPS} ) - dev-libs/libnl:3= - net-libs/libpcap" -RDEPEND="${DEPEND}" - REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="test" -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-r3_src_unpack - cp -R "${S}/" "${WORKDIR}/all" - fi - default_src_unpack -} +RDEPEND=" + dev-libs/libnl:3= + net-libs/libpcap + python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + python? ( ${DISTUTILS_DEPS} )" src_prepare() { default use python && distutils-r1_src_prepare } -src_configure() { - econf --disable-static -} - src_compile() { - default_src_compile + default + if use python; then - LDFLAGS+=" -L${S}/.libs/" + append-ldflags "-L${S}/.libs/" cd pylorcon2 || die distutils-r1_src_compile fi } src_install() { - emake DESTDIR="${ED}" install + default + if use python; then cd pylorcon2 || die distutils-r1_src_install fi + find "${ED}" -name '*.la' -delete || die } diff --git a/net-wireless/lorcon/metadata.xml b/net-wireless/lorcon/metadata.xml index 5b155ef976b3..9fa099abab96 100644 --- a/net-wireless/lorcon/metadata.xml +++ b/net-wireless/lorcon/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> -<email>zerochaos@gentoo.org</email> -<name>Rick Farina</name> -</maintainer> + <maintainer type="person"> + <email>zerochaos@gentoo.org</email> + <name>Rick Farina</name> + </maintainer> + <upstream> + <remote-id type="github">kismetwireless/lorcon</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/madwimax/madwimax-0.1.1-r1.ebuild b/net-wireless/madwimax/madwimax-0.1.1-r2.ebuild index 43812bae6dfa..cfb08defa6d2 100644 --- a/net-wireless/madwimax/madwimax-0.1.1-r1.ebuild +++ b/net-wireless/madwimax/madwimax-0.1.1-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 + inherit autotools linux-info udev DESCRIPTION="Reverse-engineered driver for WiMAX devices based on Samsung CMC-730 chip" @@ -14,7 +15,8 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="doc" RDEPEND="virtual/libusb:1" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig doc? ( app-text/asciidoc @@ -24,6 +26,7 @@ DEPEND="${RDEPEND} CONFIG_CHECK="~TUN" src_prepare() { + default sed -i -e "s:\(for name in docbook2\)x-man:\1man\.pl:" configure.ac || die eautoreconf } diff --git a/net-wireless/mdk/mdk-3.6-r1.ebuild b/net-wireless/mdk/mdk-3.6-r1.ebuild index 26bffddfa6e9..e90cd46c37f6 100644 --- a/net-wireless/mdk/mdk-3.6-r1.ebuild +++ b/net-wireless/mdk/mdk-3.6-r1.ebuild @@ -23,7 +23,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" } src_install() { diff --git a/net-wireless/mfoc/mfoc-0.10.7-r1.ebuild b/net-wireless/mfoc/mfoc-0.10.7-r1.ebuild index 6fe306c11ff2..c220a9c964ce 100644 --- a/net-wireless/mfoc/mfoc-0.10.7-r1.ebuild +++ b/net-wireless/mfoc/mfoc-0.10.7-r1.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="Mifare Classic Offline Cracker" HOMEPAGE="https://github.com/nfc-tools/mfoc" SRC_URI="https://github.com/nfc-tools/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" LICENSE="GPL-2 GPL-2+ BSD-2" SLOT="0" @@ -16,8 +17,6 @@ KEYWORDS="~amd64" DEPEND=">=dev-libs/libnfc-1.7.0:=" RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-${P}" - src_prepare() { default eautoreconf diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest index 5477bafa3243..bdd8dcf31023 100644 --- a/net-wireless/nanovna-saver/Manifest +++ b/net-wireless/nanovna-saver/Manifest @@ -1 +1,3 @@ -DIST nanovna-saver-0.3.8.tar.gz 357896 BLAKE2B bace55c49c55e7389931c9f001e49cf8c0dab895b390e1be94d9f590e8c6352d81ff0ce6029c06211939360c76710c4df919af3e0f41533e1d7d56b75a788d3e SHA512 f560d076eb2ab06e441b0e1cb73cf20318abacc70dc9092ef9e32bac4198922aead8210997c176c774dffe2325407ad66cfbbb0f120f1fb465b84e46b28beed8 +DIST nanovna-saver-0.5.4.tar.gz 494010 BLAKE2B 71e4292e33dbb5b055e7ddd3a29222a67e05b1af431eaee64b613e50648b0b91ad5446cc2d3af868ae624826caf871bff9062275239298c29de261d741bad1f4 SHA512 6600b3c83fc1dcaf81a85b1d14087d2067327098c486011c8bfbaba83e06ca1081c6f7045730a58f097bab332072139707ea23c037924624d2f8100a7b61acb7 +DIST nanovna-saver-0.6.2.tar.gz 579583 BLAKE2B aa10f8272a63e42f35f5c395203bc1101f2a166bc29274cf28385fa7aab33d89953fdcf4595fadeed25abb2b6c02948307a1576738bd421cd648f7ef2a953bc9 SHA512 d5c548ffda24d8ca69a30cdda4afc1473afa5f5c3fecf2cee17e65e16fd46bee0dc274d5d597c5bb354c7251870e1f3ba0bd61a43f0af424db5403c5694713b5 +DIST nanovna-saver-0.6.3.tar.gz 580073 BLAKE2B be8482bf60a3abfff8a58c14cb34e81cf7b5733efa4d4da02e8d1cae0884fc4030f14a21bd66a6e5fb38f05938a446de8a5919cf3d13d902568c8c76f43381f1 SHA512 96cedb567f01f90ff07fef385d7ab6130213ab35674668d50962795e527414ca772583991db7bab73375a2651cb23876f1047d914579d5bec7758173f70bce71 diff --git a/net-wireless/nanovna-saver/metadata.xml b/net-wireless/nanovna-saver/metadata.xml index 94ed3ecdb025..e98d29aa3737 100644 --- a/net-wireless/nanovna-saver/metadata.xml +++ b/net-wireless/nanovna-saver/metadata.xml @@ -5,6 +5,10 @@ <email>zerochaos@gentoo.org</email> <name>Rick Farina</name> </maintainer> + <maintainer type="person"> + <email>tomjbe@gentoo.org</email> + <name>Thomas Beierlein</name> + </maintainer> <maintainer type="project"> <email>radio@gentoo.org</email> <name>Radio</name> diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.5.4.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.5.4.ebuild new file mode 100644 index 000000000000..45d22e0f674b --- /dev/null +++ b/net-wireless/nanovna-saver/nanovna-saver-0.5.4.ebuild @@ -0,0 +1,55 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 xdg-utils + +DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA" +HOMEPAGE="https://github.com/mihtjel/nanovna-saver" +SRC_URI="" + +LICENSE="GPL-3+" +SLOT="0" +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git" +else + SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 x86" +fi +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + dev-python/cython[${PYTHON_USEDEP}] + dev-python/pyserial[${PYTHON_USEDEP}] + dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}]" +BDEPEND="" + +distutils_enable_tests pytest + +src_prepare() { + sed -i -e "s/48.png/48/" \ + -e "s/TerminalOptions=/#TerminalOptions=/" \ + -e "s/Path=/#Path=/" NanoVNASaver.desktop || die + sed -i "/nanovnasaver/d" setup.py || die + eapply_user +} + +python_install() { + distutils-r1_python_install +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild index c56b16504c74..e564e750411f 100644 --- a/net-wireless/nanovna-saver/nanovna-saver-0.3.8.ebuild +++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild @@ -1,13 +1,13 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 +EAPI=8 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 xdg-utils DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA" HOMEPAGE="https://github.com/mihtjel/nanovna-saver" -SRC_URI="" LICENSE="GPL-3+" SLOT="0" @@ -16,20 +16,30 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git" else SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64" + export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}" fi -IUSE="" -DEPEND="" RDEPEND="${DEPEND} dev-python/cython[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets] dev-python/numpy[${PYTHON_USEDEP}] dev-python/scipy[${PYTHON_USEDEP}]" -BDEPEND="" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]" -src_prepare() { - sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py - distutils-r1_src_prepare +distutils_enable_tests pytest + +python_install() { + distutils-r1_python_install +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update } diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.3.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.3.ebuild new file mode 100644 index 000000000000..ac921ab992af --- /dev/null +++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.3.ebuild @@ -0,0 +1,47 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 xdg-utils + +DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA" +HOMEPAGE="https://github.com/mihtjel/nanovna-saver" + +LICENSE="GPL-3+" +SLOT="0" +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git" +else + SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}" +fi + +RDEPEND="${DEPEND} + dev-python/cython[${PYTHON_USEDEP}] + dev-python/pyserial[${PYTHON_USEDEP}] + dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets] + dev-python/PyQt6-sip[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}]" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +python_install() { + distutils-r1_python_install +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild index c56b16504c74..ac921ab992af 100644 --- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild +++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild @@ -1,13 +1,13 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 +EAPI=8 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 xdg-utils DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA" HOMEPAGE="https://github.com/mihtjel/nanovna-saver" -SRC_URI="" LICENSE="GPL-3+" SLOT="0" @@ -16,20 +16,32 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git" else SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" + export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}" fi -IUSE="" -DEPEND="" RDEPEND="${DEPEND} dev-python/cython[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets] + dev-python/PyQt6-sip[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] dev-python/scipy[${PYTHON_USEDEP}]" -BDEPEND="" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]" -src_prepare() { - sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py - distutils-r1_src_prepare +distutils_enable_tests pytest + +python_install() { + distutils-r1_python_install +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update } diff --git a/net-wireless/neard/Manifest b/net-wireless/neard/Manifest index 3cfbeb5c7a82..e532dc4300a8 100644 --- a/net-wireless/neard/Manifest +++ b/net-wireless/neard/Manifest @@ -1 +1 @@ -DIST neard-0.16.tar.xz 379436 BLAKE2B 8432200eafa2d7517d768ef160e2d2f8db698119ea047d505d7212b1c2d46087223b71749a4c855bf7e7ff43f73d4aa6d67fab272909dbb3236b312ee3b911be SHA512 d0fd5dcfd19db64e65e4149c76979bc7a438240aa6840b35059fde41a8a84a2424274577de964a925e76cd013d21796f69f5361012b6ac79c546d0abdcfed2a6 +DIST neard-0.19.tar.gz 229059 BLAKE2B 35976667dc22d6fc4e80468fcd21124bd8675c490e5d96e6d8d0f5bba28a92deae4255aa96070419f6a840ede9cda7fa793ef2c27fa3e725710dbf0a2a7105a5 SHA512 577061c214365853667033a2ae9f78a367adcbf07f2d7a70087c484ac31b410d34c003f396da622604f8844f30d44cba01f0d8a7cadebfd4c4c6457996541b48 diff --git a/net-wireless/neard/metadata.xml b/net-wireless/neard/metadata.xml index 3207e891091a..207c1220cbea 100644 --- a/net-wireless/neard/metadata.xml +++ b/net-wireless/neard/metadata.xml @@ -5,4 +5,7 @@ <use> <flag name="tools">Build and install 'nfctool' for further NFC debugging</flag> </use> + <upstream> + <remote-id type="github">linux-nfc/neard</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/neard/neard-0.16.ebuild b/net-wireless/neard/neard-0.16.ebuild deleted file mode 100644 index 7ec240979082..000000000000 --- a/net-wireless/neard/neard-0.16.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Near Field Communication (NFC) management daemon" -HOMEPAGE="https://01.org/linux-nfc/" -SRC_URI="https://www.kernel.org/pub/linux/network/nfc/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="tools systemd" - -RDEPEND=" - dev-libs/libnl:3= - sys-apps/dbus - sys-libs/glibc - systemd? ( sys-apps/systemd:0 ) -" - -DEPEND="${RDEPEND}" - -src_configure() { - # Workaround for >= GCC-10 - append-cflags -fcommon - - local myeconfargs=( - --disable-optimization - --enable-ese - --enable-pie - $(use_enable systemd) - $(use_enable tools) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # Patch for this has been sent upstream. Do it manually - # to avoid having to rebuild autotools. #580876 - mv "${ED}"/usr/include/version.h "${ED}"/usr/include/near/ || die - - newinitd "${FILESDIR}"/neard.rc neard - newconfd "${FILESDIR}"/neard.confd neard -} diff --git a/net-wireless/neard/neard-0.19.ebuild b/net-wireless/neard/neard-0.19.ebuild new file mode 100644 index 000000000000..a5a95d20a167 --- /dev/null +++ b/net-wireless/neard/neard-0.19.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Near Field Communication (NFC) management daemon" +HOMEPAGE="https://github.com/linux-nfc/neard" +SRC_URI="https://github.com/linux-nfc/neard/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="test tools systemd" + +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.28 + dev-libs/libnl:3= + >=sys-apps/dbus-1.2 + systemd? ( sys-apps/systemd:0 ) +" + +DEPEND="${RDEPEND}" +BDEPEND="dev-build/autoconf-archive" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-optimization + --disable-test # Only installs test programs, #913709. + --enable-ese + --enable-nfctype1 + --enable-nfctype2 + --enable-nfctype3 + --enable-nfctype4 + --enable-nfctype5 + --enable-p2p + --enable-pie + $(use_enable systemd) + $(use_enable tools) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Patch for this has been sent upstream. Do it manually + # to avoid having to rebuild autotools. #580876 + mv "${ED}/usr/include/version.h" "${ED}/usr/include/near/" || die + + newinitd "${FILESDIR}/neard.rc" neard + newconfd "${FILESDIR}/neard.confd" neard +} diff --git a/net-wireless/osmo-fl2k/Manifest b/net-wireless/osmo-fl2k/Manifest index acd1b0033b76..3f2bc0faa161 100644 --- a/net-wireless/osmo-fl2k/Manifest +++ b/net-wireless/osmo-fl2k/Manifest @@ -1 +1 @@ -DIST osmo-fl2k-0.1.1.tar.gz 68811 BLAKE2B 6c1b602b47d5e0816d93750e0470ed4530e587341f28e2e93c3aef634d7108b981cc4a96b758d72796316f15e4401ef746b91a983f374e63103ac76d8b7168c1 SHA512 55b384e18cfa5a1ab660860874cc6f6256b812ee867c863b6cd12c67cfc3517632469fc1ed6b83a35c956aa5371e1198634a52b292b109da828bee60c23f5140 +DIST osmo-fl2k-0.2.0.tar.gz 73276 BLAKE2B c15613ec0bdc3ec28a55892a893e0bc8fc397ab916f66bbc50a04c2ae12ef749e9c78906d66c3499c3d5cf5b711d7742cec8ca014099f4815e9690643922f4d7 SHA512 3b419869edecd3b64ec26212007be379154b93470305d3f125b4723bbbafc012eba32a414ebd84c5e0e9019a8079f4c1ddea7d0e6d108cc8628ce0e5e3e8755a diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-0.2.0.ebuild index 0df5cfc8b4b9..4f95c0da4bf9 100644 --- a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild +++ b/net-wireless/osmo-fl2k/osmo-fl2k-0.2.0.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils flag-o-matic linux-info udev +inherit cmake flag-o-matic linux-info udev DESCRIPTION="turns FL2000-based USB 3.0 to VGA adapters into low cost DACs" - HOMEPAGE="https://osmocom.org/projects/osmo-fl2k/wiki" if [[ ${PV} == "9999" ]]; then inherit git-r3 - EGIT_REPO_URI="https://git.osmocom.org/osmo-fl2k" + EGIT_REPO_URI="https://gitea.osmocom.org/sdr/osmo-fl2k" else KEYWORDS="~amd64" - SRC_URI="https://git.osmocom.org/osmo-fl2k/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/v${PV}" + SRC_URI="https://gitea.osmocom.org/sdr/osmo-fl2k/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}" fi LICENSE="GPL-2+" @@ -24,9 +23,9 @@ SLOT="0" IUSE="udev" DEPEND="virtual/libusb:1" -RDEPEND="${DEPEND}" -PDEPEND="media-sound/sox - sys-apps/pv" +RDEPEND="${DEPEND} + media-sound/sox + sys-apps/pv" # continguous memory allocator can optionally be used for zero-copy transfer # TODO: tell users to set CONFIG_CMA_SIZE_MBYTES or boot with cma=... parameter @@ -41,12 +40,23 @@ src_configure() { #https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49653 replace-flags -O0 -O2 replace-flags -Os -O2 - cmake-utils_src_configure + cmake_src_configure } src_install() { if use udev; then udev_newrules ${PN}.rules 99-${PN}.rules fi - cmake-utils_src_install + cmake_src_install + # https://bugs.gentoo.org/727984 + # No obvious way to prevent build + find "${ED}" -name libosmo-fl2k.a -delete +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload } diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild index 148e9614dedc..4f95c0da4bf9 100644 --- a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild +++ b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils flag-o-matic linux-info udev +inherit cmake flag-o-matic linux-info udev DESCRIPTION="turns FL2000-based USB 3.0 to VGA adapters into low cost DACs" - HOMEPAGE="https://osmocom.org/projects/osmo-fl2k/wiki" if [[ ${PV} == "9999" ]]; then inherit git-r3 - EGIT_REPO_URI="https://git.osmocom.org/osmo-fl2k" + EGIT_REPO_URI="https://gitea.osmocom.org/sdr/osmo-fl2k" else KEYWORDS="~amd64" - SRC_URI="https://git.osmocom.org/osmo-fl2k/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/v${PV}" + SRC_URI="https://gitea.osmocom.org/sdr/osmo-fl2k/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}" fi LICENSE="GPL-2+" @@ -24,9 +23,9 @@ SLOT="0" IUSE="udev" DEPEND="virtual/libusb:1" -RDEPEND="${DEPEND}" -PDEPEND="media-sound/sox - sys-apps/pv" +RDEPEND="${DEPEND} + media-sound/sox + sys-apps/pv" # continguous memory allocator can optionally be used for zero-copy transfer # TODO: tell users to set CONFIG_CMA_SIZE_MBYTES or boot with cma=... parameter @@ -41,12 +40,23 @@ src_configure() { #https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49653 replace-flags -O0 -O2 replace-flags -Os -O2 - cmake-utils_src_configure + cmake_src_configure } src_install() { if use udev; then udev_newrules ${PN}.rules 99-${PN}.rules fi - cmake-utils_src_install + cmake_src_install + # https://bugs.gentoo.org/727984 + # No obvious way to prevent build + find "${ED}" -name libosmo-fl2k.a -delete +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload } diff --git a/net-wireless/portapack-firmware/portapack-firmware-20190405.ebuild b/net-wireless/portapack-firmware/portapack-firmware-20190405.ebuild index 5da4e1ade90a..f38f39b3114a 100644 --- a/net-wireless/portapack-firmware/portapack-firmware-20190405.ebuild +++ b/net-wireless/portapack-firmware/portapack-firmware-20190405.ebuild @@ -1,24 +1,22 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Firmware and scripts for controlling the Portapack from Sharebrained" HOMEPAGE="https://github.com/sharebrained/portapack-hackrf/releases" SRC_URI="https://github.com/sharebrained/portapack-hackrf/releases/download/${PV}/portapack-h1-firmware-${PV}.tar.bz2" +S="${WORKDIR}/portapack-h1-firmware-${PV}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" PDEPEND=">=net-wireless/hackrf-tools-2015.07.2-r1 >=app-mobilephone/dfu-util-0.7" -S="${WORKDIR}/portapack-h1-firmware-${PV}" - src_install() { insinto /usr/share/hackrf newins portapack-h1-firmware.bin portapack-h1-firmware-${PV}.bin - ln -s portapack-h1-firmware-${PV}.bin "${ED}/usr/share/hackrf/portapack-h1-firmware.bin" + ln -s portapack-h1-firmware-${PV}.bin "${ED}/usr/share/hackrf/portapack-h1-firmware.bin" || die } diff --git a/net-wireless/portapack-havoc/portapack-havoc-0.0_p20180612.ebuild b/net-wireless/portapack-havoc/portapack-havoc-0.0_p20180612.ebuild index 59b7f30080d1..e668a2dbe80a 100644 --- a/net-wireless/portapack-havoc/portapack-havoc-0.0_p20180612.ebuild +++ b/net-wireless/portapack-havoc/portapack-havoc-0.0_p20180612.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Custom firmware for the HackRF SDR + PortaPack H1 addon" HOMEPAGE="https://github.com/furrtek/portapack-havoc/wiki" @@ -9,9 +9,8 @@ COMMIT="609235b19f55d0bf278c0e7c4b9f9b6b15136247" SRC_URI="https://github.com/furrtek/portapack-havoc/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -IUSE="" KEYWORDS="~amd64 ~x86" @@ -29,7 +28,7 @@ src_compile() { src_install() { insinto /usr/share/hackrf newins firmware/portapack-h1-havoc.bin portapack-h1-havoc-${PV}.bin - ln -s portapack-h1-havoc-${PV}.bin "${ED}/usr/share/hackrf/portapack-h1-havoc.bin" + ln -s portapack-h1-havoc-${PV}.bin "${ED}/usr/share/hackrf/portapack-h1-havoc.bin" || die cat << EOF > switch_to_havoc #!/bin/sh diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest index 0a024ee243e5..40540ae44506 100644 --- a/net-wireless/qdmr/Manifest +++ b/net-wireless/qdmr/Manifest @@ -1,2 +1,4 @@ -DIST qdmr-0.8.1.tar.gz 3870631 BLAKE2B 3be78a398a41cb105abac07b2a3c3ddaf0a5e51b5af855860c5ea06a407447d71ae89d4f3be5d46ba8fd50c38baec42663977373c643813f4db193ab034cfb88 SHA512 068eaad49393dca4384146b5254342d57921fd2e3f972057dd0f6abc1f8ce1412ae544ab09f50ce0ffa50f48f7fb2145fc36e82c2c8f9cf534fedb60e947130d -DIST qdmr-0.9.0_alpha3.tar.gz 5630070 BLAKE2B 5ba3a0f885bce39be88528541704d4dd7644588d689d28aba033e06174d677ae930c4ed2bc16f25bb0a2355a733d41d22c82dfaee3cd420acb788597a6fef350 SHA512 fb7c0689f2a03b632a305ebbc3a5ad3e5609bd6eec6490638ffce1534032110417e834863f3dd1c99a2cae92de7c7cb1d2a408ddcb5c5887cf0d31352cbf377c +DIST qdmr-0.10.2.tar.gz 5903169 BLAKE2B 1ef4e9846dd4206d1eae3cfb5562fccec24b156bfd77a82e801e8d1194b969bbda0f14e99c1b6505d18abba4a79d87c5eee2232110969faf4c078c1fe781a8ee SHA512 96a3fd22be2b8f77a4925cfb426de12a55b29ee73eaf78869091fd0ecd36d2df51195f2ca70689857e190767c4651d3d4915a0b7aa9f5c6e429f46a53edb991c +DIST qdmr-0.10.4.tar.gz 6013877 BLAKE2B 32da2984620e162e049f4017e29bff7d500f293fa6125246fdd2e7640ed9dd1e0e066c03297c365b9b5dc2e76dee1e1511fed327690c9a611fd7aa1abc26f988 SHA512 4ba75274bcaa4a7b8887edf7a1725863ee4dc00730d9386673b5c149e7ac30a32f06b7341ebd327cae337eac7a445999a17606cbbb22734216df2c14cb03c322 +DIST qdmr-0.11.2.tar.gz 6391759 BLAKE2B d45c934a0bad8c92a10a1f183007310137c8ad04a95f5f1471bac2a54f7f33e3af44b386e4ff2803a42934b575ce2e414bb6090a7e474e7aa1ac82b1d722598e SHA512 cd8dfc9eb9d6efad08efcaaa7b6e2ae61823982bd2ffa7bc41826c9fea3c21bd63f5a2114dc63d88e01a0c56f2fb615cbe0ddef62b87deebb798beda937de5d0 +DIST qdmr-0.11.3.tar.gz 6577404 BLAKE2B 7f9133e9620c5286492ee813907c47d550eba9368e801cd3939897381ed751788fa43337dbeb2cd1be5c4765c554ac5a031d9b4965c49dd1a521949d74b6f9f2 SHA512 4bb62cd84e8cce02f6582f854c4247c91f30271cc96856a4d1a55a4dbea5d2d9639e9db2df8b76f2ff196dddac1d7de3632627890617688037bd78085422e75e diff --git a/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch b/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch new file mode 100644 index 000000000000..21673cb4ebb2 --- /dev/null +++ b/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch @@ -0,0 +1,34 @@ +From eca81fba54b156707545967b78c823cc38b1b53f Mon Sep 17 00:00:00 2001 +From: Hannes Matuschek <hmatuschek@gmail.com> +Date: Wed, 6 Apr 2022 15:29:02 +0200 +Subject: [PATCH] Fixed compilation issue under Genoo. Addresses #216. + +--- + lib/radiolimits.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/lib/radiolimits.cc b/lib/radiolimits.cc +index b883cc8..eb72166 100644 +--- a/lib/radiolimits.cc ++++ b/lib/radiolimits.cc +@@ -3,9 +3,10 @@ + #include "logger.hh" + #include "config.hh" + #include <QMetaProperty> ++#include <ctype.h> + + // Utility function to check string content for ASCII encoding +-inline bool isascii(const QString &text) { ++inline bool qstring_is_ascii(const QString &text) { + foreach (QChar c, text) { + if ((c<0x1f) && (0x7f != c)) + return false; +@@ -205,7 +206,7 @@ RadioLimitString::verify(const ConfigItem *item, const QMetaProperty &prop, Radi + << ") is shorter than minimum size " << _minLen << "."; + } + +- if ((ASCII == _encoding) && (! isascii(value))) { ++ if ((ASCII == _encoding) && (! qstring_is_ascii(value))) { + auto &msg = context.newMessage(); + msg << "Cannot encode string '" << value << "' in ASCII."; + } diff --git a/net-wireless/qdmr/metadata.xml b/net-wireless/qdmr/metadata.xml index d03ef4bc4f35..e6c5a00f9bfe 100644 --- a/net-wireless/qdmr/metadata.xml +++ b/net-wireless/qdmr/metadata.xml @@ -5,6 +5,10 @@ <email>radio@gentoo.org</email> <name>Radio</name> </maintainer> + <maintainer type="person"> + <email>anarchy@gentoo.org</email> + <name>Jory A. Pratt</name> + </maintainer> <upstream> <remote-id type="github">hmatuschek/qdmr</remote-id> </upstream> diff --git a/net-wireless/qdmr/qdmr-0.8.1.ebuild b/net-wireless/qdmr/qdmr-0.10.2.ebuild index c17d694d921a..c57e656cbffa 100644 --- a/net-wireless/qdmr/qdmr-0.8.1.ebuild +++ b/net-wireless/qdmr/qdmr-0.10.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake udev linux-info @@ -11,7 +11,9 @@ if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git" else - SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + MY_PV="${PV/_/-}" + SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" KEYWORDS="amd64 x86" fi @@ -19,6 +21,7 @@ LICENSE="GPL-3+" SLOT="0" RDEPEND=" + dev-cpp/yaml-cpp:= dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 @@ -29,9 +32,10 @@ RDEPEND=" dev-qt/qtserialport:5 virtual/libusb:1 " -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" -BDEPEND="" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +PATCHES=( "${FILESDIR}/${P}-musl.patch" ) pkg_setup() { CONFIG_CHECK="~USB_ACM" @@ -47,3 +51,7 @@ src_prepare() { sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt cmake_src_prepare } + +pkg_postinst() { + udev_reload +} diff --git a/net-wireless/qdmr/qdmr-0.9.0_alpha3.ebuild b/net-wireless/qdmr/qdmr-0.10.4.ebuild index d80ff7599869..2408bd6b897c 100644 --- a/net-wireless/qdmr/qdmr-0.9.0_alpha3.ebuild +++ b/net-wireless/qdmr/qdmr-0.10.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake udev linux-info @@ -32,9 +32,8 @@ RDEPEND=" dev-qt/qtserialport:5 virtual/libusb:1 " -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" -BDEPEND="" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" pkg_setup() { CONFIG_CHECK="~USB_ACM" @@ -50,3 +49,11 @@ src_prepare() { sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt cmake_src_prepare } + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/qdmr/qdmr-0.11.2.ebuild b/net-wireless/qdmr/qdmr-0.11.2.ebuild new file mode 100644 index 000000000000..1ba9c2ff8c36 --- /dev/null +++ b/net-wireless/qdmr/qdmr-0.11.2.ebuild @@ -0,0 +1,67 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake udev linux-info + +DESCRIPTION="GUI application for configuring and programming cheap DMR radios" +HOMEPAGE="https://dm3mat.darc.de/qdmr/" +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git" +else + MY_PV="${PV/_/-}" + SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64 ~x86" +fi +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND=" + dev-cpp/yaml-cpp:= + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtpositioning:5 + dev-qt/qtserialport:5 + virtual/libusb:1 +" +DEPEND="${RDEPEND} + dev-qt/designer:5 + test? ( dev-qt/qttest:5 ) +" +BDEPEND="dev-qt/linguist-tools:5" + +pkg_setup() { + CONFIG_CHECK="~USB_ACM" + WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio" + CONFIG_CHECK="~USB_SERIAL" + WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio" + check_extra_config +} + +src_prepare() { + sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS="$(usex test)" + ) + cmake_src_configure +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/qdmr/qdmr-0.11.3.ebuild b/net-wireless/qdmr/qdmr-0.11.3.ebuild new file mode 100644 index 000000000000..1ba9c2ff8c36 --- /dev/null +++ b/net-wireless/qdmr/qdmr-0.11.3.ebuild @@ -0,0 +1,67 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake udev linux-info + +DESCRIPTION="GUI application for configuring and programming cheap DMR radios" +HOMEPAGE="https://dm3mat.darc.de/qdmr/" +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git" +else + MY_PV="${PV/_/-}" + SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64 ~x86" +fi +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND=" + dev-cpp/yaml-cpp:= + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtpositioning:5 + dev-qt/qtserialport:5 + virtual/libusb:1 +" +DEPEND="${RDEPEND} + dev-qt/designer:5 + test? ( dev-qt/qttest:5 ) +" +BDEPEND="dev-qt/linguist-tools:5" + +pkg_setup() { + CONFIG_CHECK="~USB_ACM" + WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio" + CONFIG_CHECK="~USB_SERIAL" + WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio" + check_extra_config +} + +src_prepare() { + sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS="$(usex test)" + ) + cmake_src_configure +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/qdmr/qdmr-9999.ebuild b/net-wireless/qdmr/qdmr-9999.ebuild index d80ff7599869..1ba9c2ff8c36 100644 --- a/net-wireless/qdmr/qdmr-9999.ebuild +++ b/net-wireless/qdmr/qdmr-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake udev linux-info @@ -16,14 +16,14 @@ else S="${WORKDIR}/${PN}-${MY_PV}" KEYWORDS="~amd64 ~x86" fi +IUSE="test" +RESTRICT="!test? ( test )" LICENSE="GPL-3+" SLOT="0" RDEPEND=" dev-cpp/yaml-cpp:= - dev-qt/designer:5 - dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 @@ -33,8 +33,10 @@ RDEPEND=" virtual/libusb:1 " DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" -BDEPEND="" + dev-qt/designer:5 + test? ( dev-qt/qttest:5 ) +" +BDEPEND="dev-qt/linguist-tools:5" pkg_setup() { CONFIG_CHECK="~USB_ACM" @@ -45,8 +47,21 @@ pkg_setup() { } src_prepare() { - #no devil perms - sed -i 's#666#660#' dist/99-qdmr.rules sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt cmake_src_prepare } + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS="$(usex test)" + ) + cmake_src_configure +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/rfkill/Manifest b/net-wireless/rfkill/Manifest deleted file mode 100644 index 7047a19da2e3..000000000000 --- a/net-wireless/rfkill/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST rfkill-0.5.tar.xz 7776 BLAKE2B 7f8d2e4d6b9433236de7c2e57035d39ece8b9a0c99c572aa8b0365dad35087f5594b21dcea3e6ea47e73c8471f172ef2d16193ce2ceb1fcc0490b61ddf11b765 SHA512 6ad4d28e7bf7ec69ec6a600cd774b7b3c60e85849ae3fca0f5509ed6a283ed5656d37cfd770df45ff1ceca59edd814807d116b30e199fca303baf496441419d7 -DIST rfkill-1.0.tar.xz 7228 BLAKE2B 045bcb83f5d6b89945846d5d80b1c45e8c18227ad73f4f05cdd73ffbb8e8076b8b14ce60a8f419c39db3c6543856ad47e1308f81e1621332faa64e80abc78342 SHA512 55055f47574f9589ee3739675f784c1ea286bef0ffb32f33a7ee9e319bd7ac61df6e22c6ecd1deada8ad451a8ee1f5284e4cbf5628a6d4fdedbd8ca8c7da5276 diff --git a/net-wireless/rfkill/metadata.xml b/net-wireless/rfkill/metadata.xml deleted file mode 100644 index 9d9716b4e41d..000000000000 --- a/net-wireless/rfkill/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name> Rick Farina</name> - </maintainer> -</pkgmetadata> diff --git a/net-wireless/rfkill/rfkill-0.5-r2.ebuild b/net-wireless/rfkill/rfkill-0.5-r2.ebuild deleted file mode 100644 index ac0d53456b95..000000000000 --- a/net-wireless/rfkill/rfkill-0.5-r2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Tool to read and control rfkill status through /dev/rfkill" -HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/rfkill" -SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc ppc64 x86" -IUSE="" - -RDEPEND="!>=sys-apps/util-linux-2.31_rc1" -DEPEND="" - -src_compile() { - emake CC=$(tc-getCC) LD=$(tc-getLD) V=1 -} - -src_install() { - emake install V=1 DESTDIR="${D}" -} diff --git a/net-wireless/rfkill/rfkill-0.5-r3.ebuild b/net-wireless/rfkill/rfkill-0.5-r3.ebuild deleted file mode 100644 index dad893b293f8..000000000000 --- a/net-wireless/rfkill/rfkill-0.5-r3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Tool to read and control rfkill status through /dev/rfkill" -HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/rfkill" -SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="!>=sys-apps/util-linux-2.31_rc1" -DEPEND="" - -src_prepare() { - default - - sed -i "s|^SUFFIX=$|SUFFIX=-${PR}|" version.sh || die -} - -src_compile() { - emake CC=$(tc-getCC) LD=$(tc-getLD) V=1 -} - -src_install() { - emake install V=1 DESTDIR="${D}" -} diff --git a/net-wireless/rfkill/rfkill-1.0.ebuild b/net-wireless/rfkill/rfkill-1.0.ebuild deleted file mode 100644 index 2dcc85799b0b..000000000000 --- a/net-wireless/rfkill/rfkill-1.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Tool to read and control rfkill status through /dev/rfkill" -HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/rfkill" -SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="!>=sys-apps/util-linux-2.31_rc1" -DEPEND="" - -src_prepare() { - sed -i 's#rfkill.8.gz#rfkill.8#' Makefile - default -} - -src_compile() { - emake CC=$(tc-getCC) LD=$(tc-getLD) V=1 -} - -src_install() { - emake install V=1 DESTDIR="${D}" -} diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest index e4cb6db4b4ff..4b0707b9f509 100644 --- a/net-wireless/rtl-sdr/Manifest +++ b/net-wireless/rtl-sdr/Manifest @@ -1 +1 @@ -DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b2e7ffbccb4e5a2ebb6af698321ceaeba5012e6b88be03c7ff4c7b5cd45ec8df2baaa4ae55b813cdf448d895877a6757f47 SHA512 355af98a887a978794b562aa8ef78c91d19c33a6d0eb5740eb3a9b1e1329f8b11ca688eebc81a2d61440972ba5121225205de7165a22882a7e32cf6608888f25 +DIST rtl-sdr-2.0.1.gh.tar.gz 135727 BLAKE2B 46bb64e2e35d5f6164acb15b0b1e4c0c988bac8de8fd494faec85f4d36f2db3f73ebb0dc46ce42d4b2ff00a9025f145259aeff25563dd82623c2a3502cda1059 SHA512 ed7b84f05d524d89afc1db384a4e1c4bb2a66e9c6b42623ab42ac9d55829bde77eb12529044e1778664b5a97a48dc5b64bed19161a430c9d91c04dd08cb6b7ac diff --git a/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch new file mode 100644 index 000000000000..b71454b87828 --- /dev/null +++ b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cc39bc3..4833602 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -160,7 +160,7 @@ ENDIF(CMAKE_CROSSCOMPILING) + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix \${prefix}) + set(includedir \${prefix}/include) +-set(libdir \${exec_prefix}/lib) ++set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) + + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/librtlsdr.pc.in diff --git a/net-wireless/rtl-sdr/metadata.xml b/net-wireless/rtl-sdr/metadata.xml index cd7543fbf5e2..cacbce26183d 100644 --- a/net-wireless/rtl-sdr/metadata.xml +++ b/net-wireless/rtl-sdr/metadata.xml @@ -8,4 +8,7 @@ <use> <flag name="zerocopy">may cause a bus error on some ARM systems</flag> </use> + <upstream> + <remote-id type="github">osmocom/rtl-sdr</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild deleted file mode 100644 index 959351d23e5c..000000000000 --- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake multilib - -DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver" -HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://git.osmocom.org/${PN}" -else - #git clone https://git.osmocom.org/rtl-sdr - #cd rtl-sdr - #git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz - #SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz" - - COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5" - SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+zerocopy" - -DEPEND="virtual/libusb:1" -RDEPEND="${DEPEND}" - -src_unpack() { - if [[ ${PV} == 9999* ]]; then - git-r3_src_unpack - else - default - fi -} - -src_prepare() { - sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt - cmake_src_prepare -} - -src_configure() { - #the udev rules are 666, we don't want that - mycmakeargs=( - -DINSTALL_UDEV_RULES=OFF - -DDETACH_KERNEL_DRIVER=ON - -DENABLE_ZEROCOPY="$(usex zerocopy)" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp - newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp -} - -pkg_postinst() { - elog "Only users in the usb group can capture." - elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login." -} diff --git a/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild new file mode 100644 index 000000000000..be4305a53b0c --- /dev/null +++ b/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver" +HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.osmocom.org/${PN}" +else + #COMMIT="142325a93c6ad70f851f43434acfdf75e12dfe03" + #SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + #S="${WORKDIR}/${PN}-${COMMIT}" + SRC_URI="https://github.com/osmocom/rtl-sdr/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="+zerocopy" + +DEPEND="virtual/libusb:1" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch +) + +src_configure() { + #the udev rules are 666, we don't want that + local mycmakeargs=( + -DINSTALL_UDEV_RULES=OFF + -DDETACH_KERNEL_DRIVER=ON + -DENABLE_ZEROCOPY="$(usex zerocopy)" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp + newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp +} + +pkg_postinst() { + elog "Only users in the usb group can capture." + elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login." +} diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild index 4f87f3a82cdd..dd2530e97a36 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild @@ -1,52 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake multilib +inherit cmake -DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver" +DESCRIPTION="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver" HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr" if [[ ${PV} == 9999* ]]; then inherit git-r3 - SRC_URI="" EGIT_REPO_URI="https://git.osmocom.org/${PN}" else - #git clone https://git.osmocom.org/rtl-sdr - #cd rtl-sdr - #git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz - #SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz" - - COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5" - SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" + #COMMIT="142325a93c6ad70f851f43434acfdf75e12dfe03" + #SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + #S="${WORKDIR}/${PN}-${COMMIT}" + SRC_URI="https://github.com/osmocom/rtl-sdr/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" fi -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="+zerocopy" DEPEND="virtual/libusb:1" RDEPEND="${DEPEND}" -src_unpack() { - if [[ ${PV} == 9999* ]]; then - git-r3_src_unpack - else - default - fi -} - -src_prepare() { - sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt - cmake_src_prepare -} +PATCHES=( + "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch +) src_configure() { #the udev rules are 666, we don't want that - mycmakeargs=( + local mycmakeargs=( -DINSTALL_UDEV_RULES=OFF -DDETACH_KERNEL_DRIVER=ON -DENABLE_ZEROCOPY="$(usex zerocopy)" diff --git a/net-wireless/rtl_433/Manifest b/net-wireless/rtl_433/Manifest index 9ddff570127a..497a36f177c8 100644 --- a/net-wireless/rtl_433/Manifest +++ b/net-wireless/rtl_433/Manifest @@ -1 +1,2 @@ -DIST rtl_433-21.05.tar.gz 841774 BLAKE2B 4a3c060c85233a85e951eff5fb210cc4ec5529a6cc868782fdbf7b3dad7372dcd7d428776c539d25105b9cfdf5f260bc031bbd5435eb2658e73b8b275f2040ee SHA512 fe0a26b14df97c679968536b5b3dfe41e5f8c6e0af00265461b4e1bf6312dd71cc1b1ccf2f5f78bc4d67b5f2effb17a88b743dc38db4a0a73f9f5b756868dba4 +DIST rtl_433-21.12.tar.gz 954628 BLAKE2B 7622cba1ff8d9ed46bcd9d7298b2278437aba3dca65985f27d44d20d3b79082cff04172d4593af07379928d42d5e422ff2857ada427156b16f1ba24a7bca57ed SHA512 8183887c1e09e94bee10b70190555d7fa0fa6675bba6130f78ab111b77428fef90696bc15a8e5abb07ae5ae3e492641a40acd6087d5bc413db5f2944878f03a3 +DIST rtl_433-22.11.tar.gz 841774 BLAKE2B 4a3c060c85233a85e951eff5fb210cc4ec5529a6cc868782fdbf7b3dad7372dcd7d428776c539d25105b9cfdf5f260bc031bbd5435eb2658e73b8b275f2040ee SHA512 fe0a26b14df97c679968536b5b3dfe41e5f8c6e0af00265461b4e1bf6312dd71cc1b1ccf2f5f78bc4d67b5f2effb17a88b743dc38db4a0a73f9f5b756868dba4 diff --git a/net-wireless/rtl_433/files/rtl_433-21.12-CVE.patch b/net-wireless/rtl_433/files/rtl_433-21.12-CVE.patch new file mode 100644 index 000000000000..1ce26c468e87 --- /dev/null +++ b/net-wireless/rtl_433/files/rtl_433-21.12-CVE.patch @@ -0,0 +1,55 @@ +From 2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8 Mon Sep 17 00:00:00 2001 +From: "Christian W. Zuckschwerdt" <christian@zuckschwerdt.org> +Date: Mon, 24 Jan 2022 15:53:20 +0100 +Subject: [PATCH] minor: Fix overflow in Clipsal-CMR113 and Somfy-IOHC reported + by aug5t7 + +--- + src/devices/cmr113.c | 4 ++-- + src/devices/somfy_iohc.c | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/devices/cmr113.c b/src/devices/cmr113.c +index c85dfac56..19ec5d421 100644 +--- a/src/devices/cmr113.c ++++ b/src/devices/cmr113.c +@@ -42,8 +42,8 @@ Kudos to Jon Oxer for decoding this stream and putting it here: + + */ + +-#define COMPARE_BITS 83 +-#define COMPARE_BYTES (COMPARE_BITS/8) ++#define COMPARE_BITS 83 ++#define COMPARE_BYTES ((COMPARE_BITS + 7) / 8) + + static int cmr113_decode(r_device *decoder, bitbuffer_t *bitbuffer) + { +diff --git a/src/devices/somfy_iohc.c b/src/devices/somfy_iohc.c +index 906cae53e..2c88067b5 100644 +--- a/src/devices/somfy_iohc.c ++++ b/src/devices/somfy_iohc.c +@@ -100,11 +100,12 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + if (bitbuffer->num_rows != 1) + return DECODE_ABORT_EARLY; + +- int offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; +- if (offset >= bitbuffer->bits_per_row[0] - 19 * 10) ++ unsigned offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; ++ if (offset + 19 * 10 >= bitbuffer->bits_per_row[0]) + return DECODE_ABORT_EARLY; + +- int num_bits = bitbuffer->bits_per_row[0] - offset; ++ unsigned num_bits = bitbuffer->bits_per_row[0] - offset; ++ num_bits = MIN(num_bits, sizeof (b) * 8); + + int len = extract_bytes_uart(bitbuffer->bb[0], offset, num_bits, b); + if (len < 19) +@@ -120,7 +121,7 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) + // calculate and verify checksum + if (crc16lsb(b, len, 0x8408, 0x0000) != 0) // unreflected poly 0x1021 + return DECODE_FAIL_MIC; +- bitrow_printf(b, len * 8, "%s: offset %d, num_bits %d, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); ++ bitrow_printf(b, len * 8, "%s: offset %u, num_bits %u, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); + + int msg_type = (b[0]); + int dst_id = ((unsigned)b[4] << 24) | (b[3] << 16) | (b[2] << 8) | (b[1]); // assume Little-Endian diff --git a/net-wireless/rtl_433/files/rtl_433-21.12-test-visibility.patch b/net-wireless/rtl_433/files/rtl_433-21.12-test-visibility.patch new file mode 100644 index 000000000000..01626361f5cc --- /dev/null +++ b/net-wireless/rtl_433/files/rtl_433-21.12-test-visibility.patch @@ -0,0 +1,155 @@ +From eda74c17dba1cfed7bcbb0654251cb0cd4e1f4b2 Mon Sep 17 00:00:00 2001 +From: "Christian W. Zuckschwerdt" <christian@zuckschwerdt.org> +Date: Thu, 17 Mar 2022 08:55:49 +0100 +Subject: [PATCH] minor: Add visibility to dynamic lib exports (closes #2010) + +Co-authored-by: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org> +--- + include/data.h | 58 ++++++++++++++++++++++++++++---------------- + src/CMakeLists.txt | 2 +- + tests/CMakeLists.txt | 2 +- + 3 files changed, 39 insertions(+), 23 deletions(-) + +diff --git a/include/data.h b/include/data.h +index 34fe79525..e892c7fa2 100644 +--- a/include/data.h ++++ b/include/data.h +@@ -21,6 +21,22 @@ + #ifndef INCLUDE_DATA_H_ + #define INCLUDE_DATA_H_ + ++#if defined _WIN32 || defined __CYGWIN__ ++ #ifdef data_EXPORTS ++ #define R_API __stdcall __declspec(dllexport) // Note: actually gcc seems to also supports this syntax. ++ #else ++ #define R_API __stdcall __declspec(dllimport) // Note: actually gcc seems to also supports this syntax. ++ #endif ++ #define R_API_CALLCONV __stdcall ++#else ++ #if __GNUC__ >= 4 ++ #define R_API __attribute__((visibility ("default"))) ++ #else ++ #define R_API ++ #endif ++ #define R_API_CALLCONV ++#endif ++ + #include <stddef.h> + + typedef enum { +@@ -87,19 +103,19 @@ typedef struct data { + + @return A constructed data_t* object or NULL if there was a memory allocation error. + */ +-data_t *data_make(const char *key, const char *pretty_key, ...); ++R_API data_t *data_make(const char *key, const char *pretty_key, ...); + + /** Adds to a structured data object, by appending data. + + @see data_make() + */ +-data_t *data_append(data_t *first, const char *key, const char *pretty_key, ...); ++R_API data_t *data_append(data_t *first, const char *key, const char *pretty_key, ...); + + /** Adds to a structured data object, by prepending data. + + @see data_make() + */ +-data_t *data_prepend(data_t *first, const char *key, const char *pretty_key, ...); ++R_API data_t *data_prepend(data_t *first, const char *key, const char *pretty_key, ...); + + /** Constructs an array from given data of the given uniform type. + +@@ -110,28 +126,28 @@ data_t *data_prepend(data_t *first, const char *key, const char *pretty_key, ... + @return The constructed data array object, typically placed inside a data_t or NULL + if there was a memory allocation error. + */ +-data_array_t *data_array(int num_values, data_type_t type, void *ptr); ++R_API data_array_t *data_array(int num_values, data_type_t type, void *ptr); + + /** Releases a data array. */ +-void data_array_free(data_array_t *array); ++R_API void data_array_free(data_array_t *array); + + /** Retain a structure object, returns the structure object passed in. */ +-data_t *data_retain(data_t *data); ++R_API data_t *data_retain(data_t *data); + + /** Releases a structure object if retain is zero, decrement retain otherwise. */ +-void data_free(data_t *data); ++R_API void data_free(data_t *data); + + struct data_output; + + typedef struct data_output { +- void (*print_data)(struct data_output *output, data_t *data, char const *format); +- void (*print_array)(struct data_output *output, data_array_t *data, char const *format); +- void (*print_string)(struct data_output *output, const char *data, char const *format); +- void (*print_double)(struct data_output *output, double data, char const *format); +- void (*print_int)(struct data_output *output, int data, char const *format); +- void (*output_start)(struct data_output *output, char const *const *fields, int num_fields); +- void (*output_flush)(struct data_output *output); +- void (*output_free)(struct data_output *output); ++ void (R_API_CALLCONV *print_data)(struct data_output *output, data_t *data, char const *format); ++ void (R_API_CALLCONV *print_array)(struct data_output *output, data_array_t *data, char const *format); ++ void (R_API_CALLCONV *print_string)(struct data_output *output, const char *data, char const *format); ++ void (R_API_CALLCONV *print_double)(struct data_output *output, double data, char const *format); ++ void (R_API_CALLCONV *print_int)(struct data_output *output, int data, char const *format); ++ void (R_API_CALLCONV *output_start)(struct data_output *output, char const *const *fields, int num_fields); ++ void (R_API_CALLCONV *output_flush)(struct data_output *output); ++ void (R_API_CALLCONV *output_free)(struct data_output *output); + } data_output_t; + + /** Setup known field keys and start output, used by CSV only. +@@ -141,19 +157,19 @@ typedef struct data_output { + strings not. The list may contain duplicates and they are eliminated. + @param num_fields number of fields + */ +-void data_output_start(struct data_output *output, char const *const *fields, int num_fields); ++R_API void data_output_start(struct data_output *output, char const *const *fields, int num_fields); + + /** Prints a structured data object, flushes the output if applicable. */ +-void data_output_print(struct data_output *output, data_t *data); ++R_API void data_output_print(struct data_output *output, data_t *data); + +-void data_output_free(struct data_output *output); ++R_API void data_output_free(struct data_output *output); + + /* data output helpers */ + +-void print_value(data_output_t *output, data_type_t type, data_value_t value, char const *format); ++R_API void print_value(data_output_t *output, data_type_t type, data_value_t value, char const *format); + +-void print_array_value(data_output_t *output, data_array_t *array, char const *format, int idx); ++R_API void print_array_value(data_output_t *output, data_array_t *array, char const *format, int idx); + +-size_t data_print_jsons(data_t *data, char *dst, size_t len); ++R_API size_t data_print_jsons(data_t *data, char *dst, size_t len); + + #endif // INCLUDE_DATA_H_ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b050dd597..443393e67 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -253,7 +253,7 @@ if(MSVC) + target_sources(rtl_433 PRIVATE getopt/getopt.c) + endif() + +-add_library(data data.c abuf.c term_ctl.c) ++add_library(data data.c abuf.c) + target_link_libraries(data ${NET_LIBRARIES}) + + target_link_libraries(rtl_433 +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index aaae3d498..9a3a14302 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,7 +1,7 @@ + ######################################################################## + # Compile test cases + ######################################################################## +-add_executable(data-test data-test.c ../src/output_file.c) ++add_executable(data-test data-test.c ../src/output_file.c ../src/term_ctl.c) + + target_link_libraries(data-test data) + diff --git a/net-wireless/rtl_433/rtl_433-21.12.ebuild b/net-wireless/rtl_433/rtl_433-21.12.ebuild new file mode 100644 index 000000000000..8e0908f317bb --- /dev/null +++ b/net-wireless/rtl_433/rtl_433-21.12.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Decode OOK modulated signals" +HOMEPAGE="https://github.com/merbanan/rtl_433" +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/merbanan/rtl_433" +else + SRC_URI="https://github.com/merbanan/rtl_433/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+rtlsdr soapysdr test" + +DEPEND="rtlsdr? ( net-wireless/rtl-sdr:= + virtual/libusb:1 ) + soapysdr? ( net-wireless/soapysdr:= ) + dev-libs/openssl:=" +RDEPEND="${DEPEND}" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${P}-CVE.patch" + "${FILESDIR}/${P}-test-visibility.patch" +) + +src_configure() { + local mycmakeargs=( + -DENABLE_RTLSDR="$(usex rtlsdr)" + -DENABLE_SOAPYSDR="$(usex soapysdr)" + -DBUILD_TESTING="$(usex test)" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + mv "${ED}/usr/etc" "${ED}/" || die +} diff --git a/net-wireless/rtl_433/rtl_433-21.05.ebuild b/net-wireless/rtl_433/rtl_433-22.11.ebuild index 5aa379a4bcba..7c0afbe1dac1 100644 --- a/net-wireless/rtl_433/rtl_433-21.05.ebuild +++ b/net-wireless/rtl_433/rtl_433-22.11.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -#this doesn't work in eapi 7, even with emake or cmake.eclass -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="Decode OOK modulated signals" HOMEPAGE="https://github.com/merbanan/rtl_433" @@ -21,22 +20,29 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+rtlsdr soapysdr" +IUSE="+rtlsdr soapysdr test" DEPEND="rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) soapysdr? ( net-wireless/soapysdr:= )" RDEPEND="${DEPEND}" +RESTRICT="!test? ( test )" + +src_prepare() { + sed -i 's#data data.c#data STATIC data.c#' src/CMakeLists.txt || die + cmake_src_prepare +} src_configure() { - mycmakeargs=( + local mycmakeargs=( -DENABLE_RTLSDR="$(usex rtlsdr)" -DENABLE_SOAPYSDR="$(usex soapysdr)" + -DBUILD_TESTING="$(usex test)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install mv "${ED}/usr/etc" "${ED}/" || die } diff --git a/net-wireless/rtl_433/rtl_433-9999.ebuild b/net-wireless/rtl_433/rtl_433-9999.ebuild index 5aa379a4bcba..ea9cb877d387 100644 --- a/net-wireless/rtl_433/rtl_433-9999.ebuild +++ b/net-wireless/rtl_433/rtl_433-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -#this doesn't work in eapi 7, even with emake or cmake.eclass -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="Decode OOK modulated signals" HOMEPAGE="https://github.com/merbanan/rtl_433" @@ -21,22 +20,25 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+rtlsdr soapysdr" +IUSE="+rtlsdr soapysdr test" -DEPEND="rtlsdr? ( net-wireless/rtl-sdr:= +DEPEND="dev-libs/openssl:= + rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) soapysdr? ( net-wireless/soapysdr:= )" RDEPEND="${DEPEND}" +RESTRICT="!test? ( test )" + +src_prepare() { + sed -i 's#data data.c#data STATIC data.c#' src/CMakeLists.txt || die + cmake_src_prepare +} src_configure() { - mycmakeargs=( + local mycmakeargs=( -DENABLE_RTLSDR="$(usex rtlsdr)" -DENABLE_SOAPYSDR="$(usex soapysdr)" + -DBUILD_TESTING="$(usex test)" ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - mv "${ED}/usr/etc" "${ED}/" || die + cmake_src_configure } diff --git a/net-wireless/rtl_power_fftw/Manifest b/net-wireless/rtl_power_fftw/Manifest deleted file mode 100644 index d4eedbd69866..000000000000 --- a/net-wireless/rtl_power_fftw/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rtl_power_fftw-0.0_p20180528.tar.gz 37927 BLAKE2B da496c3700df5c2c2104c93c7137bda2f23982fc9a80498b02ccbe57f47c118c766523e33841abd1add60d230e9e10be378eadb3ec03f1ce43a09c0e808f11d4 SHA512 2d097bd1f72c421d54a8081da02fd0410d7749141286db21c350e5a2694cf5f04d61d7dea989a1ce6749e7a03543e264bc837600cbc4a6b58d3ad45d009eb8b3 diff --git a/net-wireless/rtl_power_fftw/metadata.xml b/net-wireless/rtl_power_fftw/metadata.xml deleted file mode 100644 index 807ec69d81bc..000000000000 --- a/net-wireless/rtl_power_fftw/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> -</pkgmetadata> diff --git a/net-wireless/rtl_power_fftw/rtl_power_fftw-0.0_p20180528.ebuild b/net-wireless/rtl_power_fftw/rtl_power_fftw-0.0_p20180528.ebuild deleted file mode 100644 index 1ab71952dffc..000000000000 --- a/net-wireless/rtl_power_fftw/rtl_power_fftw-0.0_p20180528.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="power spectrum for RTLSDR dongles" -HOMEPAGE="https://github.com/AD-Vega/rtl-power-fftw" - -LICENSE="GPL-3" -SLOT="0" -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/AD-Vega/rtl-power-fftw.git" -else - KEYWORDS="~amd64 ~x86" - COMMIT="d567a454a6c96a67c61242178363e29d4cc84d64" - SRC_URI="https://github.com/AD-Vega/rtl-power-fftw/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN//_/-}-${COMMIT}" -fi - -IUSE="" - -RDEPEND="dev-cpp/tclap - sci-libs/fftw:= - net-wireless/rtl-sdr:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" diff --git a/net-wireless/rtl_power_fftw/rtl_power_fftw-9999.ebuild b/net-wireless/rtl_power_fftw/rtl_power_fftw-9999.ebuild deleted file mode 100644 index 1ab71952dffc..000000000000 --- a/net-wireless/rtl_power_fftw/rtl_power_fftw-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="power spectrum for RTLSDR dongles" -HOMEPAGE="https://github.com/AD-Vega/rtl-power-fftw" - -LICENSE="GPL-3" -SLOT="0" -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/AD-Vega/rtl-power-fftw.git" -else - KEYWORDS="~amd64 ~x86" - COMMIT="d567a454a6c96a67c61242178363e29d4cc84d64" - SRC_URI="https://github.com/AD-Vega/rtl-power-fftw/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN//_/-}-${COMMIT}" -fi - -IUSE="" - -RDEPEND="dev-cpp/tclap - sci-libs/fftw:= - net-wireless/rtl-sdr:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" diff --git a/net-wireless/sdrplay/Manifest b/net-wireless/sdrplay/Manifest index c4b3064aa0bc..6c94971fa862 100644 --- a/net-wireless/sdrplay/Manifest +++ b/net-wireless/sdrplay/Manifest @@ -1 +1,2 @@ DIST SDRplay_RSP_API-Linux-2.13.1.run 326016 BLAKE2B 7eff1aa35190db1ead5b1d96994d24ae2301e3a765d6701756c6304a1719aa32125fedacf6a6859d89b89db5dd6956ec0e8c7e814dbd6242db5614a53e89efb3 SHA512 576be63e18084cf3e74bfb20592a44836f22fd9efe74ba9e27e5865a9ab755b26b3f2894cd8331ff876ab664d4e533d2bdbc629d552e75fcfbb3e9814dd140ce +DIST SDRplay_RSP_API-Linux-3.07.1.run 388847 BLAKE2B 059d9a5fbd14c0e7ecb969cd3e5afe8e3f42896175b443bdaa9f9108302a1c9ef5ad9769e62f824465611d74f67191fff71cc6dbe297e399e5b2f6824c650112 SHA512 428b191db522ca332acd280ac80081852a4ac68117dfdcf48e196f1c28c40a44a8e0907efa56e7f50915af8d53bfa864d437db1692867e15fb653b86fe4b549a diff --git a/net-wireless/sdrplay/files/sdrplay.initd b/net-wireless/sdrplay/files/sdrplay.initd new file mode 100644 index 000000000000..7611306a3e53 --- /dev/null +++ b/net-wireless/sdrplay/files/sdrplay.initd @@ -0,0 +1,7 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +pidfile="/run/sdrplay.pid" +command="/usr/bin/sdrplay_apiService" +command_background=true diff --git a/net-wireless/sdrplay/sdrplay-3.07.1.ebuild b/net-wireless/sdrplay/sdrplay-3.07.1.ebuild new file mode 100644 index 000000000000..904f5ace67bd --- /dev/null +++ b/net-wireless/sdrplay/sdrplay-3.07.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MULTILIB_COMPAT=( abi_x86_{32,64} ) + +inherit unpacker udev multilib-minimal systemd + +MY_PV_1=$(ver_cut 1) +MY_PV_12=$(ver_cut 1-2) + +DESCRIPTION="SDRplay API/HW driver for all RSPs" +HOMEPAGE="https://www.sdrplay.com" +SRC_URI="http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${PV}.run" + +LICENSE="SDRplay" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="systemd" + +DEPEND="virtual/libusb:1 + virtual/udev + systemd? ( sys-apps/systemd )" + +RDEPEND="${DEPEND}" + +S="${WORKDIR}" + +QA_PREBUILT="usr/lib64/libsdrplay_api.so.${MY_PV_12} +usr/lib/libsdrplay_api.so.${MY_PV_12} +usr/bin/sdrplay_apiService" + +multilib_src_install_all() { + doheader -r inc/*.h + + udev_dorules 66-mirics.rules + udev_reload + + if use systemd; then + systemd_newunit scripts/sdrplay.service.usr sdrplay.service + fi + + newinitd "${FILESDIR}/${PN}.initd" ${PN} +} + +multilib_src_install() { + if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_32" ]; then + dolib.so "${S}/i686/libsdrplay_api.so.${MY_PV_12}" + fi + + if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_64" ]; then + dolib.so "${S}/x86_64/libsdrplay_api.so.${MY_PV_12}" + fi + + if multilib_is_native_abi; then + if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_32" ]; then + dobin "${S}/i686/sdrplay_apiService" + elif [ "${MULTILIB_ABI_FLAG}" = "abi_x86_64" ]; then + dobin "${S}/x86_64/sdrplay_apiService" + fi + fi + + dosym libsdrplay_api.so.${MY_PV_12} "/usr/$(get_libdir)/libsdrplay_api.so.${MY_PV_1}" + dosym libsdrplay_api.so.${MY_PV_1} "/usr/$(get_libdir)/libsdrplay_api.so" +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/sigdigger/Manifest b/net-wireless/sigdigger/Manifest index c68508ec17e5..4582b3d7655c 100644 --- a/net-wireless/sigdigger/Manifest +++ b/net-wireless/sigdigger/Manifest @@ -1 +1,2 @@ DIST sigdigger-0.1.0.tar.gz 4190977 BLAKE2B 2079ab0cb8ea24c17fd1643c01b9a31ea38921d3c72885753eeefff67c5bfe366ff306cd8538cac03f354bc31e14fa5c13d624b3a9b8d5104f006e6d223523b7 SHA512 2bd84ae0aca4f89f19a756e8cb5cae34e0f91cfb0df94bef58079edbebc1133ec5e9c620c8bd394e757237c30a72a67c691991c48317cd952dc17df95f141dd8 +DIST sigdigger-0.3.0.tar.gz 15761823 BLAKE2B 01a53b012f707c5e33e31eab856b5f9831ac535895da4271f0bb2e69c4238a73401377d58e31b48a6d30d7db113e566996fbdc262581380312a1919885493ed9 SHA512 c24e2ac600ebdc8e080840f22812c2aba774c07de06abcffa5b561e76af0bb6ff423ea1f7c528fc8803cac8fc39edd63ba1779d3b535affbeb14a3c9aba54c9c diff --git a/net-wireless/sigdigger/sigdigger-0.3.0.ebuild b/net-wireless/sigdigger/sigdigger-0.3.0.ebuild new file mode 100644 index 000000000000..cad479d9ef4d --- /dev/null +++ b/net-wireless/sigdigger/sigdigger-0.3.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit qmake-utils + +DESCRIPTION="The free digital signal analyzer" +HOMEPAGE="https://github.com/BatchDrake/SigDigger" +SRC_URI="https://github.com/BatchDrake/SigDigger/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + media-libs/alsa-lib + media-libs/libsndfile + net-misc/curl + net-wireless/sigutils + net-wireless/soapysdr:= + net-wireless/suscan + net-wireless/suwidgets + sci-libs/fftw:3.0= +" +RDEPEND="${DEPEND}" +BDEPEND="" + +S="${WORKDIR}/SigDigger-${PV}" + +src_configure() { + #prevent stripping + sed -i '/QMAKE_LFLAGS+=-s/d' SigDigger.pro + eqmake5 PREFIX=/usr SigDigger.pro +} + +src_install() { + INSTALL_ROOT="${ED}" emake install +} diff --git a/net-wireless/sigutils/Manifest b/net-wireless/sigutils/Manifest index 088dbdcfa327..6b92e3bc2037 100644 --- a/net-wireless/sigutils/Manifest +++ b/net-wireless/sigutils/Manifest @@ -1 +1 @@ -DIST sigutils-0.1.0.tar.gz 98315 BLAKE2B 68e91dea40ad5e9cbff98f8618945ef11df4ae6551827c1e52a1a8051bbc61162e4bc0c1bc90fe4d7fe84992132d35b46af56d199cb90896a27d429bdedb9d2e SHA512 871bbd72739463f1094748edbddf07a9641fb34b29ba78b4d241ad1116f3a85128e99800561f72348a8c7a2590e2d0b3a3b99c368246807bac7a5665fb5829ca +DIST sigutils-0.3.0.tar.gz 113241 BLAKE2B 41df646ba18ffb32e9f6fadc17ce7f46e07ca422b1eaa7c2f057b2ec9e65905dcec22f428cb75ea1de956846f8bfefe338594eb7f7e557ad6af5fad55620a3db SHA512 fbf6db639e324ac9e835dacc4b12ff35edb7345f9873a805cb18b4d79651dd1102bccf24ffdcad860a93a21baff19c4f59636fd0459cd2e2de7ffbb02d79ca53 diff --git a/net-wireless/sigutils/sigutils-0.1.0-r1.ebuild b/net-wireless/sigutils/sigutils-0.3.0.ebuild index 30a26a5d5071..8f22b87f93f9 100644 --- a/net-wireless/sigutils/sigutils-0.1.0-r1.ebuild +++ b/net-wireless/sigutils/sigutils-0.3.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_MAKEFILE_GENERATOR='emake' inherit cmake @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="media-libs/libsndfile +DEPEND=" sci-libs/fftw:3.0= sci-libs/volk:= " @@ -22,7 +22,7 @@ RDEPEND="${DEPEND}" BDEPEND="" src_prepare() { - sed -i -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" -e "s#/lib/#/$(get_libdir)/#" CMakeLists.txt + #sed -i -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" -e "s#/lib/#/$(get_libdir)/#" CMakeLists.txt sed -i "s#/lib#/$(get_libdir)#" sigutils.pc.in cmake_src_prepare } diff --git a/net-wireless/soapy_power/Manifest b/net-wireless/soapy_power/Manifest deleted file mode 100644 index 2a98d84b3655..000000000000 --- a/net-wireless/soapy_power/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST soapy_power-1.6.1.tar.gz 14672 BLAKE2B 7cc16fed02a02f91cb62d3937a1cf73144f8a427acbba1bacf4c8949f8d270d7bf5a443ddd227b0a53183d79f62fa2fc5e13f67ac188dfc3a2a385d22634076a SHA512 19aa0e80a7b67cb29d842343c09b8ca2e3068583c8117a8151c5b47f1a34369f0ec833f038595323712986c9348b14a43dc1fdc6516adb40de6b42a281d782e1 diff --git a/net-wireless/soapy_power/metadata.xml b/net-wireless/soapy_power/metadata.xml deleted file mode 100644 index 9513772a9873..000000000000 --- a/net-wireless/soapy_power/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - </maintainer> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> - <use> - <flag name="faster">Use <pkg>dev-python/scipy</pkg> to speed up drawing</flag> - <flag name="fastest">Use <pkg>dev-python/pyFFTW</pkg> to speed up drawing to the max</flag> - </use> - <upstream> - <remote-id type="github">csete/gqrx</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild deleted file mode 100644 index 8cae7f1477bc..000000000000 --- a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 - -DESCRIPTION="Obtain power spectrum from SoapySDR devices" -HOMEPAGE="https://github.com/xmikos/soapy_power" - -LICENSE="MIT" -SLOT="0" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xmikos/soapy_power.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xmikos/soapy_power/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -IUSE="faster +fastest" - -DEPEND="" -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - dev-python/simplespectral[${PYTHON_USEDEP}] - >=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}] - faster? ( dev-python/scipy[${PYTHON_USEDEP}] ) - fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )" diff --git a/net-wireless/soapy_power/soapy_power-9999.ebuild b/net-wireless/soapy_power/soapy_power-9999.ebuild deleted file mode 100644 index 8cae7f1477bc..000000000000 --- a/net-wireless/soapy_power/soapy_power-9999.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 - -DESCRIPTION="Obtain power spectrum from SoapySDR devices" -HOMEPAGE="https://github.com/xmikos/soapy_power" - -LICENSE="MIT" -SLOT="0" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xmikos/soapy_power.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xmikos/soapy_power/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -IUSE="faster +fastest" - -DEPEND="" -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - dev-python/simplespectral[${PYTHON_USEDEP}] - >=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}] - faster? ( dev-python/scipy[${PYTHON_USEDEP}] ) - fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )" diff --git a/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild b/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild index 6d0f42506d10..2fa212a5f4d1 100644 --- a/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild +++ b/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyBladeRF.git" inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" SRC_URI="https://github.com/pothosware/SoapyBladeRF/archive/soapy-bladerf-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapyBladeRF-soapy-bladerf-"${PV}" fi diff --git a/net-wireless/soapyhackrf/Manifest b/net-wireless/soapyhackrf/Manifest index 4c95626f68be..42d0588d7e07 100644 --- a/net-wireless/soapyhackrf/Manifest +++ b/net-wireless/soapyhackrf/Manifest @@ -1 +1 @@ -DIST soapyhackrf-0.3.3.tar.gz 15853 BLAKE2B 2e4c551add132e153033197ca6dc4762bac854d0959b524de7c65cdb0371ff862a52102868a1c9a5ad730c43d09730c2093666d186b79abe0d3d74e84b76a800 SHA512 d0e6ddbb8054b11bfb121a18e435c0f0c23290e5e29e89af83f660865e1c8adf4ed38082c96ab6a3cb68a50b7379f3fe5ef171616eccabe3f67d65b71d08dba9 +DIST soapyhackrf-0.3.4.tar.gz 16475 BLAKE2B ee34c465e700ec93d02c51286224e8bc6f72c391867c1d3dc5bf54f28ef3230234937128eadf25409fe7c1561576a5a386178e0e94c820bd867c2fc5383a58c8 SHA512 950fc0d2d9b1a5946605d0f7f934a3d92facb6878251e8d9a673384db85e1b776ab27fd3499db11d482d599f78e705b9394b5e1238935d297252ab5acc8fb935 diff --git a/net-wireless/soapyhackrf/soapyhackrf-0.3.3-r1.ebuild b/net-wireless/soapyhackrf/soapyhackrf-0.3.4.ebuild index 7f6aa51fbd67..017475da18d7 100644 --- a/net-wireless/soapyhackrf/soapyhackrf-0.3.3-r1.ebuild +++ b/net-wireless/soapyhackrf/soapyhackrf-0.3.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyHackRF.git" inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" SRC_URI="https://github.com/pothosware/SoapyHackRF/archive/soapy-hackrf-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapyHackRF-soapy-hackrf-"${PV}" fi diff --git a/net-wireless/soapyhackrf/soapyhackrf-9999.ebuild b/net-wireless/soapyhackrf/soapyhackrf-9999.ebuild index 7f6aa51fbd67..017475da18d7 100644 --- a/net-wireless/soapyhackrf/soapyhackrf-9999.ebuild +++ b/net-wireless/soapyhackrf/soapyhackrf-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyHackRF.git" inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" SRC_URI="https://github.com/pothosware/SoapyHackRF/archive/soapy-hackrf-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapyHackRF-soapy-hackrf-"${PV}" fi diff --git a/net-wireless/soapyplutosdr/Manifest b/net-wireless/soapyplutosdr/Manifest index 4d0ae4a95984..144195fccf62 100644 --- a/net-wireless/soapyplutosdr/Manifest +++ b/net-wireless/soapyplutosdr/Manifest @@ -1 +1 @@ -DIST soapyplutosdr-0.2.1.tar.gz 17597 BLAKE2B d5b6205da7aa64406ccf84d198088094c10397ca874925926dfe2ee3134e045c3ab80b68db06ee84448ae8966e2d8edecb2517ef70b10bbddd9681fcbf09385a SHA512 40cc7c83c13f1d81212c5b0b6028d49de6c9e0b4df9e479c5cb577f60a92b415f76e159d45ecf19aad2deac507f7bd779b7cce1f7bc5e6fd2ea9a3f24399dfe7 +DIST soapyplutosdr-0.2.2.tar.gz 25472 BLAKE2B 100b366edf268c76109be2d335b6d4d6a5723a219f1f160d481385e7ac7c89e3cd25860e9916b754f67708f83d90e6f82262572c6a62eb045483a2bba6a794b3 SHA512 dd5514cde4867bd915b2ef1f0257af85359986b93a7650f00f665fd83a7d7a2c8621f79fe91ce1c16867fdff0c0c14b700628cd9a94746c11b854da1afd7daf7 diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-0.2.1.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-0.2.2.ebuild index 813d3574f115..115e42eb16c6 100644 --- a/net-wireless/soapyplutosdr/soapyplutosdr-0.2.1.ebuild +++ b/net-wireless/soapyplutosdr/soapyplutosdr-0.2.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -12,8 +12,8 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyPlutoSDR.git" inherit git-r3 else - KEYWORDS="~amd64 ~x86" - COMMIT="782650597b18f311cc97fbb7c6813539e6adef16" + KEYWORDS="~amd64 ~arm ~riscv ~x86" + COMMIT="422a9b306f765499dd3e9a4c3400fa39816dcfdb" SRC_URI="https://github.com/pothosware/SoapyPlutoSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapyPlutoSDR-${COMMIT} fi diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild index 813d3574f115..115e42eb16c6 100644 --- a/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild +++ b/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -12,8 +12,8 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyPlutoSDR.git" inherit git-r3 else - KEYWORDS="~amd64 ~x86" - COMMIT="782650597b18f311cc97fbb7c6813539e6adef16" + KEYWORDS="~amd64 ~arm ~riscv ~x86" + COMMIT="422a9b306f765499dd3e9a4c3400fa39816dcfdb" SRC_URI="https://github.com/pothosware/SoapyPlutoSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapyPlutoSDR-${COMMIT} fi diff --git a/net-wireless/soapyremote/Manifest b/net-wireless/soapyremote/Manifest index 01919a221070..a9d65142b587 100644 --- a/net-wireless/soapyremote/Manifest +++ b/net-wireless/soapyremote/Manifest @@ -1 +1 @@ -DIST soapyremote-0.5.0.tar.gz 71881 BLAKE2B e81f2df8f513df329289404de8f1f5916379a824bb51b0aa0e3b1bfc6af953a367119293db80374ef6c2ba6e638228eb8ffb5f0c9eb70a7dd61e2ff4e5641ef8 SHA512 5c5ce76c90dfbfc3b6846902f5dbf0c0906d92ae193a50d79733ce47403f1ec27dcf78d07fc198e8099272431c313984eb32c26306fb2afee129339e6501f3d2 +DIST soapyremote-0.5.2.tar.gz 72929 BLAKE2B 17b8a2f3f5400c4c6d88e726471d977aa27a263079690780dc91f93c0e30645a4e433f5406d694f5e3ba60bf0a73ce93fff616a21b0e4ac7e0b5d17cf8275711 SHA512 55841f248c796a870a81a508cec85962ed821c2abd40438eaee07135cb6dde0bd93e84a3ff709dfeaf26f7f79717197c80c3aad378d62b3e4b232f60c46b0151 diff --git a/net-wireless/soapyremote/soapyremote-0.5.0.ebuild b/net-wireless/soapyremote/soapyremote-0.5.2.ebuild index 0ad6fd2b4430..2e6d321d6176 100644 --- a/net-wireless/soapyremote/soapyremote-0.5.0.ebuild +++ b/net-wireless/soapyremote/soapyremote-0.5.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="Soapy SDR remote module" HOMEPAGE="https://github.com/pothosware/SoapyRemote" diff --git a/net-wireless/soapyremote/soapyremote-9999.ebuild b/net-wireless/soapyremote/soapyremote-9999.ebuild index 0ad6fd2b4430..2e6d321d6176 100644 --- a/net-wireless/soapyremote/soapyremote-9999.ebuild +++ b/net-wireless/soapyremote/soapyremote-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="Soapy SDR remote module" HOMEPAGE="https://github.com/pothosware/SoapyRemote" diff --git a/net-wireless/soapyrtlsdr/Manifest b/net-wireless/soapyrtlsdr/Manifest index 911d875143d2..b35267b606d3 100644 --- a/net-wireless/soapyrtlsdr/Manifest +++ b/net-wireless/soapyrtlsdr/Manifest @@ -1 +1,2 @@ DIST soapyrtlsdr-0.3.2.tar.gz 16033 BLAKE2B b3a874998f99d291c8e204007fe9822285a3e56b50b36957c8f1b14c48469050bc0775f9fd0237c8cfa96fa08e88967a438fa9eb8bec0a80016b212d3b309759 SHA512 f8279afebb251d72fea14d89889835be5ed8109c1400fdcc785c1ec120e978ae7b1de53cc84d16bf609de4cca2ddbc9d432d046e4c6967e1e494fd5571d46cc2 +DIST soapyrtlsdr-0.3.3.tar.gz 16760 BLAKE2B 63e4c707d65af13e9b3974c9afe1261909395c70589e07a5b8398fcd40c421dbb7754a39467a325d09f4312a410fb60e34f51fca1fdb26eac68ac495b0b2c9a8 SHA512 a43511c8644a8dbec8e0b7d8f114c4955ba9407727680680cef446a12a9ee27bfe892cab49aa77ce82d52e4272075f4e6f2ee38350675f5508601ff24ff82081 diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.2.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.2.ebuild index c69214fbee0c..769f04594963 100644 --- a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.2.ebuild +++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyRTLSDR.git" inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" SRC_URI="https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtl-sdr-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapyRTLSDR-soapy-rtl-sdr-"${PV}" fi @@ -23,3 +23,4 @@ SLOT="0" RDEPEND="net-wireless/soapysdr:= net-wireless/rtl-sdr" DEPEND="${RDEPEND}" +BDEPEND="" diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.3.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.3.ebuild new file mode 100644 index 000000000000..769f04594963 --- /dev/null +++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.3.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="SoapySDR RTL-SDR Support Module" +HOMEPAGE="https://github.com/pothosware/SoapyRTLSDR" + +if [ "${PV}" = "9999" ]; then + EGIT_REPO_URI="https://github.com/pothosware/SoapyRTLSDR.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~riscv ~x86" + SRC_URI="https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtl-sdr-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/SoapyRTLSDR-soapy-rtl-sdr-"${PV}" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND="net-wireless/soapysdr:= + net-wireless/rtl-sdr" +DEPEND="${RDEPEND}" +BDEPEND="" diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild index c69214fbee0c..769f04594963 100644 --- a/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild +++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyRTLSDR.git" inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" SRC_URI="https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtl-sdr-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapyRTLSDR-soapy-rtl-sdr-"${PV}" fi @@ -23,3 +23,4 @@ SLOT="0" RDEPEND="net-wireless/soapysdr:= net-wireless/rtl-sdr" DEPEND="${RDEPEND}" +BDEPEND="" diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest index 8736fc69bae5..2de4d5a52684 100644 --- a/net-wireless/soapysdr/Manifest +++ b/net-wireless/soapysdr/Manifest @@ -1 +1 @@ -DIST soapysdr-0.7.2.tar.gz 124607 BLAKE2B 534480574e2085bddea52141f26e0da8c70157e2c89a0af1236f3d1eb5b996d4ae5231cd209c610fc22d099bd9db665c4c7aea54081eeca2bb293b9eb1fe7c8e SHA512 2454b9b6bf4542f3bce2c6a8e1c886cee9179ca0e13e3c1e22817a05ef671428a3cb8fea69e496c8b62573f360c248508edf3d0871ec5063dfac8211b122d371 +DIST soapysdr-0.8.1.tar.gz 131252 BLAKE2B 4dc97b683063a1bc52717f15b12a2471a338cebc30dccfd58723792119a496f5170b67eeda1ff4dbcd34811948f70b9f0e5df11b5b1738b46839ca7377fe557b SHA512 50c8f1652bf9ca09215f9c4115175427ca7b5338add7591e31ca0e627093c94b73e7cf7f84fa71ff419cc010d3c1263931506c728bbaa00413a7915d56a87787 diff --git a/net-wireless/soapysdr/soapysdr-0.7.2.ebuild b/net-wireless/soapysdr/soapysdr-0.8.1.ebuild index 0d446573c63d..fa9402a85678 100644 --- a/net-wireless/soapysdr/soapysdr-0.7.2.ebuild +++ b/net-wireless/soapysdr/soapysdr-0.8.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-r1 @@ -15,7 +15,7 @@ if [ "${PV}" = "9999" ]; then EGIT_CLONE_TYPE="shallow" inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" SRC_URI="https://github.com/pothosware/SoapySDR/archive/soapy-sdr-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapySDR-soapy-sdr-"${PV}" fi diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild b/net-wireless/soapysdr/soapysdr-9999.ebuild index 0d446573c63d..fa9402a85678 100644 --- a/net-wireless/soapysdr/soapysdr-9999.ebuild +++ b/net-wireless/soapysdr/soapysdr-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-r1 @@ -15,7 +15,7 @@ if [ "${PV}" = "9999" ]; then EGIT_CLONE_TYPE="shallow" inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" SRC_URI="https://github.com/pothosware/SoapySDR/archive/soapy-sdr-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapySDR-soapy-sdr-"${PV}" fi diff --git a/net-wireless/soapysdrplay/Manifest b/net-wireless/soapysdrplay/Manifest index ee25bcdcc602..16728763a32c 100644 --- a/net-wireless/soapysdrplay/Manifest +++ b/net-wireless/soapysdrplay/Manifest @@ -1,2 +1 @@ -DIST soapysdrplay-0.1.0.tar.gz 11736 BLAKE2B 746e01092d094cedb6b15b9c11ec0b828e18cd3c814e46cbe5cb9473cfd494d8342ab9618d8c5d945429b2b62178b02b81c2b000e20c53a7cb027d4b2a25c789 SHA512 28382b4ac79e27a0b84ed6edb4abeca99b90222ad2890041e1585cac21177518ca3fcea0a3e14f8502091d47e7b2a223913dd77c53b6c0360f0f3875328613da -DIST soapysdrplay-0.2.0.tar.gz 13570 BLAKE2B c77342b091a3510986e4388911dc2e45d7bc0e54dfef7ebe1fe774d564193bc773509d46238c0a3ea87458ab0c7ea2447a877f083a72a26f2ca5e592386b1ba1 SHA512 7ed6e34ee42416b4d2eec76b66cdc0e9b40835ab3299a2b3a906492cf342bbdef7c92dd3e9e63b12fdceb897ca4fb2bb574b23d4aee121cc32fbfcddbb7b060a +DIST soapysdrplay-20220120.tar.gz 21089 BLAKE2B db8a8f7b20a57d637f69b45cab283419e46808ab95bfbcba96b155c696bb6673223347ef720c8556f4122a53659eb166edb15b48796b2e01ec3ee5bb10eafba1 SHA512 a0cd5e84da86ab9fc6ffae93e963a14091c0936bc93a0ab86d7c3cab15cf2e62e1382da9fff10b1f457d1fbf925dc3ea74683f0fa13e12394d994f9571e52334 diff --git a/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild b/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild deleted file mode 100644 index 935b6c269996..000000000000 --- a/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Soapy SDR plugin for SDRPlay" -HOMEPAGE="https://github.com/pothosware/SoapySDRPlay" - -if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git" - EGIT_CLONE_TYPE="shallow" - inherit git-r3 -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}" -fi - -LICENSE="Boost-1.0" -SLOT="0" - -IUSE="" -REQUIRED_USE="" - -RDEPEND="net-wireless/soapysdr - net-wireless/sdrplay" -DEPEND="${RDEPEND}" diff --git a/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild b/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild deleted file mode 100644 index 935b6c269996..000000000000 --- a/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Soapy SDR plugin for SDRPlay" -HOMEPAGE="https://github.com/pothosware/SoapySDRPlay" - -if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git" - EGIT_CLONE_TYPE="shallow" - inherit git-r3 -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}" -fi - -LICENSE="Boost-1.0" -SLOT="0" - -IUSE="" -REQUIRED_USE="" - -RDEPEND="net-wireless/soapysdr - net-wireless/sdrplay" -DEPEND="${RDEPEND}" diff --git a/net-wireless/soapysdrplay/soapysdrplay-20220120.ebuild b/net-wireless/soapysdrplay/soapysdrplay-20220120.ebuild new file mode 100644 index 000000000000..446b5336ed79 --- /dev/null +++ b/net-wireless/soapysdrplay/soapysdrplay-20220120.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Soapy SDR plugin for SDRPlay" +HOMEPAGE="https://github.com/pothosware/SoapySDRPlay3" + +if [ "${PV}" = "9999" ]; then + EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay3.git" + EGIT_CLONE_TYPE="shallow" + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" + COMMIT_HASH="b789d5985b900973c81c69aa04cb3c7ebe620a75" + SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/SoapySDRPlay3-"${COMMIT_HASH}" +fi + +LICENSE="Boost-1.0" +SLOT="0" + +IUSE="" +REQUIRED_USE="" + +RDEPEND="net-wireless/soapysdr + >=net-wireless/sdrplay-3.07" +DEPEND="${RDEPEND}" diff --git a/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild b/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild index 935b6c269996..446b5336ed79 100644 --- a/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild +++ b/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="Soapy SDR plugin for SDRPlay" -HOMEPAGE="https://github.com/pothosware/SoapySDRPlay" +HOMEPAGE="https://github.com/pothosware/SoapySDRPlay3" if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git" + EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay3.git" EGIT_CLONE_TYPE="shallow" inherit git-r3 else KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}" + COMMIT_HASH="b789d5985b900973c81c69aa04cb3c7ebe620a75" + SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/SoapySDRPlay3-"${COMMIT_HASH}" fi LICENSE="Boost-1.0" @@ -25,5 +26,5 @@ IUSE="" REQUIRED_USE="" RDEPEND="net-wireless/soapysdr - net-wireless/sdrplay" + >=net-wireless/sdrplay-3.07" DEPEND="${RDEPEND}" diff --git a/net-wireless/soapyuhd/soapyuhd-0.4.1.ebuild b/net-wireless/soapyuhd/soapyuhd-0.4.1.ebuild index dba31a72d677..ce4efc4c34c3 100644 --- a/net-wireless/soapyuhd/soapyuhd-0.4.1.ebuild +++ b/net-wireless/soapyuhd/soapyuhd-0.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyUHD.git" inherit git-r3 else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~riscv ~x86" SRC_URI="https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/SoapyUHD-soapy-uhd-"${PV}" fi diff --git a/net-wireless/spectools/Manifest b/net-wireless/spectools/Manifest deleted file mode 100644 index b11e1ec2c594..000000000000 --- a/net-wireless/spectools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST spectools-2016-01-R1.tar.xz 120732 BLAKE2B ad937d7fc737729314ebce3c2615981ee33abee052778c7acebb15d7d33667062fce01515a8b41e18a15f3ca6214d0a818c79efe3b85929f67b18f1a06a78536 SHA512 59da488e08114018cd756d45f48541a26f643a3618bfbaec0e72c434c80e6cbc8b4f930476206c66af84ee574807e011489f884e96c7291c626b1b4e69619fad diff --git a/net-wireless/spectools/files/spectools-2011.08.1_p20140618-tinfo.patch b/net-wireless/spectools/files/spectools-2011.08.1_p20140618-tinfo.patch deleted file mode 100644 index c5ef3480d01c..000000000000 --- a/net-wireless/spectools/files/spectools-2011.08.1_p20140618-tinfo.patch +++ /dev/null @@ -1,41 +0,0 @@ - configure.in | 21 +++++++++++---------- - 1 file changed, 11 insertions(+), 10 deletions(-) - -diff --git a/configure.in b/configure.in -index a15258c..af4ae57 100644 ---- a/configure.in -+++ b/configure.in -@@ -131,22 +131,23 @@ AC_CHECK_LIB([usb], [usb_init], AC_DEFINE(HAVE_LIBUSB, 1, LibUSB) LIBS="$LIBS -l - dnl Look for curses/libcurses - termcontrol="none"; - --AC_CHECK_LIB([ncurses], [initscr], -+PKG_CHECK_MODULES([NCURSES], [ncurses], [foundhcurses=yesyes curseaux="${NCURSES_LIBS}" termcontrol="ncurses"], [ -+ AC_CHECK_LIB([ncurses], [initscr], - AC_DEFINE(HAVE_LIBNCURSES, 1, NCurses terminal lib) \ - foundlcurses=yes curseaux="-lncurses" termcontrol="ncurses" ) - --if test "$foundlcurses" != "yes"; then -- AC_CHECK_LIB([curses], [initscr], -+ if test "$foundlcurses" != "yes"; then -+ AC_CHECK_LIB([curses], [initscr], - AC_DEFINE(HAVE_LIBCURSES, 1, Curses terminal lib) \ - foundlcurses=yes curseaux="-lcurses" termcontrol="curses" ) --fi -- --if test "$termcontrol" = "ncurses"; then -- AC_CHECK_HEADER([ncurses.h], [foundhcurses=yes]) --elif test "$termcontrol" = "curses"; then -- AC_CHECK_HEADER([curses.h], [foundhcurses=yes]) --fi -+ fi - -+ if test "$termcontrol" = "ncurses"; then -+ AC_CHECK_HEADER([ncurses.h], [foundhcurses=yes]) -+ elif test "$termcontrol" = "curses"; then -+ AC_CHECK_HEADER([curses.h], [foundhcurses=yes]) -+ fi -+]) - if test "$foundhcurses$foundlcurses" != "yesyes"; then - AC_MSG_WARN(*** Could not find curses library. Curses grapher will not be built.) - else diff --git a/net-wireless/spectools/metadata.xml b/net-wireless/spectools/metadata.xml deleted file mode 100644 index 3d6d7f4d06fd..000000000000 --- a/net-wireless/spectools/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - <description>maintainer, has access to all hardware as needed</description> - </maintainer> - <maintainer type="person"> - <email>robbat2@gentoo.org</email> - <name>Robin H. Johnson</name> - <description>Maintainer, has 1st gen WiSpy hardware for testing</description> - </maintainer> - <use> - <flag name="debug">Build the raw output client for spectools. (for developers)</flag> - <flag name="ncurses">Build the ncurses based client for spectools</flag> - <flag name="gtk">Build the gtk-2 based client for spectools</flag> - </use> -</pkgmetadata> diff --git a/net-wireless/spectools/spectools-2016.01.1.ebuild b/net-wireless/spectools/spectools-2016.01.1.ebuild deleted file mode 100644 index 9f71f354a675..000000000000 --- a/net-wireless/spectools/spectools-2016.01.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs udev flag-o-matic - -MY_PN=${PN} -MY_PV=${PV/\./-} -MY_PV=${MY_PV/./-R} -MY_P="${MY_PN}-${MY_PV}" -S=${WORKDIR}/${MY_P} - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" - inherit git-r3 -else - SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" - KEYWORDS="amd64 arm ~arm64 ~ppc x86" -fi - -DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware" -HOMEPAGE="https://www.kismetwireless.net/spectools/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug +ncurses +gtk" - -RDEPEND=" - virtual/libusb:0 - ncurses? ( sys-libs/ncurses:0= ) - gtk? ( x11-libs/gtk+:2 - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/pango - dev-libs/glib:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" -# Upstream has still not migrated to the libusb-1 line. -# Maemo: Add hildon and bbus - -src_prepare() { - eapply "${FILESDIR}"/${PN}-2011.08.1_p20140618-tinfo.patch - mv configure.{in,ac} || die - eautoreconf - # fix bug 577466 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - default -} - -# Please note that upstream removed the --with-gtk-version option -# and GTK is now automagical. GTK1 support was also removed. -src_compile() { - emake depend - - emake spectool_net - - use debug && emake spectool_raw - - use ncurses && emake spectool_curses - - use gtk && emake spectool_gtk - - #if use maemo; then - # emake spectool_hildon usbcontrol \ - # || die "emake spectool_hildon usbcontrol failed" - #fi -} - -src_install() { - dobin spectool_net - use debug && dobin spectool_raw - use ncurses && dobin spectool_curses - use gtk && dobin spectool_gtk - - udev_dorules 99-wispy.rules - dodoc README - - #if use maemo; then - # dobin spectool_hildon - # dosbin usbcontrol - #fi -} diff --git a/net-wireless/spectools/spectools-9999.ebuild b/net-wireless/spectools/spectools-9999.ebuild deleted file mode 100644 index 09a1223f3f4d..000000000000 --- a/net-wireless/spectools/spectools-9999.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs udev flag-o-matic - -MY_PN=${PN} -MY_PV=${PV/\./-} -MY_PV=${MY_PV/./-R} -MY_P="${MY_PN}-${MY_PV}" -S=${WORKDIR}/${MY_P} - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" - inherit git-r3 -else - SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -fi - -DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware" -HOMEPAGE="https://www.kismetwireless.net/spectools/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug +ncurses +gtk" - -RDEPEND=" - virtual/libusb:0 - ncurses? ( sys-libs/ncurses:0= ) - gtk? ( x11-libs/gtk+:2 - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/pango - dev-libs/glib:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" -# Upstream has still not migrated to the libusb-1 line. -# Maemo: Add hildon and bbus - -src_prepare() { - eapply "${FILESDIR}"/${PN}-2011.08.1_p20140618-tinfo.patch - mv configure.{in,ac} || die - eautoreconf - # fix bug 577466 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - default -} - -# Please note that upstream removed the --with-gtk-version option -# and GTK is now automagical. GTK1 support was also removed. -src_compile() { - emake depend - - emake spectool_net - - use debug && emake spectool_raw - - use ncurses && emake spectool_curses - - use gtk && emake spectool_gtk - - #if use maemo; then - # emake spectool_hildon usbcontrol \ - # || die "emake spectool_hildon usbcontrol failed" - #fi -} - -src_install() { - dobin spectool_net - use debug && dobin spectool_raw - use ncurses && dobin spectool_curses - use gtk && dobin spectool_gtk - - udev_dorules 99-wispy.rules - dodoc README - - #if use maemo; then - # dobin spectool_hildon - # dosbin usbcontrol - #fi -} diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest deleted file mode 100644 index 7eaea39dc7c1..000000000000 --- a/net-wireless/srslte/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST srslte-20.10.1.tar.gz 8098321 BLAKE2B 713cbe45c49baa416b96dc432982656fef92082f026392c890f447d09588a48aafab32f94a4d7ed982814d2d838224303895a0bd0276a90f5815f6d0707d9732 SHA512 a6e38ccdb02a7e129f51fbad258722f5cd1f568541627c3e9e70f9e92491279cb55c18ab0463bce94b0f5fc62f0868027a83beffc483bb3689f0838fbea91186 diff --git a/net-wireless/srslte/files/srslte-20.10.1-add-missing-include.patch b/net-wireless/srslte/files/srslte-20.10.1-add-missing-include.patch deleted file mode 100644 index 158ff9e6db39..000000000000 --- a/net-wireless/srslte/files/srslte-20.10.1-add-missing-include.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/786855 - -From 4ec818f0d337a54ff3d4ff587bbd6f5f05363700 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Wed, 4 Aug 2021 23:14:21 +0100 -Subject: [PATCH] Add missing include - ---- - lib/include/srslte/adt/observer.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/include/srslte/adt/observer.h b/lib/include/srslte/adt/observer.h -index 38a881d..9ad33a0 100644 ---- a/lib/include/srslte/adt/observer.h -+++ b/lib/include/srslte/adt/observer.h -@@ -26,6 +26,7 @@ - #include <functional> - #include <limits> - #include <vector> -+#include <cstddef> - - namespace srslte { - --- -2.32.0 - diff --git a/net-wireless/srslte/metadata.xml b/net-wireless/srslte/metadata.xml deleted file mode 100644 index aa49f7fde140..000000000000 --- a/net-wireless/srslte/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> - <use> - <flag name="uhd">support Ettus Research hardware</flag> - <flag name="bladerf">support Nuand BladeRF hardware</flag> - <flag name="soapysdr">use soapysdr to support various hardware</flag> - <flag name="simcard">support hardware sim cards</flag> - <flag name="zeromq">enable zeromq message passing</flag> - </use> - <upstream> - <remote-id type="github">srsLTE/srsLTE</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-wireless/srslte/srslte-20.10.1-r2.ebuild b/net-wireless/srslte/srslte-20.10.1-r2.ebuild deleted file mode 100644 index 789887297552..000000000000 --- a/net-wireless/srslte/srslte-20.10.1-r2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems" -HOMEPAGE="http://www.softwareradiosystems.com" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/srsLTE/srsLTE.git" -else - inherit vcs-snapshot - KEYWORDS="~amd64 ~x86" - MY_PV=${PV//./_} - SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz" -fi -#https://github.com/srsLTE/srsLTE/issues/537 -RESTRICT="test" - -LICENSE="GPL-3" -SLOT="0" -IUSE="bladerf simcard soapysdr uhd zeromq" - -DEPEND=" - dev-libs/boost:= - dev-libs/libconfig:=[cxx] - net-misc/lksctp-tools - net-libs/mbedtls:= - sci-libs/fftw:3.0= - bladerf? ( net-wireless/bladerf:= ) - simcard? ( sys-apps/pcsc-lite ) - soapysdr? ( net-wireless/soapysdr:= ) - uhd? ( net-wireless/uhd:= ) - zeromq? ( net-libs/zeromq:= ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-20.10.1-add-missing-include.patch -) - -src_prepare() { - sed -i '/ -Werror"/d' CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - mycmakeargs=( - -DENABLE_UHD="$(usex uhd)" - -DENABLE_BLADERF="$(usex bladerf)" - -DENABLE_SOAPYSDR="$(usex soapysdr)" - -DENABLE_ZEROMQ="$(usex zeromq)" - -DENABLE_HARDSIM="$(usex simcard)" - ) - cmake_src_configure -} diff --git a/net-wireless/srslte/srslte-9999.ebuild b/net-wireless/srslte/srslte-9999.ebuild deleted file mode 100644 index 02ff600dab82..000000000000 --- a/net-wireless/srslte/srslte-9999.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems" -HOMEPAGE="http://www.softwareradiosystems.com" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/srsLTE/srsLTE.git" -else - inherit vcs-snapshot - KEYWORDS="~amd64 ~x86" - MY_PV=${PV//./_} - SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz" -fi -#https://github.com/srsLTE/srsLTE/issues/537 -RESTRICT="test" - -LICENSE="GPL-3" -SLOT="0" -IUSE="bladerf simcard soapysdr uhd zeromq" - -DEPEND=" - dev-libs/boost:= - dev-libs/libconfig:=[cxx] - net-misc/lksctp-tools - net-libs/mbedtls:= - sci-libs/fftw:3.0= - bladerf? ( net-wireless/bladerf:= ) - simcard? ( sys-apps/pcsc-lite ) - soapysdr? ( net-wireless/soapysdr:= ) - uhd? ( net-wireless/uhd:= ) - zeromq? ( net-libs/zeromq:= ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - sed -i '/ -Werror"/d' CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - mycmakeargs=( - -DENABLE_UHD="$(usex uhd)" - -DENABLE_BLADERF="$(usex bladerf)" - -DENABLE_SOAPYSDR="$(usex soapysdr)" - -DENABLE_ZEROMQ="$(usex zeromq)" - -DENABLE_HARDSIM="$(usex simcard)" - ) - cmake_src_configure -} diff --git a/net-wireless/suscan/Manifest b/net-wireless/suscan/Manifest index 1692e4e979c9..bae6f2a1baf3 100644 --- a/net-wireless/suscan/Manifest +++ b/net-wireless/suscan/Manifest @@ -1 +1 @@ -DIST suscan-0.1.0.tar.gz 1868384 BLAKE2B a021b67f38f86cd54c137c6091ecc2bdbc92fadcc4173f119a4a071d90db8ce259f02a38006b9021f8c65fe13a3a64b2a4b0d459f3d32b492c70f0551f8f59d1 SHA512 1ae42fb2ebe762b77040b4f2bee70b213e89ce9c348c7b4d589600d0bc764a402cf5bbf8488d8f69bdb4c03aea44cbf6384ad986dac217591caab563bdc09fc6 +DIST suscan-0.3.0.tar.gz 2951138 BLAKE2B 71ab08a8a9e3f38adb188254b7130f485ac043841aceb0d7c2f16138da593e87745bacd1a7292aab05e23d669f32bb7c72ce5546540005484936a9e80aa19e0d SHA512 7074217e2abfd06ace2acef6dbdea1c44e58e8c7a11f798686a6ed1b914e0f0a3c19c45bed9975781f889d8bc237e3d18083ee751b6921947939c0e24f3833cd diff --git a/net-wireless/suscan/suscan-0.1.0-r1.ebuild b/net-wireless/suscan/suscan-0.3.0.ebuild index 1f10e15ed213..d6455894e98f 100644 --- a/net-wireless/suscan/suscan-0.1.0-r1.ebuild +++ b/net-wireless/suscan/suscan-0.3.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_MAKEFILE_GENERATOR='emake' inherit cmake @@ -14,18 +14,13 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="media-libs/libsndfile +DEPEND=" dev-libs/libxml2 + media-libs/alsa-lib + media-libs/libsndfile net-wireless/sigutils net-wireless/soapysdr:= - sci-libs/fftw:3.0= - sci-libs/volk:= + sys-libs/zlib " RDEPEND="${DEPEND}" BDEPEND="" - -src_prepare() { - sed -i -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" -e "s#/lib/#/$(get_libdir)/#" CMakeLists.txt - sed -i "s#/lib#/$(get_libdir)#" sigutils.pc.in - cmake_src_prepare -} diff --git a/net-wireless/suwidgets/Manifest b/net-wireless/suwidgets/Manifest index 86a9a8ca6416..afaba8b0575b 100644 --- a/net-wireless/suwidgets/Manifest +++ b/net-wireless/suwidgets/Manifest @@ -1 +1,2 @@ DIST suwidgets-0.1.0.tar.gz 74722 BLAKE2B 7677fe49cba6646eb45b01aea2d311aba5ab62adae71d9c5b8381766aeeec09560f1c028f94fdce7056b1340d923f6d4727fcc2295db609231a1e5c70dd8f26b SHA512 9f623e01e66d22424b99682c00b5109d9fe07d041f51c583573304897e1bbad33e940a19fc3d1104f97dfcd2f7b7d9a00abc02a3c91e0114214a7a954dfdc054 +DIST suwidgets-0.3.0.tar.gz 143360 BLAKE2B 2d823afef947280bb199447f8a7a4e663f9dcb88f98d163a85bd714e22a9d573e92a7174fb910dd7a6eb388b261d8320e0a06a2177b8107e334955558c31daac SHA512 af6c378594e324587efabd72163d0715779ed53536aa0c02a8a1b39e0c2d8c6c991205a37f1f0dc75da03b8b0cb05a4a800fec631b6878568287fd6d1e46c47c diff --git a/net-wireless/suwidgets/suwidgets-0.3.0.ebuild b/net-wireless/suwidgets/suwidgets-0.3.0.ebuild new file mode 100644 index 000000000000..a75749527397 --- /dev/null +++ b/net-wireless/suwidgets/suwidgets-0.3.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit qmake-utils + +DESCRIPTION="graphical library containing all SigDigger's custom widgets" +HOMEPAGE="https://github.com/BatchDrake/SuWidgets" +SRC_URI="https://github.com/BatchDrake/SuWidgets/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + media-libs/libglvnd +" +RDEPEND="${DEPEND}" +BDEPEND="" + +S="${WORKDIR}/SuWidgets-${PV}" + +src_prepare() { + sed -i '/^#include <QPainter>/i #include <QPainterPath>' Waveform.cpp Waterfall.cpp \ + Transition.cpp SymView.cpp QVerticalLabel.cpp LCD.cpp Histogram.cpp \ + Constellation.cpp ColorChooserButton.cpp + + default +} + +src_configure() { + eqmake5 SuWidgetsLib.pro +} + +src_install() { + INSTALL_ROOT="${ED}" emake install +} diff --git a/net-wireless/tempestsdr/metadata.xml b/net-wireless/tempestsdr/metadata.xml index 193aff4c505d..b44d71742ea6 100644 --- a/net-wireless/tempestsdr/metadata.xml +++ b/net-wireless/tempestsdr/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="person"> <email>zerochaos@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">deltj/TempestSDR.git</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/tempestsdr/tempestsdr-0.0_p20200221.ebuild b/net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild index 8a649e9a4665..1301229d0e69 100644 --- a/net-wireless/tempestsdr/tempestsdr-0.0_p20200221.ebuild +++ b/net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit java-pkg-2 @@ -22,6 +22,7 @@ fi IUSE="" DEPEND=">=virtual/jdk-1.8:* + dev-libs/boost:= net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr diff --git a/net-wireless/tempestsdr/tempestsdr-9999.ebuild b/net-wireless/tempestsdr/tempestsdr-9999.ebuild index 8a649e9a4665..1301229d0e69 100644 --- a/net-wireless/tempestsdr/tempestsdr-9999.ebuild +++ b/net-wireless/tempestsdr/tempestsdr-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit java-pkg-2 @@ -22,6 +22,7 @@ fi IUSE="" DEPEND=">=virtual/jdk-1.8:* + dev-libs/boost:= net-wireless/airspy net-wireless/uhd:= net-wireless/rtl-sdr diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest index 03ea22126d66..5c58d150391e 100644 --- a/net-wireless/ubertooth/Manifest +++ b/net-wireless/ubertooth/Manifest @@ -1,2 +1 @@ -DIST ubertooth-2018-12-R1.tar.xz 704208 BLAKE2B 7a17830a0ed417a737d78aa22c5a6a270a67b350a3a5e9a0aebabd4b38547d8d35551e061ea3d5260996f8fe1a366c75c8773d5e3a6abf37a0930f93200da3fc SHA512 409fdb403d6a3fa84b92757e0fd8672b1403ba3d24888fbde4d6d6923d8e0796914c20d38e2fc58909f81fcb8a0b6290bcf91282bb02354c310e6e91ad85e23b DIST ubertooth-2020-12-R1.tar.xz 763952 BLAKE2B 592c5fa689e0f944875bd777dedfd83394ebe5c9c65c1ac2c19006a949daeda8440dc102e537cf97b4547e0730df8f47d5c2a420d84d5dc770577b6039e16b28 SHA512 f127cae09d9b20dc34ffad080871f4505cbeccc1117e0e4e841ecf4a30f578d02b67b52786d7a82bdfc43d06562919008c076f8eb9befc7e4bd95def05a3864c diff --git a/net-wireless/ubertooth/files/ubertooth-2018.12.1-gcc-10.patch b/net-wireless/ubertooth/files/ubertooth-2018.12.1-gcc-10.patch deleted file mode 100644 index b4f25e6b0b8c..000000000000 --- a/net-wireless/ubertooth/files/ubertooth-2018.12.1-gcc-10.patch +++ /dev/null @@ -1,23 +0,0 @@ -From abc1d87631c71fb5bf3be4b81327c66292d852ca Mon Sep 17 00:00:00 2001 -From: Jonas Stein <news@jonasstein.de> -Date: Sat, 6 Jun 2020 21:11:38 +0200 -Subject: [PATCH] extern packet_counter_max to compile with gcc-10 - -Fixes: https://github.com/greatscottgadgets/ubertooth/issues/408 ---- - host/libubertooth/src/ubertooth_callback.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libubertooth/src/ubertooth_callback.c b/libubertooth/src/ubertooth_callback.c -index a36e3512..adb9934f 100644 ---- a/libubertooth/src/ubertooth_callback.c -+++ b/libubertooth/src/ubertooth_callback.c -@@ -27,7 +27,7 @@ - - #include "ubertooth_callback.h" - --unsigned int packet_counter_max; -+extern unsigned int packet_counter_max; - - static int8_t cc2400_rssi_to_dbm( const int8_t rssi ) - { diff --git a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild b/net-wireless/ubertooth/ubertooth-2020.12.1-r1.ebuild index d71069e391f4..45856c5f06e4 100644 --- a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild +++ b/net-wireless/ubertooth/ubertooth-2020.12.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 inherit cmake udev -HOMEPAGE="http://ubertooth.sourceforge.net/" +HOMEPAGE="https://greatscottgadgets.com/ubertoothone/" LICENSE="GPL-2" SLOT="0" @@ -14,7 +14,7 @@ IUSE="+bluez static-libs +ubertooth1-firmware +udev" DEPEND="bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-${PV}:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) - virtual/libusb:1=" + virtual/libusb:1" RDEPEND="${DEPEND} udev? ( virtual/udev )" @@ -32,9 +32,8 @@ fi DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation" #readd firmware building, but do it right -#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi - -PATCHES=( "${FILESDIR}"/"${P}"-gcc-10.patch ) +#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv \ +#'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi src_configure() { local mycmakeargs=( @@ -61,11 +60,21 @@ src_install() { ewarn "Firmware isn't available for git releases, we assume you are already" ewarn "on the latest and/or can build your own." else - use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu - use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu + if use ubertooth1-firmware; then + newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu + newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu + fi fi popd elog "Everyone can read from the ubertooth, but to talk to it" elog "your user needs to be in the usb group." } + +pkg_postinst() { + use udev && udev_reload +} + +pkg_postrm() { + use udev && udev_reload +} diff --git a/net-wireless/ubertooth/ubertooth-2020.12.1.ebuild b/net-wireless/ubertooth/ubertooth-2020.12.1.ebuild deleted file mode 100644 index c3cfc4790455..000000000000 --- a/net-wireless/ubertooth/ubertooth-2020.12.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake udev - -HOMEPAGE="http://ubertooth.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+bluez static-libs +ubertooth1-firmware +udev" - -DEPEND="bluez? ( net-wireless/bluez:= ) - >=net-libs/libbtbb-${PV}:=[static-libs?] - static-libs? ( dev-libs/libusb[static-libs] ) - virtual/libusb:1=" -RDEPEND="${DEPEND} - udev? ( virtual/udev )" - -MY_PV=${PV/\./-} -MY_PV=${MY_PV/./-R} -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git" - inherit git-r3 - S="${WORKDIR}/${P}/host" -else - S="${WORKDIR}/${PN}-${MY_PV}/host" - SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" -fi -DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation" - -#readd firmware building, but do it right -#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi - -src_configure() { - local mycmakeargs=( - -DUSE_BLUEZ=$(usex bluez) - -DBUILD_STATIC_LIB=$(usex static-libs) - -DINSTALL_UDEV_RULES=$(usex udev) - -DENABLE_PYTHON=false - ) - if use udev; then - mycmakeargs+=( - -DUDEV_RULES_GROUP=usb - -DUDEV_RULES_PATH="$(get_udevdir)/rules.d" - ) - fi - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /usr/share/${PN} - pushd "${WORKDIR}/${PN}-${MY_PV}" || die - if [[ ${PV} == "9999" ]] ; then - ewarn "Firmware isn't available for git releases, we assume you are already" - ewarn "on the latest and/or can build your own." - else - use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu - use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu - fi - popd - - elog "Everyone can read from the ubertooth, but to talk to it" - elog "your user needs to be in the usb group." -} diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild index 4a9603a7e8d4..719d5adfaf80 100644 --- a/net-wireless/ubertooth/ubertooth-9999.ebuild +++ b/net-wireless/ubertooth/ubertooth-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 inherit cmake udev -HOMEPAGE="http://ubertooth.sourceforge.net/" +HOMEPAGE="https://greatscottgadgets.com/ubertoothone/" LICENSE="GPL-2" SLOT="0" @@ -14,7 +14,7 @@ IUSE="+bluez static-libs +ubertooth1-firmware +udev" DEPEND="bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-${PV}:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) - virtual/libusb:1=" + virtual/libusb:1" RDEPEND="${DEPEND} udev? ( virtual/udev )" @@ -32,7 +32,8 @@ fi DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation" #readd firmware building, but do it right -#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi +#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv \ +#'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi src_configure() { local mycmakeargs=( @@ -59,11 +60,21 @@ src_install() { ewarn "Firmware isn't available for git releases, we assume you are already" ewarn "on the latest and/or can build your own." else - use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu - use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu + if use ubertooth1-firmware; then + newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu + newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu + fi fi popd elog "Everyone can read from the ubertooth, but to talk to it" elog "your user needs to be in the usb group." } + +pkg_postinst() { + use udev && udev_reload +} + +pkg_postrm() { + use udev && udev_reload +} diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest index db104b0ddc9b..3c32537c43ec 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -1,4 +1,4 @@ -DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0 -DIST EttusResearch-UHD-4.1.0.4.tar.gz 37913211 BLAKE2B 28cd3892490aaa8ec01ca8233c4f0500fd49a3184be74f77dbb8a5fdafc08d74144eb01485e5059d8c115406606024261f851fa7c592687637a5906e12d42b2e SHA512 f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6 -DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033 -DIST uhd-images_4.1.0.4.tar.xz 118536976 BLAKE2B 6ac9b0b4aff5cbe1336edcb07a450dba3e050bf36c87af37fdbb2e83c472d86a2a8b51720fad3046d4f58d5ad1b6a836d35d1d7c57e1a36171161c22f2c7fe30 SHA512 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b +DIST EttusResearch-UHD-4.4.0.0.tar.gz 38210999 BLAKE2B defc2ae91c1422491c0c434f76852c253d84e2bdc43f6768069e23c40803d33aac8f087d51c28037102ab4760c5f3d5e04dc090655ddca26eef3440bf703db61 SHA512 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a +DIST EttusResearch-UHD-4.6.0.0.tar.gz 41235519 BLAKE2B 4a9c9d0064bf52edd4a4a93ee8602eaa61029b5350728431e4e2e17d9f4a06de21c2598a6ffde0832ecfd5a499344d190ba113f1c5d96ffea0a029186f95de87 SHA512 de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30 +DIST uhd-images_4.4.0.0.tar.xz 127558912 BLAKE2B bb7135241c4e39db2450e0fca8c8c6b0421d76f512dca08e50732ee0a2dbfa5f330df168101607d52b6215aba083cd966027a9da8f14331f6bac17fdd76d766b SHA512 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463 +DIST uhd-images_4.6.0.0.tar.xz 180745328 BLAKE2B f698c68c66e706146cd2163abca10bc2d3660827e2425f395b9096b1ccecdadaf563730912e930e29b6f286dd77a83dc2ab0280e0d55ceb550496de03c208917 SHA512 944a26bea2f11d0df630e14a2a586d07e185e2c9bf40e10ff17cc103a33a8cf32c37b676e15cf55a1c1efd17c82384c7323526aed4b0624fda0b58d39ed487d3 diff --git a/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch b/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch deleted file mode 100644 index de165e9deebf..000000000000 --- a/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git host/CMakeLists.txt host/CMakeLists.txt -index 2337396e7..3a77776a0 100644 ---- host/CMakeLists.txt -+++ host/CMakeLists.txt -@@ -531,6 +531,9 @@ endforeach(Boost_Comp) - if(ENABLE_USB) - list(APPEND UHD_LINK_LIST_STATIC "usb-1.0") - endif(ENABLE_USB) -+ -+LIST(APPEND UHD_LINK_LIST_STATIC "tinfo") -+ - # UHDConfig.cmake also needs UHD_RFNOC_FOUND - if(ENABLE_RFNOC) - set(UHD_RFNOC_FOUND "TRUE") -diff --git host/examples/CMakeLists.txt host/examples/CMakeLists.txt -index b384d978c..402aded94 100644 ---- host/examples/CMakeLists.txt -+++ host/examples/CMakeLists.txt -@@ -58,11 +58,11 @@ find_package(Curses) - if(CURSES_FOUND) - include_directories(${CURSES_INCLUDE_DIR}) - add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp) -- target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - - add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp) -- target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - endif(CURSES_FOUND) - -diff --git host/utils/latency/CMakeLists.txt host/utils/latency/CMakeLists.txt -index 05bacd77a..d3b1449a6 100644 ---- host/utils/latency/CMakeLists.txt -+++ host/utils/latency/CMakeLists.txt -@@ -25,7 +25,7 @@ if(CURSES_FOUND) - get_filename_component(name ${source} NAME_WE) - add_executable(${name} ${source} ${latency_lib_path}) - LIBUHD_APPEND_SOURCES(${name}) -- target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) -+ target_link_libraries(${name} uhd ${Boost_LIBRARIES} tinfo ${CURSES_LIBRARIES}) - UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) - endforeach(source) - diff --git a/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch b/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch deleted file mode 100644 index 123a01bca56e..000000000000 --- a/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch +++ /dev/null @@ -1,59 +0,0 @@ -From b05285b3853493436f71eb4192365b818005b0af Mon Sep 17 00:00:00 2001 -From: loqs <loqs@users.noreply.github.com> -Date: Tue, 25 May 2021 22:43:07 +0100 -Subject: [PATCH] Fix Boost 1.76.0 incompatibility - -Fixes EttusResearch/uhd/issues/437 ---- - host/lib/usrp/cores/rx_dsp_core_3000.cpp | 1 + - host/lib/usrp/cores/rx_frontend_core_3000.cpp | 1 + - host/lib/usrp/usrp2/usrp2_impl.cpp | 5 ++--- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp -index ff431fd41..53f3fee69 100644 ---- a/lib/usrp/cores/rx_dsp_core_3000.cpp -+++ b/lib/usrp/cores/rx_dsp_core_3000.cpp -@@ -14,6 +14,7 @@ - #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp> - #include <boost/assign/list_of.hpp> - #include <boost/math/special_functions/round.hpp> -+#include <boost/math/special_functions/sign.hpp> - #include <algorithm> - #include <cmath> - #include <functional> -diff --git a/lib/usrp/cores/rx_frontend_core_3000.cpp b/host/lib/usrp/cores/rx_frontend_core_3000.cpp -index abbe64b13..d51fea2ca 100644 ---- a/lib/usrp/cores/rx_frontend_core_3000.cpp -+++ b/lib/usrp/cores/rx_frontend_core_3000.cpp -@@ -12,6 +12,7 @@ - #include <uhdlib/usrp/cores/rx_frontend_core_3000.hpp> - #include <boost/assign/list_of.hpp> - #include <boost/math/special_functions/round.hpp> -+#include <boost/math/special_functions/sign.hpp> - #include <functional> - - using namespace uhd; -diff --git a/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp -index c2514ae02..28aa11083 100644 ---- a/lib/usrp/usrp2/usrp2_impl.cpp -+++ b/lib/usrp/usrp2/usrp2_impl.cpp -@@ -17,6 +17,8 @@ - #include <uhdlib/usrp/common/apply_corrections.hpp> - #include <boost/asio.hpp> //used for htonl and ntohl - #include <boost/asio/ip/address_v4.hpp> -+#include <boost/math/special_functions/round.hpp> -+#include <boost/math/special_functions/sign.hpp> - #include <boost/format.hpp> - #include <boost/thread.hpp> - #include <functional> -@@ -948,9 +950,6 @@ meta_range_t usrp2_impl::get_tx_dsp_freq_range(const std::string& mb) - return meta_range_t(-dac_rate / 2, +dac_rate / 2, dsp_range_step); - } - --#include <boost/math/special_functions/round.hpp> --#include <boost/math/special_functions/sign.hpp> -- - void usrp2_impl::update_clock_source(const std::string& mb, const std::string& source) - { - // NOTICE: U2_REG_MISC_CTRL_CLOCK is on the wb clock, and cannot be set from fifo_ctrl diff --git a/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch b/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch deleted file mode 100644 index 484aa1f9c2f5..000000000000 --- a/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur host/CMakeLists.txt uhd-4.0.0.0-patched/host/CMakeLists.txt ---- host/CMakeLists.txt 2020-09-13 15:14:04.000000000 -0400 -+++ host/CMakeLists.txt 2020-09-16 10:11:52.266933094 -0400 -@@ -506,6 +506,9 @@ - if(ENABLE_USB) - list(APPEND UHD_LINK_LIST_STATIC "usb-1.0") - endif(ENABLE_USB) -+ -+LIST(APPEND UHD_LINK_LIST_STATIC "tinfo") -+ - set(UHD_RFNOC_FOUND "TRUE") - - configure_file( -diff -Naur host/examples/CMakeLists.txt uhd-4.0.0.0-patched/host/examples/CMakeLists.txt ---- host/examples/CMakeLists.txt 2020-09-13 15:14:04.000000000 -0400 -+++ host/examples/CMakeLists.txt 2020-09-16 10:12:49.082935381 -0400 -@@ -55,11 +55,11 @@ - if(CURSES_FOUND) - include_directories(${CURSES_INCLUDE_DIR}) - add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp) -- target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - - add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp) -- target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - endif(CURSES_FOUND) - -diff -Naur host/utils/latency/CMakeLists.txt uhd-4.0.0.0-patched/host/utils/latency/CMakeLists.txt ---- host/utils/latency/CMakeLists.txt 2020-09-13 15:14:04.000000000 -0400 -+++ host/utils/latency/CMakeLists.txt 2020-09-16 10:13:55.994938074 -0400 -@@ -25,7 +25,7 @@ - get_filename_component(name ${source} NAME_WE) - add_executable(${name} ${source} ${latency_lib_path}) - LIBUHD_APPEND_SOURCES(${name}) -- target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) -+ target_link_libraries(${name} uhd ${Boost_LIBRARIES} tinfo ${CURSES_LIBRARIES}) - UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) - endforeach(source) - diff --git a/net-wireless/uhd/metadata.xml b/net-wireless/uhd/metadata.xml index 6e0308ff1a54..53ff3bc77463 100644 --- a/net-wireless/uhd/metadata.xml +++ b/net-wireless/uhd/metadata.xml @@ -22,7 +22,6 @@ <flag name="e300">support E300, E310 hardware</flag> <flag name="mpmd">support N300, N310 hardware</flag> <flag name="octoclock">Octoclock Network Support</flag> - <flag name="n230">support N230 harware</flag> <flag name="usrp1">support USRP1 hardware</flag> <flag name="usrp2">support USRP2, N200, N210 hardware</flag> <flag name="utils">utilities needed to list, query, calibrate, or update FPGA/Firmware</flag> diff --git a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild b/net-wireless/uhd/uhd-4.4.0.0.ebuild index 3854e1ceee95..e84fcfca773b 100644 --- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild +++ b/net-wireless/uhd/uhd-4.4.0.0.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -#not sure why, but eapi 7 fails +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib +inherit cmake gnome2-utils python-single-r1 udev DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver" HOMEPAGE="https://kb.ettus.com" @@ -18,29 +17,30 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese LICENSE="GPL-3" SLOT="0/$(ver_cut 1-3)" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300" +KEYWORDS="~amd64 ~arm ~riscv ~x86" +IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) - || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )" + || ( b100 b200 e300 mpmd usrp1 usrp2 x300 )" RDEPEND="${PYTHON_DEPS} e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= - sys-libs/ncurses:0[tinfo] + sys-libs/ncurses:0= $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ') " - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) +DEPEND="${RDEPEND}" +#zip and gzip are directly used by the build system +BDEPEND=" + doc? ( app-text/doxygen ) $(python_gen_cond_dep ' dev-python/mako[${PYTHON_USEDEP}] ') @@ -48,8 +48,6 @@ DEPEND="${RDEPEND} app-arch/gzip " -PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" ) - S="${WORKDIR}/${P}/host" src_unpack() { @@ -58,22 +56,18 @@ src_unpack() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare gnome2_environment_reset #534582 - - #this may not be needed in 3.4.3 and above, please verify - sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die - - #rpath is set for apple and no one else, just remove the conditional - sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die } src_configure() { - mycmakeargs=( + #https://gitlab.kitware.com/cmake/cmake/-/issues/23236 + #https://github.com/EttusResearch/uhd/pull/560 + local mycmakeargs=( + -DCURSES_NEED_NCURSES=ON -DENABLE_LIBUHD=ON -DENABLE_C_API=ON - -DENABLE_LIBERIO=OFF -DENABLE_MAN_PAGES=ON -DENABLE_MAN_PAGE_COMPRESSION=OFF -DENABLE_EXAMPLES="$(usex examples)" @@ -88,27 +82,34 @@ src_configure() { -DENABLE_USRP1="$(usex usrp1)" -DENABLE_USRP2="$(usex usrp2)" -DENABLE_X300="$(usex x300)" - -DENABLE_N230="$(usex n230)" -DENABLE_MPMD="$(usex mpmd)" -DENABLE_OCTOCLOCK="$(usex octoclock)" + -DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)" + -DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)" -DPYTHON_EXECUTABLE="${PYTHON}" -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DUHD_VERSION="${PV}" ) - cmake-utils_src_configure + cmake_src_configure } + src_install() { - cmake-utils_src_install + cmake_src_install python_optimize - use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ - if [ "${PV}" != "9999" ]; then - rm -rf "${ED}/usr/bin/uhd_images_downloader" - rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1" + if use utils; then + python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ + if [[ "${PV}" != "9999" ]]; then + rm -r "${ED}/usr/bin/uhd_images_downloader" || die + fi + fi + # do not install test files (bug #857492) + if use test; then + rm "${ED}/usr/lib64/${PN}/tests" -R || die fi - insinto /lib/udev/rules.d/ - doins "${S}/utils/uhd-usrp.rules" + udev_dorules "${S}/utils/uhd-usrp.rules" - rm -rf "${WORKDIR}/images/winusb_driver" + rm -r "${WORKDIR}/images/winusb_driver" || die if ! use b100; then rm "${WORKDIR}"/images/usrp_b100* || die fi @@ -121,9 +122,6 @@ src_install() { if ! use mpmd; then rm "${WORKDIR}"/images/usrp_n310* || die fi - if ! use n230; then - rm "${WORKDIR}"/images/usrp_n230* || die - fi if ! use octoclock; then rm "${WORKDIR}"/images/octoclock* || die fi @@ -141,3 +139,11 @@ src_install() { insinto /usr/share/${PN} doins -r "${WORKDIR}/images" } + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.6.0.0.ebuild index e74d51a15c92..514bdaafdd63 100644 --- a/net-wireless/uhd/uhd-4.1.0.4.ebuild +++ b/net-wireless/uhd/uhd-4.6.0.0.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -#not sure why, but eapi 7 fails +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib +inherit cmake gnome2-utils python-single-r1 udev DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver" HOMEPAGE="https://kb.ettus.com" @@ -18,29 +17,30 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese LICENSE="GPL-3" SLOT="0/$(ver_cut 1-3)" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300" +KEYWORDS="~amd64 ~arm ~riscv ~x86" +IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) - || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )" + || ( b100 b200 e300 mpmd usrp1 usrp2 x300 )" RDEPEND="${PYTHON_DEPS} e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= - sys-libs/ncurses:0[tinfo] + sys-libs/ncurses:0= $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ') " - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) +DEPEND="${RDEPEND}" +#zip and gzip are directly used by the build system +BDEPEND=" + doc? ( app-text/doxygen ) $(python_gen_cond_dep ' dev-python/mako[${PYTHON_USEDEP}] ') @@ -48,10 +48,6 @@ DEPEND="${RDEPEND} app-arch/gzip " -PATCHES=( - "${FILESDIR}/${PN}-4.0.0.0-tinfo.patch" -) - S="${WORKDIR}/${P}/host" src_unpack() { @@ -60,16 +56,15 @@ src_unpack() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare gnome2_environment_reset #534582 - - #rpath is set for apple and no one else, just remove the conditional - sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die } src_configure() { - mycmakeargs=( + #https://gitlab.kitware.com/cmake/cmake/-/issues/23236 + #https://github.com/EttusResearch/uhd/pull/560 + local mycmakeargs=( -DENABLE_LIBUHD=ON -DENABLE_C_API=ON -DENABLE_MAN_PAGES=ON @@ -88,24 +83,32 @@ src_configure() { -DENABLE_X300="$(usex x300)" -DENABLE_MPMD="$(usex mpmd)" -DENABLE_OCTOCLOCK="$(usex octoclock)" + -DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)" + -DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)" -DPYTHON_EXECUTABLE="${PYTHON}" -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DUHD_VERSION="${PV}" ) - cmake-utils_src_configure + cmake_src_configure } + src_install() { - cmake-utils_src_install + cmake_src_install python_optimize - use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ - if [ "${PV}" != "9999" ]; then - rm -rf "${ED}/usr/bin/uhd_images_downloader" - rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1" + if use utils; then + python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ + if [[ "${PV}" != "9999" ]]; then + rm -r "${ED}/usr/bin/uhd_images_downloader" || die + fi + fi + # do not install test files (bug #857492) + if use test; then + rm "${ED}/usr/lib64/${PN}/tests" -R || die fi - insinto /lib/udev/rules.d/ - doins "${S}/utils/uhd-usrp.rules" + udev_dorules "${S}/utils/uhd-usrp.rules" - rm -rf "${WORKDIR}/images/winusb_driver" + rm -r "${WORKDIR}/images/winusb_driver" || die if ! use b100; then rm "${WORKDIR}"/images/usrp_b100* || die fi @@ -118,9 +121,6 @@ src_install() { if ! use mpmd; then rm "${WORKDIR}"/images/usrp_n310* || die fi - if ! use n230; then - rm "${WORKDIR}"/images/usrp_n230* || die - fi if ! use octoclock; then rm "${WORKDIR}"/images/octoclock* || die fi @@ -139,8 +139,10 @@ src_install() { doins -r "${WORKDIR}/images" } -src_test() { - #we can disable the python tests - #ctest -E 'py*' - PYTHON_PATH=python/ cmake-utils_src_test +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload } diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest index 0446f2afb735..a5baa23e8616 100644 --- a/net-wireless/unifi/Manifest +++ b/net-wireless/unifi/Manifest @@ -1,3 +1,4 @@ -DIST unifi-6.4.54.zip 158992649 BLAKE2B 90f98b1349a5fca3e6d85ef42823c5beaff0a3ac4697622a0387259421fdcfa891b094acb66f798a97b4397a27d477d6fe10d53bed03e15081f4d63abafb9d8e SHA512 d0502f87fe6827cdfabbffce7c7b0159aaad2ac032b59d04d5f233ada279fb90d5e21e043de518260c3380c7e23ff561f04040433a441866421dbe9b2db540c0 -DIST unifi-6.5.42.zip 161190627 BLAKE2B 9eca9169167ce09b27925e02d0ae9a7e96748be7821a920ca438c1ae76ddb7d45547c97b0066a22e66accbfd59a2a40e981ef772a4266c53c4630d1e36ca50dd SHA512 bbbdc046eb1a1e59c0d030c048fba268e1673053de9d8efed1c085a71b376ec2fc0840d08e6f226648629b1370fe9ea7bab147a7584e3fb32fc44d10bf791b86 -DIST unifi-6.5.45.zip 158061910 BLAKE2B 16b24ae67c9c649c5b7b008afa3b503dd5492e6da45107ac1be81707940623e20d111a350c32dae45a11a5a53de041b8e6b60f246af509b00bf933e36a1e9002 SHA512 ab408506055cbdca5e3f2bb7ca8bfbd4106e57621f8d741b789dba983dcd65f126435d40a5995e453ebfabaa32c3d493940bc5115c344d9f29c8ae10f265b850 +DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e +DIST unifi-7.5.187.zip 172434106 BLAKE2B db54079f30c9f61989ceb70474ea68559189804876000534c2a0165a9ef2324f92d19e7b055eaa31cd77e7bd90db0c29aa9f20953dc17a5c54cc646a5c862990 SHA512 703e29273412c497a5bea74210e8c409c629b81fee2badd3f116bbb31a2ca82942ff0281303c0da57757a85e44f4457ba3730deaba0a1f4cc2adc1eb5ace3276 +DIST unifi-8.0.28.zip 158243946 BLAKE2B 396517012acc6efae37ab1894cfa5d605b9bb5474af35a8facf19985393d7647df853e9ba3676abc482c9021a97e149f61b093c4b9b22d211907e7be582e7be1 SHA512 50ec9d56e8358e934806ef85e9635c6bf5bb3374ec4897ff4ede708073fad276a9aabdf06108a780f077612b49d2d99b2f9ae15dfa9c558c941a4af1dfa30432 +DIST unifi-8.1.113.zip 169688768 BLAKE2B 458b92f495dc5f738687d64ccfd7cb02066a46d3712bb11b28c17d65dd152553bb2ed7dc46e41840bb2ce99948579af7630be5bfaa775e084ee61334a7c0ea62 SHA512 f20f028097a63246c3189567b254e2da5bb0cf42abdce9d8c4cdd438665b8db76210c9a98c2e4f00fe526cff259ddd039887082661d4b3e13089eaa797e4d404 diff --git a/net-wireless/unifi/files/README.gentoo b/net-wireless/unifi/files/README.gentoo new file mode 100644 index 000000000000..b6284b3017ea --- /dev/null +++ b/net-wireless/unifi/files/README.gentoo @@ -0,0 +1,11 @@ +System MongoDB +============== + +If you want using the system-mongodb systemd service instead of the started +mongodb from the unifi service please add to +"var/lib/unifi/data/system.properties" the following properties: + +db.mongo.local=false +db.mongo.uri=mongodb\://127.0.0.1\:27017/ace +statdb.mongo.uri=mongodb\://127.0.0.1\:27017/ace_stat +unifi.db.name=ace diff --git a/net-wireless/unifi/files/unifi-mongodb.initd b/net-wireless/unifi/files/unifi-mongodb.initd new file mode 100644 index 000000000000..fb55027eb149 --- /dev/null +++ b/net-wireless/unifi/files/unifi-mongodb.initd @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +unifi_exec="/usr/bin/unifi" +unifi_path="/usr/lib/unifi" + +unifi_user="unifi" +unifi_group="unifi" + +name="UniFi Controller" + +start_stop_daemon_args="--chdir ${unifi_path}" + +command="${unifi_exec}" +command_args="start" +command_background=true +command_progress=true +command_user="${unifi_user}:${unifi_group}" + +pidfile="/run/${RC_SVCNAME}.pid" +retry=TERM/60 + +rc_after="mongodb" +rc_need="mongodb" diff --git a/net-wireless/unifi/files/unifi-mongodb.service b/net-wireless/unifi/files/unifi-mongodb.service new file mode 100644 index 000000000000..6d9b9d55ee2e --- /dev/null +++ b/net-wireless/unifi/files/unifi-mongodb.service @@ -0,0 +1,15 @@ +[Unit] +Description=UniFi Controller +After=mongodb.service network.target +Requires=mongodb.service + +[Service] +Type=simple +User=unifi +Group=unifi +WorkingDirectory=/usr/lib/unifi +ExecStart=/usr/bin/unifi start +ExecStop=/usr/bin/unifi stop + +[Install] +WantedBy=multi-user.target diff --git a/net-wireless/unifi/files/unifi.initd-r1 b/net-wireless/unifi/files/unifi.initd-r1 deleted file mode 100644 index 2db36571dac0..000000000000 --- a/net-wireless/unifi/files/unifi.initd-r1 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -ACE_LIB="lib/ace.jar" -DAEMON="${JAVA_HOME-/etc/java-config-2/current-system-vm}"/bin/java -JAVA_OPTS="-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=" -UNIFI_PATH="/usr/lib/unifi" - -UNIFI_USER="unifi" -UNIFI_GROUP="unifi" - -name="UniFi Controller" - -start_stop_daemon_args="--chdir ${UNIFI_PATH}" - -command="${DAEMON}" -command_args="${JAVA_OPTS} -jar ${ACE_LIB} start" -command_background=true -pidfile="/run/${RC_SVCNAME}.pid" - -command_user="${UNIFI_USER}:${UNIFI_GROUP}" - -command_progress=true -retry=TERM/60 diff --git a/net-wireless/unifi/files/unifi.initd-r2 b/net-wireless/unifi/files/unifi.initd-r2 new file mode 100644 index 000000000000..a92172fffb97 --- /dev/null +++ b/net-wireless/unifi/files/unifi.initd-r2 @@ -0,0 +1,22 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +unifi_exec="/usr/bin/unifi" +unifi_path="/usr/lib/unifi" + +unifi_user="unifi" +unifi_group="unifi" + +name="UniFi Controller" + +start_stop_daemon_args="--chdir ${unifi_path}" + +command="${unifi_exec}" +command_args="start" +command_background=true +command_progress=true +command_user="${unifi_user}:${unifi_group}" + +pidfile="/run/${RC_SVCNAME}.pid" +retry=TERM/60 diff --git a/net-wireless/unifi/files/unifi.service b/net-wireless/unifi/files/unifi.service deleted file mode 100644 index 00c00d7f3c9e..000000000000 --- a/net-wireless/unifi/files/unifi.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=UniFi Controller -After=network-online.target - -[Service] -Type=simple -User=unifi -Group=unifi -WorkingDirectory=/usr/lib/unifi -ExecStart=/usr/bin/java -Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar start -ExecStop=/usr/bin/java -Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar stop - -[Install] -WantedBy=network.target diff --git a/net-wireless/unifi/files/unifi.service-r2 b/net-wireless/unifi/files/unifi.service-r2 new file mode 100644 index 000000000000..40fff6c81797 --- /dev/null +++ b/net-wireless/unifi/files/unifi.service-r2 @@ -0,0 +1,14 @@ +[Unit] +Description=UniFi Controller +After=network.target + +[Service] +Type=simple +User=unifi +Group=unifi +WorkingDirectory=/usr/lib/unifi +ExecStart=/usr/bin/unifi start +ExecStop=/usr/bin/unifi stop + +[Install] +WantedBy=multi-user.target diff --git a/net-wireless/unifi/metadata.xml b/net-wireless/unifi/metadata.xml index e8af626aaf48..4835f95389c4 100644 --- a/net-wireless/unifi/metadata.xml +++ b/net-wireless/unifi/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>bkohler@gentoo.org</email> - <name>Ben Kohler</name> - </maintainer> - <maintainer type="person"> <email>conikost@gentoo.org</email> <name>Conrad Kostecki</name> </maintainer> @@ -15,4 +11,7 @@ Also all kind of statistics are collected, which can be accessed through UniFi. There is also an internal RADIUS server, which can be used for WPA2-Enterprise. </longdescription> + <use> + <flag name="system-mongodb">Using <pkg>dev-db/mongodb</pkg> systemd service instead of the bundled one</flag> + </use> </pkgmetadata> diff --git a/net-wireless/unifi/unifi-6.4.54.ebuild b/net-wireless/unifi/unifi-6.4.54.ebuild deleted file mode 100644 index 868b59c5a214..000000000000 --- a/net-wireless/unifi/unifi-6.4.54.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Set this var for any releases except stable -RC_SUFFIX="-bdf9275f33" - -inherit systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" - -KEYWORDS="amd64" -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/$(ver_cut 1-2)" -IUSE="systemd" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -DEPEND="app-arch/unzip" - -RESTRICT="bindist mirror" - -S="${WORKDIR}/UniFi" - -DOCS=( "readme.txt" ) - -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" - -src_prepare() { - # Remove unneeded files Linux, Mac and Windows - rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - - default -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - newinitd "${FILESDIR}"/unifi.initd-r1 unifi - systemd_dounit "${FILESDIR}"/unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} diff --git a/net-wireless/unifi/unifi-6.5.42.ebuild b/net-wireless/unifi/unifi-6.5.42.ebuild deleted file mode 100644 index 857371196894..000000000000 --- a/net-wireless/unifi/unifi-6.5.42.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Set this var for any releases except stable -RC_SUFFIX="-7bfe5b2ead" - -inherit systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" - -KEYWORDS="~amd64" -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/$(ver_cut 1-2)" -IUSE="systemd" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -DEPEND="app-arch/unzip" - -RESTRICT="bindist mirror" - -S="${WORKDIR}/UniFi" - -DOCS=( "readme.txt" ) - -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" - -src_prepare() { - # Remove unneeded files Linux, Mac and Windows - rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - - default -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - newinitd "${FILESDIR}"/unifi.initd-r1 unifi - systemd_dounit "${FILESDIR}"/unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} diff --git a/net-wireless/unifi/unifi-6.5.45.ebuild b/net-wireless/unifi/unifi-6.5.45.ebuild deleted file mode 100644 index bef829df5c5a..000000000000 --- a/net-wireless/unifi/unifi-6.5.45.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Set this var for any releases except stable -RC_SUFFIX="-c8122c1151" - -inherit systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" - -KEYWORDS="~amd64" -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/$(ver_cut 1-2)" -IUSE="systemd" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -DEPEND="app-arch/unzip" - -RESTRICT="bindist mirror" - -S="${WORKDIR}/UniFi" - -DOCS=( "readme.txt" ) - -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" - -src_prepare() { - # Remove unneeded files Linux, Mac and Windows - rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - - default -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - newinitd "${FILESDIR}"/unifi.initd-r1 unifi - systemd_dounit "${FILESDIR}"/unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} diff --git a/net-wireless/unifi/unifi-6.5.55-r2.ebuild b/net-wireless/unifi/unifi-6.5.55-r2.ebuild new file mode 100644 index 000000000000..30feb46a0502 --- /dev/null +++ b/net-wireless/unifi/unifi-6.5.55-r2.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Set this var for any releases except stable +RC_SUFFIX="-1d0581c00d" + +inherit java-pkg-2 systemd + +DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" +HOMEPAGE="https://www.ubnt.com" +SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" +S="${WORKDIR}/UniFi" + +LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="-* amd64 ~arm64" +IUSE="systemd" +RESTRICT="bindist mirror" + +RDEPEND=" + acct-group/unifi + acct-user/unifi + dev-db/mongodb + virtual/jre:1.8 +" + +BDEPEND="app-arch/unzip" + +DOCS=( "readme.txt" ) + +QA_PREBUILT=" + usr/lib/unifi/lib/native/Linux/aarch64/*.so + usr/lib/unifi/lib/native/Linux/x86_64/*.so +" + +src_prepare() { + # Remove unneeded files Mac and Windows + rm -r lib/native/{Mac,Windows} || die + + if [[ ${CHOST} != aarch64* ]]; then + rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries" + fi + if [[ ${CHOST} != armv7* ]]; then + rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries" + fi + if [[ ${CHOST} != x86_64* ]]; then + rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries" + fi + + if [[ ${CHOST} == aarch64* ]]; then + if ! use systemd; then + rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == armv7* ]]; then + if ! use systemd; then + rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == x86_64* ]]; then + if ! use systemd; then + rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die + fi + fi + + default +} + +src_compile() { + :; +} + +src_install() { + insinto /usr/lib/unifi + doins -r bin dl lib webapps + + diropts -o unifi -g unifi + keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi + + for symlink in conf data run tmp work; do + dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} + done + dosym ../../../var/log/unifi /usr/lib/unifi/logs + + java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar + java-pkg_dolauncher \ + unifi \ + --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' \ + --jar ace.jar \ + --pwd '/usr/lib/unifi' + + newinitd "${FILESDIR}"/unifi.initd-r2 unifi + systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service + + newconfd "${FILESDIR}"/unifi.confd unifi + + echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die + doenvd "${T}"/99unifi + + einstalldocs +} diff --git a/net-wireless/unifi/unifi-7.5.187.ebuild b/net-wireless/unifi/unifi-7.5.187.ebuild new file mode 100644 index 000000000000..9eb90b0aa930 --- /dev/null +++ b/net-wireless/unifi/unifi-7.5.187.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Set this var for any releases except stable +RC_SUFFIX="-f57f5bf7ab" + +inherit java-pkg-2 readme.gentoo-r1 systemd + +DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" +HOMEPAGE="https://www.ubnt.com" +SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" +S="${WORKDIR}/UniFi" + +LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="-* amd64 ~arm64" +IUSE="systemd system-mongodb" +RESTRICT="bindist mirror" + +RDEPEND=" + acct-group/unifi + acct-user/unifi + dev-db/mongodb + virtual/jre:17 +" + +BDEPEND="app-arch/unzip" + +DOCS=( "readme.txt" ) + +QA_PREBUILT=" + usr/lib/unifi/lib/native/Linux/aarch64/*.so + usr/lib/unifi/lib/native/Linux/x86_64/*.so +" + +src_prepare() { + if [[ ${CHOST} != aarch64* ]]; then + rm -r lib/native/Linux/aarch64 || die + fi + if [[ ${CHOST} != x86_64* ]]; then + rm -r lib/native/Linux/x86_64 || die + fi + + if [[ ${CHOST} == aarch64* ]]; then + if ! use systemd; then + rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == x86_64* ]]; then + if ! use systemd; then + rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die + fi + fi + + default +} + +src_compile() { + :; +} + +src_install() { + insinto /usr/lib/unifi + doins -r dl lib webapps + ! use system-mongodb && doins -r bin + + diropts -o unifi -g unifi + keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi + + for symlink in conf data run tmp work; do + dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} + done + dosym ../../../var/log/unifi /usr/lib/unifi/logs + + java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar + java-pkg_dolauncher \ + unifi \ + --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp \ + -Djava.library.path= \ + --add-opens java.base/java.lang=ALL-UNNAMED \ + --add-opens java.base/java.time=ALL-UNNAMED \ + --add-opens java.base/sun.security.util=ALL-UNNAMED \ + --add-opens java.base/java.io=ALL-UNNAMED \ + --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED' \ + --jar ace.jar \ + --pwd '/usr/lib/unifi' + + if use system-mongodb; then + systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service + newinitd "${FILESDIR}"/unifi-mongodb.initd unifi + else + systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service + newinitd "${FILESDIR}"/unifi.initd-r2 unifi + fi + + newconfd "${FILESDIR}"/unifi.confd unifi + + echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die + doenvd "${T}"/99unifi + + einstalldocs + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-wireless/unifi/unifi-8.0.28.ebuild b/net-wireless/unifi/unifi-8.0.28.ebuild new file mode 100644 index 000000000000..2f1936dc19fa --- /dev/null +++ b/net-wireless/unifi/unifi-8.0.28.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Set this var for any releases except stable +# RC_SUFFIX="-" + +inherit java-pkg-2 readme.gentoo-r1 systemd + +DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" +HOMEPAGE="https://www.ubnt.com" +SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" +S="${WORKDIR}/UniFi" + +LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="-* amd64 ~arm64" +IUSE="systemd system-mongodb" +RESTRICT="bindist mirror" + +RDEPEND=" + acct-group/unifi + acct-user/unifi + dev-db/mongodb + virtual/jre:17 +" + +BDEPEND="app-arch/unzip" + +DOCS=( "readme.txt" ) + +QA_PREBUILT=" + usr/lib/unifi/lib/native/Linux/aarch64/*.so + usr/lib/unifi/lib/native/Linux/x86_64/*.so +" + +src_prepare() { + if [[ ${CHOST} != aarch64* ]]; then + rm -r lib/native/Linux/aarch64 || die + fi + if [[ ${CHOST} != x86_64* ]]; then + rm -r lib/native/Linux/x86_64 || die + fi + + if [[ ${CHOST} == aarch64* ]]; then + if ! use systemd; then + rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == x86_64* ]]; then + if ! use systemd; then + rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die + fi + fi + + default +} + +src_compile() { + :; +} + +src_install() { + insinto /usr/lib/unifi + doins -r dl lib webapps + ! use system-mongodb && doins -r bin + + diropts -o unifi -g unifi + keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi + + for symlink in conf data run tmp work; do + dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} + done + dosym ../../../var/log/unifi /usr/lib/unifi/logs + + java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar + java-pkg_dolauncher \ + unifi \ + --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp \ + -Djava.library.path= \ + --add-opens java.base/java.lang=ALL-UNNAMED \ + --add-opens java.base/java.time=ALL-UNNAMED \ + --add-opens java.base/sun.security.util=ALL-UNNAMED \ + --add-opens java.base/java.io=ALL-UNNAMED \ + --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED' \ + --jar ace.jar \ + --pwd '/usr/lib/unifi' + + if use system-mongodb; then + systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service + newinitd "${FILESDIR}"/unifi-mongodb.initd unifi + else + systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service + newinitd "${FILESDIR}"/unifi.initd-r2 unifi + fi + + newconfd "${FILESDIR}"/unifi.confd unifi + + echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die + doenvd "${T}"/99unifi + + einstalldocs + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-wireless/unifi/unifi-8.1.113.ebuild b/net-wireless/unifi/unifi-8.1.113.ebuild new file mode 100644 index 000000000000..ed01ef5545ac --- /dev/null +++ b/net-wireless/unifi/unifi-8.1.113.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Set this var for any releases except stable +# RC_SUFFIX="-" + +inherit java-pkg-2 readme.gentoo-r1 systemd + +DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" +HOMEPAGE="https://www.ubnt.com" +SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" +S="${WORKDIR}/UniFi" + +LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="-* ~amd64 ~arm64" +IUSE="systemd system-mongodb" +RESTRICT="bindist mirror" + +RDEPEND=" + acct-group/unifi + acct-user/unifi + dev-db/mongodb + virtual/jre:17 +" + +BDEPEND="app-arch/unzip" + +DOCS=( "readme.txt" ) + +QA_PREBUILT=" + usr/lib/unifi/lib/native/Linux/aarch64/*.so + usr/lib/unifi/lib/native/Linux/x86_64/*.so +" + +src_prepare() { + if [[ ${CHOST} != aarch64* ]]; then + rm -r lib/native/Linux/aarch64 || die + fi + if [[ ${CHOST} != x86_64* ]]; then + rm -r lib/native/Linux/x86_64 || die + fi + + if [[ ${CHOST} == aarch64* ]]; then + if ! use systemd; then + rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die + fi + fi + if [[ ${CHOST} == x86_64* ]]; then + if ! use systemd; then + rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die + fi + fi + + default +} + +src_compile() { + :; +} + +src_install() { + insinto /usr/lib/unifi + doins -r dl lib webapps + ! use system-mongodb && doins -r bin + + diropts -o unifi -g unifi + keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi + + for symlink in conf data run tmp work; do + dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} + done + dosym ../../../var/log/unifi /usr/lib/unifi/logs + + java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar + java-pkg_dolauncher \ + unifi \ + --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp \ + -Djava.library.path= \ + --add-opens java.base/java.lang=ALL-UNNAMED \ + --add-opens java.base/java.time=ALL-UNNAMED \ + --add-opens java.base/sun.security.util=ALL-UNNAMED \ + --add-opens java.base/java.io=ALL-UNNAMED \ + --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED' \ + --jar ace.jar \ + --pwd '/usr/lib/unifi' + + if use system-mongodb; then + systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service + newinitd "${FILESDIR}"/unifi-mongodb.initd unifi + else + systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service + newinitd "${FILESDIR}"/unifi.initd-r2 unifi + fi + + newconfd "${FILESDIR}"/unifi.confd unifi + + echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die + doenvd "${T}"/99unifi + + einstalldocs + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest index 9081cce557e0..95d76c41da5c 100644 --- a/net-wireless/urh/Manifest +++ b/net-wireless/urh/Manifest @@ -1 +1,2 @@ -DIST urh-2.9.2.tar.gz 13408784 BLAKE2B 7219b7284556d5c6f4365306bd0d0b8e7bd70524f212faef9b23acb6db30d5ac6eb1a6f5814041a7a6fbf76677d0172aa488abe804fd3cf54c13441b1a99a027 SHA512 4cf0ae173be467257d64f9d27aad52ffa73ef3a1b428e8bb8ca5d5647ddca48418f0625cc14b93f434ecb92095162a560f0a89e4e378fc98c38393af44425854 +DIST urh-2.9.4.tar.gz 13415656 BLAKE2B 504cb073540f614eea070a7aaa83ac62f81c6a115a01f935cfc39baec37bc1deb5b56035100700825f41b21ec0937d6014f0d0b73debcbf9ca951e238805d64b SHA512 a888c20a4d2f349960e41defdb5cce6590d4523f8a1a655e21e4caaf7dd98a6f51936fa5a038787cb5935bc42e8863d2940059130dc9982caeea4b80e431aeeb +DIST urh-2.9.5.tar.gz 13414599 BLAKE2B efe075e78dd7b289d21d93675be420e8e5e69293eb1f5e61025a9b0a7db60f4e2cae29d94af03fa9e42a6941edda9667a935b201a8838c0204e61008d2883b56 SHA512 7f04f041963103aab4a67fd5fd8f874339cad04da846236b0ec4584553ae6b4a6469c2505cec7c67f72d848d0eb90a4996753802c65535914e70a943d40e6970 diff --git a/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch b/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch new file mode 100644 index 000000000000..4beca0eed64f --- /dev/null +++ b/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch @@ -0,0 +1,11 @@ +diff -Naur urh-2.9.4-orig/setup.py urh-2.9.4/setup.py +--- urh-2.9.4-orig/setup.py 2023-08-20 20:31:45.067321480 -0400 ++++ urh-2.9.4/setup.py 2023-08-20 20:31:55.088320822 -0400 +@@ -50,7 +50,6 @@ + print("Finalizing options") + _build_ext.finalize_options(self) + # Prevent numpy from thinking it is still in its setup process: +- __builtins__.__NUMPY_SETUP__ = False + import numpy + self.include_dirs.append(numpy.get_include()) + diff --git a/net-wireless/urh/urh-2.9.2.ebuild b/net-wireless/urh/urh-2.9.2.ebuild deleted file mode 100644 index 83929531f23e..000000000000 --- a/net-wireless/urh/urh-2.9.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -inherit distutils-r1 - -DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss" -HOMEPAGE="https://github.com/jopohl/urh" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/jopohl/urh.git" -else - SRC_URI="https://github.com/jopohl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd" - -DEPEND="${PYTHON_DEPS} - net-wireless/gnuradio[zeromq] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pyzmq[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - airspy? ( net-wireless/airspy:= ) - audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] ) - bladerf? ( net-wireless/bladerf:= ) - hackrf? ( net-libs/libhackrf:= ) - limesdr? ( net-wireless/limesuite:= ) - plutosdr? ( net-libs/libiio:= ) - rtlsdr? ( net-wireless/rtl-sdr:= ) - sdrplay? ( net-wireless/sdrplay:= ) - uhd? ( net-wireless/uhd:= )" -RDEPEND="${DEPEND} - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - net-wireless/gr-osmosdr" - -python_configure_all() { - mydistutilsargs=( - $(use_with airspy) - $(use_with bladerf) - $(use_with hackrf) - $(use_with limesdr) - $(use_with plutosdr) - $(use_with rtlsdr) - $(use_with sdrplay) - $(use_with uhd usrp) - ) -} diff --git a/net-wireless/urh/urh-2.9.4.ebuild b/net-wireless/urh/urh-2.9.4.ebuild new file mode 100644 index 000000000000..fbf539dbce42 --- /dev/null +++ b/net-wireless/urh/urh-2.9.4.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 virtualx + +DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss" +HOMEPAGE="https://github.com/jopohl/urh" + +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jopohl/urh.git" +else + SRC_URI="https://github.com/jopohl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd" + +DEPEND="${PYTHON_DEPS} + net-wireless/gnuradio[zeromq] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pyzmq[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + airspy? ( net-wireless/airspy:= ) + audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] ) + bladerf? ( net-wireless/bladerf:= ) + hackrf? ( net-libs/libhackrf:= ) + limesdr? ( net-wireless/limesuite ) + plutosdr? ( net-libs/libiio:= ) + rtlsdr? ( net-wireless/rtl-sdr ) + sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) + uhd? ( net-wireless/uhd:= )" +RDEPEND="${DEPEND} + dev-python/PyQt5[${PYTHON_USEDEP},testlib] + net-wireless/gr-osmosdr" + +distutils_enable_tests pytest + +PATCHES=( "${FILESDIR}/${P}-no-numpy-setup.patch" ) + +python_configure_all() { + DISTUTILS_ARGS=( + $(use_with airspy) + $(use_with bladerf) + $(use_with hackrf) + $(use_with limesdr) + $(use_with plutosdr) + $(use_with rtlsdr) + $(use_with sdrplay) + $(use_with uhd usrp) + ) +} + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + # Why are these disabled? + # import errors AND hangs forever after 'tests/test_spectrogram.py::TestSpectrogram::test_cancel_filtering' + # import errors 'tests/test_continuous_modulator.py::TestContinuousModulator::test_modulate_continuously' + # import errors 'tests/test_send_recv_dialog_gui.py::TestSendRecvDialog::test_continuous_send_dialog' + # import errors 'tests/test_spectrogram.py::TestSpectrogram::test_channel_separation_with_negative_frequency' + local EPYTEST_DESELECT=( + 'tests/test_spectrogram.py::TestSpectrogram::test_cancel_filtering' + 'tests/test_continuous_modulator.py::TestContinuousModulator::test_modulate_continuously' + 'tests/test_send_recv_dialog_gui.py::TestSendRecvDialog::test_continuous_send_dialog' + 'tests/test_spectrogram.py::TestSpectrogram::test_channel_separation_with_negative_frequency' + + ) + cd "${T}" || die + epytest -s --pyargs urh.cythonext "${S}/tests" || die +} diff --git a/net-wireless/urh/urh-2.9.5.ebuild b/net-wireless/urh/urh-2.9.5.ebuild new file mode 100644 index 000000000000..656c0488c09c --- /dev/null +++ b/net-wireless/urh/urh-2.9.5.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 virtualx + +DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss" +HOMEPAGE="https://github.com/jopohl/urh" + +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jopohl/urh.git" +else + SRC_URI="https://github.com/jopohl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd" + +DEPEND="${PYTHON_DEPS} + net-wireless/gnuradio[zeromq] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pyzmq[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + airspy? ( net-wireless/airspy:= ) + audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] ) + bladerf? ( net-wireless/bladerf:= ) + hackrf? ( net-libs/libhackrf:= ) + limesdr? ( net-wireless/limesuite ) + plutosdr? ( net-libs/libiio:= ) + rtlsdr? ( net-wireless/rtl-sdr ) + sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) + uhd? ( net-wireless/uhd:= )" +RDEPEND="${DEPEND} + dev-python/PyQt5[${PYTHON_USEDEP},testlib] + net-wireless/gr-osmosdr" + +distutils_enable_tests pytest + +PATCHES=( "${FILESDIR}/${PN}-2.9.4-no-numpy-setup.patch" ) + +python_configure_all() { + DISTUTILS_ARGS=( + $(use_with airspy) + $(use_with bladerf) + $(use_with hackrf) + $(use_with limesdr) + $(use_with plutosdr) + $(use_with rtlsdr) + $(use_with sdrplay) + $(use_with uhd usrp) + ) +} + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + # Why are these disabled? + # import errors AND hangs forever after 'tests/test_spectrogram.py::TestSpectrogram::test_cancel_filtering' + # import errors 'tests/test_continuous_modulator.py::TestContinuousModulator::test_modulate_continuously' + # import errors 'tests/test_send_recv_dialog_gui.py::TestSendRecvDialog::test_continuous_send_dialog' + # import errors 'tests/test_spectrogram.py::TestSpectrogram::test_channel_separation_with_negative_frequency' + local EPYTEST_DESELECT=( + 'tests/test_spectrogram.py::TestSpectrogram::test_cancel_filtering' + 'tests/test_continuous_modulator.py::TestContinuousModulator::test_modulate_continuously' + 'tests/test_send_recv_dialog_gui.py::TestSendRecvDialog::test_continuous_send_dialog' + 'tests/test_spectrogram.py::TestSpectrogram::test_channel_separation_with_negative_frequency' + + ) + cd "${T}" || die + epytest -s --pyargs urh.cythonext "${S}/tests" || die +} diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild index 83929531f23e..ed1d620f7de7 100644 --- a/net-wireless/urh/urh-9999.ebuild +++ b/net-wireless/urh/urh-9999.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..9} ) -inherit distutils-r1 +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 virtualx DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss" HOMEPAGE="https://github.com/jopohl/urh" @@ -31,17 +33,21 @@ DEPEND="${PYTHON_DEPS} audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) - limesdr? ( net-wireless/limesuite:= ) + limesdr? ( net-wireless/limesuite ) plutosdr? ( net-libs/libiio:= ) - rtlsdr? ( net-wireless/rtl-sdr:= ) - sdrplay? ( net-wireless/sdrplay:= ) + rtlsdr? ( net-wireless/rtl-sdr ) + sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= )" RDEPEND="${DEPEND} dev-python/PyQt5[${PYTHON_USEDEP},testlib] net-wireless/gr-osmosdr" +distutils_enable_tests pytest + python_configure_all() { - mydistutilsargs=( + # Using sed in the live ebuild to avoid patch failure + sed -i '/__NUMPY_SETUP__/d' setup.py || die + DISTUTILS_ARGS=( $(use_with airspy) $(use_with bladerf) $(use_with hackrf) @@ -52,3 +58,24 @@ python_configure_all() { $(use_with uhd usrp) ) } + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + # Why are these disabled? + # import errors AND hangs forever after 'tests/test_spectrogram.py::TestSpectrogram::test_cancel_filtering' + # import errors 'tests/test_continuous_modulator.py::TestContinuousModulator::test_modulate_continuously' + # import errors 'tests/test_send_recv_dialog_gui.py::TestSendRecvDialog::test_continuous_send_dialog' + # import errors 'tests/test_spectrogram.py::TestSpectrogram::test_channel_separation_with_negative_frequency' + local EPYTEST_DESELECT=( + 'tests/test_spectrogram.py::TestSpectrogram::test_cancel_filtering' + 'tests/test_continuous_modulator.py::TestContinuousModulator::test_modulate_continuously' + 'tests/test_send_recv_dialog_gui.py::TestSendRecvDialog::test_continuous_send_dialog' + 'tests/test_spectrogram.py::TestSpectrogram::test_channel_separation_with_negative_frequency' + + ) + cd "${T}" || die + epytest -s --pyargs urh.cythonext "${S}/tests" || die +} diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest index 7134aee68ac8..245aa94e849b 100644 --- a/net-wireless/wavemon/Manifest +++ b/net-wireless/wavemon/Manifest @@ -1,2 +1,3 @@ DIST wavemon-0.9.3.tar.gz 220372 BLAKE2B 383e5462e6f3abf86b3604499764060927321018f9dfaef9b742d933e832e568249e41f348788184e125324f81672f2f2b2ff9ca970c215f95a80ec140e0ca11 SHA512 0e4f6db1dfd1915a3c0e1c9708eea501d7180e80df891d0c5a59bb72d48777731c67a256d2d7d6c748ade8e1a3efad9004f5e13971e0b4e16eefdd4f8c6fe1c1 DIST wavemon-0.9.4.tar.gz 221133 BLAKE2B e07feb16dba86b1a91dc9b7d7df51da1b4498d8ea1a6ca36f6ae1e30e0e0bb09971330a470cde3425e7ae785bbd2819460ac2f1ddc2bc8da3aae29de3356bdbb SHA512 5121c6216d6697cc20ef55b2e365098e327a4966758af27a5a58cc13fe84d6e0828336031d9dcfe141210821f72fc3eaefc41fa3ab8a2e572a3b92c168c1ceb1 +DIST wavemon-0.9.5.tar.gz 225492 BLAKE2B 492ac0f16da1400b4e9e06af43b1ec8b96303bd33a62f355820975db61efc3b0603e1e3f97be05a69597b9546aeb95e3a2655cb0c45c90aa9f2bd765a06b8884 SHA512 c8abd0d0a2971b937eb2ea51470ec30c9a0e656161a7884cae257a226ef39e0daa8399ef349bbcb370b91a28b6ad0f42acb831524e1f7f5ce43ec244adcb7767 diff --git a/net-wireless/wavemon/wavemon-0.9.5.ebuild b/net-wireless/wavemon/wavemon-0.9.5.ebuild new file mode 100644 index 000000000000..3c940d85a547 --- /dev/null +++ b/net-wireless/wavemon/wavemon-0.9.5.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info + +DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards" +HOMEPAGE="https://github.com/uoaerg/wavemon/" +SRC_URI="https://github.com/uoaerg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86" + +IUSE="caps" +RDEPEND=" + dev-libs/libnl:3[utils] + sys-libs/ncurses:0= + caps? ( sys-libs/libcap )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS=( README.md ) + +pkg_pretend() { + local CONFIG_CHECK="~CFG80211" + check_extra_config +} + +src_prepare() { + default + + # Do not install docs to /usr/share + sed -i -e '/^install:/s/install-docs//' Makefile.in || die \ + 'sed on Makefile.in failed' + + # automagic on libcap, discovered in bug #448406 + use caps || export ac_cv_lib_cap_cap_get_flag=false + + eautoreconf +} + +src_configure () { + CFLAGS="${CFLAGS}" econf +} + +src_compile() { + unset CFLAGS + default +} + +src_install() { + default + + # Install man files manually(bug #397807) + doman wavemon.1 + doman wavemonrc.5 +} diff --git a/net-wireless/wepattack/files/wepattack-0.1.3-modern-c.patch b/net-wireless/wepattack/files/wepattack-0.1.3-modern-c.patch new file mode 100644 index 000000000000..f24d44813f39 --- /dev/null +++ b/net-wireless/wepattack/files/wepattack-0.1.3-modern-c.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/881007 +--- a/src/log.c ++++ b/src/log.c +@@ -25,6 +25,7 @@ + #include "log.h" + #include "wepattack.h" + #include "config.h" ++#include "misc.h" + + static time_t start_time; + char logfile[40]; +--- a/src/misc.c ++++ b/src/misc.c +@@ -23,6 +23,7 @@ + #include "wepattack.h" + #include "config.h" + #include "misc.h" ++#include "log.h" + + double difftime_us(struct timeval *time_start, struct timeval *time_end) { + +@@ -87,8 +88,10 @@ d_fprintf (FILE *__restrict __stream, + __const char *__restrict __format,...) { + + if (DEBUG) { +- fprintf(__stream, __format); ++ return fprintf(__stream, __format); + } ++ ++ return 0; + } + + void print_hex_array(FILE* out, unsigned char* data, int length) { diff --git a/net-wireless/wepattack/wepattack-0.1.3-r5.ebuild b/net-wireless/wepattack/wepattack-0.1.3-r6.ebuild index 60effbb9d41b..a58936f4d107 100644 --- a/net-wireless/wepattack/wepattack-0.1.3-r5.ebuild +++ b/net-wireless/wepattack/wepattack-0.1.3-r6.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit epatch toolchain-funcs +inherit toolchain-funcs MY_P="WepAttack-${PV}" DESCRIPTION="WLAN tool for breaking 802.11 WEP keys" HOMEPAGE="http://wepattack.sourceforge.net/" SRC_URI="mirror://sourceforge/wepattack/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" @@ -16,20 +17,30 @@ KEYWORDS="amd64 x86" IUSE="john" DEPEND=" - dev-libs/openssl:0= + dev-libs/openssl:= net-libs/libpcap sys-libs/zlib " +RDEPEND=" + ${DEPEND} + john? ( + || ( + app-crypt/johntheripper + app-crypt/johntheripper-jumbo + ) + ) +" -RDEPEND="${DEPEND} -john? ( || ( app-crypt/johntheripper app-crypt/johntheripper-jumbo ) )" - -S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${P}-filter-mac-address.patch + "${FILESDIR}"/${P}-missed-string.h-warnings-fix.patch + "${FILESDIR}"/${P}-modern-c.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-filter-mac-address.patch - epatch "${FILESDIR}"/${P}-missed-string.h-warnings-fix.patch - chmod +x src/wlan + default + + chmod +x src/wlan || die sed -i \ -e "/^CFLAGS=/s:=:=${CFLAGS} :" \ -e 's:-fno-for-scope::g' \ @@ -47,11 +58,12 @@ src_compile() { } src_install() { + dodoc README dobin src/wepattack + if use john; then dosbin run/wepattack_{inc,word} insinto /etc doins "${FILESDIR}"/wepattack.conf fi - dodoc README } diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest index 96d5b0e8a1aa..82e5206f1dc5 100644 --- a/net-wireless/wireless-regdb/Manifest +++ b/net-wireless/wireless-regdb/Manifest @@ -1,2 +1,2 @@ -DIST wireless-regdb-2020.11.20.tar.xz 24840 BLAKE2B b2db70097db43710cc2b6d8966b5c6d4d910a704a87a0bc979667bfd293d8baa402677b5e5bc0fcc4f49647ede4cd6bc3e17d41288f41e58c5c6cf3b968489a9 SHA512 93764e677c4d5cdcb4e927bff206c646061fe1e65896dd63f683e145d45917545b4e08caa14bfb3ea04ffb85438935503bbde386cbabfef2804905e508ecf7a0 -DIST wireless-regdb-2021.04.21.tar.xz 24944 BLAKE2B 4af782ceefe67c311cb90d1f64d830d9e5d2ccb7bc1aebcd8a176079522c21f1d8ef70cad0bd7223e9d56d46e6d20030af2349da9944d7ee3590bad28aeba467 SHA512 0ffbee04ec08c2025a34b60adc11198d64cb258a6ce53caf758667d25b733a242ca592d76ebd08e5692047917f5f42bb67a176f67a7d6bd11ad9178378cd0d26 +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 diff --git a/net-wireless/wireless-regdb/wireless-regdb-20210421.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20210421.ebuild deleted file mode 100644 index 9b1cae71b9ea..000000000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20210421.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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-20201120.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220606.ebuild index a79ca195cab7..3f15ef755143 100644 --- a/net-wireless/wireless-regdb/wireless-regdb-20201120.ebuild +++ b/net-wireless/wireless-regdb/wireless-regdb-20220606.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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 sparc x86" - -S="${WORKDIR}/${MY_P}" +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." 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..8860373ea93f --- /dev/null +++ b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 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" +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 + 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() { + # 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-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild index 375b8b9ac65a..061033128513 100644 --- a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild +++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -inherit toolchain-funcs multilib +inherit toolchain-funcs # The following works with both pre-releases and releases MY_P=${PN/-/_}.${PV/_/.} @@ -15,12 +15,9 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="multicall" -DEPEND="sys-apps/sed" -RDEPEND="" - PATCHES=("${FILESDIR}"/${PN}-29-asneeded.patch) src_prepare() { diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index 587047b0ad3a..0e445ba324c5 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -1,2 +1 @@ -DIST wpa_supplicant-2.9-r3-patches.tar.bz2 5266 BLAKE2B 284fdeaf6328c35b1f5e88075c62c3b008ec2c400b0cc163a59d9cf8d7c356c3e58f8798e5bade102259d2e5be2ed298b63a0001d0a4ab71d90604a8ee8bf274 SHA512 80e4950ddc99d1134a29a3e5a39767c756f7c9f9f283749e688db3435184631f0384b78954f926724ceff86c96d05b4fb042160265e9d00f976a96e864b7ecc5 -DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807 SHA512 37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8 +DIST wpa_supplicant-2.10.tar.gz 3511622 BLAKE2B 7f6045e5dcf24f7ccf1ea75c99541f9d68fadaea858a6ca11a95c997de14e33b3aa89138e748664579b5a4ea493d247cf6613da3c5fae49a4dbb5cd58dace752 SHA512 021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1 diff --git a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch deleted file mode 100644 index 727684865dbd..000000000000 --- a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch +++ /dev/null @@ -1,174 +0,0 @@ -From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Fri, 14 Jul 2017 15:15:35 +0200 -Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake - -Do not reinstall TK to the driver during Reassociation Response frame -processing if the first attempt of setting the TK succeeded. This avoids -issues related to clearing the TX/RX PN that could result in reusing -same PN values for transmitted frames (e.g., due to CCM nonce reuse and -also hitting replay protection on the receiver) and accepting replayed -frames on RX side. - -This issue was introduced by the commit -0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in -authenticator') which allowed wpa_ft_install_ptk() to be called multiple -times with the same PTK. While the second configuration attempt is -needed with some drivers, it must be done only if the first attempt -failed. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/ap/ieee802_11.c | 16 +++++++++++++--- - src/ap/wpa_auth.c | 11 +++++++++++ - src/ap/wpa_auth.h | 3 ++- - src/ap/wpa_auth_ft.c | 10 ++++++++++ - src/ap/wpa_auth_i.h | 1 + - 5 files changed, 37 insertions(+), 4 deletions(-) - -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index 4e04169..333035f 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd, - { - struct ieee80211_ht_capabilities ht_cap; - struct ieee80211_vht_capabilities vht_cap; -+ int set = 1; - - /* - * Remove the STA entry to ensure the STA PS state gets cleared and -@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd, - * FT-over-the-DS, where a station re-associates back to the same AP but - * skips the authentication flow, or if working with a driver that - * does not support full AP client state. -+ * -+ * Skip this if the STA has already completed FT reassociation and the -+ * TK has been configured since the TX/RX PN must not be reset to 0 for -+ * the same key. - */ -- if (!sta->added_unassoc) -+ if (!sta->added_unassoc && -+ (!(sta->flags & WLAN_STA_AUTHORIZED) || -+ !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) { - hostapd_drv_sta_remove(hapd, sta->addr); -+ wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED); -+ set = 0; -+ } - - #ifdef CONFIG_IEEE80211N - if (sta->flags & WLAN_STA_HT) -@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd, - sta->flags & WLAN_STA_VHT ? &vht_cap : NULL, - sta->flags | WLAN_STA_ASSOC, sta->qosinfo, - sta->vht_opmode, sta->p2p_ie ? 1 : 0, -- sta->added_unassoc)) { -+ set)) { - hostapd_logger(hapd, sta->addr, - HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE, - "Could not %s STA to kernel driver", -- sta->added_unassoc ? "set" : "add"); -+ set ? "set" : "add"); - - if (sta->added_unassoc) { - hostapd_drv_sta_remove(hapd, sta->addr); -diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c -index 3587086..707971d 100644 ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -1745,6 +1745,9 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event) - #else /* CONFIG_IEEE80211R */ - break; - #endif /* CONFIG_IEEE80211R */ -+ case WPA_DRV_STA_REMOVED: -+ sm->tk_already_set = FALSE; -+ return 0; - } - - #ifdef CONFIG_IEEE80211R -@@ -3250,6 +3253,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm) - } - - -+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm) -+{ -+ if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt)) -+ return 0; -+ return sm->tk_already_set; -+} -+ -+ - int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, - struct rsn_pmksa_cache_entry *entry) - { -diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h -index 0de8d97..97461b0 100644 ---- a/src/ap/wpa_auth.h -+++ b/src/ap/wpa_auth.h -@@ -267,7 +267,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth, - u8 *data, size_t data_len); - enum wpa_event { - WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH, -- WPA_REAUTH_EAPOL, WPA_ASSOC_FT -+ WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED - }; - void wpa_remove_ptk(struct wpa_state_machine *sm); - int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event); -@@ -280,6 +280,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm); - int wpa_auth_get_pairwise(struct wpa_state_machine *sm); - int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm); - int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm); -+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm); - int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, - struct rsn_pmksa_cache_entry *entry); - struct rsn_pmksa_cache_entry * -diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c -index 42242a5..e63b99a 100644 ---- a/src/ap/wpa_auth_ft.c -+++ b/src/ap/wpa_auth_ft.c -@@ -780,6 +780,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) - return; - } - -+ if (sm->tk_already_set) { -+ /* Must avoid TK reconfiguration to prevent clearing of TX/RX -+ * PN in the driver */ -+ wpa_printf(MSG_DEBUG, -+ "FT: Do not re-install same PTK to the driver"); -+ return; -+ } -+ - /* FIX: add STA entry to kernel/driver here? The set_key will fail - * most likely without this.. At the moment, STA entry is added only - * after association has been completed. This function will be called -@@ -792,6 +800,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) - - /* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */ - sm->pairwise_set = TRUE; -+ sm->tk_already_set = TRUE; - } - - -@@ -898,6 +907,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm, - - sm->pairwise = pairwise; - sm->PTK_valid = TRUE; -+ sm->tk_already_set = FALSE; - wpa_ft_install_ptk(sm); - - buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + -diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h -index 72b7eb3..7fd8f05 100644 ---- a/src/ap/wpa_auth_i.h -+++ b/src/ap/wpa_auth_i.h -@@ -65,6 +65,7 @@ struct wpa_state_machine { - struct wpa_ptk PTK; - Boolean PTK_valid; - Boolean pairwise_set; -+ Boolean tk_already_set; - int keycount; - Boolean Pair; - struct wpa_key_replay_counter { --- -2.7.4 - diff --git a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch deleted file mode 100644 index 1802d664add6..000000000000 --- a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch +++ /dev/null @@ -1,250 +0,0 @@ -From 927f891007c402fefd1ff384645b3f07597c3ede Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Wed, 12 Jul 2017 16:03:24 +0200 -Subject: [PATCH 2/8] Prevent reinstallation of an already in-use group key - -Track the current GTK and IGTK that is in use and when receiving a -(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do -not install the given key if it is already in use. This prevents an -attacker from trying to trick the client into resetting or lowering the -sequence counter associated to the group key. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/common/wpa_common.h | 11 +++++ - src/rsn_supp/wpa.c | 116 ++++++++++++++++++++++++++++++------------------ - src/rsn_supp/wpa_i.h | 4 ++ - 3 files changed, 87 insertions(+), 44 deletions(-) - -diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h -index af1d0f0..d200285 100644 ---- a/src/common/wpa_common.h -+++ b/src/common/wpa_common.h -@@ -217,6 +217,17 @@ struct wpa_ptk { - size_t tk_len; - }; - -+struct wpa_gtk { -+ u8 gtk[WPA_GTK_MAX_LEN]; -+ size_t gtk_len; -+}; -+ -+#ifdef CONFIG_IEEE80211W -+struct wpa_igtk { -+ u8 igtk[WPA_IGTK_MAX_LEN]; -+ size_t igtk_len; -+}; -+#endif /* CONFIG_IEEE80211W */ - - /* WPA IE version 1 - * 00-50-f2:1 (OUI:OUI type) -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 3c47879..95bd7be 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -714,6 +714,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - const u8 *_gtk = gd->gtk; - u8 gtk_buf[32]; - -+ /* Detect possible key reinstallation */ -+ if (sm->gtk.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", -+ gd->keyidx, gd->tx, gd->gtk_len); -+ return 0; -+ } -+ - wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len); - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)", -@@ -748,6 +757,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - } - os_memset(gtk_buf, 0, sizeof(gtk_buf)); - -+ sm->gtk.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ - return 0; - } - -@@ -854,6 +866,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - } - - -+#ifdef CONFIG_IEEE80211W -+static int wpa_supplicant_install_igtk(struct wpa_sm *sm, -+ const struct wpa_igtk_kde *igtk) -+{ -+ size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); -+ u16 keyidx = WPA_GET_LE16(igtk->keyid); -+ -+ /* Detect possible key reinstallation */ -+ if (sm->igtk.igtk_len == len && -+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", -+ keyidx); -+ return 0; -+ } -+ -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x", -+ keyidx, MAC2STR(igtk->pn)); -+ wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len); -+ if (keyidx > 4095) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Invalid IGTK KeyID %d", keyidx); -+ return -1; -+ } -+ if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -+ broadcast_ether_addr, -+ keyidx, 0, igtk->pn, sizeof(igtk->pn), -+ igtk->igtk, len) < 0) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Failed to configure IGTK to the driver"); -+ return -1; -+ } -+ -+ sm->igtk.igtk_len = len; -+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ -+ return 0; -+} -+#endif /* CONFIG_IEEE80211W */ -+ -+ - static int ieee80211w_set_keys(struct wpa_sm *sm, - struct wpa_eapol_ie_parse *ie) - { -@@ -864,30 +918,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, - if (ie->igtk) { - size_t len; - const struct wpa_igtk_kde *igtk; -- u16 keyidx; -+ - len = wpa_cipher_key_len(sm->mgmt_group_cipher); - if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len) - return -1; -+ - igtk = (const struct wpa_igtk_kde *) ie->igtk; -- keyidx = WPA_GET_LE16(igtk->keyid); -- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d " -- "pn %02x%02x%02x%02x%02x%02x", -- keyidx, MAC2STR(igtk->pn)); -- wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", -- igtk->igtk, len); -- if (keyidx > 4095) { -- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -- "WPA: Invalid IGTK KeyID %d", keyidx); -- return -1; -- } -- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -- broadcast_ether_addr, -- keyidx, 0, igtk->pn, sizeof(igtk->pn), -- igtk->igtk, len) < 0) { -- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -- "WPA: Failed to configure IGTK to the driver"); -+ if (wpa_supplicant_install_igtk(sm, igtk) < 0) - return -1; -- } - } - - return 0; -@@ -2307,7 +2345,7 @@ void wpa_sm_deinit(struct wpa_sm *sm) - */ - void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - { -- int clear_ptk = 1; -+ int clear_keys = 1; - - if (sm == NULL) - return; -@@ -2333,11 +2371,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - /* Prepare for the next transition */ - wpa_ft_prepare_auth_request(sm, NULL); - -- clear_ptk = 0; -+ clear_keys = 0; - } - #endif /* CONFIG_IEEE80211R */ - -- if (clear_ptk) { -+ if (clear_keys) { - /* - * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if - * this is not part of a Fast BSS Transition. -@@ -2347,6 +2385,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - sm->tptk_set = 0; - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); -+ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+#ifdef CONFIG_IEEE80211W -+ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+#endif /* CONFIG_IEEE80211W */ - } - - #ifdef CONFIG_TDLS -@@ -2877,6 +2919,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) - os_memset(sm->pmk, 0, sizeof(sm->pmk)); - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); -+ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+#ifdef CONFIG_IEEE80211W -+ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+#endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211R - os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); - os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0)); -@@ -2949,29 +2995,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - os_memset(&gd, 0, sizeof(gd)); - #ifdef CONFIG_IEEE80211W - } else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) { -- struct wpa_igtk_kde igd; -- u16 keyidx; -- -- os_memset(&igd, 0, sizeof(igd)); -- keylen = wpa_cipher_key_len(sm->mgmt_group_cipher); -- os_memcpy(igd.keyid, buf + 2, 2); -- os_memcpy(igd.pn, buf + 4, 6); -- -- keyidx = WPA_GET_LE16(igd.keyid); -- os_memcpy(igd.igtk, buf + 10, keylen); -- -- wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)", -- igd.igtk, keylen); -- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -- broadcast_ether_addr, -- keyidx, 0, igd.pn, sizeof(igd.pn), -- igd.igtk, keylen) < 0) { -- wpa_printf(MSG_DEBUG, "Failed to install the IGTK in " -- "WNM mode"); -- os_memset(&igd, 0, sizeof(igd)); -+ const struct wpa_igtk_kde *igtk; -+ -+ igtk = (const struct wpa_igtk_kde *) (buf + 2); -+ if (wpa_supplicant_install_igtk(sm, igtk) < 0) - return -1; -- } -- os_memset(&igd, 0, sizeof(igd)); - #endif /* CONFIG_IEEE80211W */ - } else { - wpa_printf(MSG_DEBUG, "Unknown element id"); -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index f653ba6..afc9e37 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -31,6 +31,10 @@ struct wpa_sm { - u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN]; - int rx_replay_counter_set; - u8 request_counter[WPA_REPLAY_COUNTER_LEN]; -+ struct wpa_gtk gtk; -+#ifdef CONFIG_IEEE80211W -+ struct wpa_igtk igtk; -+#endif /* CONFIG_IEEE80211W */ - - struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ - --- -2.7.4 - diff --git a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch deleted file mode 100644 index e2937b851ad5..000000000000 --- a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 8280294e74846ea342389a0cd17215050fa5afe8 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Sun, 1 Oct 2017 12:12:24 +0300 -Subject: [PATCH 3/8] Extend protection of GTK/IGTK reinstallation of WNM-Sleep - Mode cases - -This extends the protection to track last configured GTK/IGTK value -separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a -corner case where these two different mechanisms may get used when the -GTK/IGTK has changed and tracking a single value is not sufficient to -detect a possible key reconfiguration. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/wpa.c | 53 +++++++++++++++++++++++++++++++++++++--------------- - src/rsn_supp/wpa_i.h | 2 ++ - 2 files changed, 40 insertions(+), 15 deletions(-) - -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 95bd7be..7a2c68d 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -709,14 +709,17 @@ struct wpa_gtk_data { - - static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - const struct wpa_gtk_data *gd, -- const u8 *key_rsc) -+ const u8 *key_rsc, int wnm_sleep) - { - const u8 *_gtk = gd->gtk; - u8 gtk_buf[32]; - - /* Detect possible key reinstallation */ -- if (sm->gtk.gtk_len == (size_t) gd->gtk_len && -- os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { -+ if ((sm->gtk.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) || -+ (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk, -+ sm->gtk_wnm_sleep.gtk_len) == 0)) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", - gd->keyidx, gd->tx, gd->gtk_len); -@@ -757,8 +760,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - } - os_memset(gtk_buf, 0, sizeof(gtk_buf)); - -- sm->gtk.gtk_len = gd->gtk_len; -- os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ if (wnm_sleep) { -+ sm->gtk_wnm_sleep.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk, -+ sm->gtk_wnm_sleep.gtk_len); -+ } else { -+ sm->gtk.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ } - - return 0; - } -@@ -852,7 +861,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - (wpa_supplicant_check_group_cipher(sm, sm->group_cipher, - gtk_len, gtk_len, - &gd.key_rsc_len, &gd.alg) || -- wpa_supplicant_install_gtk(sm, &gd, key_rsc))) { -+ wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "RSN: Failed to install GTK"); - os_memset(&gd, 0, sizeof(gd)); -@@ -868,14 +877,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - - #ifdef CONFIG_IEEE80211W - static int wpa_supplicant_install_igtk(struct wpa_sm *sm, -- const struct wpa_igtk_kde *igtk) -+ const struct wpa_igtk_kde *igtk, -+ int wnm_sleep) - { - size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); - u16 keyidx = WPA_GET_LE16(igtk->keyid); - - /* Detect possible key reinstallation */ -- if (sm->igtk.igtk_len == len && -- os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { -+ if ((sm->igtk.igtk_len == len && -+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) || -+ (sm->igtk_wnm_sleep.igtk_len == len && -+ os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk, -+ sm->igtk_wnm_sleep.igtk_len) == 0)) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", - keyidx); -@@ -900,8 +913,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm, - return -1; - } - -- sm->igtk.igtk_len = len; -- os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ if (wnm_sleep) { -+ sm->igtk_wnm_sleep.igtk_len = len; -+ os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk, -+ sm->igtk_wnm_sleep.igtk_len); -+ } else { -+ sm->igtk.igtk_len = len; -+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ } - - return 0; - } -@@ -924,7 +943,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, - return -1; - - igtk = (const struct wpa_igtk_kde *) ie->igtk; -- if (wpa_supplicant_install_igtk(sm, igtk) < 0) -+ if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0) - return -1; - } - -@@ -1574,7 +1593,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm, - if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc)) - key_rsc = null_rsc; - -- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) || -+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) || - wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0) - goto failed; - os_memset(&gd, 0, sizeof(gd)); -@@ -2386,8 +2405,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - sm->tptk_set = 0; - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); - os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); - #ifdef CONFIG_IEEE80211W - os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); - #endif /* CONFIG_IEEE80211W */ - } - -@@ -2920,8 +2941,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); - os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); - #ifdef CONFIG_IEEE80211W - os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); - #endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211R - os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); -@@ -2986,7 +3009,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - - wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)", - gd.gtk, gd.gtk_len); -- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) { -+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) { - os_memset(&gd, 0, sizeof(gd)); - wpa_printf(MSG_DEBUG, "Failed to install the GTK in " - "WNM mode"); -@@ -2998,7 +3021,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - const struct wpa_igtk_kde *igtk; - - igtk = (const struct wpa_igtk_kde *) (buf + 2); -- if (wpa_supplicant_install_igtk(sm, igtk) < 0) -+ if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0) - return -1; - #endif /* CONFIG_IEEE80211W */ - } else { -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index afc9e37..9a54631 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -32,8 +32,10 @@ struct wpa_sm { - int rx_replay_counter_set; - u8 request_counter[WPA_REPLAY_COUNTER_LEN]; - struct wpa_gtk gtk; -+ struct wpa_gtk gtk_wnm_sleep; - #ifdef CONFIG_IEEE80211W - struct wpa_igtk igtk; -+ struct wpa_igtk igtk_wnm_sleep; - #endif /* CONFIG_IEEE80211W */ - - struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ --- -2.7.4 - diff --git a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch deleted file mode 100644 index 22ee217947d6..000000000000 --- a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Fri, 29 Sep 2017 04:22:51 +0200 -Subject: [PATCH 4/8] Prevent installation of an all-zero TK - -Properly track whether a PTK has already been installed to the driver -and the TK part cleared from memory. This prevents an attacker from -trying to trick the client into installing an all-zero TK. - -This fixes the earlier fix in commit -ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the -driver in EAPOL-Key 3/4 retry case') which did not take into account -possibility of an extra message 1/4 showing up between retries of -message 3/4. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/common/wpa_common.h | 1 + - src/rsn_supp/wpa.c | 5 ++--- - src/rsn_supp/wpa_i.h | 1 - - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h -index d200285..1021ccb 100644 ---- a/src/common/wpa_common.h -+++ b/src/common/wpa_common.h -@@ -215,6 +215,7 @@ struct wpa_ptk { - size_t kck_len; - size_t kek_len; - size_t tk_len; -+ int installed; /* 1 if key has already been installed to driver */ - }; - - struct wpa_gtk { -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 7a2c68d..0550a41 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm, - os_memset(buf, 0, sizeof(buf)); - } - sm->tptk_set = 1; -- sm->tk_to_set = 1; - - kde = sm->assoc_wpa_ie; - kde_len = sm->assoc_wpa_ie_len; -@@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, - enum wpa_alg alg; - const u8 *key_rsc; - -- if (!sm->tk_to_set) { -+ if (sm->ptk.installed) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Do not re-install same PTK to the driver"); - return 0; -@@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, - - /* TK is not needed anymore in supplicant */ - os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN); -- sm->tk_to_set = 0; -+ sm->ptk.installed = 1; - - if (sm->wpa_ptk_rekey) { - eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL); -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index 9a54631..41f371f 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -24,7 +24,6 @@ struct wpa_sm { - struct wpa_ptk ptk, tptk; - int ptk_set, tptk_set; - unsigned int msg_3_of_4_ok:1; -- unsigned int tk_to_set:1; - u8 snonce[WPA_NONCE_LEN]; - u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */ - int renew_snonce; --- -2.7.4 - diff --git a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch deleted file mode 100644 index c19c4c710235..000000000000 --- a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 12fac09b437a1dc8a0f253e265934a8aaf4d2f8b Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Sun, 1 Oct 2017 12:32:57 +0300 -Subject: [PATCH 5/8] Fix PTK rekeying to generate a new ANonce - -The Authenticator state machine path for PTK rekeying ended up bypassing -the AUTHENTICATION2 state where a new ANonce is generated when going -directly to the PTKSTART state since there is no need to try to -determine the PMK again in such a case. This is far from ideal since the -new PTK would depend on a new nonce only from the supplicant. - -Fix this by generating a new ANonce when moving to the PTKSTART state -for the purpose of starting new 4-way handshake to rekey PTK. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/ap/wpa_auth.c | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c -index 707971d..bf10cc1 100644 ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -1901,6 +1901,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2) - } - - -+static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm) -+{ -+ if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) { -+ wpa_printf(MSG_ERROR, -+ "WPA: Failed to get random data for ANonce"); -+ sm->Disconnect = TRUE; -+ return -1; -+ } -+ wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce, -+ WPA_NONCE_LEN); -+ sm->TimeoutCtr = 0; -+ return 0; -+} -+ -+ - SM_STATE(WPA_PTK, INITPMK) - { - u8 msk[2 * PMK_LEN]; -@@ -2458,9 +2473,12 @@ SM_STEP(WPA_PTK) - SM_ENTER(WPA_PTK, AUTHENTICATION); - else if (sm->ReAuthenticationRequest) - SM_ENTER(WPA_PTK, AUTHENTICATION2); -- else if (sm->PTKRequest) -- SM_ENTER(WPA_PTK, PTKSTART); -- else switch (sm->wpa_ptk_state) { -+ else if (sm->PTKRequest) { -+ if (wpa_auth_sm_ptk_update(sm) < 0) -+ SM_ENTER(WPA_PTK, DISCONNECTED); -+ else -+ SM_ENTER(WPA_PTK, PTKSTART); -+ } else switch (sm->wpa_ptk_state) { - case WPA_PTK_INITIALIZE: - break; - case WPA_PTK_DISCONNECT: --- -2.7.4 - diff --git a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch deleted file mode 100644 index e1bd5a572625..000000000000 --- a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 6c4bed4f47d1960ec04981a9d50e5076aea5223d Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 11:03:15 +0300 -Subject: [PATCH 6/8] TDLS: Reject TPK-TK reconfiguration - -Do not try to reconfigure the same TPK-TK to the driver after it has -been successfully configured. This is an explicit check to avoid issues -related to resetting the TX/RX packet number. There was already a check -for this for TPK M2 (retries of that message are ignored completely), so -that behavior does not get modified. - -For TPK M3, the TPK-TK could have been reconfigured, but that was -followed by immediate teardown of the link due to an issue in updating -the STA entry. Furthermore, for TDLS with any real security (i.e., -ignoring open/WEP), the TPK message exchange is protected on the AP path -and simple replay attacks are not feasible. - -As an additional corner case, make sure the local nonce gets updated if -the peer uses a very unlikely "random nonce" of all zeros. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 36 insertions(+), 2 deletions(-) - -diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c -index e424168..9eb9738 100644 ---- a/src/rsn_supp/tdls.c -+++ b/src/rsn_supp/tdls.c -@@ -112,6 +112,7 @@ struct wpa_tdls_peer { - u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */ - } tpk; - int tpk_set; -+ int tk_set; /* TPK-TK configured to the driver */ - int tpk_success; - int tpk_in_progress; - -@@ -192,6 +193,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - u8 rsc[6]; - enum wpa_alg alg; - -+ if (peer->tk_set) { -+ /* -+ * This same TPK-TK has already been configured to the driver -+ * and this new configuration attempt (likely due to an -+ * unexpected retransmitted frame) would result in clearing -+ * the TX/RX sequence number which can break security, so must -+ * not allow that to happen. -+ */ -+ wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR -+ " has already been configured to the driver - do not reconfigure", -+ MAC2STR(peer->addr)); -+ return -1; -+ } -+ - os_memset(rsc, 0, 6); - - switch (peer->cipher) { -@@ -209,12 +224,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - return -1; - } - -+ wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR, -+ MAC2STR(peer->addr)); - if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1, - rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) { - wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the " - "driver"); - return -1; - } -+ peer->tk_set = 1; - return 0; - } - -@@ -696,7 +714,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - peer->cipher = 0; - peer->qos_info = 0; - peer->wmm_capable = 0; -- peer->tpk_set = peer->tpk_success = 0; -+ peer->tk_set = peer->tpk_set = peer->tpk_success = 0; - peer->chan_switch_enabled = 0; - os_memset(&peer->tpk, 0, sizeof(peer->tpk)); - os_memset(peer->inonce, 0, WPA_NONCE_LEN); -@@ -1159,6 +1177,7 @@ skip_rsnie: - wpa_tdls_peer_free(sm, peer); - return -1; - } -+ peer->tk_set = 0; /* A new nonce results in a new TK */ - wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake", - peer->inonce, WPA_NONCE_LEN); - os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN); -@@ -1751,6 +1770,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer, - } - - -+static int tdls_nonce_set(const u8 *nonce) -+{ -+ int i; -+ -+ for (i = 0; i < WPA_NONCE_LEN; i++) { -+ if (nonce[i]) -+ return 1; -+ } -+ -+ return 0; -+} -+ -+ - static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr, - const u8 *buf, size_t len) - { -@@ -2004,7 +2036,8 @@ skip_rsn: - peer->rsnie_i_len = kde.rsn_ie_len; - peer->cipher = cipher; - -- if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) { -+ if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 || -+ !tdls_nonce_set(peer->inonce)) { - /* - * There is no point in updating the RNonce for every obtained - * TPK M1 frame (e.g., retransmission due to timeout) with the -@@ -2020,6 +2053,7 @@ skip_rsn: - "TDLS: Failed to get random data for responder nonce"); - goto error; - } -+ peer->tk_set = 0; /* A new nonce results in a new TK */ - } - - #if 0 --- -2.7.4 - diff --git a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch b/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch deleted file mode 100644 index 85ea1d62bcf5..000000000000 --- a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 53c5eb58e95004f86e65ee9fbfccbc291b139057 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 11:25:02 +0300 -Subject: [PATCH 7/8] WNM: Ignore WNM-Sleep Mode Response without pending - request - -Commit 03ed0a52393710be6bdae657d1b36efa146520e5 ('WNM: Ignore WNM-Sleep -Mode Response if WNM-Sleep Mode has not been used') started ignoring the -response when no WNM-Sleep Mode Request had been used during the -association. This can be made tighter by clearing the used flag when -successfully processing a response. This adds an additional layer of -protection against unexpected retransmissions of the response frame. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - wpa_supplicant/wnm_sta.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c -index 1b3409c..67a07ff 100644 ---- a/wpa_supplicant/wnm_sta.c -+++ b/wpa_supplicant/wnm_sta.c -@@ -260,7 +260,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, - - if (!wpa_s->wnmsleep_used) { - wpa_printf(MSG_DEBUG, -- "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode has not been used in this association"); -+ "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode operation has not been requested"); - return; - } - -@@ -299,6 +299,8 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, - return; - } - -+ wpa_s->wnmsleep_used = 0; -+ - if (wnmsleep_ie->status == WNM_STATUS_SLEEP_ACCEPT || - wnmsleep_ie->status == WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) { - wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response " --- -2.7.4 - diff --git a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch deleted file mode 100644 index b9678f6815a8..000000000000 --- a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch +++ /dev/null @@ -1,82 +0,0 @@ -From b372ab0b7daea719749194dc554b26e6367603f2 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 12:06:37 +0300 -Subject: [PATCH 8/8] FT: Do not allow multiple Reassociation Response frames - -The driver is expected to not report a second association event without -the station having explicitly request a new association. As such, this -case should not be reachable. However, since reconfiguring the same -pairwise or group keys to the driver could result in nonce reuse issues, -be extra careful here and do an additional state check to avoid this -even if the local driver ends up somehow accepting an unexpected -Reassociation Response frame. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/wpa.c | 3 +++ - src/rsn_supp/wpa_ft.c | 8 ++++++++ - src/rsn_supp/wpa_i.h | 1 + - 3 files changed, 12 insertions(+) - -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 0550a41..2a53c6f 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -2440,6 +2440,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm) - #ifdef CONFIG_TDLS - wpa_tdls_disassoc(sm); - #endif /* CONFIG_TDLS */ -+#ifdef CONFIG_IEEE80211R -+ sm->ft_reassoc_completed = 0; -+#endif /* CONFIG_IEEE80211R */ - - /* Keys are not needed in the WPA state machine anymore */ - wpa_sm_drop_sa(sm); -diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c -index 205793e..d45bb45 100644 ---- a/src/rsn_supp/wpa_ft.c -+++ b/src/rsn_supp/wpa_ft.c -@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len, - u16 capab; - - sm->ft_completed = 0; -+ sm->ft_reassoc_completed = 0; - - buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + - 2 + sm->r0kh_id_len + ric_ies_len + 100; -@@ -681,6 +682,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, - return -1; - } - -+ if (sm->ft_reassoc_completed) { -+ wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission"); -+ return 0; -+ } -+ - if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) { - wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs"); - return -1; -@@ -781,6 +787,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, - return -1; - } - -+ sm->ft_reassoc_completed = 1; -+ - if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0) - return -1; - -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index 41f371f..56f88dc 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -128,6 +128,7 @@ struct wpa_sm { - size_t r0kh_id_len; - u8 r1kh_id[FT_R1KH_ID_LEN]; - int ft_completed; -+ int ft_reassoc_completed; - int over_the_ds_in_progress; - u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */ - int set_ptk_after_assoc; --- -2.7.4 - diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch new file mode 100644 index 000000000000..18f879c9f39f --- /dev/null +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch @@ -0,0 +1,57 @@ +From: Jouni Malinen <j@w1.fi> +Date: Sun, 22 May 2022 17:01:35 +0300 +Subject: OpenSSL: Drop security level to 0 with OpenSSL 3.0 when using TLS 1.0/1.1 + +Commit 9afb68b03976 ("OpenSSL: Allow systemwide secpolicy overrides for +TLS version") with commit 58bbcfa31b18 ("OpenSSL: Update security level +drop for TLS 1.0/1.1 with OpenSSL 3.0") allow this workaround to be +enabled with an explicit network configuration parameter. However, the +default settings are still allowing TLS 1.0 and 1.1 to be negotiated +just to see them fail immediately when using OpenSSL 3.0. This is not +exactly helpful especially when the OpenSSL error message for this +particular case is "internal error" which does not really say anything +about the reason for the error. + +It is is a bit inconvenient to update the security policy for this +particular issue based on the negotiated TLS version since that happens +in the middle of processing for the first message from the server. +However, this can be done by using the debug callback for printing out +the received TLS messages during processing. + +Drop the OpenSSL security level to 0 if that is the only option to +continue the TLS negotiation, i.e., when TLS 1.0/1.1 are still allowed +in wpa_supplicant default configuration and OpenSSL 3.0 with the +constraint on MD5-SHA1 use. + +Signed-off-by: Jouni Malinen <j@w1.fi> + +Bug-Debian: https://bugs.debian.org/1011121 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1958267 +Origin: upstream, commit:bc99366f9b960150aa2e369048bbc2218c1d414e +--- + src/crypto/tls_openssl.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c +index 6602ac64f591..78621d926dab 100644 +--- a/src/crypto/tls_openssl.c ++++ b/src/crypto/tls_openssl.c +@@ -1557,6 +1557,15 @@ static void tls_msg_cb(int write_p, int version, int content_type, + struct tls_connection *conn = arg; + const u8 *pos = buf; + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++ if ((SSL_version(ssl) == TLS1_VERSION || ++ SSL_version(ssl) == TLS1_1_VERSION) && ++ SSL_get_security_level(ssl) > 0) { ++ wpa_printf(MSG_DEBUG, ++ "OpenSSL: Drop security level to 0 to allow TLS 1.0/1.1 use of MD5-SHA1 signature algorithm"); ++ SSL_set_security_level(ssl, 0); ++ } ++#endif /* OpenSSL version >= 3.0 */ + if (write_p == 2) { + wpa_printf(MSG_DEBUG, + "OpenSSL: session ver=0x%x content_type=%d", +-- +2.39.0 + diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-allow-legacy-renegotiation.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-allow-legacy-renegotiation.patch new file mode 100644 index 000000000000..574973fe6fe5 --- /dev/null +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-allow-legacy-renegotiation.patch @@ -0,0 +1,30 @@ +From: James Ralston <ralston@pobox.com> +Date: Sun, 1 May 2022 16:15:23 -0700 +Subject: Allow legacy renegotiation to fix PEAP issues with some servers + +Upstream: http://lists.infradead.org/pipermail/hostap/2022-May/040511.html +--- + src/crypto/tls_openssl.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c +index 273e5cb..ad3aa1a 100644 +--- a/src/crypto/tls_openssl.c ++++ b/src/crypto/tls_openssl.c +@@ -1056,6 +1056,16 @@ void * tls_init(const struct tls_config *conf) + SSL_CTX_set_options(ssl, SSL_OP_NO_SSLv2); + SSL_CTX_set_options(ssl, SSL_OP_NO_SSLv3); + ++ /* Many enterprise PEAP server implementations (e.g. used in large ++ corporations and universities) do not support RFC5746 secure ++ renegotiation, and starting with OpenSSL 3.0, ++ SSL_OP_LEGACY_SERVER_CONNECT is no longer set as part of SSL_OP_ALL. ++ So until we implement a way to request SSL_OP_LEGACY_SERVER_CONNECT ++ only in EAP peer mode, just set SSL_OP_LEGACY_SERVER_CONNECT ++ globally. */ ++ ++ SSL_CTX_set_options(ssl, SSL_OP_LEGACY_SERVER_CONNECT); ++ + SSL_CTX_set_mode(ssl, SSL_MODE_AUTO_RETRY); + + #ifdef SSL_MODE_NO_AUTO_CHAIN diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch deleted file mode 100644 index d764a9db016c..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Thu, 29 Aug 2019 11:52:04 +0300 -Subject: [PATCH] AP: Silently ignore management frame from unexpected source - address - -Do not process any received Management frames with unexpected/invalid SA -so that we do not add any state for unexpected STA addresses or end up -sending out frames to unexpected destination. This prevents unexpected -sequences where an unprotected frame might end up causing the AP to send -out a response to another device and that other device processing the -unexpected response. - -In particular, this prevents some potential denial of service cases -where the unexpected response frame from the AP might result in a -connected station dropping its association. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/ap/drv_callbacks.c | 13 +++++++++++++ - src/ap/ieee802_11.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+) - -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c -index 31587685fe3b..34ca379edc3d 100644 ---- a/src/ap/drv_callbacks.c -+++ b/src/ap/drv_callbacks.c -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, - "hostapd_notif_assoc: Skip event with no address"); - return -1; - } -+ -+ if (is_multicast_ether_addr(addr) || -+ is_zero_ether_addr(addr) || -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR -+ " in received indication - ignore this indication silently", -+ __func__, MAC2STR(addr)); -+ return 0; -+ } -+ - random_add_randomness(addr, ETH_ALEN); - - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index c85a28db44b7..e7065372e158 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, - fc = le_to_host16(mgmt->frame_control); - stype = WLAN_FC_GET_STYPE(fc); - -+ if (is_multicast_ether_addr(mgmt->sa) || -+ is_zero_ether_addr(mgmt->sa) || -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR -+ " in received frame - ignore this frame silently", -+ MAC2STR(mgmt->sa)); -+ return 0; -+ } -+ - if (stype == WLAN_FC_STYPE_BEACON) { - handle_beacon(hapd, mgmt, len, fi); - return 1; --- -2.20.1 - diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml index 0209c6198dc8..489b2ea119fd 100644 --- a/net-wireless/wpa_supplicant/metadata.xml +++ b/net-wireless/wpa_supplicant/metadata.xml @@ -20,7 +20,9 @@ <flag name="ps3">Add support for ps3 hypervisor driven gelic wifi</flag> <flag name="privsep">Enable wpa_priv privledge separation binary</flag> <flag name="tdls">Add support for Tunneled Direct Link Setup (802.11z)</flag> + <flag name="tkip">Add support for WPA TKIP (deprecated due to security flaws in 2009)</flag> <flag name="uncommon-eap-types">Add support for GPSK, SAKE, GPSK_SHA256, IKEV2 and EKE</flag> + <flag name="wep">Add support for Wired Equivalent Privacy (deprecated due to security flaws in 2004)</flag> <flag name="wps">Add support for Wi-Fi Protected Setup</flag> <flag name="wimax">Add support for Wimax EAP-PEER authentication algorithm</flag> <flag name="smartcard">Add support for smartcards</flag> diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild index f3b138d121f2..5778596a4275 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs +inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" HOMEPAGE="https://w1.fi/wpa_supplicant/" @@ -13,16 +13,16 @@ if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://w1.fi/hostap.git" else - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" SRC_URI="https://w1.fi/releases/${P}.tar.gz" fi SLOT="0" -IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps" # CONFIG_PRIVSEP=y does not have sufficient support for the new driver # interface functions used for MACsec, so this combination cannot be used -# at least for now. +# at least for now. bug #684442 REQUIRED_USE=" macsec? ( !privsep ) privsep? ( !macsec ) @@ -30,11 +30,10 @@ REQUIRED_USE=" " DEPEND=" - >=dev-libs/openssl-1.0.2k:0=[bindist(-)=] + >=dev-libs/openssl-1.0.2k:= dbus? ( sys-apps/dbus ) kernel_linux? ( - dev-libs/libnl:3 - net-wireless/crda + >=dev-libs/libnl-3.2:3 eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) @@ -51,6 +50,9 @@ DEPEND=" " RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-networkmanager ) + kernel_linux? ( + net-wireless/wireless-regdb + ) " BDEPEND="virtual/pkgconfig" @@ -74,13 +76,17 @@ Kconfig_style_config() { #first remove any leading "# " if $2 is not n sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" #set item = $setting (defaulting to y) - sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" + if ! sed -i "/^$CONFIG_PARAM\>/s/=.*/=$setting/" .config; then + echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" + fi if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then echo "$CONFIG_PARAM=$setting" >>.config fi else #ensure item commented out - sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" + if ! sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config; then + echo "Kconfig_style_config error commenting $CONFIG_PARAM" + fi fi } @@ -92,13 +98,6 @@ src_prepare() { -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \ ../src/l2_packet/l2_packet_freebsd.c || die - # People seem to take the example configuration file too literally (bug #102361) - sed -i \ - -e "s:^\(opensc_engine_path\):#\1:" \ - -e "s:^\(pkcs11_engine_path\):#\1:" \ - -e "s:^\(pkcs11_module_path\):#\1:" \ - wpa_supplicant.conf || die - # Change configuration to match Gentoo locations (bug #143750) sed -i \ -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ @@ -123,11 +122,12 @@ src_prepare() { # bug (320097) eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch" + # bug (912315) + eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch" + eapply "${FILESDIR}/${P}-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch" + # bug (640492) sed -i 's#-Werror ##' wpa_supplicant/Makefile || die - - #CVE-2019-16275 bug #696030 - eapply "${FILESDIR}/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch" } src_configure() { @@ -233,23 +233,36 @@ src_configure() { Kconfig_style_config TLS openssl Kconfig_style_config FST - if ! use bindist ; then - Kconfig_style_config EAP_PWD - if use fils; then - Kconfig_style_config FILS - Kconfig_style_config FILS_SK_PFS - fi - if use mesh; then - Kconfig_style_config MESH - else - Kconfig_style_config MESH n - fi - #WPA3 - Kconfig_style_config OWE - Kconfig_style_config SAE - Kconfig_style_config DPP - Kconfig_style_config SUITEB192 - Kconfig_style_config SUITEB + + Kconfig_style_config EAP_PWD + if use fils; then + Kconfig_style_config FILS + Kconfig_style_config FILS_SK_PFS + fi + if use mesh; then + Kconfig_style_config MESH + else + Kconfig_style_config MESH n + fi + # WPA3 + Kconfig_style_config OWE + Kconfig_style_config SAE + Kconfig_style_config DPP + Kconfig_style_config DPP2 + Kconfig_style_config SUITEB192 + Kconfig_style_config SUITEB + + if use wep ; then + Kconfig_style_config WEP + else + Kconfig_style_config WEP n + fi + + # Watch out, reversed logic + if use tkip ; then + Kconfig_style_config NO_TKIP n + else + Kconfig_style_config NO_TKIP fi if use smartcard ; then @@ -277,15 +290,15 @@ src_configure() { #Kconfig_style_config DRIVER_MACSEC_QCA Kconfig_style_config DRIVER_MACSEC_LINUX Kconfig_style_config MACSEC + else + # bug #831369 and bug #684442 + Kconfig_style_config DRIVER_MACSEC_LINUX n + Kconfig_style_config MACSEC n fi if use ps3 ; then Kconfig_style_config DRIVER_PS3 fi - - elif use kernel_FreeBSD ; then - # FreeBSD specific driver - Kconfig_style_config DRIVER_BSD fi # Wi-Fi Protected Setup (WPS) @@ -341,11 +354,7 @@ src_configure() { Kconfig_style_config PRIVSEP fi - # If we are using libnl 2.0 and above, enable support for it - # Bug 382159 - # Removed for now, since the 3.2 version is broken, and we don't - # support it. - if has_version ">=dev-libs/libnl-3.2"; then + if use kernel_linux ; then Kconfig_style_config LIBNL32 fi @@ -380,18 +389,8 @@ src_install() { use privsep && dosbin wpa_priv dobin wpa_cli wpa_passphrase - # baselayout-1 compat - if has_version "<sys-apps/baselayout-2.0.0"; then - dodir /sbin - dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant - dodir /bin - dosym ../usr/bin/wpa_cli /bin/wpa_cli - fi - - if has_version ">=sys-apps/openrc-0.5.0"; then - newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant - newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant - fi + newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant + newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant exeinto /etc/wpa_supplicant/ newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh @@ -446,10 +445,19 @@ pkg_postinst() { ewarn "WARNING: your old configuration file ${EROOT}/etc/wpa_supplicant.conf" ewarn "needs to be moved to ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf" fi - - if use bindist; then - ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." - ewarn "This is incredibly undesirable" + if ! use wep; then + einfo "WARNING: You are building with WEP support disabled, which is recommended since" + einfo "this protocol is deprecated and insecure. If you still need to connect to" + einfo "WEP-enabled networks, you may turn this flag back on. With this flag off," + einfo "WEP-enabled networks will not even show up as available." + einfo "If your network is missing you may wish to USE=wep" + fi + if ! use tkip; then + ewarn "WARNING: You are building with TKIP support disabled, which is recommended since" + ewarn "this protocol is deprecated and insecure. If you still need to connect to" + ewarn "TKIP-enabled networks, you may turn this flag back on. With this flag off," + ewarn "TKIP-enabled networks, including mixed mode TKIP/AES-CCMP will not even show up" + ewarn "as available. If your network is missing you may wish to USE=tkip" fi # Mea culpa, feel free to remove that after some time --mgorny. diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild deleted file mode 100644 index 62785e101ba2..000000000000 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild +++ /dev/null @@ -1,475 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs - -DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" -HOMEPAGE="https://w1.fi/wpa_supplicant/" -LICENSE="|| ( GPL-2 BSD )" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://w1.fi/hostap.git" -else - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" - SRC_URI="https://w1.fi/releases/${P}.tar.gz" - SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2" -fi - -SLOT="0" -IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" - -# CONFIG_PRIVSEP=y does not have sufficient support for the new driver -# interface functions used for MACsec, so this combination cannot be used -# at least for now. -REQUIRED_USE=" - macsec? ( !privsep ) - privsep? ( !macsec ) - broadcom-sta? ( !fils !mesh !mbo ) -" - -DEPEND=" - >=dev-libs/openssl-1.0.2k:0=[bindist(-)=] - dbus? ( sys-apps/dbus ) - kernel_linux? ( - dev-libs/libnl:3 - net-wireless/crda - eap-sim? ( sys-apps/pcsc-lite ) - ) - !kernel_linux? ( net-libs/libpcap ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) - readline? ( - sys-libs/ncurses:0= - sys-libs/readline:0= - ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-networkmanager ) -" -BDEPEND="virtual/pkgconfig" - -DOC_CONTENTS=" - If this is a clean installation of wpa_supplicant, you - have to create a configuration file named - ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf - An example configuration file is available for reference in - ${EROOT}/usr/share/doc/${PF}/ -" - -S="${WORKDIR}/${P}/${PN}" - -Kconfig_style_config() { - #param 1 is CONFIG_* item - #param 2 is what to set it = to, defaulting in y - CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1" - setting="${2:-y}" - - if [ ! $setting = n ]; then - #first remove any leading "# " if $2 is not n - sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" - #set item = $setting (defaulting to y) - sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" - if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then - echo "$CONFIG_PARAM=$setting" >>.config - fi - else - #ensure item commented out - sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" - fi -} - -src_prepare() { - default - - # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD - sed -i \ - -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \ - ../src/l2_packet/l2_packet_freebsd.c || die - - # People seem to take the example configuration file too literally (bug #102361) - sed -i \ - -e "s:^\(opensc_engine_path\):#\1:" \ - -e "s:^\(pkcs11_engine_path\):#\1:" \ - -e "s:^\(pkcs11_module_path\):#\1:" \ - wpa_supplicant.conf || die - - # Change configuration to match Gentoo locations (bug #143750) - sed -i \ - -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ - -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ - wpa_supplicant.conf || die - - # systemd entries to D-Bus service files (bug #372877) - echo 'SystemdService=wpa_supplicant.service' \ - | tee -a dbus/*.service >/dev/null || die - - cd "${WORKDIR}/${P}" || die - - if use wimax; then - # generate-libeap-peer.patch comes before - # fix-undefined-reference-to-random_get_bytes.patch - eapply "${FILESDIR}/${P}-generate-libeap-peer.patch" - - # multilib-strict fix (bug #373685) - sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile || die - fi - - # bug (320097) - eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch" - - # bug (640492) - sed -i 's#-Werror ##' wpa_supplicant/Makefile || die - - ## Security patches - # CVE-2019-16275 (bug #696030) - eapply "${FILESDIR}/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch" - # 2020-2, 2021-1 security advisories (bug #768759) - eapply "${WORKDIR}"/wpa_supplicant-2.9-r3-patches/security-{2020-2,2021-1}/*.patch - # CVE-2021-30004 (bug #780138) - eapply "${WORKDIR}"/wpa_supplicant-2.9-r3-patches/misc/CVE-2021-30004.patch -} - -src_configure() { - # Toolchain setup - tc-export CC PKG_CONFIG - - cp defconfig .config || die - - # Basic setup - Kconfig_style_config CTRL_IFACE - Kconfig_style_config MATCH_IFACE - Kconfig_style_config BACKEND file - Kconfig_style_config IBSS_RSN - Kconfig_style_config IEEE80211W - Kconfig_style_config IEEE80211R - Kconfig_style_config HT_OVERRIDES - Kconfig_style_config VHT_OVERRIDES - Kconfig_style_config OCV - Kconfig_style_config TLSV11 - Kconfig_style_config TLSV12 - Kconfig_style_config GETRANDOM - - # Basic authentication methods - # NOTE: we don't set GPSK or SAKE as they conflict - # with the below options - Kconfig_style_config EAP_GTC - Kconfig_style_config EAP_MD5 - Kconfig_style_config EAP_OTP - Kconfig_style_config EAP_PAX - Kconfig_style_config EAP_PSK - Kconfig_style_config EAP_TLV - Kconfig_style_config EAP_EXE - Kconfig_style_config IEEE8021X_EAPOL - Kconfig_style_config PKCS12 - Kconfig_style_config PEERKEY - Kconfig_style_config EAP_LEAP - Kconfig_style_config EAP_MSCHAPV2 - Kconfig_style_config EAP_PEAP - Kconfig_style_config EAP_TEAP - Kconfig_style_config EAP_TLS - Kconfig_style_config EAP_TTLS - - # Enabling background scanning. - Kconfig_style_config BGSCAN_SIMPLE - Kconfig_style_config BGSCAN_LEARN - - if use dbus ; then - Kconfig_style_config CTRL_IFACE_DBUS - Kconfig_style_config CTRL_IFACE_DBUS_NEW - Kconfig_style_config CTRL_IFACE_DBUS_INTRO - else - Kconfig_style_config CTRL_IFACE_DBUS n - Kconfig_style_config CTRL_IFACE_DBUS_NEW n - Kconfig_style_config CTRL_IFACE_DBUS_INTRO n - fi - - if use eapol-test ; then - Kconfig_style_config EAPOL_TEST - fi - - # Enable support for writing debug info to a log file and syslog. - Kconfig_style_config DEBUG_FILE - Kconfig_style_config DEBUG_SYSLOG - - if use hs2-0 ; then - Kconfig_style_config INTERWORKING - Kconfig_style_config HS20 - fi - - if use mbo ; then - Kconfig_style_config MBO - else - Kconfig_style_config MBO n - fi - - if use uncommon-eap-types; then - Kconfig_style_config EAP_GPSK - Kconfig_style_config EAP_SAKE - Kconfig_style_config EAP_GPSK_SHA256 - Kconfig_style_config EAP_IKEV2 - Kconfig_style_config EAP_EKE - fi - - if use eap-sim ; then - # Smart card authentication - Kconfig_style_config EAP_SIM - Kconfig_style_config EAP_AKA - Kconfig_style_config EAP_AKA_PRIME - Kconfig_style_config PCSC - fi - - if use fasteap ; then - Kconfig_style_config EAP_FAST - fi - - if use readline ; then - # readline/history support for wpa_cli - Kconfig_style_config READLINE - else - #internal line edit mode for wpa_cli - Kconfig_style_config WPA_CLI_EDIT - fi - - Kconfig_style_config TLS openssl - Kconfig_style_config FST - if ! use bindist ; then - Kconfig_style_config EAP_PWD - if use fils; then - Kconfig_style_config FILS - Kconfig_style_config FILS_SK_PFS - fi - if use mesh; then - Kconfig_style_config MESH - else - Kconfig_style_config MESH n - fi - #WPA3 - Kconfig_style_config OWE - Kconfig_style_config SAE - Kconfig_style_config DPP - Kconfig_style_config SUITEB192 - Kconfig_style_config SUITEB - fi - - if use smartcard ; then - Kconfig_style_config SMARTCARD - else - Kconfig_style_config SMARTCARD n - fi - - if use tdls ; then - Kconfig_style_config TDLS - fi - - if use kernel_linux ; then - # Linux specific drivers - Kconfig_style_config DRIVER_ATMEL - Kconfig_style_config DRIVER_HOSTAP - Kconfig_style_config DRIVER_IPW - Kconfig_style_config DRIVER_NL80211 - Kconfig_style_config DRIVER_RALINK - Kconfig_style_config DRIVER_WEXT - Kconfig_style_config DRIVER_WIRED - - if use macsec ; then - #requires something, no idea what - #Kconfig_style_config DRIVER_MACSEC_QCA - Kconfig_style_config DRIVER_MACSEC_LINUX - Kconfig_style_config MACSEC - fi - - if use ps3 ; then - Kconfig_style_config DRIVER_PS3 - fi - - elif use kernel_FreeBSD ; then - # FreeBSD specific driver - Kconfig_style_config DRIVER_BSD - fi - - # Wi-Fi Protected Setup (WPS) - if use wps ; then - Kconfig_style_config WPS - Kconfig_style_config WPS2 - # USB Flash Drive - Kconfig_style_config WPS_UFD - # External Registrar - Kconfig_style_config WPS_ER - # Universal Plug'n'Play - Kconfig_style_config WPS_UPNP - # Near Field Communication - Kconfig_style_config WPS_NFC - else - Kconfig_style_config WPS n - Kconfig_style_config WPS2 n - Kconfig_style_config WPS_UFD n - Kconfig_style_config WPS_ER n - Kconfig_style_config WPS_UPNP n - Kconfig_style_config WPS_NFC n - fi - - # Wi-Fi Direct (WiDi) - if use p2p ; then - Kconfig_style_config P2P - Kconfig_style_config WIFI_DISPLAY - else - Kconfig_style_config P2P n - Kconfig_style_config WIFI_DISPLAY n - fi - - # Access Point Mode - if use ap ; then - Kconfig_style_config AP - else - Kconfig_style_config AP n - fi - - # Enable essentials for AP/P2P - if use ap || use p2p ; then - # Enabling HT support (802.11n) - Kconfig_style_config IEEE80211N - - # Enabling VHT support (802.11ac) - Kconfig_style_config IEEE80211AC - fi - - # Enable mitigation against certain attacks against TKIP - Kconfig_style_config DELAYED_MIC_ERROR_REPORT - - if use privsep ; then - Kconfig_style_config PRIVSEP - fi - - # If we are using libnl 2.0 and above, enable support for it - # Bug 382159 - # Removed for now, since the 3.2 version is broken, and we don't - # support it. - if has_version ">=dev-libs/libnl-3.2"; then - Kconfig_style_config LIBNL32 - fi - - if use qt5 ; then - pushd "${S}"/wpa_gui-qt4 > /dev/null || die - eqmake5 wpa_gui.pro - popd > /dev/null || die - fi -} - -src_compile() { - einfo "Building wpa_supplicant" - emake V=1 BINDIR=/usr/sbin - - if use wimax; then - emake -C ../src/eap_peer clean - emake -C ../src/eap_peer - fi - - if use qt5; then - einfo "Building wpa_gui" - emake -C "${S}"/wpa_gui-qt4 - fi - - if use eapol-test ; then - emake eapol_test - fi -} - -src_install() { - dosbin wpa_supplicant - use privsep && dosbin wpa_priv - dobin wpa_cli wpa_passphrase - - # baselayout-1 compat - if has_version "<sys-apps/baselayout-2.0.0"; then - dodir /sbin - dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant - dodir /bin - dosym ../usr/bin/wpa_cli /bin/wpa_cli - fi - - if has_version ">=sys-apps/openrc-0.5.0"; then - newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant - newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant - fi - - exeinto /etc/wpa_supplicant/ - newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh - - readme.gentoo_create_doc - dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ - wpa_supplicant.conf - - newdoc .config build-config - - if [ "${PV}" != "9999" ]; then - doman doc/docbook/*.{5,8} - fi - - if use qt5 ; then - into /usr - dobin wpa_gui-qt4/wpa_gui - doicon wpa_gui-qt4/icons/wpa_gui.svg - domenu wpa_gui-qt4/wpa_gui.desktop - else - rm "${ED}"/usr/share/man/man8/wpa_gui.8 - fi - - use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install - - if use dbus ; then - pushd "${S}"/dbus > /dev/null || die - insinto /etc/dbus-1/system.d - newins dbus-wpa_supplicant.conf wpa_supplicant.conf - insinto /usr/share/dbus-1/system-services - doins fi.w1.wpa_supplicant1.service - popd > /dev/null || die - - # This unit relies on dbus support, bug 538600. - systemd_dounit systemd/wpa_supplicant.service - fi - - if use eapol-test ; then - dobin eapol_test - fi - - systemd_dounit "systemd/wpa_supplicant@.service" - systemd_dounit "systemd/wpa_supplicant-nl80211@.service" - systemd_dounit "systemd/wpa_supplicant-wired@.service" -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -e "${EROOT}"/etc/wpa_supplicant.conf ]] ; then - echo - ewarn "WARNING: your old configuration file ${EROOT}/etc/wpa_supplicant.conf" - ewarn "needs to be moved to ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf" - fi - - if use bindist; then - ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." - ewarn "This is incredibly undesirable" - fi - - # Mea culpa, feel free to remove that after some time --mgorny. - local fn - for fn in wpa_supplicant{,@wlan0}.service; do - if [[ -e "${EROOT}"/etc/systemd/system/network.target.wants/${fn} ]] - then - ebegin "Moving ${fn} to multi-user.target" - mv "${EROOT}"/etc/systemd/system/network.target.wants/${fn} \ - "${EROOT}"/etc/systemd/system/multi-user.target.wants/ || die - eend ${?} \ - "Please try to re-enable ${fn}" - fi - done - - systemd_reenable wpa_supplicant.service -} diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild index 97cde554f0db..5778596a4275 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs +inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" HOMEPAGE="https://w1.fi/wpa_supplicant/" @@ -13,16 +13,16 @@ if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://w1.fi/hostap.git" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" SRC_URI="https://w1.fi/releases/${P}.tar.gz" fi SLOT="0" -IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps" # CONFIG_PRIVSEP=y does not have sufficient support for the new driver # interface functions used for MACsec, so this combination cannot be used -# at least for now. +# at least for now. bug #684442 REQUIRED_USE=" macsec? ( !privsep ) privsep? ( !macsec ) @@ -30,11 +30,10 @@ REQUIRED_USE=" " DEPEND=" - >=dev-libs/openssl-1.0.2k:0=[bindist(-)=] + >=dev-libs/openssl-1.0.2k:= dbus? ( sys-apps/dbus ) kernel_linux? ( - dev-libs/libnl:3 - net-wireless/crda + >=dev-libs/libnl-3.2:3 eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) @@ -51,6 +50,9 @@ DEPEND=" " RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-networkmanager ) + kernel_linux? ( + net-wireless/wireless-regdb + ) " BDEPEND="virtual/pkgconfig" @@ -74,13 +76,17 @@ Kconfig_style_config() { #first remove any leading "# " if $2 is not n sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" #set item = $setting (defaulting to y) - sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" + if ! sed -i "/^$CONFIG_PARAM\>/s/=.*/=$setting/" .config; then + echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" + fi if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then echo "$CONFIG_PARAM=$setting" >>.config fi else #ensure item commented out - sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" + if ! sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config; then + echo "Kconfig_style_config error commenting $CONFIG_PARAM" + fi fi } @@ -92,13 +98,6 @@ src_prepare() { -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \ ../src/l2_packet/l2_packet_freebsd.c || die - # People seem to take the example configuration file too literally (bug #102361) - sed -i \ - -e "s:^\(opensc_engine_path\):#\1:" \ - -e "s:^\(pkcs11_engine_path\):#\1:" \ - -e "s:^\(pkcs11_module_path\):#\1:" \ - wpa_supplicant.conf || die - # Change configuration to match Gentoo locations (bug #143750) sed -i \ -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ @@ -123,6 +122,10 @@ src_prepare() { # bug (320097) eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch" + # bug (912315) + eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch" + eapply "${FILESDIR}/${P}-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch" + # bug (640492) sed -i 's#-Werror ##' wpa_supplicant/Makefile || die } @@ -230,23 +233,36 @@ src_configure() { Kconfig_style_config TLS openssl Kconfig_style_config FST - if ! use bindist ; then - Kconfig_style_config EAP_PWD - if use fils; then - Kconfig_style_config FILS - Kconfig_style_config FILS_SK_PFS - fi - if use mesh; then - Kconfig_style_config MESH - else - Kconfig_style_config MESH n - fi - #WPA3 - Kconfig_style_config OWE - Kconfig_style_config SAE - Kconfig_style_config DPP - Kconfig_style_config SUITEB192 - Kconfig_style_config SUITEB + + Kconfig_style_config EAP_PWD + if use fils; then + Kconfig_style_config FILS + Kconfig_style_config FILS_SK_PFS + fi + if use mesh; then + Kconfig_style_config MESH + else + Kconfig_style_config MESH n + fi + # WPA3 + Kconfig_style_config OWE + Kconfig_style_config SAE + Kconfig_style_config DPP + Kconfig_style_config DPP2 + Kconfig_style_config SUITEB192 + Kconfig_style_config SUITEB + + if use wep ; then + Kconfig_style_config WEP + else + Kconfig_style_config WEP n + fi + + # Watch out, reversed logic + if use tkip ; then + Kconfig_style_config NO_TKIP n + else + Kconfig_style_config NO_TKIP fi if use smartcard ; then @@ -274,15 +290,15 @@ src_configure() { #Kconfig_style_config DRIVER_MACSEC_QCA Kconfig_style_config DRIVER_MACSEC_LINUX Kconfig_style_config MACSEC + else + # bug #831369 and bug #684442 + Kconfig_style_config DRIVER_MACSEC_LINUX n + Kconfig_style_config MACSEC n fi if use ps3 ; then Kconfig_style_config DRIVER_PS3 fi - - elif use kernel_FreeBSD ; then - # FreeBSD specific driver - Kconfig_style_config DRIVER_BSD fi # Wi-Fi Protected Setup (WPS) @@ -338,11 +354,7 @@ src_configure() { Kconfig_style_config PRIVSEP fi - # If we are using libnl 2.0 and above, enable support for it - # Bug 382159 - # Removed for now, since the 3.2 version is broken, and we don't - # support it. - if has_version ">=dev-libs/libnl-3.2"; then + if use kernel_linux ; then Kconfig_style_config LIBNL32 fi @@ -377,18 +389,8 @@ src_install() { use privsep && dosbin wpa_priv dobin wpa_cli wpa_passphrase - # baselayout-1 compat - if has_version "<sys-apps/baselayout-2.0.0"; then - dodir /sbin - dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant - dodir /bin - dosym ../usr/bin/wpa_cli /bin/wpa_cli - fi - - if has_version ">=sys-apps/openrc-0.5.0"; then - newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant - newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant - fi + newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant + newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant exeinto /etc/wpa_supplicant/ newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh @@ -443,10 +445,19 @@ pkg_postinst() { ewarn "WARNING: your old configuration file ${EROOT}/etc/wpa_supplicant.conf" ewarn "needs to be moved to ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf" fi - - if use bindist; then - ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." - ewarn "This is incredibly undesirable" + if ! use wep; then + einfo "WARNING: You are building with WEP support disabled, which is recommended since" + einfo "this protocol is deprecated and insecure. If you still need to connect to" + einfo "WEP-enabled networks, you may turn this flag back on. With this flag off," + einfo "WEP-enabled networks will not even show up as available." + einfo "If your network is missing you may wish to USE=wep" + fi + if ! use tkip; then + ewarn "WARNING: You are building with TKIP support disabled, which is recommended since" + ewarn "this protocol is deprecated and insecure. If you still need to connect to" + ewarn "TKIP-enabled networks, you may turn this flag back on. With this flag off," + ewarn "TKIP-enabled networks, including mixed mode TKIP/AES-CCMP will not even show up" + ewarn "as available. If your network is missing you may wish to USE=tkip" fi # Mea culpa, feel free to remove that after some time --mgorny. diff --git a/net-wireless/yatebts/Manifest b/net-wireless/yatebts/Manifest deleted file mode 100644 index 2c59509a7d16..000000000000 --- a/net-wireless/yatebts/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST yate-bts-6.0.0-1.tar.gz 2672036 BLAKE2B 3b538586786df32a2159002cc70f60ba6ed8ee3e82430f0e48652f9c2cb9602c229ad0e577f6445dae2225aab7fc047d40614a22f3eb995c93a870183856274b SHA512 dbff3ed5c801adc983a26e585186cc115e7c3d7a1d12d6bc6b0a08a48dfe6c4c1f15f5e731ca4c2ece04bd1784ab9af352b488e5b0f2c43f3c84204fce3ad3c7 diff --git a/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch b/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch deleted file mode 100644 index 988ca2d4f73f..000000000000 --- a/net-wireless/yatebts/files/yatebts-5.0.0-gcc6.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/mbts/GPRS/MSInfo.cpp -+++ b/mbts/GPRS/MSInfo.cpp -@@ -638,7 +638,7 @@ - if (msPCHDowns.size() > 1) { - std::ostringstream os; - msDumpChannels(os); -- GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for "<<this<<os; -+ GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for "<<this<<(!os.fail()); - } - - } else { ---- a/mbts/SGSNGGSN/Sgsn.cpp -+++ b/mbts/SGSNGGSN/Sgsn.cpp -@@ -149,7 +149,7 @@ - clearConn(GprsConnNone,SigConnLost); - std::ostringstream ss; - sgsnInfoDump(this,ss); -- SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing SgsnInfo:"<<ss); -+ SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing SgsnInfo:"<<(!ss.fail())); - sSgsnInfoList.remove(this); - GmmInfo *gmm = getGmm(); - if (gmm && (gmm->getSI() == this)) { -@@ -252,7 +252,7 @@ - { - std::ostringstream ss; - gmmInfoDump(gmm,ss,0); -- SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"<<ss); -+ SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"<<(!ss.fail())); - SgsnInfo *si; - RN_FOR_ALL(SgsnInfoList_t,sSgsnInfoList,si) { - // The second test here should be redundant. diff --git a/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch b/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch deleted file mode 100644 index 8768164cfa63..000000000000 --- a/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -38,9 +38,6 @@ - AC_PROG_CC - AC_PROG_AWK - --# Delete -g as we handle debug info at build time --CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| \+\)-g[[0-9]]*//' 2>/dev/null` -- - # Helper to check by pkgconfig including local paths - function pkgconfig_check() - { diff --git a/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff b/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff deleted file mode 100644 index 46b4b1d1ba4d..000000000000 --- a/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/mbts/SGSNGGSN/iputils.cpp b/mbts/SGSNGGSN/iputils.cpp -index 979ae3a..49bb0ff 100644 ---- a/mbts/SGSNGGSN/iputils.cpp -+++ b/mbts/SGSNGGSN/iputils.cpp -@@ -466,7 +466,7 @@ EXPORT uint32_t *ip_findmyaddr() - const int maxaddrs = 5; - static uint32_t addrs[maxaddrs+1]; - int n = 0; -- int fd = runcmd("|/bin/hostname","hostname","-I", NULL); -+ int fd = runcmd("|/bin/hostname","hostname","-i", NULL); - if (fd < 0) { - failed: - addrs[0] = (unsigned) -1; // converts to all 1s - diff --git a/net-wireless/yatebts/metadata.xml b/net-wireless/yatebts/metadata.xml deleted file mode 100644 index e368df6ddf5f..000000000000 --- a/net-wireless/yatebts/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> - <use> - <flag name="rad1">Build RAD1 transceiver</flag> - <flag name="usrp1">Build USRP1 transceiver</flag> - <flag name="uhd">Build UHD transceiver</flag> - <flag name="bladerf">Build bladeRF transceiver</flag> - </use> -</pkgmetadata> diff --git a/net-wireless/yatebts/yatebts-6.0.0-r1.ebuild b/net-wireless/yatebts/yatebts-6.0.0-r1.ebuild deleted file mode 100644 index ad1aea9178bd..000000000000 --- a/net-wireless/yatebts/yatebts-6.0.0-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="The Yate GSM base station" -HOMEPAGE="https://yatebts.com" -ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk" - -LICENSE="GPL-2" -SLOT="0" -IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1" - -RDEPEND=" - >=net-voip/yate-6.0.0:=[gsm] - bladerf? ( net-wireless/bladerf:= ) - uhd? ( net-wireless/uhd ) - virtual/libusb:1" -DEPEND="virtual/pkgconfig - ${RDEPEND}" - -if [[ ${PV} == "9999" ]] ; then - inherit subversion -else - KEYWORDS="~amd64 ~arm ~x86" - SRC_URI="http://yate.null.ro/tarballs/${PN}6/yate-bts-${PV}-1.tar.gz" - S="${WORKDIR}/yate-bts" -fi - -#we need more patches or configure flags because things install in really wrong places per FHS -PATCHES=( - "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff - "${FILESDIR}"/${PN}-5.0.0-gcc6.patch - "${FILESDIR}"/${P}-dont-mess-with-cflags.patch - ) - -src_prepare() { - default - eautoreconf -} - -# $(use_enable rad1) \ -# $(use_enable usrp1) \ -# $(use_enable uhd) \ -# $(use_enable bladerf) \ -src_configure() { - econf \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable cpu_flags_x86_sse4_1 sse41) - -} diff --git a/net-wireless/yatebts/yatebts-9999.ebuild b/net-wireless/yatebts/yatebts-9999.ebuild deleted file mode 100644 index 18f4117784c9..000000000000 --- a/net-wireless/yatebts/yatebts-9999.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="The Yate GSM base station" -HOMEPAGE="https://yatebts.com" -ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk" - -LICENSE="GPL-2" -SLOT="0" -IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1" - -RDEPEND=" - =net-voip/yate-${PV}:=[gsm] - bladerf? ( net-wireless/bladerf:= ) - uhd? ( net-wireless/uhd ) - virtual/libusb:1" -DEPEND="virtual/pkgconfig - ${RDEPEND}" - -if [[ ${PV} == "9999" ]] ; then - inherit subversion -else - KEYWORDS="~amd64 ~arm ~x86" - SRC_URI="http://yate.null.ro/tarballs/${PN}6/yate-bts-${PV}-1.tar.gz" - S="${WORKDIR}/yate-bts" -fi - -#we need more patches or configure flags because things install in really wrong places per FHS -PATCHES=( - "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff - "${FILESDIR}"/${PN}-5.0.0-gcc6.patch - "${FILESDIR}"/${P}-dont-mess-with-cflags.patch - ) - -src_prepare() { - default - eautoreconf -} - -# $(use_enable rad1) \ -# $(use_enable usrp1) \ -# $(use_enable uhd) \ -# $(use_enable bladerf) \ -src_configure() { - econf \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable cpu_flags_x86_sse4_1 sse41) - -} |