diff options
Diffstat (limited to 'net-wireless')
164 files changed, 2200 insertions, 4817 deletions
diff --git a/net-wireless/aic8800/Manifest b/net-wireless/aic8800/Manifest new file mode 100644 index 000000000000..5855369aef24 --- /dev/null +++ b/net-wireless/aic8800/Manifest @@ -0,0 +1,2 @@ +DIST aic8800-1.0.3.deb 535400 BLAKE2B 0e337bded43f99a00fb3d786742418d7faf0adf3d6e517933d4d4a82e7e723e5f45798991238a02fb1836529a5d72cc56181356939eb150feb4c26f14dcd762e SHA512 0917ac4f5a594adb68c084f38bedacb92f3c0700d13dda497943d199bd883c18fc624ffc579091b40fdc6322dc2e5b81cc21add06b27ae8364ee2f8f9f119a7d +DIST aic8800-1.0.5.deb 595050 BLAKE2B 551e9ad09814bcab5464a7bfe09b922e400253403568068b74d839b8d53261251424b571266abed907314d08b27ac5bdbd51abd493bec5d0a511363173635e42 SHA512 4b4917a510caf1104ae7124f883b958d6a936a6e172d1afcc79f58349a943e0feb9a8bb35d326f96c56e0b089d62e3359cf81967e01e1edb1a1ddfc6fe101da0 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/aic8800-1.0.5.ebuild b/net-wireless/aic8800/aic8800-1.0.5.ebuild new file mode 100644 index 000000000000..79471e659a08 --- /dev/null +++ b/net-wireless/aic8800/aic8800-1.0.5.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/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..b1c2edecc39d --- /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/bladerf-2021.03-r1.ebuild b/net-wireless/bladerf/bladerf-2021.03-r1.ebuild index 1f66fd37bef7..84e327b78d20 100644 --- a/net-wireless/bladerf/bladerf-2021.03-r1.ebuild +++ b/net-wireless/bladerf/bladerf-2021.03-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake udev +inherit cmake flag-o-matic udev DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand" HOMEPAGE="https://nuand.com/" @@ -32,7 +32,7 @@ else KEYWORDS="amd64 ~arm ~riscv x86" fi -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" CDEPEND=">=dev-libs/libusb-1.0.16:1 tecla? ( dev-libs/libtecla )" DEPEND="${CDEPEND} @@ -51,6 +51,11 @@ src_unpack() { } 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)" diff --git a/net-wireless/bladerf/bladerf-2023.02.ebuild b/net-wireless/bladerf/bladerf-2023.02.ebuild index 0e056e6784c4..74c85125258c 100644 --- a/net-wireless/bladerf/bladerf-2023.02.ebuild +++ b/net-wireless/bladerf/bladerf-2023.02.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake udev +inherit cmake flag-o-matic udev DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand" HOMEPAGE="https://nuand.com/" @@ -32,7 +32,7 @@ else KEYWORDS="~amd64 ~arm ~riscv ~x86" fi -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" CDEPEND=">=dev-libs/libusb-1.0.16:1 tecla? ( dev-libs/libtecla )" DEPEND="${CDEPEND} @@ -53,6 +53,11 @@ src_unpack() { } 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)" diff --git a/net-wireless/bladerf/bladerf-9999.ebuild b/net-wireless/bladerf/bladerf-9999.ebuild index 30f5ea73a4e7..9723f8fcbe5b 100644 --- a/net-wireless/bladerf/bladerf-9999.ebuild +++ b/net-wireless/bladerf/bladerf-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake udev +inherit cmake flag-o-matic udev DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand" HOMEPAGE="https://nuand.com/" @@ -32,7 +32,7 @@ else KEYWORDS="~amd64 ~arm ~riscv ~x86" fi -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" CDEPEND=">=dev-libs/libusb-1.0.16:1 tecla? ( dev-libs/libtecla )" DEPEND="${CDEPEND} @@ -51,6 +51,11 @@ src_unpack() { } 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)" diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest index 9a944340b460..815827c2a343 100644 --- a/net-wireless/blueman/Manifest +++ b/net-wireless/blueman/Manifest @@ -1 +1,2 @@ -DIST blueman-2.3.5.tar.xz 1544232 BLAKE2B 454a5369cecd429dcbff84108ef5440c61e3740d54de30e85cef941f9bd55ef3f032aa4774b161cd145eecc53061d2d104ea6d6ec12516beb2f2b3579c074ccb SHA512 678261dc0a795ca79b43614f4fc6ad436b44690d0ce4dbf15f55dba4834a25a5c1956bf658d568a3318828863b3bb089689d0dc4fef8963ed2b27cf0f1144580 +DIST blueman-2.4.2.tar.xz 1529804 BLAKE2B a10957db2721d308ea6cdd0351c94910d527023e146afee794f63d5997af9ab530abdff19c74f8a645c16ba8c84377b720318fba69f78deb5d0e268f653470af SHA512 d394147e2fcc097d4922bf7dcebd1d6fa386eacbfb08f332006eb377be7b8b6c8a725b1578b01894b386bc87daf3129c08c11755aca07166cd246a74eeb4ccac +DIST blueman-2.4.3.tar.xz 1567044 BLAKE2B 1ecd7e70ab5e84e68115cdfc6a6dbdcaa539973fc4fd93740495c822a0b08b1fc2e9fd46b421282fd0ba4a4ce5deccef6724e7fa23466b9c68d9523eacfecd97 SHA512 387e51d143b90ee34d156595f83d032930e427baee4065cb07809b8273f4da641893caa4113cc034c81bfacdb9b2caffb316b6d8738a44aba90ca6941aefc13f diff --git a/net-wireless/blueman/blueman-2.3.5.ebuild b/net-wireless/blueman/blueman-2.4.2.ebuild index c798557ce30f..806f7a6d29d5 100644 --- a/net-wireless/blueman/blueman-2.3.5.ebuild +++ b/net-wireless/blueman/blueman-2.4.2.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +DISTUTILS_EXT=1 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=no -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils @@ -38,6 +39,11 @@ DEPEND=" BDEPEND=" $(python_gen_cond_dep ' dev-python/cython[${PYTHON_USEDEP}] + test? ( + dev-python/python-dbusmock[${PYTHON_USEDEP}] + media-libs/libpulse + >=net-misc/networkmanager-0.8[introspection] + ) ') virtual/pkgconfig nls? ( sys-devel/gettext ) @@ -79,6 +85,8 @@ RDEPEND=" ) " +distutils_enable_tests unittest + pkg_pretend() { if use network; then local CONFIG_CHECK=" @@ -96,12 +104,8 @@ pkg_setup() { } src_prepare() { - if [[ ${PV} == 9999 ]]; then - eautoreconf - else - # remove this when upstream switches to automake with .pyc fix - eautomake - fi + # Run else fails on newer automake: https://bugs.gentoo.org/936065 + eautoreconf distutils-r1_src_prepare } @@ -127,9 +131,24 @@ python_compile() { } 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 + local -x PYTHONPATH=module/.libs + + if [[ ! -f /dev/rfkill ]]; then + # Tests attempt to import these modules if present, but they + # require /dev/rfkill. Hide them to make the tests pass. + mv blueman/plugins/mechanism/RfKill.py{,~} || die + mv blueman/plugins/applet/KillSwitch.py{,~} || die + fi + + local failed= + nonfatal eunittest || failed=1 + + if [[ ! -f /dev/rfkill ]]; then + mv blueman/plugins/mechanism/RfKill.py{~,} || die + mv blueman/plugins/applet/KillSwitch.py{~,} || die + fi + + [[ ${failed} ]] && die "Tests failed with ${EPYTHON}" } python_install() { diff --git a/net-wireless/blueman/blueman-2.4.3.ebuild b/net-wireless/blueman/blueman-2.4.3.ebuild new file mode 100644 index 000000000000..2393efed4e60 --- /dev/null +++ b/net-wireless/blueman/blueman-2.4.3.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=no +PYTHON_COMPAT=( python3_{10..12} ) + +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/" + +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/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz + " + S=${WORKDIR}/${P/_/.} + 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="network nls policykit pulseaudio" + +DEPEND=" + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + >=net-wireless/bluez-5:= +" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + test? ( + dev-python/python-dbusmock[${PYTHON_USEDEP}] + media-libs/libpulse + >=net-misc/networkmanager-0.8[introspection] + ) + ') + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${DEPEND} + $(python_gen_cond_dep ' + dev-python/pycairo[${PYTHON_USEDEP}] + ') + sys-apps/dbus + 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 + ) + network? ( + net-firewall/iptables + || ( + sys-apps/net-tools + sys-apps/iproute2 + ) + || ( + net-dns/dnsmasq + net-misc/dhcp + >=net-misc/networkmanager-0.8[introspection] + ) + ) + policykit? ( + sys-auth/polkit + ) + pulseaudio? ( + || ( + media-sound/pulseaudio-daemon[bluetooth] + media-video/pipewire[bluetooth] + <media-sound/pulseaudio-15.99.1[bluetooth] + ) + ) +" + +distutils_enable_tests unittest + +pkg_pretend() { + if use network; then + local CONFIG_CHECK=" + ~BRIDGE + ~IP_NF_IPTABLES + ~IP_NF_NAT + ~IP_NF_TARGET_MASQUERADE + " + check_extra_config + fi +} + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + # Run else fails on newer automake: https://bugs.gentoo.org/936065 + eautoreconf + distutils-r1_src_prepare +} + +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 policykit polkit) + $(use_enable nls) + $(use_enable pulseaudio) + # thunar integration is a single data file with no extra deps + # so install it unconditionally + --enable-thunar-sendto + ) + econf "${myconf[@]}" +} + +python_compile() { + default +} + +python_test() { + local -x PYTHONPATH=module/.libs + + if [[ ! -f /dev/rfkill ]]; then + # Tests attempt to import these modules if present, but they + # require /dev/rfkill. Hide them to make the tests pass. + mv blueman/plugins/mechanism/RfKill.py{,~} || die + mv blueman/plugins/applet/KillSwitch.py{,~} || die + fi + + local failed= + nonfatal eunittest || failed=1 + + if [[ ! -f /dev/rfkill ]]; then + mv blueman/plugins/mechanism/RfKill.py{~,} || die + mv blueman/plugins/applet/KillSwitch.py{~,} || die + fi + + [[ ${failed} ]] && die "Tests failed with ${EPYTHON}" +} + +python_install() { + default + + if use policykit; then + # Allow users in plugdev group to modify connections + insinto /usr/share/polkit-1/rules.d + doins "${FILESDIR}/01-org.blueman.rules" + fi + + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild index 65fe1c7ffb7d..697c7faeab72 100644 --- a/net-wireless/blueman/blueman-9999.ebuild +++ b/net-wireless/blueman/blueman-9999.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +DISTUTILS_EXT=1 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=no -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils @@ -20,7 +21,7 @@ else https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz " S=${WORKDIR}/${P/_/.} - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi # icons are GPL-2 @@ -38,6 +39,11 @@ DEPEND=" BDEPEND=" $(python_gen_cond_dep ' dev-python/cython[${PYTHON_USEDEP}] + test? ( + dev-python/python-dbusmock[${PYTHON_USEDEP}] + media-libs/libpulse + >=net-misc/networkmanager-0.8[introspection] + ) ') virtual/pkgconfig nls? ( sys-devel/gettext ) @@ -67,15 +73,20 @@ RDEPEND=" >=net-misc/networkmanager-0.8[introspection] ) ) - policykit? ( sys-auth/polkit ) + policykit? ( + sys-auth/polkit + ) pulseaudio? ( || ( - media-video/pipewire[bluetooth] media-sound/pulseaudio-daemon[bluetooth] + media-video/pipewire[bluetooth] + <media-sound/pulseaudio-15.99.1[bluetooth] ) ) " +distutils_enable_tests unittest + pkg_pretend() { if use network; then local CONFIG_CHECK=" @@ -124,9 +135,24 @@ python_compile() { } 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 + local -x PYTHONPATH=module/.libs + + if [[ ! -f /dev/rfkill ]]; then + # Tests attempt to import these modules if present, but they + # require /dev/rfkill. Hide them to make the tests pass. + mv blueman/plugins/mechanism/RfKill.py{,~} || die + mv blueman/plugins/applet/KillSwitch.py{,~} || die + fi + + local failed= + nonfatal eunittest || failed=1 + + if [[ ! -f /dev/rfkill ]]; then + mv blueman/plugins/mechanism/RfKill.py{~,} || die + mv blueman/plugins/applet/KillSwitch.py{~,} || die + fi + + [[ ${failed} ]] && die "Tests failed with ${EPYTHON}" } python_install() { diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index feaf3df7eb22..2689f4ae77d7 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,3 +1,2 @@ -DIST bluez-5.68.tar.xz 2319788 BLAKE2B 3beca78fadef4d66df6f237b7460f6ac4bf001d80c856b599faa2cc1232c4342c7945eace5a6667009b9d19f2368f9841e608f07bc826b30ce9112c43dd7e316 SHA512 1805fb68923a5e098777b69835d7593396f8f2bbf52e1cfe58e7447621497a700b23389c79e96b2d663c611335f6ea9df11efe8aa75a8842f6b73105f66e799c -DIST bluez-5.69.tar.xz 2335728 BLAKE2B 3b85c6418bf5f8fea989d9435d90f704da707248034006d12863465b9acee2b549f6d2950fdde64e74a1cbded4c711c54db747a82abdaa67ec965aab1c817d85 SHA512 4d5618cd083fe375c41faff868b5d9f072aeaccdffed758f6b69fd0cb46b058431cbf63182bd4a3f4f4e7a24b092729a4125687af730cd4250b273d66107bf42 -DIST bluez-5.70.tar.xz 2339844 BLAKE2B 1ba2ddd3bfc6562a07f4e8376e0d537b555f0d36a221f051c4c10dd912c23e73aa2b0d8aa125e0fd911908e4cfa0036429e17250a26b3298bb21f65e4cc5255c SHA512 3a5f8caf7730dcdbbe0bb92154b41651a9d6619038447bf4c25e5e3e5316effcd7242a7a0456d731ce21d55b8daea5212a359acc5e5fc460499b9356b7d364cf +DIST bluez-5.76.tar.xz 2418848 BLAKE2B 658e67ec3ac568fd4d8bdc434eabfc63fd8cddd287f7cf6a8967771673e79fe95c509be654ae2495d1b3aedb1e23ca710d545f5ded281a64fd44058b0cdf7afe SHA512 30dc3faef74a2225fd6027178376dca4166082d1ed5188021e13d13582db5846aef60b753f173d525bfd0c040f26c3e7dab0283ecafbd34c4a06855d13abb389 +DIST bluez-5.77.tar.xz 2432176 BLAKE2B 9c1a8c78ad11a79080af12333338a6b75189ac51f8c49545de9eede8544fea531a7d8f50676f6e26c84289828fe8327bbc3e5b50ad4d9c08822cf0353a82ecaf SHA512 cf0faba4ddbfe6cc3c2d86cbd809483ed82327cbd7e4970ef53cf19053de7b355a505cab88844aebe7a6aa1947ec7a366250d3cbf48cf309db413d287289ff99 diff --git a/net-wireless/bluez/bluez-5.68.ebuild b/net-wireless/bluez/bluez-5.68.ebuild deleted file mode 100644 index 37f02d578577..000000000000 --- a/net-wireless/bluez/bluez-5.68.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) - -inherit autotools 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" -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 ~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} ) -" - -TEST_DEPS="${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/dbus-python-1[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - dev-python/docutils - virtual/pkgconfig - test? ( ${TEST_DEPS} ) -" -DEPEND=" - >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] - 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/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=( - # 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 - # https://lore.kernel.org/linux-bluetooth/20220901110719.176944-1-hadess@hadess.net/T/#m9c08d004cd5422783ee1d93154f42303bba9169f - "${FILESDIR}"/${PN}-5.66-power-state-adapter-property.patch - - # Fixed in next release - "${FILESDIR}"/${P}-bap-resume.patch - "${FILESDIR}"/${P}-bap-nonzero.patch - "${FILESDIR}"/${P}-bap-dettach-io.patch - "${FILESDIR}"/${P}-bap-ebusy-fix.patch - "${FILESDIR}"/${P}-monitor-decoding.patch - "${FILESDIR}"/${P}-heap-use-after-free.patch - "${FILESDIR}"/${P}-clang-midi.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 ~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_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS" - 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 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 systemd; then - dosym obex.service /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 -} - -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" -} - -pkg_postrm() { - use udev && udev_reload -} diff --git a/net-wireless/bluez/bluez-5.69.ebuild b/net-wireless/bluez/bluez-5.76-r1.ebuild index 657bb53be4c7..47eb7a23592b 100644 --- a/net-wireless/bluez/bluez-5.69.ebuild +++ b/net-wireless/bluez/bluez-5.76-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 +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 https://github.com/bluez/bluez" @@ -12,7 +12,7 @@ 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" +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 @@ -51,7 +51,7 @@ DEPEND=" readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= - udev? ( >=virtual/udev-172 ) + udev? ( >=virtual/udev-196 ) " RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-bluetooth ) @@ -66,10 +66,6 @@ PATCHES=( # https://bugs.gentoo.org/539844 # https://github.com/bluez/bluez/issues/268 "${FILESDIR}"/${PN}-udevadm-path-r1.patch - - # Fedora patches - # 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() { @@ -104,24 +100,21 @@ pkg_setup() { src_prepare() { default - # http://www.spinics.net/lists/linux-bluetooth/msg38490.html - if ! 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}"/${PN}-5.73-configure-cups.patch - eautoreconf + # https://github.com/bluez/bluez/issues/806 + eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch - 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 + eautoreconf 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 @@ -252,18 +245,10 @@ multilib_src_install_all() { 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 + insinto /etc/bluetooth doins src/main.conf newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth @@ -271,6 +256,15 @@ multilib_src_install_all() { einstalldocs use doc && dodoc doc/*.txt + + # https://bugs.gentoo.org/929017 + fperms 0555 /etc/bluetooth + + # https://bugs.gentoo.org/932172 + if ! use systemd; then + keepdir /var/lib/bluetooth + fperms 0700 /var/lib/bluetooth + fi } pkg_postinst() { diff --git a/net-wireless/bluez/bluez-5.70.ebuild b/net-wireless/bluez/bluez-5.77.ebuild index 657bb53be4c7..3472b07914c7 100644 --- a/net-wireless/bluez/bluez-5.70.ebuild +++ b/net-wireless/bluez/bluez-5.77.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{9..13} ) -inherit autotools linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 +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 https://github.com/bluez/bluez" @@ -51,7 +51,7 @@ DEPEND=" readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= - udev? ( >=virtual/udev-172 ) + udev? ( >=virtual/udev-196 ) " RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-bluetooth ) @@ -66,10 +66,6 @@ PATCHES=( # https://bugs.gentoo.org/539844 # https://github.com/bluez/bluez/issues/268 "${FILESDIR}"/${PN}-udevadm-path-r1.patch - - # Fedora patches - # 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() { @@ -104,24 +100,18 @@ pkg_setup() { src_prepare() { default - # http://www.spinics.net/lists/linux-bluetooth/msg38490.html - if ! use systemd; then - eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch - fi + # https://github.com/bluez/bluez/issues/806 + eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.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 @@ -252,18 +242,9 @@ multilib_src_install_all() { 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 + insinto /etc/bluetooth doins src/main.conf newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth @@ -271,6 +252,16 @@ multilib_src_install_all() { einstalldocs use doc && dodoc doc/*.txt + + # https://bugs.gentoo.org/929017 + # https://github.com/bluez/bluez/issues/329#issuecomment-1102459104 + fperms 0555 /etc/bluetooth + + # https://bugs.gentoo.org/932172 + if ! use systemd; then + keepdir /var/lib/bluetooth + fperms 0700 /var/lib/bluetooth + fi } pkg_postinst() { diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch deleted file mode 100644 index dcebaa007bc1..000000000000 --- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org> -Date: Sat, 12 Oct 2013 17:45:25 +0200 -Subject: [PATCH] Allow using obexd without systemd in the user session - -Not all sessions run systemd --user (actually, the majority -doesn't), so the dbus daemon must be able to spawn obexd -directly, and to do so it needs the full path of the daemon. ---- - Makefile.obexd | 4 ++-- - obexd/src/org.bluez.obex.service | 4 ---- - obexd/src/org.bluez.obex.service.in | 4 ++++ - 3 files changed, 6 insertions(+), 6 deletions(-) - delete mode 100644 obexd/src/org.bluez.obex.service - create mode 100644 obexd/src/org.bluez.obex.service.in - -diff --git a/Makefile.obexd b/Makefile.obexd -index 3760867..142e7c3 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -2,12 +2,12 @@ - if SYSTEMD - systemduserunitdir = $(SYSTEMD_USERUNITDIR) - systemduserunit_DATA = obexd/src/obex.service -+endif - - dbussessionbusdir = $(DBUS_SESSIONBUSDIR) - dbussessionbus_DATA = obexd/src/org.bluez.obex.service --endif - --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in - - obex_plugindir = $(libdir)/obex/plugins - -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service -deleted file mode 100644 -index a538088..0000000 ---- a/obexd/src/org.bluez.obex.service -+++ /dev/null -@@ -1,4 +0,0 @@ --[D-BUS Service] --Name=org.bluez.obex --Exec=/bin/false --SystemdService=dbus-org.bluez.obex.service -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in -new file mode 100644 -index 0000000..9c815f2 ---- /dev/null -+++ b/obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@pkglibexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch new file mode 100644 index 000000000000..bb4c838b9545 --- /dev/null +++ b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch @@ -0,0 +1,20 @@ +https://github.com/bluez/bluez/issues/806 +https://bugs.gentoo.org/928417 +--- bluez-5.73.orig/Makefile.obexd 2024-04-02 10:38:48.743419656 +0200 ++++ bluez-5.73/Makefile.obexd 2024-04-02 10:40:53.300086281 +0200 +@@ -1,13 +1,13 @@ + # SPDX-License-Identifier: GPL-2.0 + if OBEX + ++dbussessionbusdir = $(DBUS_SESSIONBUSDIR) ++dbussessionbus_DATA = obexd/src/org.bluez.obex.service ++ + if SYSTEMD + systemduserunitdir = $(SYSTEMD_USERUNITDIR) + systemduserunit_DATA = obexd/src/obex.service + +-dbussessionbusdir = $(DBUS_SESSIONBUSDIR) +-dbussessionbus_DATA = obexd/src/org.bluez.obex.service +- + obexd-add-service-symlink: + $(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service 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 deleted file mode 100644 index 566d7c08b591..000000000000 --- a/net-wireless/bluez/files/bluez-5.66-power-state-adapter-property.patch +++ /dev/null @@ -1,28 +0,0 @@ -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.68-bap-dettach-io.patch b/net-wireless/bluez/files/bluez-5.68-bap-dettach-io.patch deleted file mode 100644 index bb79fc42734b..000000000000 --- a/net-wireless/bluez/files/bluez-5.68-bap-dettach-io.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 7b10e72de6f41585f087e6fc338106b44d3e69c9 Mon Sep 17 00:00:00 2001 -From: Pauli Virtanen <pav@iki.fi> -Date: Sun, 2 Jul 2023 21:43:04 +0300 -Subject: shared/bap: detach io for source ASEs only after Stop Ready - -The Client may terminate a CIS when sink is in QOS and source in -Disabling states (BAP v1.0.1 Sec 5.6.5). It may also terminate it when -Receiver Stop Ready has completed successfully (BAP v1.0.1 Sec 5.6.5.1). - -It appears Samsung Galaxy Buds2 Pro (R510XXUOAWA5) ignores the Receiver -Stop Ready command if CIS is already disconnected, and then gets stuck -in disabling state. It works if CIS is disconnected after Receiver Stop -Ready. - -For better compatibility as client for this device, and since it -shouldn't matter for us in which order we do it, disconnect CIS after -completion of Receiver Stop Ready, instead of immediately in Disabling. - -We disconnect also if Receiver Stop Ready fails, given that -disconnecting in Disabled state should be OK. - -Link: https://github.com/bluez/bluez/issues/516 ---- - src/shared/bap.c | 33 +++++++++++++++------------------ - 1 file changed, 15 insertions(+), 18 deletions(-) - -diff --git a/src/shared/bap.c b/src/shared/bap.c -index a0f5a0ae3c..72ce67c086 100644 ---- a/src/shared/bap.c -+++ b/src/shared/bap.c -@@ -1168,18 +1168,6 @@ static bool match_stream_io(const void *data, const void *user_data) - return stream->io == io; - } - --static void stream_stop_disabling(void *data, void *user_data) --{ -- struct bt_bap_stream *stream = data; -- -- if (stream->io || stream->ep->state != BT_ASCS_ASE_STATE_DISABLING) -- return; -- -- DBG(stream->bap, "stream %p", stream); -- -- bt_bap_stream_stop(stream, NULL, NULL); --} -- - static bool bap_stream_io_detach(struct bt_bap_stream *stream) - { - struct bt_bap_stream *link; -@@ -1198,9 +1186,6 @@ static bool bap_stream_io_detach(struct bt_bap_stream *stream) - /* Detach link if in QoS state */ - if (link->ep->state == BT_ASCS_ASE_STATE_QOS) - bap_stream_io_detach(link); -- } else { -- /* Links without IO on disabling state shall be stopped. */ -- queue_foreach(stream->links, stream_stop_disabling, NULL); - } - - stream_io_unref(io); -@@ -1244,6 +1229,15 @@ static struct bt_bap *bt_bap_ref_safe(struct bt_bap *bap) - return bt_bap_ref(bap); - } - -+static void stream_stop_complete(struct bt_bap_stream *stream, uint8_t code, -+ uint8_t reason, void *user_data) -+{ -+ DBG(stream->bap, "stream %p stop 0x%02x 0x%02x", stream, code, reason); -+ -+ if (stream->ep->state == BT_ASCS_ASE_STATE_DISABLING) -+ bap_stream_io_detach(stream); -+} -+ - static void bap_stream_state_changed(struct bt_bap_stream *stream) - { - struct bt_bap *bap = stream->bap; -@@ -1271,7 +1265,9 @@ static void bap_stream_state_changed(struct bt_bap_stream *stream) - bap_stream_update_io_links(stream); - break; - case BT_ASCS_ASE_STATE_DISABLING: -- bap_stream_io_detach(stream); -+ /* As client, we detach after Receiver Stop Ready */ -+ if (!stream->client) -+ bap_stream_io_detach(stream); - break; - case BT_ASCS_ASE_STATE_QOS: - if (stream->io && !stream->io->connecting) -@@ -1305,8 +1301,9 @@ static void bap_stream_state_changed(struct bt_bap_stream *stream) - bt_bap_stream_start(stream, NULL, NULL); - break; - case BT_ASCS_ASE_STATE_DISABLING: -- if (!bt_bap_stream_get_io(stream)) -- bt_bap_stream_stop(stream, NULL, NULL); -+ /* Send Stop Ready, and detach IO after remote replies */ -+ if (stream->client) -+ bt_bap_stream_stop(stream, stream_stop_complete, NULL); - break; - } - --- -cgit - diff --git a/net-wireless/bluez/files/bluez-5.68-bap-ebusy-fix.patch b/net-wireless/bluez/files/bluez-5.68-bap-ebusy-fix.patch deleted file mode 100644 index 72b875ba4b6f..000000000000 --- a/net-wireless/bluez/files/bluez-5.68-bap-ebusy-fix.patch +++ /dev/null @@ -1,206 +0,0 @@ -From 8c3170190d6f626869f1f382138caf3a16030462 Mon Sep 17 00:00:00 2001 -From: Pauli Virtanen <pav@iki.fi> -Date: Sun, 2 Jul 2023 21:43:05 +0300 -Subject: bap: wait for CIG to become configurable before recreating CIS - -ISO sockets cannot be reconnected before all sockets in the same CIG -have been closed, if the CIG was previously active. - -Keep track which endpoints have active CIG, and postpone connecting CIS -until their CIG is no longer active. - -This addresses getting EBUSY from connect() when multiple CIS in the -same CIG move streaming -> qos at the same time, which disconnects CIS -and recreates them. The EBUSY originates from COMMAND_DISALLOWED -response to Set CIG Parameters. - -This requires the kernel side do the Disconnect CIS / Remove CIG / Set -CIG Parameters HCI command steps in the right order, when all old -sockets are closed first before connecting new ones. ---- - profiles/audio/bap.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 97 insertions(+), 10 deletions(-) - -diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c -index 8e2fc1556a..d7ce9e0389 100644 ---- a/profiles/audio/bap.c -+++ b/profiles/audio/bap.c -@@ -68,6 +68,7 @@ struct bap_ep { - GIOChannel *io; - unsigned int io_id; - bool recreate; -+ bool cig_active; - struct iovec *caps; - struct iovec *metadata; - struct bt_bap_qos qos; -@@ -525,6 +526,7 @@ static void bap_io_close(struct bap_ep *ep) - - g_io_channel_unref(ep->io); - ep->io = NULL; -+ ep->cig_active = false; - } - - static DBusMessage *set_configuration(DBusConnection *conn, DBusMessage *msg, -@@ -988,7 +990,7 @@ drop: - g_io_channel_shutdown(io, TRUE, NULL); - } - --static void bap_accept_io(struct bap_data *data, struct bt_bap_stream *stream, -+static void bap_accept_io(struct bap_ep *ep, struct bt_bap_stream *stream, - int fd, int defer) - { - char c; -@@ -1025,12 +1027,52 @@ static void bap_accept_io(struct bap_data *data, struct bt_bap_stream *stream, - } - } - -+ ep->cig_active = true; -+ - return; - - fail: - close(fd); - } - -+struct cig_busy_data { -+ struct btd_adapter *adapter; -+ uint8_t cig; -+}; -+ -+static bool cig_busy_ep(const void *data, const void *match_data) -+{ -+ const struct bap_ep *ep = data; -+ const struct cig_busy_data *info = match_data; -+ -+ return (ep->qos.ucast.cig_id == info->cig) && ep->cig_active; -+} -+ -+static bool cig_busy_session(const void *data, const void *match_data) -+{ -+ const struct bap_data *session = data; -+ const struct cig_busy_data *info = match_data; -+ -+ if (device_get_adapter(session->device) != info->adapter) -+ return false; -+ -+ return queue_find(session->snks, cig_busy_ep, match_data) || -+ queue_find(session->srcs, cig_busy_ep, match_data); -+} -+ -+static bool is_cig_busy(struct bap_data *data, uint8_t cig) -+{ -+ struct cig_busy_data info; -+ -+ if (cig == BT_ISO_QOS_CIG_UNSET) -+ return false; -+ -+ info.adapter = device_get_adapter(data->device); -+ info.cig = cig; -+ -+ return queue_find(sessions, cig_busy_session, &info); -+} -+ - static void bap_create_io(struct bap_data *data, struct bap_ep *ep, - struct bt_bap_stream *stream, int defer); - -@@ -1047,6 +1089,48 @@ static gboolean bap_io_recreate(void *user_data) - return FALSE; - } - -+static void recreate_cig_ep(void *data, void *match_data) -+{ -+ struct bap_ep *ep = (struct bap_ep *)data; -+ struct cig_busy_data *info = match_data; -+ -+ if (ep->qos.ucast.cig_id != info->cig || !ep->recreate || ep->io_id) -+ return; -+ -+ ep->recreate = false; -+ ep->io_id = g_idle_add(bap_io_recreate, ep); -+} -+ -+static void recreate_cig_session(void *data, void *match_data) -+{ -+ struct bap_data *session = data; -+ struct cig_busy_data *info = match_data; -+ -+ if (device_get_adapter(session->device) != info->adapter) -+ return; -+ -+ queue_foreach(session->snks, recreate_cig_ep, match_data); -+ queue_foreach(session->srcs, recreate_cig_ep, match_data); -+} -+ -+static void recreate_cig(struct bap_ep *ep) -+{ -+ struct bap_data *data = ep->data; -+ struct cig_busy_data info; -+ -+ info.adapter = device_get_adapter(data->device); -+ info.cig = ep->qos.ucast.cig_id; -+ -+ DBG("adapter %p ep %p recreate CIG %d", info.adapter, ep, info.cig); -+ -+ if (ep->qos.ucast.cig_id == BT_ISO_QOS_CIG_UNSET) { -+ recreate_cig_ep(ep, &info); -+ return; -+ } -+ -+ queue_foreach(sessions, recreate_cig_session, &info); -+} -+ - static gboolean bap_io_disconnected(GIOChannel *io, GIOCondition cond, - gpointer user_data) - { -@@ -1059,10 +1143,8 @@ static gboolean bap_io_disconnected(GIOChannel *io, GIOCondition cond, - bap_io_close(ep); - - /* Check if connecting recreate IO */ -- if (ep->recreate) { -- ep->recreate = false; -- ep->io_id = g_idle_add(bap_io_recreate, ep); -- } -+ if (!is_cig_busy(ep->data, ep->qos.ucast.cig_id)) -+ recreate_cig(ep); - - return FALSE; - } -@@ -1087,18 +1169,22 @@ static void bap_connect_io(struct bap_data *data, struct bap_ep *ep, - int fd; - - /* If IO already set skip creating it again */ -- if (bt_bap_stream_get_io(stream)) -+ if (bt_bap_stream_get_io(stream)) { -+ DBG("ep %p stream %p has existing io", ep, stream); - return; -+ } - - if (bt_bap_stream_io_is_connecting(stream, &fd)) { -- bap_accept_io(data, stream, fd, defer); -+ bap_accept_io(ep, stream, fd, defer); - return; - } - -- /* If IO channel still up wait for it to be disconnected and then -- * recreate. -+ /* If IO channel still up or CIG is busy, wait for it to be -+ * disconnected and then recreate. - */ -- if (ep->io) { -+ if (ep->io || is_cig_busy(data, ep->qos.ucast.cig_id)) { -+ DBG("ep %p stream %p defer %s wait recreate", ep, stream, -+ defer ? "true" : "false"); - ep->recreate = true; - return; - } -@@ -1131,6 +1217,7 @@ static void bap_connect_io(struct bap_data *data, struct bap_ep *ep, - bap_io_disconnected, ep); - - ep->io = io; -+ ep->cig_active = !defer; - - bt_bap_stream_io_connecting(stream, g_io_channel_unix_get_fd(io)); - } --- -cgit - diff --git a/net-wireless/bluez/files/bluez-5.68-bap-nonzero.patch b/net-wireless/bluez/files/bluez-5.68-bap-nonzero.patch deleted file mode 100644 index 3a7ddd3c6f2a..000000000000 --- a/net-wireless/bluez/files/bluez-5.68-bap-nonzero.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8fd0c76b41d35e24e10e45fcf57262482cb978a2 Mon Sep 17 00:00:00 2001 -From: Pauli Virtanen <pav@iki.fi> -Date: Sun, 2 Jul 2023 22:34:19 +0300 -Subject: shared/bap: use only nonzero req->id - -In bap_req_new, use same pattern as elsewhere to not use zero as -a valid id. ---- - src/shared/bap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/shared/bap.c b/src/shared/bap.c -index cf5d810bba..a0f5a0ae3c 100644 ---- a/src/shared/bap.c -+++ b/src/shared/bap.c -@@ -4306,7 +4306,7 @@ static struct bt_bap_req *bap_req_new(struct bt_bap_stream *stream, - static unsigned int id; - - req = new0(struct bt_bap_req, 1); -- req->id = ++id; -+ req->id = ++id ? id : ++id; - req->stream = stream; - req->op = op; - req->iov = util_iov_dup(iov, len); --- -cgit - diff --git a/net-wireless/bluez/files/bluez-5.68-bap-resume.patch b/net-wireless/bluez/files/bluez-5.68-bap-resume.patch deleted file mode 100644 index fbc2eeda89cc..000000000000 --- a/net-wireless/bluez/files/bluez-5.68-bap-resume.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 466fce0209a3878512672159168943047a9e2323 Mon Sep 17 00:00:00 2001 -From: Pauli Virtanen <pav@iki.fi> -Date: Sun, 2 Jul 2023 22:34:18 +0300 -Subject: transport: handle BAP Enabling state correctly when resuming - -If BAP stream is in Enabling state when transport acquire is attempted, -we should wait for bap_state_changed to emit the completion event. - -transport->resume() is only called with new owner with no -owner->pending, and shall return nonzero completion id on success. -Currently if BAP stream is Enabling, it returns zero which fails the -acquire operation. - -To fix this, return valid completion id in this case instead. Also keep -track of the g_idle_add resume id, so that we don't try to give it to -bt_bap_stream_cancel. - -Fixes sound server getting spurious Not Authorized errors when trying to -acquire a pending transport. This can happen on BAP server: linked -transports become pending when the first of the two enters Streaming. If -sound server tries to acquire the other linked transport whose stream is -still Enabling, the acquire fails (media_owner_free + -btd_error_not_authorized). - -Log: -=============================================================== -profiles/audio/transport.c:bap_state_changed() stream 0x25c2880: qos(2) -> enabling(3) -... -profiles/audio/transport.c:bap_state_changed() stream 0x25cc590: qos(2) -> enabling(3) -... -src/shared/bap.c:bap_stream_state_changed() stream 0x25cc590 dir 0x01: enabling -> streaming -profiles/audio/bap.c:bap_state() stream 0x25cc590: enabling(3) -> streaming(4) -profiles/audio/transport.c:bap_state_changed() stream 0x25cc590: enabling(3) -> streaming(4) -/org/bluez/hci0/dev_XX_XX_XX_XX_XX_XX/fd1: fd(36) ready -profiles/audio/transport.c:transport_update_playing() /org/bluez/hci0/dev_XX_XX_XX_XX_XX_XX/fd1 State=TRANSPORT_STATE_IDLE Playing=1 -profiles/audio/transport.c:transport_set_state() State changed /org/bluez/hci0/dev_XX_XX_XX_XX_XX_XX/fd1: TRANSPORT_STATE_IDLE -> TRANSPORT_STATE_PENDING -profiles/audio/transport.c:transport_set_state() State changed /org/bluez/hci0/dev_XX_XX_XX_XX_XX_XX/fd0: TRANSPORT_STATE_IDLE -> TRANSPORT_STATE_PENDING -profiles/audio/transport.c:media_owner_create() Owner created: sender=:1.1242 -profiles/audio/transport.c:media_owner_free() Owner :1.1242 -=============================================================== ---- - profiles/audio/transport.c | 67 +++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 55 insertions(+), 12 deletions(-) - -diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c -index 77216e10b3..aa3a718b0f 100644 ---- a/profiles/audio/transport.c -+++ b/profiles/audio/transport.c -@@ -86,6 +86,7 @@ struct bap_transport { - unsigned int state_id; - bool linked; - struct bt_bap_qos qos; -+ guint resume_id; - }; - - struct media_transport { -@@ -1191,17 +1192,27 @@ static void bap_enable_complete(struct bt_bap_stream *stream, - media_transport_remove_owner(owner->transport); - } - --static gboolean resume_complete(void *data) -+static void bap_resume_complete(struct media_transport *transport) - { -- struct media_transport *transport = data; -+ struct bap_transport *bap = transport->data; - struct media_owner *owner = transport->owner; - -+ DBG("stream %p owner %p resume complete", bap->stream, owner); -+ -+ if (bap->resume_id) { -+ g_source_remove(bap->resume_id); -+ bap->resume_id = 0; -+ } -+ - if (!owner) -- return FALSE; -+ return; -+ -+ if (owner->pending) -+ owner->pending->id = 0; - - if (transport->fd < 0) { - media_transport_remove_owner(transport); -- return FALSE; -+ return; - } - - if (owner->pending) { -@@ -1215,15 +1226,13 @@ static gboolean resume_complete(void *data) - DBUS_TYPE_INVALID); - if (!ret) { - media_transport_remove_owner(transport); -- return FALSE; -+ return; - } - } - - media_owner_remove(owner); - - transport_set_state(transport, TRANSPORT_STATE_ACTIVE); -- -- return FALSE; - } - - static void bap_update_links(const struct media_transport *transport); -@@ -1306,6 +1315,32 @@ static void bap_update_qos(const struct media_transport *transport) - "Delay"); - } - -+static gboolean bap_resume_complete_cb(void *data) -+{ -+ struct media_transport *transport = data; -+ struct bap_transport *bap = transport->data; -+ -+ bap->resume_id = 0; -+ bap_resume_complete(transport); -+ return FALSE; -+} -+ -+static gboolean bap_resume_wait_cb(void *data) -+{ -+ struct media_transport *transport = data; -+ struct bap_transport *bap = transport->data; -+ struct media_owner *owner = transport->owner; -+ -+ /* bap_state_changed will call completion callback when ready */ -+ DBG("stream %p owner %p resume wait", bap->stream, owner); -+ -+ bap->resume_id = 0; -+ if (owner && owner->pending) -+ owner->pending->id = 0; -+ -+ return FALSE; -+} -+ - static guint resume_bap(struct media_transport *transport, - struct media_owner *owner) - { -@@ -1315,17 +1350,19 @@ static guint resume_bap(struct media_transport *transport, - - if (!bap->stream) - return 0; -+ if (bap->resume_id) -+ return 0; - - bap_update_links(transport); - - switch (bt_bap_stream_get_state(bap->stream)) { - case BT_BAP_STREAM_STATE_ENABLING: - bap_enable_complete(bap->stream, 0x00, 0x00, owner); -- if (owner->pending) -- return owner->pending->id; -- return 0; -+ bap->resume_id = g_idle_add(bap_resume_wait_cb, transport); -+ return bap->resume_id; - case BT_BAP_STREAM_STATE_STREAMING: -- return g_idle_add(resume_complete, transport); -+ bap->resume_id = g_idle_add(bap_resume_complete_cb, transport); -+ return bap->resume_id; - } - - meta = bt_bap_stream_get_metadata(bap->stream); -@@ -1389,6 +1426,12 @@ static void cancel_bap(struct media_transport *transport, guint id) - { - struct bap_transport *bap = transport->data; - -+ if (id == bap->resume_id && bap->resume_id) { -+ g_source_remove(bap->resume_id); -+ bap->resume_id = 0; -+ return; -+ } -+ - if (!bap->stream) - return; - -@@ -1491,7 +1534,7 @@ static void bap_state_changed(struct bt_bap_stream *stream, uint8_t old_state, - transport_update_playing(transport, TRUE); - - done: -- resume_complete(transport); -+ bap_resume_complete(transport); - } - - static void bap_connecting(struct bt_bap_stream *stream, bool state, int fd, --- -cgit - diff --git a/net-wireless/bluez/files/bluez-5.68-clang-midi.patch b/net-wireless/bluez/files/bluez-5.68-clang-midi.patch deleted file mode 100644 index f62d9f395944..000000000000 --- a/net-wireless/bluez/files/bluez-5.68-clang-midi.patch +++ /dev/null @@ -1,83 +0,0 @@ -From b9e93e01161cf5392f0cbea3400cfa2dae54643d Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> -Date: Mon, 17 Jul 2023 12:36:15 -0700 -Subject: midi: Fix build errors - -This fixes the following build errors: - -unit/test-midi.c:541:82: error: function definition is not allowed here -void compare_events_cb(const struct midi_write_parser *parser, - void *user_data) { - ^ -unit/test-midi.c:587:17: error: use of undeclared identifier -'compare_events_cb'; did you mean 'compare_events'? - compare_events_cb, &midi_data); - ^~~~~~~~~~~~~~~~~ - compare_events - -profiles/midi/midi.c:61:75: error: function definition is not allowed -here -void foreach_cb(const struct midi_write_parser *parser, void *user_data) { - ^ -profiles/midi/midi.c:78:40: error: use of undeclared identifier 'foreach_cb' - midi_read_ev(&midi->midi_out, event, foreach_cb, midi); - ^ ---- - profiles/midi/midi.c | 27 ++++++++++++++------------- - 1 file changed, 14 insertions(+), 13 deletions(-) - -(limited to 'profiles/midi/midi.c') - -diff --git a/profiles/midi/midi.c b/profiles/midi/midi.c -index 40064df3ae..bab309bca7 100644 ---- a/profiles/midi/midi.c -+++ b/profiles/midi/midi.c -@@ -53,20 +53,21 @@ struct midi { - struct midi_write_parser midi_out; - }; - -+static void foreach_cb(const struct midi_write_parser *parser, void *user_data) -+{ -+ struct midi *midi = user_data; -+ -+ bt_gatt_client_write_without_response(midi->client, -+ midi->midi_io_handle, false, -+ midi_write_data(parser), -+ midi_write_data_size(parser)); -+} -+ - static bool midi_write_cb(struct io *io, void *user_data) - { - struct midi *midi = user_data; - int err; - -- void foreach_cb(const struct midi_write_parser *parser, void *user_data) { -- struct midi *midi = user_data; -- bt_gatt_client_write_without_response(midi->client, -- midi->midi_io_handle, -- false, -- midi_write_data(parser), -- midi_write_data_size(parser)); -- }; -- - do { - snd_seq_event_t *event = NULL; - -@@ -81,10 +82,10 @@ static bool midi_write_cb(struct io *io, void *user_data) - - if (midi_write_has_data(&midi->midi_out)) - bt_gatt_client_write_without_response(midi->client, -- midi->midi_io_handle, -- false, -- midi_write_data(&midi->midi_out), -- midi_write_data_size(&midi->midi_out)); -+ midi->midi_io_handle, -+ false, -+ midi_write_data(&midi->midi_out), -+ midi_write_data_size(&midi->midi_out)); - - midi_write_reset(&midi->midi_out); - --- -cgit - diff --git a/net-wireless/bluez/files/bluez-5.68-heap-use-after-free.patch b/net-wireless/bluez/files/bluez-5.68-heap-use-after-free.patch deleted file mode 100644 index 3cc6733634a5..000000000000 --- a/net-wireless/bluez/files/bluez-5.68-heap-use-after-free.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b741460688925448807c7532fe96182e4d32ec42 Mon Sep 17 00:00:00 2001 -From: Vlad Pruteanu <vlad.pruteanu@nxp.com> -Date: Tue, 4 Jul 2023 08:56:43 +0300 -Subject: plugins/admin: Fix heap-use-after-free when using 2 controllers - -This commit fixes the heap-use-after-free error when connecting 2 -controllers. When a controller is connected -admin_policy_adapter_probe is called. If policy_data was already -allocated it gets freed, if not, it only gets allocated. Eventually -add_interface is called. Here policy_data is put in the "data" variable -(specific for each controller) and the process_changes task is called -with idle priority. This function ultimately accesses policy_data from -the "data" variable. - -When Bluez crashes the flow is: -1)first controller is attached -2)admin_policy_adapter_probe is called and policy_data is allocated -4)second controller is attached -5)admin_policy_adapter_probe is called and policy_data is freed, then -allocated again -6)process_changes runs and the policy_data for the first controller is -read, but it was already freed, thus the crash ---- - plugins/admin.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/plugins/admin.c b/plugins/admin.c -index 68e9237d3f..16b74cfbf0 100644 ---- a/plugins/admin.c -+++ b/plugins/admin.c -@@ -502,7 +502,6 @@ static int admin_policy_adapter_probe(struct btd_adapter *adapter) - if (policy_data) { - btd_warn(policy_data->adapter_id, - "Policy data already exists"); -- admin_policy_free(policy_data); - policy_data = NULL; - } - --- -cgit - diff --git a/net-wireless/bluez/files/bluez-5.68-monitor-decoding.patch b/net-wireless/bluez/files/bluez-5.68-monitor-decoding.patch deleted file mode 100644 index 6d5c6306ccd3..000000000000 --- a/net-wireless/bluez/files/bluez-5.68-monitor-decoding.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f9557931ad361e08f1f1537ea670fedd1dd0138d Mon Sep 17 00:00:00 2001 -From: Claudia Draghicescu <claudia.rosu@nxp.com> -Date: Tue, 4 Jul 2023 10:41:44 +0300 -Subject: monitor: Add decoding support for Sync Receiver events - -This commit adds decoding support for PA Sync Established, -BIG Sync Established and BIG Sync Lost events. ---- - lib/mgmt.h | 3 +++ - monitor/packet.c | 5 +++++ - 2 files changed, 8 insertions(+) - -diff --git a/lib/mgmt.h b/lib/mgmt.h -index 062fa02712..8f92b77315 100644 ---- a/lib/mgmt.h -+++ b/lib/mgmt.h -@@ -1238,6 +1238,9 @@ static const char *mgmt_ev[] = { - "Advertisement Monitor Device Lost", - "Mesh Packet Found", - "Mesh Packet Complete", -+ "PA Sync Established", -+ "BIG Sync Established", -+ "BIG Sync Lost", - }; - - static const char *mgmt_status[] = { -diff --git a/monitor/packet.c b/monitor/packet.c -index a871c7f272..f2167fb52a 100644 ---- a/monitor/packet.c -+++ b/monitor/packet.c -@@ -3093,6 +3093,11 @@ static const struct bitfield_data events_le_table[] = { - { 27, "LE Terminate BIG Complete" }, - { 28, "LE BIG Sync Estabilished Complete" }, - { 29, "LE BIG Sync Lost" }, -+ { 30, "LE Request Peer SCA Complete"}, -+ { 31, "LE Path Loss Threshold" }, -+ { 32, "LE Transmit Power Reporting" }, -+ { 33, "LE BIG Info Advertising Report" }, -+ { 34, "LE Subrate Change" }, - { } - }; - --- -cgit - 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/crda/Manifest b/net-wireless/crda/Manifest deleted file mode 100644 index 69432c917fcf..000000000000 --- a/net-wireless/crda/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053 -DIST crda-4.15.tar.gz 72907 BLAKE2B c5fe2a625e37a92447a52a477214fe8279201cb729fdb4af9f26e4174923179edf53e35484a34f76707e6801b2b636e38fe043c2a54038b7dd7f14ab97532d45 SHA512 5a5a2c6914529383ae84895a70d2455dbc94939f0bd0f8ee3f7158e768ab4a0123053abf5d87b050dc4104397f246ec2f1c1b97e9b6a7043c65b7aef568af539 diff --git a/net-wireless/crda/crda-4.14.ebuild b/net-wireless/crda/crda-4.14.ebuild deleted file mode 100644 index 1d12e6681bfc..000000000000 --- a/net-wireless/crda/crda-4.14.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit toolchain-funcs python-any-r1 udev - -DESCRIPTION="Central Regulatory Domain Agent for wireless networks" -HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda" -SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="gcrypt" - -RDEPEND="!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/crda-4.15-r2.ebuild b/net-wireless/crda/crda-4.15-r2.ebuild deleted file mode 100644 index 74648f669a84..000000000000 --- a/net-wireless/crda/crda-4.15-r2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit toolchain-funcs python-any-r1 udev - -DESCRIPTION="Central Regulatory Domain Agent for wireless networks" -HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda" -SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86" -IUSE="gcrypt test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libnl:3 - net-wireless/wireless-regdb - !gcrypt? ( - dev-libs/openssl:= - ) - gcrypt? ( dev-libs/libgcrypt:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]') - test? ( net-wireless/wireless-regdb[crda(+)] ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-no-werror.patch - "${FILESDIR}"/${PN}-cflags.patch - "${FILESDIR}"/${PN}-4.14-python-3.patch - "${FILESDIR}"/${PN}-4.14-openssl-1.1.0-compatibility.patch # bug #652428 - "${FILESDIR}"/${PN}-4.14-do-not-compress-doc.patch - "${FILESDIR}"/${PN}-4.15-no-ldconfig.patch - "${FILESDIR}"/${PN}-4.15-libreg-link.patch # bug #542436 - "${FILESDIR}"/${PN}-4.15-ldflags.patch -) - -python_check_deps() { - python_has_version "dev-python/m2crypto[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - sed -i \ - -e "s:\<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 -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} 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-4.15-ldflags.patch b/net-wireless/crda/files/crda-4.15-ldflags.patch deleted file mode 100644 index af5de2d1c0af..000000000000 --- a/net-wireless/crda/files/crda-4.15-ldflags.patch +++ /dev/null @@ -1,14 +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 -@@ -115,7 +115,7 @@ keys.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - - $(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-4.15-libreg-link.patch b/net-wireless/crda/files/crda-4.15-libreg-link.patch deleted file mode 100644 index b32626edb6cc..000000000000 --- a/net-wireless/crda/files/crda-4.15-libreg-link.patch +++ /dev/null @@ -1,21 +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> ---- a/Makefile -+++ b/Makefile -@@ -115,7 +115,7 @@ keys.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - - $(LIBREG): reglib.c regdb.h reglib.h - $(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' diff --git a/net-wireless/crda/files/crda-4.15-no-ldconfig.patch b/net-wireless/crda/files/crda-4.15-no-ldconfig.patch deleted file mode 100644 index a7e744fe8d70..000000000000 --- a/net-wireless/crda/files/crda-4.15-no-ldconfig.patch +++ /dev/null @@ -1,19 +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> ---- a/Makefile -+++ b/Makefile -@@ -127,7 +127,6 @@ install-libreg: - $(NQ) ' INSTALL libreg' - $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)$(INSTALL) -m 644 $(LIBREG) $(DESTDIR)/$(LIBDIR)/ -- $(Q)ldconfig - - %.o: %.c regdb.h $(LIBREG) - $(NQ) ' CC ' $@ 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/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest index 8ed0c18baef9..9ea6a8fc92ea 100644 --- a/net-wireless/gnome-bluetooth/Manifest +++ b/net-wireless/gnome-bluetooth/Manifest @@ -1,2 +1,2 @@ -DIST gnome-bluetooth-42.6.tar.xz 304668 BLAKE2B d3dbc6c41de456e357e16b8d714f96bbcf9fc28776d361d4fc7d6d2c6ed7bb21496cc5f5eb02a24ce0b48c40ca2fefd80a36dda78e3ae63f67051b6f6a358258 SHA512 4c939a2f19c656ecc03535a203e3eed582a288abb3862ae92c517e611395e940ac65412281c9cd238cb8da99a2019505dd5bb2a687f143dd02b24b11d40b5450 -DIST gnome-bluetooth-42.7.tar.xz 304736 BLAKE2B 6b3eed3d93184c01a98307458ac1570ce97b46fea116d24ec54aa499aa45ce3245cb7982d8fda01d731ff0455b450c6513a86d52a6f7d7ee724726e476ddfd78 SHA512 dcbc5f54c2eb9eea29fea91e3c2c60ab3b6bf23effbe79df54dfc91834dda10fef144fb3abf6dc8a4651b5cc18bc666d4ab0574be793d31d199d1514e96c2a59 +DIST gnome-bluetooth-42.8.tar.xz 304908 BLAKE2B c487e0c278b316ecdcbdd39421389ce95024b06bf0e350d59dcac06d7a7e8b982da12b1088701e479d0b5c64b123899a5351a00c477208946bb1f44f3c8f30a6 SHA512 1c3d1db874b54ebae3cf59e526db8ff71131daea0c994abeefd95b51abf590bbba0baa8314ebbd1d3efe7973021327c7b8257163ed8f0567fe610b4e0c3dba88 +DIST gnome-bluetooth-46.0.tar.xz 306148 BLAKE2B cc2ecb80b69bab74f878eb640f8b65505b0a5e12d4c661bd2491cbb70c4020db7f191e604805df788e3bd45c46de38c8069434a8615874006368e027dd5608b6 SHA512 48ed8aeaa59aba1997991a6ae6113a4d3c9e286aa4e34f3f2611e33582ffa53f9f3f5a81052320292ccb576904d0f3cf8074c0fff6d0f56995266188441e6f7b diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.6.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.8.ebuild index 72c4d5ad6972..ca926a36b788 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.6.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) -inherit gnome.org meson python-any-r1 xdg +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" @@ -66,6 +66,14 @@ src_configure() { 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/gnome-bluetooth-42.7.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-46.0.ebuild index 023a1ce96473..81aefdc67717 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.7.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-46.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# 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 meson python-any-r1 xdg +inherit gnome.org gnome2-utils meson python-any-r1 xdg DESCRIPTION="Bluetooth graphical utilities integrated with GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-bluetooth" LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version @@ -66,6 +66,14 @@ src_configure() { 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/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index dc885786594e..a4b6695b28f1 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,3 +1 @@ -DIST gnuradio-3.10.4.0.tar.gz 4392284 BLAKE2B 2a5766708534966bcea1e1ab57ae703b0b453278da5042c65ddcf5bda39dee084ee8f77d414e2c8ab3eae2397680f7591c456404a6cefc08b28a7d1f5d25534d SHA512 a8690016513df3928cb2f63eef190c7306bc3cc452dfeafab2e47b43aa1dd3f61515df49832e99530535f94deabfb614388a27212b09e1c816782f3fdd4915eb -DIST gnuradio-3.10.6.0.tar.gz 4376181 BLAKE2B df246dac7277b99a398cbdb2460d98b0ed625f36a687abfdb87567436788fc14bd38f962c4a08df18edcbf1f5b258f37cd8f715dd3e71090aabc495bf140771e SHA512 cece65d6f35e1430e702a5c012146e61cc1d000432085cb2603d42fb1a7cdbf8dfe29299f834ba6b1970109ecae28ffa71f38e2aeb844e66cb337fb17aa4cffd -DIST gnuradio-3.10.7.0.tar.gz 4392777 BLAKE2B b07391a3fb5dc28e0ae5a9bcb10c3f6fdd35a4e681f9b53a86b24f7a69297cd15a93411210d4aea300bd498bc41a57bc87da1559d672024c7f33010744fb27d0 SHA512 02722532e614d88ee736f39a2cd4339434f9b4b21a5111a3dfc9b9b4b8ec1149ccaa509af323ba5c35409430c76fcb1244c26403e93e169b121e8cbe6a8a2022 +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/files/gnuradio-3.10.3.0-fix-fmt-v9.patch b/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch deleted file mode 100644 index 7b17021213d8..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch +++ /dev/null @@ -1,145 +0,0 @@ -From e63ee41fd455cdd39ae983c258d8632c3ea57fc6 Mon Sep 17 00:00:00 2001 -From: Huang Rui <vowstar@gmail.com> -Date: Sun, 7 Aug 2022 22:06:30 +0800 -Subject: [PATCH] Fix build failures with libfmt-9.0.0 - -libfmt-9.0.0 require explicit tagging of ARG types. This commit -adds those tags for the types that are currently formatted via fmt. - -Bug: https://bugs.gentoo.org/858659 -Closes: https://github.com/gnuradio/gnuradio/issues/6052 -Signed-off-by: Huang Rui <vowstar@gmail.com> ---- - gnuradio-runtime/lib/flat_flowgraph.cc | 25 ++++++++++++++++++++++ - gnuradio-runtime/lib/flowgraph.cc | 10 +++++++++ - gnuradio-runtime/lib/hier_block2_detail.cc | 19 ++++++++++++++++ - gr-analog/lib/sig_source_impl.cc | 10 +++++++++ - gr-uhd/lib/usrp_block_impl.cc | 7 ++++++ - 5 files changed, 71 insertions(+) - -diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc -index 42875fb4c32..ac7c8ce9109 100644 ---- a/gnuradio-runtime/lib/flat_flowgraph.cc -+++ b/gnuradio-runtime/lib/flat_flowgraph.cc -@@ -25,6 +25,31 @@ - #include <map> - #include <numeric> - -+#if FMT_VERSION >= 90000 -+#include <fmt/ostream.h> -+template <> -+struct fmt::formatter<gr::edge> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<gr::msg_endpoint> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<gr::block_detail>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<gr::buffer_reader>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<gr::buffer>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { -+}; -+#endif // FMT_VERSION >= 90000 -+ - namespace gr { - - -diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc -index 0bc04adc22c..6c63b834a89 100644 ---- a/gnuradio-runtime/lib/flowgraph.cc -+++ b/gnuradio-runtime/lib/flowgraph.cc -@@ -20,6 +20,16 @@ - // TODO: Replace with GNU Radio logging - #include <iostream> - -+#if FMT_VERSION >= 90000 -+#include <fmt/ostream.h> -+template <> -+struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { -+}; -+#endif // FMT_VERSION >= 90000 -+ - namespace gr { - - edge::~edge() {} -diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc -index 5cb42030dca..d3e27aee5b4 100644 ---- a/gnuradio-runtime/lib/hier_block2_detail.cc -+++ b/gnuradio-runtime/lib/hier_block2_detail.cc -@@ -22,6 +22,25 @@ - // TODO: Replace with GNU Radio logging - #include <iostream> - -+#if FMT_VERSION >= 90000 -+#include <fmt/ostream.h> -+template <> -+struct fmt::formatter<gr::edge> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<gr::endpoint> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<gr::msg_endpoint> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<gr::basic_block>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { -+}; -+#endif // FMT_VERSION >= 90000 -+ - namespace gr { - - hier_block2_detail::hier_block2_detail(hier_block2* owner) -diff --git a/gr-analog/lib/sig_source_impl.cc b/gr-analog/lib/sig_source_impl.cc -index 0e1db81648a..afa6d779cb0 100644 ---- a/gr-analog/lib/sig_source_impl.cc -+++ b/gr-analog/lib/sig_source_impl.cc -@@ -21,6 +21,16 @@ - #include <algorithm> - #include <stdexcept> - -+#if FMT_VERSION >= 90000 -+#include <fmt/ostream.h> -+template <> -+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { -+}; -+template <> -+struct fmt::formatter<gr::analog::gr_waveform_t&> : ostream_formatter { -+}; -+#endif // FMT_VERSION >= 90000 -+ - namespace gr { - namespace analog { - -diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc -index cb6dccfcdea..b11b82a9e70 100644 ---- a/gr-uhd/lib/usrp_block_impl.cc -+++ b/gr-uhd/lib/usrp_block_impl.cc -@@ -12,6 +12,13 @@ - #include <chrono> - #include <thread> - -+#if FMT_VERSION >= 90000 -+#include <fmt/ostream.h> -+template <> -+struct fmt::formatter<std::shared_ptr<pmt::pmt_base>> : ostream_formatter { -+}; -+#endif // FMT_VERSION >= 90000 -+ - using namespace gr::uhd; - using namespace std::chrono_literals; - diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch b/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch deleted file mode 100644 index b2c8270338c5..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -index 9d4e0f2..f6b8bc6 100644 ---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h -@@ -12,7 +12,8 @@ - #define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H - - #include <gnuradio/blocks/api.h> -- -+#include <cstddef> -+#include <vector> - - namespace gr { - namespace blocks { -diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc -index fc5873e..768ad9e 100644 ---- a/gr-blocks/lib/blockinterleaving.cc -+++ b/gr-blocks/lib/blockinterleaving.cc -@@ -12,6 +12,7 @@ - #include <spdlog/fmt/fmt.h> - #include <algorithm> - #include <numeric> -+#include <vector> - - namespace gr { - namespace blocks { diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch b/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch deleted file mode 100644 index 6252d96fd8b5..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Christian Inci <chris.gh@broke-the-inter.net> -Date: Mon May 15 21:26:05 2023 +0200 -Upstream: https://github.com/gnuradio/gnuradio/pull/6667 - - Include cstdint in gr-fec's alist.h - - GCC 13 will error out otherwise. - - Signed-off-by: Christian Inci <chris.gh@broke-the-inter.net> - ---- a/gr-fec/include/gnuradio/fec/alist.h -+++ b/gr-fec/include/gnuradio/fec/alist.h -@@ -23,6 +23,7 @@ - #define ALIST_H - - #include <gnuradio/fec/api.h> -+#include <cstdint> - #include <cstdlib> - #include <fstream> - #include <sstream> diff --git a/net-wireless/gnuradio/gnuradio-3.10.4.0-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.10.4.0-r2.ebuild deleted file mode 100644 index b1dcbacd01a7..000000000000 --- a/net-wireless/gnuradio/gnuradio-3.10.4.0-r2.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) - -CMAKE_BUILD_TYPE="None" -inherit cmake python-single-r1 virtualx xdg-utils - -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" -HOMEPAGE="https://www.gnuradio.org/" -LICENSE="GPL-3" -SLOT="0/${PV}" - -if [[ ${PV} =~ "9999" ]]; then - EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git" - 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 ~riscv ~x86" -fi - -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" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - audio? ( || ( alsa oss jack portaudio ) ) - alsa? ( audio ) - jack? ( audio ) - oss? ( audio ) - portaudio? ( audio ) - analog? ( filter ) - channels? ( filter analog qt5 ) - digital? ( filter analog ) - dtv? ( filter analog fec ) - modtool? ( utils ) - qt5? ( filter ) - trellis? ( analog digital ) - uhd? ( filter analog ) - vocoder? ( filter analog ) - wavelet? ( analog ) -" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]') - dev-libs/log4cpp:= - $(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 - $(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]') - ) - grc? ( - $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}]') - 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(+)] - 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? ( - $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]') - ) - utils? ( - $(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}] - dev-python/click-plugins[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}]') - ) - vocoder? ( - media-sound/gsm - >=media-libs/codec2-0.8.1:= - ) - wavelet? ( - sci-libs/gsl:= - dev-libs/gmp:= - sci-libs/lapack - ) - zeromq? ( >=net-libs/zeromq-2.1.11:= ) -" - -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.2 - $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') - $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') - virtual/pkgconfig - doc? ( - >=app-doc/doxygen-1.5.7.1 - <dev-libs/mathjax-3 - ) - grc? ( x11-misc/xdg-utils ) - oss? ( virtual/os-headers ) - test? ( >=dev-util/cppunit-1.9.14 ) - zeromq? ( net-libs/cppzmq ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659 - "${FILESDIR}/${PN}-3.10.4.0-fix-blockinterleaving.patch" - "${FILESDIR}/${PN}-3.10.6.0-fix-stdint.patch" -) - -src_prepare() { - xdg_environment_reset #534582 - - use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake - use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake - use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake - use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_DEFAULT=OFF - -DENABLE_GNURADIO_RUNTIME=ON - -DENABLE_PYTHON=ON - -DENABLE_GR_BLOCKS=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_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 -} - -src_install() { - cmake_src_install - - if use examples ; then - dodir /usr/share/doc/${PF}/ - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die - docompress -x /usr/share/doc/${PF}/examples - else - # It seems that the examples are always installed - rm -rf "${ED}"/usr/share/${PN}/examples || die - fi - - if use doc || use examples; then - #this doesn't appear useful - rm -rf "${ED}"/usr/share/doc/${PF}/xml || die - fi - - # Remove duplicated icons, MIME and desktop files and installation script - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die - 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 - - python_fix_shebang "${ED}" - # Remove incorrectly byte-compiled Python files and replace - find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die - python_optimize -} - -src_test() { - virtx cmake_src_test -} - -pkg_postinst() { - if use grc ; then - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - fi -} - -pkg_postrm() { - if use grc ; then - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - fi -} diff --git a/net-wireless/gnuradio/gnuradio-3.10.7.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r4.ebuild index 0cbd9b310c61..8f673a36f670 100644 --- a/net-wireless/gnuradio/gnuradio-3.10.7.0-r1.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,14 +18,12 @@ if [[ ${PV} =~ "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~riscv ~x86" + KEYWORDS="amd64 ~arm ~riscv ~x86" fi 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 ) ) @@ -47,12 +45,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]') + dev-libs/gmp:= dev-libs/log4cpp:= $(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 @@ -87,16 +85,16 @@ RDEPEND="${PYTHON_DEPS} $(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}]') + net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}] ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( - $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]') + >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] ) utils? ( $(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}] @@ -110,7 +108,6 @@ RDEPEND="${PYTHON_DEPS} ) wavelet? ( sci-libs/gsl:= - dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) @@ -121,7 +118,7 @@ DEPEND="${RDEPEND} $(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 ) @@ -131,9 +128,7 @@ DEPEND="${RDEPEND} zeromq? ( net-libs/cppzmq ) " -PATCHES=( - "${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659 -) +PATCHES=( "${FILESDIR}/PR7093.patch" ) src_prepare() { xdg_environment_reset #534582 @@ -228,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-3.10.6.0-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r5.ebuild index 77586bdcbe51..6aac60293382 100644 --- a/net-wireless/gnuradio/gnuradio-3.10.6.0-r2.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) CMAKE_BUILD_TYPE="None" inherit cmake desktop python-single-r1 virtualx xdg-utils @@ -18,14 +18,12 @@ if [[ ${PV} =~ "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~riscv ~x86" + KEYWORDS="amd64 ~arm ~riscv ~x86" fi 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 ) ) @@ -39,6 +37,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) + test? ( channels ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) @@ -47,12 +46,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]') + dev-libs/gmp:= dev-libs/log4cpp:= $(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 @@ -79,7 +78,6 @@ RDEPEND="${PYTHON_DEPS} iio? ( net-libs/libiio:= net-libs/libad9361-iio:= - !net-wireless/gr-iio ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) @@ -87,16 +85,16 @@ RDEPEND="${PYTHON_DEPS} $(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}]') + net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}] ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( - $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]') + >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] ) utils? ( $(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}] @@ -110,7 +108,6 @@ RDEPEND="${PYTHON_DEPS} ) wavelet? ( sci-libs/gsl:= - dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) @@ -121,20 +118,20 @@ DEPEND="${RDEPEND} $(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 ) + test? ( + >=dev-util/cppunit-1.9.14 + dev-python/pyzmq + ) zeromq? ( net-libs/cppzmq ) " -PATCHES=( - "${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659 - "${FILESDIR}/${PN}-3.10.6.0-fix-stdint.patch" -) +PATCHES=( "${FILESDIR}/PR7093.patch" ) src_prepare() { xdg_environment_reset #534582 @@ -144,6 +141,13 @@ src_prepare() { use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake + # remove empty test case (see https://github.com/gnuradio/gnuradio/commit/21df528) + # fails with Python 3.12 + rm "${S}"/gr-digital/python/digital/qa_digital.py || die + # fix test failure due to deprecated syntax for numpy + # see https://github.com/gnuradio/gnuradio/commit/a306e11 + sed -i -e "s/np.alltrue/np.all/g" \ + "${S}"/gnuradio-runtime/python/pmt/qa_pmt_to_python.py || die cmake_src_prepare } @@ -229,7 +233,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 bea417fcae83..ce5367b7d75a 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,9 +23,7 @@ fi 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 ) ) @@ -47,12 +45,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep 'dev-libs/boost:=[python,${PYTHON_USEDEP}]') + dev-libs/gmp:= dev-libs/log4cpp:= $(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 @@ -87,16 +85,16 @@ RDEPEND="${PYTHON_DEPS} $(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}]') + net-wireless/soapysdr:=[${PYTHON_SINGLE_USEDEP}] ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( - $(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]') + >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] ) utils? ( $(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}] @@ -110,7 +108,6 @@ RDEPEND="${PYTHON_DEPS} ) wavelet? ( sci-libs/gsl:= - dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) @@ -121,7 +118,7 @@ DEPEND="${RDEPEND} $(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 ) @@ -224,7 +221,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/gobi_loader/gobi_loader-0.7-r2.ebuild b/net-wireless/gobi_loader/gobi_loader-0.7-r3.ebuild index 1dd0562fa966..ceb4dcacc186 100644 --- a/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild +++ b/net-wireless/gobi_loader/gobi_loader-0.7-r3.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit udev +EAPI=8 + +inherit toolchain-funcs udev DESCRIPTION="gobi_loader is a firmware loader for Qualcomm Gobi USB chipsets" HOMEPAGE="https://www.codon.org.uk/~mjg59/gobi_loader/" @@ -11,25 +12,30 @@ SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="virtual/libusb:0" -RDEPEND="${DEPEND}" +RDEPEND="virtual/libusb:0" PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) src_prepare() { default - sed "s:%UDEVDIR%:$(get_udevdir):" -i Makefile || die + sed -e "s:%UDEVDIR%:$(get_udevdir):" \ + -e "s:gcc:$(tc-getCC):" \ + -e "s:-Wall:& -Wno-unused-result:" \ + -i Makefile || die } src_install() { + local -x prefix=${EPREFIX} emake install + keepdir /lib/firmware/gobi } pkg_postinst() { - udevadm control --reload-rules - einfo - einfo "Put your firmware in /lib/firmware/gobi." - einfo + udev_reload + einfo "Put your firmware in /lib/firmware/gobi" +} + +pkg_postrm() { + udev_reload } diff --git a/net-wireless/gqrx-scanner/Manifest b/net-wireless/gqrx-scanner/Manifest index 72b13b322fb2..9668830f3dc2 100644 --- a/net-wireless/gqrx-scanner/Manifest +++ b/net-wireless/gqrx-scanner/Manifest @@ -1,2 +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.2.ebuild deleted file mode 100644 index ebe765a41e20..000000000000 --- a/net-wireless/gqrx-scanner/gqrx-scanner-1.0.2.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="frequency scanner for Gqrx Software Defined Radio receiver" -HOMEPAGE="https://github.com/neural75/gqrx-scanner" -SRC_URI="https://github.com/neural75/gqrx-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" -IUSE="" - -PDEPEND="net-wireless/gqrx" diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild index 3965c4c7a1e3..e1b48bb9f238 100644 --- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild +++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-single-r1 diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild index 3f784616f50d..fbf88104daa3 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-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-single-r1 diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.38.2_p20210108.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.38.2_p20210108-r1.ebuild index 66f36f6206a3..36278e9cd8f5 100644 --- a/net-wireless/gr-iqbal/gr-iqbal-0.38.2_p20210108.ebuild +++ b/net-wireless/gr-iqbal/gr-iqbal-0.38.2_p20210108-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-single-r1 diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild index 66f36f6206a3..36278e9cd8f5 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-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-single-r1 diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest index 453f9b2916af..954c47c9680f 100644 --- a/net-wireless/gr-osmosdr/Manifest +++ b/net-wireless/gr-osmosdr/Manifest @@ -1,2 +1,2 @@ -DIST gr-osmosdr-0.2.3_p20210128.tar.gz 257938 BLAKE2B 1bdb3b57ec6a2f942769770c34d41b4e3db5b62f8c337d724b0099f9a2fe5bdb7231bc0727dfe4bd01cd62918b4847ea2f8780208c0960bced5853c716ec6f02 SHA512 4dcb6b2c10eeb2252111ba691be179fe5b6dc9598fa7e6129a3b214ee74d43ca2d67ab5eafa73cea2abb25729c24be0592585d149e13c7285f2ce330e52a6470 -DIST gr-osmosdr-0.2.4.tar.gz 260745 BLAKE2B 6af08b2658619edbbbf398aebcd3b3262f03aa7ed9d18c31970c255f093ea60d8da8597635fdd33a267a005a375fd54b82d1405c6674ad92721c38b3e4660a16 SHA512 04b54c92e40e58b76a9e6c9c3fb419f97af2599ca2f92cb58858464722e993ebe05896ffee2592ced729521ec65857eac9fac7809567c8b6de62a0ff99f615d5 +DIST gr-osmosdr-0.2.5.tar.gz 267914 BLAKE2B cec3790513a8e050610cb4b7f928c7b1d47e5b34e372f577c7f90a929a7353e2d7a86d04b8fcde57b24cc08554c5bee7257c052263de55e0f5ba3201f19a275c SHA512 d1c126d94accbd292624022df6ff7febecb1c73c3a1a0c3e8d0e3e4d882076df5b77ad14d79966a150e2c9d889c391239b1dc831acf49cdf891a19db7f830901 +DIST gr-osmosdr-0.2.6.tar.gz 268003 BLAKE2B e9826301e2836dbe937aa69bcc8078769a44889b19aa8981224ab4b0de96bd93cd3b6a0b42366b85e44854fc4300c5846cd07fdd5d9e3f7695082be3a29cb249 SHA512 2afac3503e74b67c8fb20b51dbe3c4d25f8247a9da4bfd9aec6d68412381e5e2319e8cc5b411faa9909a6c2b00c4844307c94d63e4efd613a2ddba027fd2e570 diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5-r2.ebuild index 189e5849f7f1..45b04b67fe12 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-single-r1 @@ -14,20 +14,16 @@ HOMEPAGE=" 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 - #commit - #COMMIT="a100eb024c0210b95e4738b6efd836d48225bd03" - #SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - #S="${WORKDIR}/${PN}-${COMMIT}" - #release - SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + 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 doc 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:= @@ -48,7 +44,7 @@ DEPEND="${RDEPEND}" BDEPEND=" $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -66,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)" @@ -82,10 +78,7 @@ src_configure() { src_install() { cmake_src_install - if use python; then - find "${ED}" -name '*.py[oc]' -delete || die - 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-0.2.3_p20210128-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.6.ebuild index 6bc31cd56c18..45b04b67fe12 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.6.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-single-r1 @@ -14,25 +14,21 @@ HOMEPAGE=" 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 - #commit - COMMIT="a100eb024c0210b95e4738b6efd836d48225bd03" - SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - #release - #SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + 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 doc 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.9.0.0: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:= ) @@ -48,13 +44,13 @@ DEPEND="${RDEPEND}" BDEPEND=" $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " REQUIRED_USE="${PYTHON_REQUIRED_USE}" PATCHES=( - "${FILESDIR}/${P}-fix-enable-python.patch" + "${FILESDIR}/${PN}-0.2.3_p20210128-fix-enable-python.patch" ) src_configure() { @@ -66,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)" @@ -82,10 +78,7 @@ src_configure() { src_install() { cmake_src_install - if use python; then - find "${ED}" -name '*.py[oc]' -delete || die - 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 c2a2986ffc9f..45b04b67fe12 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-single-r1 @@ -14,20 +14,16 @@ HOMEPAGE=" 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 - #commit - COMMIT="a100eb024c0210b95e4738b6efd836d48225bd03" - SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - #release - #SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + 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 doc 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:= @@ -48,7 +44,7 @@ DEPEND="${RDEPEND}" BDEPEND=" $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -66,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)" @@ -82,10 +78,7 @@ src_configure() { src_install() { cmake_src_install - if use python; then - find "${ED}" -name '*.py[oc]' -delete || die - 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 e19fa75ed167..034011869409 100644 --- a/net-wireless/gr-osmosdr/metadata.xml +++ b/net-wireless/gr-osmosdr/metadata.xml @@ -16,7 +16,4 @@ <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> - <upstream> - <remote-id type="github">osmocom/gr-osmosdr</remote-id> - </upstream> </pkgmetadata> diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20230427.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20230427-r1.ebuild index be25ed418e88..c4d4160fbe8a 100644 --- a/net-wireless/gr-paint/gr-paint-0.0_p20230427.ebuild +++ b/net-wireless/gr-paint/gr-paint-0.0_p20230427-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -44,7 +44,7 @@ RDEPEND="${DEPEND}" BDEPEND=" $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_configure() { diff --git a/net-wireless/gr-rds/gr-rds-0.0_p20220804-r1.ebuild b/net-wireless/gr-rds/gr-rds-0.0_p20220804-r2.ebuild index 5004055f9d05..ef3954a77e83 100644 --- a/net-wireless/gr-rds/gr-rds-0.0_p20220804-r1.ebuild +++ b/net-wireless/gr-rds/gr-rds-0.0_p20220804-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) if [[ ${PV} == 9999* ]]; then inherit git-r3 diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild b/net-wireless/gr-rds/gr-rds-9999.ebuild index 5004055f9d05..ef3954a77e83 100644 --- a/net-wireless/gr-rds/gr-rds-9999.ebuild +++ b/net-wireless/gr-rds/gr-rds-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) if [[ ${PV} == 9999* ]]; then inherit git-r3 diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest index cf1f0ee7dde5..872055496e53 100644 --- a/net-wireless/hackrf-tools/Manifest +++ b/net-wireless/hackrf-tools/Manifest @@ -1 +1,2 @@ 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 index c5e13f482da1..b60dec9c16a1 100644 --- a/net-wireless/hackrf-tools/hackrf-tools-2023.01.1.ebuild +++ b/net-wireless/hackrf-tools/hackrf-tools-2023.01.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,6 @@ 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-2024.02.1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2024.02.1.ebuild new file mode 100644 index 000000000000..8438e9697bb7 --- /dev/null +++ b/net-wireless/hackrf-tools/hackrf-tools-2024.02.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-9999.ebuild b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild index 0e79b121fd86..8438e9697bb7 100644 --- a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild +++ b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,6 @@ fi LICENSE="BSD" SLOT="0" -IUSE="" DEPEND="~net-libs/libhackrf-${PV}:= sci-libs/fftw:3.0=" diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest index 6bcebd0b18ae..c70e3773b0ab 100644 --- a/net-wireless/hostapd/Manifest +++ b/net-wireless/hostapd/Manifest @@ -1,2 +1 @@ DIST hostapd-2.10.tar.gz 2440435 BLAKE2B dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f SHA512 243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f -DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c diff --git a/net-wireless/hostapd/hostapd-2.10-r1.ebuild b/net-wireless/hostapd/hostapd-2.10-r1.ebuild deleted file mode 100644 index 44a7d7287c2a..000000000000 --- a/net-wireless/hostapd/hostapd-2.10-r1.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic systemd savedconfig toolchain-funcs - -EXTRAS_VER="2.7-r2" -EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras" -DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" -HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/" -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 selinux sqlite +suiteb +wps +crda" - -DEPEND=" - internal-tls? ( dev-libs/libtommath ) - !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) - kernel_linux? ( - >=dev-libs/libnl-3.2:3 - crda? ( net-wireless/crda ) - ) - 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 "${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-2.10-r2.ebuild b/net-wireless/hostapd/hostapd-2.10-r2.ebuild deleted file mode 100644 index 81c6f18518bb..000000000000 --- a/net-wireless/hostapd/hostapd-2.10-r2.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# 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 - -EXTRAS_VER="2.7-r2" -EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras" -DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" -HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/" -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 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 "${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/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 279d5a6782f8..89fc63d9bc7f 100644 --- a/net-wireless/iw/Manifest +++ b/net-wireless/iw/Manifest @@ -1,2 +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-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 62fe2583a7bf..9fe9ed895cb8 100644 --- a/net-wireless/iwd/Manifest +++ b/net-wireless/iwd/Manifest @@ -1,5 +1,2 @@ -DIST iwd-2.10.tar.xz 1079952 BLAKE2B e94ad62a6c0bb89229f7d2cb64371f208640e4018b5aa1236e02e9713b1043bc410313e1969574238bc3e86f96c6c928a23d5fa9b19a077d40fb679e93105624 SHA512 e1e215f1479986ef5dace80329591ba56b25a82348c58839e3e1b77935537c5ce0d0d8f796b51a0eeee263e11e738626203aef0f7672d7b3bd2485800e1a9df2 -DIST iwd-2.3.tar.xz 1061732 BLAKE2B d22bb6bd2a1672536872f5642ed31361681fb16e08f3efe7241d15f456c80e37b5acfd5ef18d28affd308ce893b4c798b9ee1b4fc67c97b1de3fad920753e164 SHA512 f320feb2b9ac9cb719d4afa87e8935663aa13ebd5e9ef7bcd3a11a0553df4352a700d76faf0c9189cc3000c05545aed2286fb1051b4f732766f822a68736efd5 -DIST iwd-2.4.tar.xz 1062540 BLAKE2B 9aa5e79ab3cc7ff83892c51c6074ca27876b037905c52bf21369d403f50b799408b82bb773a5a2522ff25e147dbdb74464bdda8aee8d77783cdadf190353ed41 SHA512 fab771147a6d32aeea2722f0865cb55ba1eb78e74416fb3f9a27c9c11583b1b5e229231829fc63d3fb913d69af16a2b51da19ee2c84ce29ae3cb24acccb5d317 -DIST iwd-2.8.tar.xz 1067700 BLAKE2B ac691dfff675bd331a7af9e02179a5df61f0e20299c4a2851bd31950cbd0b696369069bd4a635cb25d24aec75996190bf8e47c2626eeff43b7ab37af5f932989 SHA512 bd208dc5ff391dccfe1b4a12f4b587ca8cedc1c1a7a2ddb34999c23acfad0e590e0463ac1ddc5093cb6489eb8ab8a090c01bcf06d679cfaf59c4b81469631795 -DIST iwd-2.9.tar.xz 1079944 BLAKE2B 161146c2c0f8354af9816f89369c41d1313183705f2abf20fbfb711c04c4b393f840af71d5da91e709eab1c2b31074b7ab5958b8e8ca682886799515b933422b SHA512 4444ec8f0ce4b45528fe4e5ea1e5904e80fc4e71b47c098493099147f3010562e31b8cf78cc3faeeb66b84106198c73ad0173adcb379a7ce4ebf4504b989e1cc +DIST iwd-2.17.tar.xz 1083756 BLAKE2B f930c13cafa7bcfe30b481891d2a8a7a439b316aaafb5ca9b05b2c2123cfe76ec032e8194e3bf1de34ce4330016a14c7fc316d15c03428f7832213220789f486 SHA512 06630fa1fdedbe82dc294eb0b44b542e79c11c09ffed8d8dcd4e38089ab43b8f5fbcfb2af29df494441fd54bc87d76c988fde2c639c219a890bbc45de3fff53d +DIST iwd-2.19.tar.xz 1088892 BLAKE2B 0bd332b41b205ed8b396e672fb869c8d78a9b18d94691851ccc63b43602a61e96fb5029797c3fe2863fc4964ae0c51d1395f67a9bdc977dfe4dc2c49111f41be SHA512 e06f1936be25be042f6c48d3ff86db6b3b07a2d9406c234e74258e7bb3df7a7efd1510929851830922006613d02d4904b26c2d8a67bab2daa14c2eae086c2eb6 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-2.8-r2.ebuild b/net-wireless/iwd/iwd-2.17.ebuild index 3bdc0a6094ed..0e2691f3d992 100644 --- a/net-wireless/iwd/iwd-2.8-r2.ebuild +++ b/net-wireless/iwd/iwd-2.17.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit flag-o-matic linux-info systemd #Set this variable to the required external ell version -ELL_REQ="0.58" +ELL_REQ="0.64" if [[ ${PV} == *9999* ]]; then inherit autotools git-r3 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" MYRST2MAN="RST2MAN=:" fi diff --git a/net-wireless/iwd/iwd-2.10.ebuild b/net-wireless/iwd/iwd-2.19.ebuild index 057b4366d14e..36e245150607 100644 --- a/net-wireless/iwd/iwd-2.10.ebuild +++ b/net-wireless/iwd/iwd-2.19.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit flag-o-matic linux-info systemd #Set this variable to the required external ell version -ELL_REQ="0.61" +ELL_REQ="0.67" if [[ ${PV} == *9999* ]]; then inherit autotools git-r3 diff --git a/net-wireless/iwd/iwd-2.3.ebuild b/net-wireless/iwd/iwd-2.3.ebuild deleted file mode 100644 index 9f77d24c371e..000000000000 --- a/net-wireless/iwd/iwd-2.3.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit flag-o-matic linux-info systemd - -#Set this variable to the required external ell version -ELL_REQ="0.56" - -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 ~loong ppc ppc64 ~riscv ~sparc x86" - MYRST2MAN="RST2MAN=:" -fi - -DESCRIPTION="Wireless daemon for linux" -HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 crda +monitor ofono selinux standalone systemd wired" - -DEPEND=" - sys-apps/dbus - client? ( sys-libs/readline:0= ) -" - -[[ -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 ) - ) -" - -BDEPEND=" - virtual/pkgconfig -" - -[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils" - -pkg_setup() { - CONFIG_CHECK=" - ~ASYMMETRIC_KEY_TYPE - ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE - ~CFG80211 - ~CRYPTO_AES - ~CRYPTO_CBC - ~CRYPTO_CMAC - ~CRYPTO_DES - ~CRYPTO_ECB - ~CRYPTO_HMAC - ~CRYPTO_MD4 - ~CRYPTO_MD5 - ~CRYPTO_RSA - ~CRYPTO_SHA1 - ~CRYPTO_SHA256 - ~CRYPTO_SHA512 - ~CRYPTO_USER_API_HASH - ~CRYPTO_USER_API_SKCIPHER - ~KEY_DH_OPERATIONS - ~PKCS7_MESSAGE_PARSER - ~RFKILL - ~X509_CERTIFICATE_PARSER - " - if use crda;then - CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT" - WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper - regulatory domain support" - fi - - if use amd64;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64" - WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance" - fi - - if use cpu_flags_x86_aes;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL" - WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance" - fi - - if use cpu_flags_x86_ssse3 && use amd64; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3" - WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance" - fi - - if use kernel_linux && kernel_is -ge 4 20; then - CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER" - fi - - check_extra_config - - if ! use crda; then - if use kernel_linux && kernel_is -lt 4 15; then - ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:" - ewarn "Regulatory domain support for kernels older than 4.15 requires crda." - fi - if linux_config_exists && linux_chkconfig_builtin CFG80211 && - [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]] - then - ewarn "" - ewarn "REGULATORY DOMAIN PROBLEM:" - ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from" - ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m" - ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE." - ewarn "" - fi - fi -} - -src_unpack() { - if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack - EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack - else - default - fi -} - -src_prepare() { - default - if [[ ${PV} == *9999* ]] ; then - eautoreconf - fi -} - -src_configure() { - append-cflags "-fsigned-char" - local myeconfargs=( - --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var - $(use_enable client) - $(use_enable monitor) - $(use_enable ofono) - $(use_enable wired) - --enable-systemd-service - --with-systemd-unitdir="$(systemd_get_systemunitdir)" - --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d" - --with-systemd-networkdir="$(systemd_get_utildir)/network" - ) - [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake ${MYRST2MAN} -} - -src_install() { - emake DESTDIR="${D}" ${MYRST2MAN} install - keepdir /var/lib/${PN} - - newinitd "${FILESDIR}/iwd.initd-r1" iwd - - if use wired;then - newinitd "${FILESDIR}/ead.initd" ead - fi - - if [[ ${PV} == *9999* ]] ; then - exeinto /usr/share/iwd/scripts/ - doexe test/* - fi - - 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}" - dodir /etc/conf.d - echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd - fi -} diff --git a/net-wireless/iwd/iwd-2.4.ebuild b/net-wireless/iwd/iwd-2.4.ebuild deleted file mode 100644 index 39e4f7418f8a..000000000000 --- a/net-wireless/iwd/iwd-2.4.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit flag-o-matic linux-info systemd - -#Set this variable to the required external ell version -ELL_REQ="0.56" - -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 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" - MYRST2MAN="RST2MAN=:" -fi - -DESCRIPTION="Wireless daemon for linux" -HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 crda +monitor ofono selinux standalone systemd wired" - -DEPEND=" - sys-apps/dbus - client? ( sys-libs/readline:0= ) -" - -[[ -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 ) - ) -" - -BDEPEND=" - virtual/pkgconfig -" - -[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils" - -pkg_setup() { - CONFIG_CHECK=" - ~ASYMMETRIC_KEY_TYPE - ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE - ~CFG80211 - ~CRYPTO_AES - ~CRYPTO_CBC - ~CRYPTO_CMAC - ~CRYPTO_DES - ~CRYPTO_ECB - ~CRYPTO_HMAC - ~CRYPTO_MD4 - ~CRYPTO_MD5 - ~CRYPTO_RSA - ~CRYPTO_SHA1 - ~CRYPTO_SHA256 - ~CRYPTO_SHA512 - ~CRYPTO_USER_API_HASH - ~CRYPTO_USER_API_SKCIPHER - ~KEY_DH_OPERATIONS - ~PKCS7_MESSAGE_PARSER - ~RFKILL - ~X509_CERTIFICATE_PARSER - " - if use crda;then - CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT" - WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper - regulatory domain support" - fi - - if use amd64;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64" - WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance" - fi - - if use cpu_flags_x86_aes;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL" - WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance" - fi - - if use cpu_flags_x86_ssse3 && use amd64; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3" - WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance" - fi - - if use kernel_linux && kernel_is -ge 4 20; then - CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER" - fi - - check_extra_config - - if ! use crda; then - if use kernel_linux && kernel_is -lt 4 15; then - ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:" - ewarn "Regulatory domain support for kernels older than 4.15 requires crda." - fi - if linux_config_exists && linux_chkconfig_builtin CFG80211 && - [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]] - then - ewarn "" - ewarn "REGULATORY DOMAIN PROBLEM:" - ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from" - ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m" - ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE." - ewarn "" - fi - fi -} - -src_unpack() { - if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack - EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack - else - default - fi -} - -src_prepare() { - default - if [[ ${PV} == *9999* ]] ; then - eautoreconf - fi -} - -src_configure() { - append-cflags "-fsigned-char" - local myeconfargs=( - --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var - $(use_enable client) - $(use_enable monitor) - $(use_enable ofono) - $(use_enable wired) - --enable-systemd-service - --with-systemd-unitdir="$(systemd_get_systemunitdir)" - --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d" - --with-systemd-networkdir="$(systemd_get_utildir)/network" - ) - [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake ${MYRST2MAN} -} - -src_install() { - emake DESTDIR="${D}" ${MYRST2MAN} install - keepdir /var/lib/${PN} - - newinitd "${FILESDIR}/iwd.initd-r1" iwd - - if use wired;then - newinitd "${FILESDIR}/ead.initd" ead - fi - - if [[ ${PV} == *9999* ]] ; then - exeinto /usr/share/iwd/scripts/ - doexe test/* - fi - - 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}" - dodir /etc/conf.d - echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd - fi -} diff --git a/net-wireless/iwd/iwd-2.9.ebuild b/net-wireless/iwd/iwd-2.9.ebuild deleted file mode 100644 index c55b3ade1442..000000000000 --- a/net-wireless/iwd/iwd-2.9.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit flag-o-matic linux-info systemd - -#Set this variable to the required external ell version -ELL_REQ="0.60" - -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://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 - -DESCRIPTION="Wireless daemon for linux" -HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/" - -LICENSE="GPL-2" -SLOT="0" -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}" - -RDEPEND=" - ${DEPEND} - acct-group/netdev - net-wireless/wireless-regdb - selinux? ( sec-policy/selinux-networkmanager ) - standalone? ( - systemd? ( sys-apps/systemd ) - !systemd? ( virtual/resolvconf ) - ) -" - -BDEPEND=" - virtual/pkgconfig -" - -[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils" - -pkg_setup() { - CONFIG_CHECK=" - ~ASYMMETRIC_KEY_TYPE - ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE - ~CFG80211 - ~CRYPTO_AES - ~CRYPTO_CBC - ~CRYPTO_CMAC - ~CRYPTO_DES - ~CRYPTO_ECB - ~CRYPTO_HMAC - ~CRYPTO_MD4 - ~CRYPTO_MD5 - ~CRYPTO_RSA - ~CRYPTO_SHA1 - ~CRYPTO_SHA256 - ~CRYPTO_SHA512 - ~CRYPTO_USER_API_HASH - ~CRYPTO_USER_API_SKCIPHER - ~KEY_DH_OPERATIONS - ~PKCS7_MESSAGE_PARSER - ~RFKILL - ~X509_CERTIFICATE_PARSER - " - - if use amd64;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64" - WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance" - fi - - if use cpu_flags_x86_aes;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL" - WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance" - fi - - if use cpu_flags_x86_ssse3 && use amd64; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3" - WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance" - fi - - if use kernel_linux && kernel_is -ge 4 20; then - CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER" - fi - - check_extra_config -} - -src_unpack() { - if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack - EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack - else - default - fi -} - -src_prepare() { - default - if [[ ${PV} == *9999* ]] ; then - eautoreconf - fi - - 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)" - --enable-systemd-service - --with-systemd-unitdir="$(systemd_get_systemunitdir)" - --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d" - --with-systemd-networkdir="$(systemd_get_utildir)/network" - ) - [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake "${MYRST2MAN}" -} - -src_install() { - emake DESTDIR="${D}" "${MYRST2MAN}" install - keepdir "/var/lib/${PN}" - - newinitd "${FILESDIR}/iwd.initd-r1" iwd - - if use wired;then - newinitd "${FILESDIR}/ead.initd" ead - fi - - if [[ ${PV} == *9999* ]] ; then - exeinto /usr/share/iwd/scripts/ - doexe test/* - fi - - if use standalone ; then - local iwdconf="${ED}/etc/iwd/main.conf" - dodir /etc/iwd - 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 - fi -} diff --git a/net-wireless/iwd/metadata.xml b/net-wireless/iwd/metadata.xml index e63160880b73..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 <pkg>net-wireless/crda</pkg> 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/kismet/files/0001-configure.ac-bashism-fix-critical-existence-failure-.patch b/net-wireless/kismet/files/0001-configure.ac-bashism-fix-critical-existence-failure-.patch new file mode 100644 index 000000000000..3cf4ed8cff85 --- /dev/null +++ b/net-wireless/kismet/files/0001-configure.ac-bashism-fix-critical-existence-failure-.patch @@ -0,0 +1,280 @@ +From d3732f93cbdc9edf39d31c7c50b72cc6a79be0dc Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Fri, 5 Apr 2024 00:42:29 -0400 +Subject: [PATCH] configure.ac: bashism: fix critical existence failure on + systems with dash + +Remove the consistent use of bashisms. An autoconf generated script is +designed to work with POSIX sh, and contains a /bin/sh shebang. As a +result, it *cannot* assume it will be run with bash, as it won't be. + +The bashism in question is the double equals (`==`) operator for the +test command. It is actually a bash-specific alias for the single equals +operator. It behaves exactly the same, except more confusing. It +contains no added functionality and no behavior changes, it is merely an +additional alternate spelling. In exchange for doing nothing whatsoever, +even in bash, it breaks muscle memory when writing POSIX sh scripts and +tricks developers into writing the wrong thing. + +It is terrible and should never be used under any circumstances. +Ideally it would be removed altogether from GNU bash. + +Fixes the following warnings when running configure: + +``` +./configure: 5011: test: x: unexpected operator +./configure: 5014: test: x: unexpected operator +./configure: 5017: test: x: unexpected operator +./configure: 8056: test: nox: unexpected operator +./configure: 8109: test: yesx: unexpected operator +./configure: 8120: test: 3: unexpected operator +./configure: 8144: test: unexpected operator +./configure: 9089: test: stdc++x: unexpected operator +./configure: 9937: test: 0: unexpected operator +./configure: 10084: test: 0: unexpected operator +./configure: 10207: test: 0: unexpected operator +./configure: 10283: test: 0: unexpected operator +./configure: 11363: test: x: unexpected operator +./configure: 11561: test: x: unexpected operator +./configure: 11634: test: xno: unexpected operator +./configure: 11663: test: xno: unexpected operator +./configure: 12490: test: 3: unexpected operator +./configure: 13150: test: no: unexpected operator +./configure: 13167: test: no: unexpected operator +``` + +And the following fatal errors when trying to compile, since the +resulting conditionals failed to define $(PROTOCBIN): + +``` +make -j8 +cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/kismet.proto +cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/http.proto +/bin/sh: 1: -I: not found +make: [Makefile:808: protobuf_cpp/kismet.pb.h] Error 127 (ignored) +cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/datasource.proto +cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/linuxbluetooth.proto +/bin/sh: 1: -I: not found +make: [Makefile:808: protobuf_cpp/http.pb.h] Error 127 (ignored) +cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/eventbus.proto +/bin/sh: 1: -I: not found +make: [Makefile:808: protobuf_cpp/linuxbluetooth.pb.h] Error 127 (ignored) +cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/kismet.proto +/bin/sh: 1: -I: not found +cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/http.proto +/bin/sh: 1: -I: not found +/bin/sh: 1: -I: not found +make: [Makefile:808: protobuf_cpp/datasource.pb.h] Error 127 (ignored) +make: [Makefile:808: protobuf_cpp/eventbus.pb.h] Error 127 (ignored) +make: [Makefile:806: protobuf_cpp/kismet.pb.cc] Error 127 (ignored) +cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/datasource.proto +cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/linuxbluetooth.proto +cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/eventbus.proto +/bin/sh: 1: -I: not found +``` + +For extra interest, the failing command begins with `--flag` i.e. a flag +passed to protoc, which Make then interprets as "ignore errors for this +command", which means output files are not created but the build then +continues and produces significantly more confusing errors such as: + +``` +kis_external.h:51:10: fatal error: protobuf_cpp/kismet.pb.h: No such file or directory +``` + +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + configure.ac | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a967e3418..d3c961821 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -179,13 +179,13 @@ else + GCC_MINOR=$(echo $GCC_VERSION | cut -s -d'.' -f2) + GCC_PATCH=$(echo $GCC_VERSION | cut -s -d'.' -f3) + +- if test "$GCC_MAJOR"x == x; then ++ if test "$GCC_MAJOR"x = x; then + GCC_MAJOR=$GCC_VERSION + fi +- if test "$GCC_MINOR"x == x; then ++ if test "$GCC_MINOR"x = x; then + GCC_MINOR=0 + fi +- if test "$GCC_PATCH"x == x; then ++ if test "$GCC_PATCH"x = x; then + GCC_PATCH=0 + fi + +@@ -318,7 +318,7 @@ AC_ARG_ENABLE([element-typesafety], + esac], + [want_te_typesafety=no] + ) +-if test "$want_te_typesafety"x == "yes"x; then ++if test "$want_te_typesafety"x = "yes"x; then + AC_DEFINE(TE_TYPE_SAFETY, 1, Enforce runtime type safety) + else + AC_DEFINE(TE_TYPE_SAFETY, 0, Do not enforce runtime type safety) +@@ -357,7 +357,7 @@ AS_IF([test "x$with_python_interpreter" != "x"], + [] + ) + +-if test "$want_python"x == "no"x; then ++if test "$want_python"x = "no"x; then + BUILD_PYTHON_MODULES=0 + BUILD_CAPTURE_SDR_RTL433=0 + BUILD_CAPTURE_SDR_RTLAMR=0 +@@ -367,11 +367,11 @@ if test "$want_python"x == "no"x; then + BUILD_CAPTURE_PROXY_ADSB=0 + AC_MSG_WARN([Disabling Python and Python-related tools]) + else +- if test "$PYTHON_VERSION" == 3; then ++ if test "$PYTHON_VERSION" = 3; then + AC_PYTHON3_MODULE(setuptools) + fi + +- if test "$HAVE_PYMOD_SETUPTOOLS" == "no"; then ++ if test "$HAVE_PYMOD_SETUPTOOLS" = "no"; then + AC_MSG_ERROR([Missing python setuptools, if you would like to build without python entirely, use --disable-python-tools, otherwise install python setuptools for your python version]) + else + DATASOURCE_BINS="$DATASOURCE_BINS \$(CAPTURE_SDR_RTL433) \$(CAPTURE_SDR_RTLAMR) \$(CAPTURE_SDR_RTLADSB) \$(CAPTURE_FREAKLABS_ZIGBEE)" +@@ -675,7 +675,7 @@ CC="$CXX" + AC_CHECK_LIB([stdc++], [main], + foundcxxl="stdc++" CXXLIBS="$CXXLIBS -lstdc++") + +-if test "$foundcxxl"x == "x" -a "$caponly" != 1; then ++if test "$foundcxxl"x = "x" -a "$caponly" != 1; then + AC_MSG_ERROR(No standard stdc++ libraries found.) + fi + CC="$oCC" +@@ -939,7 +939,7 @@ if test "${wantpcre}x" = "nox" -a "${needpcre2}x" = "yesx"; then + AC_MSG_ERROR([Can not combine --disable-pcre and --enable-require-pcre2]) + fi + +-if test "$caponly" == 0; then ++if test "$caponly" = 0; then + if test "$HAVE_CXX17" = "1"; then + AC_MSG_CHECKING([Checking C++17 parallel functions]) + +@@ -1017,7 +1017,7 @@ if test "$caponly" == 0; then + fi + + # Dont' check pcre if we're only building datasources +-if test "$caponly" == 0; then ++if test "$caponly" = 0; then + if test "$wantpcre" = "yes"; then + # Check for pcre2 first + +@@ -1046,22 +1046,22 @@ if test "$caponly" == 0; then + LIBS="$OLIBS" + + if test "$pcre2" != "yes"; then +- if test "${needpcre2}x" == "yesx"; then ++ if test "${needpcre2}x" = "yesx"; then + AC_MSG_ERROR([Could not find libpcre2 and --enable-require-pcre2 selected]) + fi + + AC_CHECK_LIB([pcre], [pcre_compile], pcre1=yes, pcre1=no) + +- if test "$pcre1" == "yes"; then ++ if test "$pcre1" = "yes"; then + AC_CHECK_HEADER([pcre.h], pcre1=yes, pcre1=no) + fi + + fi + +- if test "$pcre2" == "yes"; then ++ if test "$pcre2" = "yes"; then + AC_DEFINE(HAVE_LIBPCRE2, 1, libpcre2 regex support) + LIBS="$LIBS -lpcre2-8" +- elif test "$pcre1" == "yes"; then ++ elif test "$pcre1" = "yes"; then + AC_DEFINE(HAVE_LIBPCRE, 1, libpcre1 regex support) + LIBS="$LIBS -lpcre" + else +@@ -1071,7 +1071,7 @@ if test "$caponly" == 0; then + fi + + # Don't check for sqlite3 if we're only building datasources +-if test "$caponly" == 0; then ++if test "$caponly" = 0; then + # Check for sqlite3 + sql3l=no + AC_CHECK_LIB([sqlite3], [sqlite3_libversion], sql3l=yes, sql3l=no) +@@ -1098,7 +1098,7 @@ if test "$caponly" == 0; then + fi # caponly + + # don't check for openssl if we're only building datasources +-if test "$caponly" == 0; then ++if test "$caponly" = 0; then + AX_CHECK_OPENSSL(AC_DEFINE(HAVE_OPENSSL, 1, openssl library present), + AC_MSG_ERROR(Failed to find OpenSSL library)) + fi # caponly +@@ -1212,7 +1212,7 @@ if test "$caponly" = 0 || test "$want_python" = "yes"; then + [ --with-protoc[=PATH] Custom location of the protoc protobuf compiler], + [ ]) + +- if test x"$with_protoc" == "x"; then ++ if test x"$with_protoc" = "x"; then + PROTOCBIN=protoc + AC_CHECK_PROG(protoc, [protoc], yes) + if test x"$protoc" != x"yes"; then +@@ -1254,7 +1254,7 @@ AC_ARG_WITH(protocc, + [ --with-protocc[=PATH] Custom location of the protoc protobuf compiler], + [ PROTOCCBIN=$withval ] + ) +-if test x"$with_protocc" == "x"; then ++if test x"$with_protocc" = "x"; then + PROTOCCBIN="protoc-c" + AC_CHECK_PROG(protocc, [protoc-c], yes) + if test x"$protocc" != x"yes"; then +@@ -1282,7 +1282,7 @@ AC_ARG_ENABLE(btgeiger, + [want_btgeiger=no] + ) + +-AS_IF([test "x$want_btgeiger" == "xyes"], [ ++AS_IF([test "x$want_btgeiger" = "xyes"], [ + AS_IF([test "x$want_python" != "xyes"], [ + AC_MSG_ERROR([Can not enable btgeiger without enabling python]) + ]) +@@ -1301,7 +1301,7 @@ AC_ARG_ENABLE(bladerf, + [want_bladerf=no] + ) + +-AS_IF([test "x$want_bladerf" == "xyes"], [ ++AS_IF([test "x$want_bladerf" = "xyes"], [ + PKG_CHECK_MODULES([libbladeRF], [libbladeRF], + [ + ], +@@ -1529,7 +1529,7 @@ if test "$havenetlink" = "yes"; then + fi + + if test "$nlname" != ""; then +- if test "$picked_nl" == "tiny"; then ++ if test "$picked_nl" = "tiny"; then + NLLIBS="-lnl-tiny" + else + NLLIBS=`pkg-config --libs $nlname` +@@ -1837,7 +1837,7 @@ AC_ARG_ENABLE(asan, + esac], + [want_asan=no] + ) +-if test "$want_asan" == "yes"; then ++if test "$want_asan" = "yes"; then + CPPFLAGS="$CPPFLAGS -fsanitize=address -fno-omit-frame-pointer" + LDFLAGS="$LDFLAGS -fsanitize=address" + fi +@@ -1850,7 +1850,7 @@ AC_ARG_ENABLE(tsan, + esac], + [want_tsan=no] + ) +-if test "$want_tsan" == "yes"; then ++if test "$want_tsan" = "yes"; then + CPPFLAGS="$CPPFLAGS -fsanitize=thread -fno-omit-frame-pointer" + LDFLAGS="$LDFLAGS -fsanitize=thread" + fi +-- +2.43.2 + diff --git a/net-wireless/kismet/kismet-2022.08.1-r2.ebuild b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild index 934221430f72..fe81d7a6be92 100644 --- a/net-wireless/kismet/kismet-2022.08.1-r2.ebuild +++ b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools python-single-r1 udev systemd +inherit autotools flag-o-matic python-single-r1 udev systemd if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" @@ -123,6 +123,14 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/877761 + # https://github.com/kismetwireless/kismet/issues/518 + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + econf \ $(use_enable libusb libusb) \ $(use_enable pcre) \ diff --git a/net-wireless/kismet/kismet-2023.07.1.ebuild b/net-wireless/kismet/kismet-2023.07.1-r1.ebuild index 4fcac1c602f0..1e4b45ab639e 100644 --- a/net-wireless/kismet/kismet-2023.07.1.ebuild +++ b/net-wireless/kismet/kismet-2023.07.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools python-single-r1 udev systemd +inherit autotools flag-o-matic python-single-r1 udev systemd if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" @@ -26,7 +26,11 @@ else #SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" #S="${WORKDIR}/${PN}-${COMMIT}" - PATCHES=( "${DISTDIR}/${P}-stdint-fix.patch" ) + PATCHES=( + "${DISTDIR}/${P}-stdint-fix.patch" + # https://github.com/kismetwireless/kismet/pull/517 + "${FILESDIR}"/0001-configure.ac-bashism-fix-critical-existence-failure-.patch + ) KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" fi @@ -39,10 +43,10 @@ SLOT="0/${PV}" IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# upstream said protobuf-26.1 breaks everything +# details are unclear at this time but adding restriction for safety CDEPEND=" ${PYTHON_DEPS} - acct-user/kismet - acct-group/kismet networkmanager? ( net-misc/networkmanager ) dev-libs/glib:2 dev-libs/elfutils @@ -56,7 +60,7 @@ CDEPEND=" ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= - dev-libs/protobuf:= + <dev-libs/protobuf-26:= $(python_gen_cond_dep ' dev-python/protobuf-python[${PYTHON_USEDEP}] dev-python/websockets[${PYTHON_USEDEP}] @@ -67,6 +71,8 @@ CDEPEND=" ubertooth? ( net-wireless/ubertooth ) " RDEPEND="${CDEPEND} + acct-user/kismet + acct-group/kismet $(python_gen_cond_dep ' dev-python/pyserial[${PYTHON_USEDEP}] ') @@ -108,12 +114,18 @@ src_prepare() { default - if [ "${PV}" = "9999" ]; then - eautoreconf - fi + eautoreconf } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/877761 + # https://github.com/kismetwireless/kismet/issues/518 + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + econf \ $(use_enable libusb libusb) \ $(use_enable libusb wifi-coconut) \ diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild index f89567fabd66..5d486e757c5f 100644 --- a/net-wireless/kismet/kismet-9999.ebuild +++ b/net-wireless/kismet/kismet-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools python-single-r1 udev systemd +inherit autotools flag-o-matic python-single-r1 udev systemd if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" @@ -33,13 +33,13 @@ HOMEPAGE="https://www.kismetwireless.net" LICENSE="GPL-2" SLOT="0/${PV}" -IUSE="libusb lm-sensors mqtt 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}" +# upstream said protobuf-26.1 breaks everything +# details are unclear at this time but adding restriction for safety CDEPEND=" ${PYTHON_DEPS} - acct-user/kismet - acct-group/kismet mqtt? ( app-misc/mosquitto ) networkmanager? ( net-misc/networkmanager ) dev-libs/glib:2 @@ -54,7 +54,7 @@ CDEPEND=" ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= - dev-libs/protobuf:= + <dev-libs/protobuf-26:= $(python_gen_cond_dep ' dev-python/protobuf-python[${PYTHON_USEDEP}] dev-python/websockets[${PYTHON_USEDEP}] @@ -65,6 +65,8 @@ CDEPEND=" ubertooth? ( net-wireless/ubertooth ) " RDEPEND="${CDEPEND} + acct-user/kismet + acct-group/kismet $(python_gen_cond_dep ' dev-python/pyserial[${PYTHON_USEDEP}] ') @@ -112,6 +114,14 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/877761 + # https://github.com/kismetwireless/kismet/issues/518 + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + econf \ $(use_enable libusb libusb) \ $(use_enable libusb wifi-coconut) \ @@ -121,6 +131,7 @@ src_configure() { $(use_enable lm-sensors lmsensors) \ $(use_enable networkmanager libnm) \ $(use_enable ubertooth) \ + $(use_enable wext linuxwext) \ --sysconfdir=/etc/kismet \ --disable-optimization } diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml index e8ae7e5c85cb..9a0418aaa270 100644 --- a/net-wireless/kismet/metadata.xml +++ b/net-wireless/kismet/metadata.xml @@ -16,6 +16,11 @@ reducing security risks </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> diff --git a/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild b/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild index 0bf53e74f27d..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-2023 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,6 +26,14 @@ RDEPEND="usb3380? ( net-wireless/libusb3380 )" DEPEND="${RDEPEND}" src_configure() { + # -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 0bf53e74f27d..dbb429f7470d 100644 --- a/net-wireless/libxtrxll/libxtrxll-9999.ebuild +++ b/net-wireless/libxtrxll/libxtrxll-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 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,6 +26,14 @@ RDEPEND="usb3380? ( net-wireless/libusb3380 )" DEPEND="${RDEPEND}" src_configure() { + # -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/limesuite/Manifest b/net-wireless/limesuite/Manifest index b58bad9c75c9..f2fe713fcb25 100644 --- a/net-wireless/limesuite/Manifest +++ b/net-wireless/limesuite/Manifest @@ -1,3 +1 @@ -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-20.10.0.ebuild b/net-wireless/limesuite/limesuite-20.10.0.ebuild deleted file mode 100644 index a3eb577bb40b..000000000000 --- a/net-wireless/limesuite/limesuite-20.10.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2022 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.10.0.ebuild b/net-wireless/limesuite/limesuite-23.10.0.ebuild deleted file mode 100644 index 6e42d2d852f0..000000000000 --- a/net-wireless/limesuite/limesuite-23.10.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# 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/linssid/linssid-3.6-r2.ebuild b/net-wireless/linssid/linssid-3.6-r2.ebuild index 8e67948519cc..ce111693814b 100644 --- a/net-wireless/linssid/linssid-3.6-r2.ebuild +++ b/net-wireless/linssid/linssid-3.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ 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" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}_${PV}.orig.tar.gz" S="${WORKDIR}/${P}/${PN}-app" LICENSE="GPL-3" 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 48237f742dc9..1d834c258f80 100644 --- a/net-wireless/nanovna-saver/Manifest +++ b/net-wireless/nanovna-saver/Manifest @@ -1,2 +1,3 @@ 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 +DIST nanovna-saver-0.6.4.tar.gz 580141 BLAKE2B f46914f60ef845cb65343c336ad905f6fb00206b5f0888ded45193b988a495127a4a944ef8fb24aa25cf5025d522291c062178ee55e460d3a54889b7a36d02c7 SHA512 ec85495cc2a72fc7f97c6336abec3cc20d1829d878d8ee1692103d00dc5482a14a5407309a585d39e938d8f77b6b336b6a12aa80c986ff01ff75b3daed6581c0 diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.3-r1.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.3-r1.ebuild new file mode 100644 index 000000000000..392fbdb2e248 --- /dev/null +++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.3-r1.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..12} ) +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-0.6.2.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.4.ebuild index f9bae222d086..f190c233f584 100644 --- a/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild +++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.4.ebuild @@ -1,14 +1,13 @@ -# Copyright 2019-2023 Gentoo Authors +# 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} ) +PYTHON_COMPAT=( python3_{9..12} ) 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" @@ -20,13 +19,13 @@ else 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/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}]" diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild index f9bae222d086..f190c233f584 100644 --- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild +++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild @@ -1,14 +1,13 @@ -# Copyright 2019-2023 Gentoo Authors +# 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} ) +PYTHON_COMPAT=( python3_{9..12} ) 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" @@ -20,13 +19,13 @@ else 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/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}]" diff --git a/net-wireless/neard/neard-0.19.ebuild b/net-wireless/neard/neard-0.19.ebuild index 0e7a5e21142b..7a99d91c18a2 100644 --- a/net-wireless/neard/neard-0.19.ebuild +++ b/net-wireless/neard/neard-0.19.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-nfc/neard/archive/refs/tags/v${PV}.tar.gz -> $ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="test tools systemd" RESTRICT="!test? ( test )" @@ -24,7 +24,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" -BDEPEND="sys-devel/autoconf-archive" +BDEPEND="dev-build/autoconf-archive" src_prepare() { default 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-r1.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-0.2.0.ebuild index f8ab9250ade2..4f95c0da4bf9 100644 --- a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild +++ b/net-wireless/osmo-fl2k/osmo-fl2k-0.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,11 +10,11 @@ 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+" @@ -52,3 +52,11 @@ src_install() { # 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 04d502092441..4f95c0da4bf9 100644 --- a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild +++ b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild @@ -10,11 +10,11 @@ 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+" 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/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest index 175021ba6533..4b0707b9f509 100644 --- a/net-wireless/rtl-sdr/Manifest +++ b/net-wireless/rtl-sdr/Manifest @@ -1,2 +1 @@ -DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b2e7ffbccb4e5a2ebb6af698321ceaeba5012e6b88be03c7ff4c7b5cd45ec8df2baaa4ae55b813cdf448d895877a6757f47 SHA512 355af98a887a978794b562aa8ef78c91d19c33a6d0eb5740eb3a9b1e1329f8b11ca688eebc81a2d61440972ba5121225205de7165a22882a7e32cf6608888f25 -DIST rtl-sdr-0.6.0_p20221217.tar.gz 134261 BLAKE2B 1148e0aeaba67dda5545b2bcd18a806047eeea9573578e1a3111b08abea481e2649ef68ab6ccd9e69603798b0003cc63efb3c5f6184acfd021dd223688402d56 SHA512 e80bae2405aaa4c6c943f5df7afc96ea02cd5861b0348d33e567000bde0a3aa79ab2204311bde6094a4b8037d11eb14ca0f91f8dbd339c339aae2581c0a78652 +DIST rtl-sdr-2.0.1.gh.tar.gz 135727 BLAKE2B 46bb64e2e35d5f6164acb15b0b1e4c0c988bac8de8fd494faec85f4d36f2db3f73ebb0dc46ce42d4b2ff00a9025f145259aeff25563dd82623c2a3502cda1059 SHA512 ed7b84f05d524d89afc1db384a4e1c4bb2a66e9c6b42623ab42ac9d55829bde77eb12529044e1778664b5a97a48dc5b64bed19161a430c9d91c04dd08cb6b7ac 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-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild deleted file mode 100644 index bbdfee3faae7..000000000000 --- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 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 - 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}" - -PATCHES=( - "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch -) - -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 - 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-0.6.0_p2020802.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild deleted file mode 100644 index f7b88d47150c..000000000000 --- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 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 - 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-0.6.0_p20221217.ebuild b/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild index 1da1818e4d31..be4305a53b0c 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,21 +10,16 @@ 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="142325a93c6ad70f851f43434acfdf75e12dfe03" - 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" + #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" +LICENSE="GPL-2+" SLOT="0" IUSE="+zerocopy" @@ -35,11 +30,6 @@ PATCHES=( "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch ) -src_prepare() { - sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20221217#' CMakeLists.txt - cmake_src_prepare -} - src_configure() { #the udev rules are 666, we don't want that local mycmakeargs=( diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild index 1da1818e4d31..dd2530e97a36 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild @@ -10,21 +10,16 @@ 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="142325a93c6ad70f851f43434acfdf75e12dfe03" - 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" @@ -35,11 +30,6 @@ PATCHES=( "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch ) -src_prepare() { - sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20221217#' CMakeLists.txt - cmake_src_prepare -} - src_configure() { #the udev rules are 666, we don't want that local mycmakeargs=( diff --git a/net-wireless/rtl_433/rtl_433-9999.ebuild b/net-wireless/rtl_433/rtl_433-9999.ebuild index db11fc2febca..ea9cb877d387 100644 --- a/net-wireless/rtl_433/rtl_433-9999.ebuild +++ b/net-wireless/rtl_433/rtl_433-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,8 +42,3 @@ src_configure() { ) cmake_src_configure } - -src_install() { - cmake_src_install - mv "${ED}/usr/etc" "${ED}/" || die -} diff --git a/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild b/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild index 0154f873ac51..60f674d398fd 100644 --- a/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild +++ b/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit versionator unpacker udev multilib-minimal +inherit unpacker udev multilib-minimal -MY_PV_1=$(get_major_version) -MY_PV_12=$(get_version_component_range 1-2) +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" @@ -38,13 +38,13 @@ multilib_src_install_all() { multilib_src_install() { if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_32" ]; then - dolib "${S}/i686/libmirsdrapi-rsp.so.${MY_PV_12}" + dolib.so "${S}/i686/libmirsdrapi-rsp.so.${MY_PV_12}" fi if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_64" ]; then - dolib "${S}/x86_64/libmirsdrapi-rsp.so.${MY_PV_12}" + dolib.so "${S}/x86_64/libmirsdrapi-rsp.so.${MY_PV_12}" fi - dosym libmirsdrapi-rsp.so.${MY_PV_12} "${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so.${MY_PV_1}" - dosym libmirsdrapi-rsp.so.${MY_PV_1} "${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so" + dosym libmirsdrapi-rsp.so.${MY_PV_12} "${EROOT}/usr/$(get_libdir)/libmirsdrapi-rsp.so.${MY_PV_1}" + dosym libmirsdrapi-rsp.so.${MY_PV_1} "${EROOT}/usr/$(get_libdir)/libmirsdrapi-rsp.so" } diff --git a/net-wireless/sigutils/Manifest b/net-wireless/sigutils/Manifest index d70052f4e60b..6b92e3bc2037 100644 --- a/net-wireless/sigutils/Manifest +++ b/net-wireless/sigutils/Manifest @@ -1,2 +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.1.0-r1.ebuild deleted file mode 100644 index 30a26a5d5071..000000000000 --- a/net-wireless/sigutils/sigutils-0.1.0-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CMAKE_MAKEFILE_GENERATOR='emake' -inherit cmake - -DESCRIPTION="signal processing library for blind signal analysis and automatic demodulation" -HOMEPAGE="https://github.com/BatchDrake/sigutils" -SRC_URI="https://github.com/BatchDrake/sigutils/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsndfile - sci-libs/fftw:3.0= - sci-libs/volk:= -" -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/sigutils/sigutils-0.3.0.ebuild b/net-wireless/sigutils/sigutils-0.3.0-r1.ebuild index 8f22b87f93f9..adb692698973 100644 --- a/net-wireless/sigutils/sigutils-0.3.0.ebuild +++ b/net-wireless/sigutils/sigutils-0.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,6 +17,7 @@ IUSE="" DEPEND=" sci-libs/fftw:3.0= sci-libs/volk:= + media-libs/libsndfile:= " RDEPEND="${DEPEND}" BDEPEND="" diff --git a/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild b/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild index 2fa212a5f4d1..dff573bf3ef7 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-2022 Gentoo Authors +# Copyright 1999-2024 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 ~arm ~riscv ~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/soapyhackrf-0.3.4.ebuild b/net-wireless/soapyhackrf/soapyhackrf-0.3.4.ebuild index 017475da18d7..d7aaaa8f3bd4 100644 --- a/net-wireless/soapyhackrf/soapyhackrf-0.3.4.ebuild +++ b/net-wireless/soapyhackrf/soapyhackrf-0.3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyHackRF.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~riscv ~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 581a4770737e..b4d830f5d287 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-2022 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 ~arm ~riscv ~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/soapyrtlsdr/soapyrtlsdr-0.3.3.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.3.ebuild index 769f04594963..8253f5f86269 100644 --- a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.3.ebuild +++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/pothosware/SoapyRTLSDR.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~riscv ~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 diff --git a/net-wireless/soapysdr/files/soapysdr-0.8.1-python3.12-distutils.patch b/net-wireless/soapysdr/files/soapysdr-0.8.1-python3.12-distutils.patch new file mode 100644 index 000000000000..877bc9c15ba7 --- /dev/null +++ b/net-wireless/soapysdr/files/soapysdr-0.8.1-python3.12-distutils.patch @@ -0,0 +1,74 @@ +https://github.com/pothosware/SoapySDR/commit/1ee5670803f89b21d84a6a84acbb578da051c119 + +From 1ee5670803f89b21d84a6a84acbb578da051c119 Mon Sep 17 00:00:00 2001 +From: Ryan Volz <ryan.volz@gmail.com> +Date: Tue, 26 Sep 2023 14:56:59 -0400 +Subject: [PATCH] Remove deprecated use of distutils, fix for Python 3.12+ + +This switches to using sysconfig from distutils, which is necessary for +Python 3.12+ since distutils is deprecated and has been removed. + +It is necessary to specify the install scheme when a prefix other than +the Python default is used so that changes to the default scheme made by +distributions (e.g. Debian, Fedora) do not produce an incorrect Python +installation directory. For example, Debian patches the default scheme +to prepend the path with '/local', but if a user specifies a prefix of +'/usr/local', then the path using the default scheme would be +'/usr/local/local/...' with a duplicated 'local' directory. Specifying +an unmodified install scheme fixes that. + +Signed-off-by: Ryan Volz <ryan.volz@gmail.com> +--- + python/get_python_lib.py | 36 ++++++++++++++++++++++++----------- + 1 file changed, 25 insertions(+), 11 deletions(-) + +diff --git a/python/get_python_lib.py b/python/get_python_lib.py +index 0c716529..574f0b60 100644 +--- a/python/get_python_lib.py ++++ b/python/get_python_lib.py +@@ -1,19 +1,33 @@ + import os ++import pathlib + import sys +-import site +-from distutils.sysconfig import get_python_lib ++import sysconfig + + if __name__ == '__main__': +- prefix = sys.argv[1] ++ prefix = pathlib.Path(sys.argv[1]).resolve() + +- #ask distutils where to install the python module +- install_dir = get_python_lib(plat_specific=True, prefix=prefix) ++ # default install dir for the running Python interpreter ++ default_install_dir = pathlib.Path(sysconfig.get_path('platlib')).resolve() + +- #use sites when the prefix is already recognized ++ # if default falls under the desired prefix, we're done + try: +- paths = [p for p in site.getsitepackages() if p.startswith(prefix)] +- if len(paths) == 1: install_dir = paths[0] +- except AttributeError: pass ++ relative_install_dir = default_install_dir.relative_to(prefix) ++ except ValueError: ++ # get install dir for the specified prefix ++ # can't use the default scheme because distributions modify it ++ # newer Python versions have 'venv' scheme, use for all OSs. ++ if 'venv' in sysconfig.get_scheme_names(): ++ scheme = 'venv' ++ elif os.name == 'nt': ++ scheme = 'nt' ++ else: ++ scheme = 'posix_prefix' ++ prefix_install_dir = pathlib.Path(sysconfig.get_path( ++ 'platlib', ++ scheme=scheme, ++ vars={'base': prefix, 'platbase': prefix}, ++ )).resolve() ++ relative_install_dir = prefix_install_dir.relative_to(prefix) + +- #strip the prefix to return a relative path +- print(os.path.relpath(install_dir, prefix)) ++ # want a relative path for use in the build system ++ print(relative_install_dir) + diff --git a/net-wireless/soapysdr/soapysdr-0.8.1.ebuild b/net-wireless/soapysdr/soapysdr-0.8.1-r1.ebuild index fa9402a85678..f4f69287124e 100644 --- a/net-wireless/soapysdr/soapysdr-0.8.1.ebuild +++ b/net-wireless/soapysdr/soapysdr-0.8.1-r1.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) - -inherit cmake python-r1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake python-single-r1 DESCRIPTION="vendor and platform neutral SDR support library" HOMEPAGE="https://github.com/pothosware/SoapySDR" @@ -15,46 +14,47 @@ if [ "${PV}" = "9999" ]; then EGIT_CLONE_TYPE="shallow" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~riscv ~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 LICENSE="Boost-1.0" SLOT="0/${PV}" - IUSE="bladerf hackrf python rtlsdr plutosdr uhd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig:0 ) +DEPEND="${RDEPEND}" +BDEPEND="python? ( dev-lang/swig:0 )" +PDEPEND=" + bladerf? ( net-wireless/soapybladerf ) + hackrf? ( net-wireless/soapyhackrf ) + rtlsdr? ( net-wireless/soapyrtlsdr ) + plutosdr? ( net-wireless/soapyplutosdr ) + uhd? ( net-wireless/soapyuhd ) " -PDEPEND="bladerf? ( net-wireless/soapybladerf ) - hackrf? ( net-wireless/soapyhackrf ) - rtlsdr? ( net-wireless/soapyrtlsdr ) - plutosdr? ( net-wireless/soapyplutosdr ) - uhd? ( net-wireless/soapyuhd )" -src_configure() { - configuration() { - mycmakeargs+=( - -DENABLE_PYTHON=ON - -DBUILD_PYTHON3=ON - ) - } +PATCHES=( + "${FILESDIR}"/soapysdr-0.8.1-python3.12-distutils.patch +) - if use python; then - python_foreach_impl configuration - fi +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DENABLE_PYTHON=$(usex python) + -DENABLE_PYTHON3=$(usex python) + -DBUILD_PYTHON3=$(usex python) + -DUSE_PYTHON_CONFIG=ON + ) cmake_src_configure } src_install() { cmake_src_install - - if use python; then - python_foreach_impl python_optimize - fi + use python && python_optimize } diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild b/net-wireless/soapysdr/soapysdr-9999.ebuild index fa9402a85678..ad161a57c0f5 100644 --- a/net-wireless/soapysdr/soapysdr-9999.ebuild +++ b/net-wireless/soapysdr/soapysdr-9999.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) - -inherit cmake python-r1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake python-single-r1 DESCRIPTION="vendor and platform neutral SDR support library" HOMEPAGE="https://github.com/pothosware/SoapySDR" @@ -22,39 +21,33 @@ fi LICENSE="Boost-1.0" SLOT="0/${PV}" - IUSE="bladerf hackrf python rtlsdr plutosdr uhd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig:0 ) +DEPEND="${RDEPEND}" +BDEPEND="python? ( dev-lang/swig:0 )" +PDEPEND=" + bladerf? ( net-wireless/soapybladerf ) + hackrf? ( net-wireless/soapyhackrf ) + rtlsdr? ( net-wireless/soapyrtlsdr ) + plutosdr? ( net-wireless/soapyplutosdr ) + uhd? ( net-wireless/soapyuhd ) " -PDEPEND="bladerf? ( net-wireless/soapybladerf ) - hackrf? ( net-wireless/soapyhackrf ) - rtlsdr? ( net-wireless/soapyrtlsdr ) - plutosdr? ( net-wireless/soapyplutosdr ) - uhd? ( net-wireless/soapyuhd )" -src_configure() { - configuration() { - mycmakeargs+=( - -DENABLE_PYTHON=ON - -DBUILD_PYTHON3=ON - ) - } +pkg_setup() { + use python && python-single-r1_pkg_setup +} - if use python; then - python_foreach_impl configuration - fi +src_configure() { + local mycmakeargs=( + -DENABLE_PYTHON3=$(usex python) + ) cmake_src_configure } src_install() { cmake_src_install - - if use python; then - python_foreach_impl python_optimize - fi + use python && python_optimize } diff --git a/net-wireless/soapyuhd/soapyuhd-0.4.1.ebuild b/net-wireless/soapyuhd/soapyuhd-0.4.1.ebuild index ce4efc4c34c3..a57ac212bdeb 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-2022 Gentoo Authors +# Copyright 1999-2024 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 ~arm ~riscv ~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/suscan/Manifest b/net-wireless/suscan/Manifest index 213ab1dd498a..bae6f2a1baf3 100644 --- a/net-wireless/suscan/Manifest +++ b/net-wireless/suscan/Manifest @@ -1,2 +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.1.0-r1.ebuild deleted file mode 100644 index 1f10e15ed213..000000000000 --- a/net-wireless/suscan/suscan-0.1.0-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CMAKE_MAKEFILE_GENERATOR='emake' -inherit cmake - -DESCRIPTION="a realtime DSP processing library" -HOMEPAGE="https://github.com/BatchDrake/suscan" -SRC_URI="https://github.com/BatchDrake/suscan/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsndfile - dev-libs/libxml2 - net-wireless/sigutils - net-wireless/soapysdr:= - sci-libs/fftw:3.0= - sci-libs/volk:= -" -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/uhd/Manifest b/net-wireless/uhd/Manifest index 91a65be5da1c..3c32537c43ec 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -1,2 +1,4 @@ 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-4.6.0.0-boost-1.85-1.patch b/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-1.patch new file mode 100644 index 000000000000..5861b93b6676 --- /dev/null +++ b/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-1.patch @@ -0,0 +1,80 @@ +https://github.com/EttusResearch/uhd/commit/ea586168c596d13d05d145832519755794649ba0 +https://bugs.gentoo.org/932239#c10 + +From ea586168c596d13d05d145832519755794649ba0 Mon Sep 17 00:00:00 2001 +From: Martin Braun <martin.braun@ettus.com> +Date: Thu, 28 Mar 2024 17:28:57 +0100 +Subject: [PATCH 08/30] lib: Replace deprecated boost::filesystem usage + +Recent versions of Boost were throwing compiler warnings due to usage of +deprecated functions. Our minimum version of Boost (1.65) already +provides the replacements, so this commit simply updates these +deprecated use cases. +--- + host/lib/usrp/mpmd/mpmd_image_loader.cpp | 6 ++---- + host/lib/usrp/x300/x300_image_loader.cpp | 4 ++-- + host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp | 2 +- + 3 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/host/lib/usrp/mpmd/mpmd_image_loader.cpp b/host/lib/usrp/mpmd/mpmd_image_loader.cpp +index 31b6387ab..ba0f45fad 100644 +--- a/lib/usrp/mpmd/mpmd_image_loader.cpp ++++ b/lib/usrp/mpmd/mpmd_image_loader.cpp +@@ -27,8 +27,6 @@ + #include <cctype> + #include <fstream> + #include <iterator> +-#include <sstream> +-#include <streambuf> + #include <string> + #include <vector> + +@@ -271,7 +269,7 @@ static uhd::usrp::component_files_t bin_dts_to_component_files( + // DTS component struct + // First, we need to determine the name + const std::string base_name = +- boost::filesystem::change_extension(fpga_path, "").string(); ++ boost::filesystem::path(fpga_path).replace_extension("").string(); + if (base_name == fpga_path) { + const std::string err_msg( + "Can't cut extension from FPGA filename... " + fpga_path); +@@ -340,7 +338,7 @@ static void mpmd_send_fpga_to_device( + UHD_LOG_TRACE("MPMD IMAGE LOADER", "FPGA path: " << fpga_path); + + // If the fpga_path is a lvbitx file, parse it as such +- if (boost::filesystem::extension(fpga_path) == ".lvbitx") { ++ if (boost::filesystem::path(fpga_path).extension() == ".lvbitx") { + all_component_files = lvbitx_to_component_files(fpga_path, delay_reload); + } else { + all_component_files = bin_dts_to_component_files(fpga_path, delay_reload); +diff --git a/host/lib/usrp/x300/x300_image_loader.cpp b/host/lib/usrp/x300/x300_image_loader.cpp +index d7a64d4d0..a84dba420 100644 +--- a/lib/usrp/x300/x300_image_loader.cpp ++++ b/lib/usrp/x300/x300_image_loader.cpp +@@ -138,8 +138,8 @@ static void x300_validate_image(x300_session_t& session) + boost::format("Could not find image at path \"%s\".") % session.filepath)); + } + +- std::string extension = fs::extension(session.filepath); +- session.lvbitx = (extension == ".lvbitx"); ++ const std::string extension = fs::path(session.filepath).extension().string(); ++ session.lvbitx = (extension == ".lvbitx"); + + if (session.lvbitx) { + extract_from_lvbitx(session); +diff --git a/host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp b/host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp +index 930c5d758..4c39790c7 100644 +--- a/lib/usrp_clock/octoclock/octoclock_image_loader.cpp ++++ b/lib/usrp_clock/octoclock/octoclock_image_loader.cpp +@@ -95,7 +95,7 @@ static void octoclock_validate_firmware_image(octoclock_session_t& session) + % session.image_filepath)); + } + +- std::string extension = fs::extension(session.image_filepath); ++ const std::string extension = fs::path(session.image_filepath).extension().string(); + if (extension == ".bin") { + octoclock_read_bin(session); + } else if (extension == ".hex") { +-- +2.44.1 + diff --git a/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-2.patch b/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-2.patch new file mode 100644 index 000000000000..fab224782ccc --- /dev/null +++ b/net-wireless/uhd/files/uhd-4.6.0.0-boost-1.85-2.patch @@ -0,0 +1,31 @@ +https://github.com/EttusResearch/uhd/commit/c4863b9b9f8b639260f7797157e8ac4dd81fef93 +https://bugs.gentoo.org/932239#c11 + +From c4863b9b9f8b639260f7797157e8ac4dd81fef93 Mon Sep 17 00:00:00 2001 +From: Joerg Hofrichter <joerg.hofrichter@ni.com> +Date: Wed, 17 Apr 2024 13:59:19 +0200 +Subject: [PATCH 26/30] fix compilation with boost 1.85.0 + +The header boost/filesystem/convenience.hpp was removed with boost 1.85.0 + +The deprecated extension-related functions were already replaced with +commit ea586168c596d13d05d145832519755794649ba0 +--- + host/lib/usrp/mpmd/mpmd_image_loader.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/host/lib/usrp/mpmd/mpmd_image_loader.cpp b/host/lib/usrp/mpmd/mpmd_image_loader.cpp +index ba0f45fad..9824bbf4d 100644 +--- a/lib/usrp/mpmd/mpmd_image_loader.cpp ++++ b/lib/usrp/mpmd/mpmd_image_loader.cpp +@@ -21,7 +21,6 @@ + #include <boost/algorithm/string.hpp> + #include <boost/archive/iterators/binary_from_base64.hpp> + #include <boost/archive/iterators/transform_width.hpp> +-#include <boost/filesystem/convenience.hpp> + #include <boost/optional.hpp> + #include <boost/property_tree/xml_parser.hpp> + #include <cctype> +-- +2.44.1 + diff --git a/net-wireless/uhd/uhd-4.4.0.0.ebuild b/net-wireless/uhd/uhd-4.4.0.0.ebuild index b0f2d369163a..e84fcfca773b 100644 --- a/net-wireless/uhd/uhd-4.4.0.0.ebuild +++ b/net-wireless/uhd/uhd-4.4.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,7 +40,7 @@ RDEPEND="${PYTHON_DEPS} DEPEND="${RDEPEND}" #zip and gzip are directly used by the build system BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) $(python_gen_cond_dep ' dev-python/mako[${PYTHON_USEDEP}] ') diff --git a/net-wireless/uhd/uhd-4.6.0.0.ebuild b/net-wireless/uhd/uhd-4.6.0.0.ebuild new file mode 100644 index 000000000000..bfe690bb44c8 --- /dev/null +++ b/net-wireless/uhd/uhd-4.6.0.0.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit cmake gnome2-utils python-single-r1 udev + +DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver" +HOMEPAGE="https://kb.ettus.com" + +SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \ + https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz" +#https://github.com/EttusResearch/UHD-Mirror/tags +#http://files.ettus.com/binaries/images/ + +LICENSE="GPL-3" +SLOT="0/$(ver_cut 1-3)" +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 usrp1 usrp2 x300 )" + +RDEPEND="${PYTHON_DEPS} + e300? ( virtual/udev ) + usb? ( virtual/libusb:1 ) + dev-libs/boost:= + sys-libs/ncurses:0= + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') +" +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}] + ') + app-arch/unzip + app-arch/gzip +" + +S="${WORKDIR}/${P}/host" + +PATCHES=( + "${FILESDIR}"/uhd-4.6.0.0-boost-1.85-1.patch + "${FILESDIR}"/uhd-4.6.0.0-boost-1.85-2.patch +) + +src_unpack() { + default + mv "uhd-images_${PV}" images || die +} + +src_prepare() { + cmake_src_prepare + + gnome2_environment_reset #534582 +} + +src_configure() { + #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 + -DENABLE_MAN_PAGE_COMPRESSION=OFF + -DENABLE_EXAMPLES="$(usex examples)" + -DENABLE_TESTS="$(usex test)" + -DENABLE_USB="$(usex usb)" + -DENABLE_UTILS="$(usex utils)" + -DENABLE_MANUAL="$(usex doc)" + -DENABLE_DOXYGEN="$(usex doc)" + -DENABLE_B100="$(usex b100)" + -DENABLE_B200="$(usex b200)" + -DENABLE_E300="$(usex e300)" + -DENABLE_USRP1="$(usex usrp1)" + -DENABLE_USRP2="$(usex usrp2)" + -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_src_configure +} + +src_install() { + cmake_src_install + python_optimize + 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 + + udev_dorules "${S}/utils/uhd-usrp.rules" + + rm -r "${WORKDIR}/images/winusb_driver" || die + if ! use b100; then + rm "${WORKDIR}"/images/usrp_b100* || die + fi + if ! use b200; then + rm "${WORKDIR}"/images/usrp_b2[01]* || die + fi + if ! use e300; then + rm "${WORKDIR}"/images/usrp_e3* || die + fi + if ! use mpmd; then + rm "${WORKDIR}"/images/usrp_n310* || die + fi + if ! use octoclock; then + rm "${WORKDIR}"/images/octoclock* || die + fi + if ! use usrp1; then + rm "${WORKDIR}"/images/usrp1* || die + fi + if ! use usrp2; then + rm "${WORKDIR}"/images/usrp2* || die + rm "${WORKDIR}"/images/usrp_n2[01]* || die + rm -r "${WORKDIR}"/images/bit || die + fi + if ! use x300; then + rm "${WORKDIR}/"images/usrp_x3* || die + fi + insinto /usr/share/${PN} + doins -r "${WORKDIR}/images" +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest index 32a7a037792b..fdde55309e82 100644 --- a/net-wireless/unifi/Manifest +++ b/net-wireless/unifi/Manifest @@ -1,3 +1,5 @@ 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.7.zip 158459828 BLAKE2B 24404aa01d574245127da119f1ec54ecca22c80b778c117f88dd5102dd0196b6616ab75befb5de7cc97428b2712a1aeb05f86317f7e652fbe49e47e7315cf7fd SHA512 91932b4d12bb4af68ad16e641ed824e93f9a478c7a9a42b4b9ac43d92d23ece8aa5cb53bfcbd06bedf5442986f76d91b933ce3ef4e4955c6bd4d1cc7e1ca1472 +DIST unifi-8.1.127.zip 165920812 BLAKE2B 553273139c7f8e38c04ce3823b4478e6e366ff3a139f22d692fb6f9c39284e6fbe12191bc4991e832d124e08893121018931c74c921a2186c849cb97016f8310 SHA512 45b9fe1d7d73b3544c2158062cc4f3fcea515a21ed31ed9be408995949cf4cc5f504a4b10934b400bbf309d38cf52ac72cdda87cde14217c360aa736071dffff +DIST unifi-8.2.93.zip 168248927 BLAKE2B 2a120d5b63fe7be97e9fe6d4092293a26cac2eef55489d36fe23402c72a15315522a335015f8aa00cb6b61c372b7e28c978906ce21361e4d2dc4f4d21c960f2f SHA512 30d747256c5ae1403ca8a01f31e80723a1f14c328368f43cee2d867158a079e441c456405ae676fe3c5d6e8ae039af3cd24f1fd36b05660ad79cfe6fdb8d6acf +DIST unifi-8.3.32.zip 169676863 BLAKE2B 337d095e4ea434d22af78c93de1a14ac8ad6800286505242498ad513d424230208cf0e38c5df5185ad6480ff83d695837e8915067aa6026dc3faea49d245571e SHA512 f8ae2712c40957d308cc713b7f75cd9682da0b34f773293428ef6e8931629e5d365c8af4bc5503f96d0b751f4d996a1b8492cc443dc9a043c40105f38d9995c6 diff --git a/net-wireless/unifi/unifi-6.5.55-r2.ebuild b/net-wireless/unifi/unifi-6.5.55-r2.ebuild index ec2a20c228d4..30feb46a0502 100644 --- a/net-wireless/unifi/unifi-6.5.55-r2.ebuild +++ b/net-wireless/unifi/unifi-6.5.55-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,9 +13,9 @@ HOMEPAGE="https://www.ubnt.com" SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" S="${WORKDIR}/UniFi" -KEYWORDS="-* amd64 ~arm64" 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" @@ -30,7 +30,10 @@ BDEPEND="app-arch/unzip" DOCS=( "readme.txt" ) -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" +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 diff --git a/net-wireless/unifi/unifi-7.5.187.ebuild b/net-wireless/unifi/unifi-7.5.187.ebuild index 4b407c739f87..9eb90b0aa930 100644 --- a/net-wireless/unifi/unifi-7.5.187.ebuild +++ b/net-wireless/unifi/unifi-7.5.187.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,9 +13,9 @@ HOMEPAGE="https://www.ubnt.com" SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" S="${WORKDIR}/UniFi" -KEYWORDS="-* amd64 ~arm64" 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" @@ -30,7 +30,10 @@ BDEPEND="app-arch/unzip" DOCS=( "readme.txt" ) -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" +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 diff --git a/net-wireless/unifi/unifi-8.0.7.ebuild b/net-wireless/unifi/unifi-8.1.127.ebuild index b6765b4de8b5..2f1936dc19fa 100644 --- a/net-wireless/unifi/unifi-8.0.7.ebuild +++ b/net-wireless/unifi/unifi-8.1.127.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,9 +13,9 @@ HOMEPAGE="https://www.ubnt.com" SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" S="${WORKDIR}/UniFi" -KEYWORDS="-* amd64 ~arm64" 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" @@ -30,7 +30,10 @@ BDEPEND="app-arch/unzip" DOCS=( "readme.txt" ) -QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so" +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 diff --git a/net-wireless/unifi/unifi-8.2.93.ebuild b/net-wireless/unifi/unifi-8.2.93.ebuild new file mode 100644 index 000000000000..2f1936dc19fa --- /dev/null +++ b/net-wireless/unifi/unifi-8.2.93.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.3.32.ebuild b/net-wireless/unifi/unifi-8.3.32.ebuild new file mode 100644 index 000000000000..ed01ef5545ac --- /dev/null +++ b/net-wireless/unifi/unifi-8.3.32.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 95d76c41da5c..53c9535a3d2d 100644 --- a/net-wireless/urh/Manifest +++ b/net-wireless/urh/Manifest @@ -1,2 +1 @@ -DIST urh-2.9.4.tar.gz 13415656 BLAKE2B 504cb073540f614eea070a7aaa83ac62f81c6a115a01f935cfc39baec37bc1deb5b56035100700825f41b21ec0937d6014f0d0b73debcbf9ca951e238805d64b SHA512 a888c20a4d2f349960e41defdb5cce6590d4523f8a1a655e21e4caaf7dd98a6f51936fa5a038787cb5935bc42e8863d2940059130dc9982caeea4b80e431aeeb -DIST urh-2.9.5.tar.gz 13414599 BLAKE2B efe075e78dd7b289d21d93675be420e8e5e69293eb1f5e61025a9b0a7db60f4e2cae29d94af03fa9e42a6941edda9667a935b201a8838c0204e61008d2883b56 SHA512 7f04f041963103aab4a67fd5fd8f874339cad04da846236b0ec4584553ae6b4a6469c2505cec7c67f72d848d0eb90a4996753802c65535914e70a943d40e6970 +DIST urh-2.9.6_p20240428.gh.tar.gz 13439550 BLAKE2B ad71275f2a3d0c5a680bac361949a70d1eb9a0fe496d720bbc831ef1e34b40ed187106825a295e421bf9e224de5f65cc4ed2791839307bbb75f900ba4f05aa61 SHA512 a278d4b5fcd09cf61cc63341545604882591b6732009ca61b41aa58c71666410175d7b75106c56f43dfd538db287a38f14288cc3d2dbde0260caef370850af03 diff --git a/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch b/net-wireless/urh/files/urh-2.9.7-no-numpy-setup.patch index 4beca0eed64f..c60b2c766197 100644 --- a/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch +++ b/net-wireless/urh/files/urh-2.9.7-no-numpy-setup.patch @@ -5,7 +5,7 @@ diff -Naur urh-2.9.4-orig/setup.py urh-2.9.4/setup.py print("Finalizing options") _build_ext.finalize_options(self) # Prevent numpy from thinking it is still in its setup process: -- __builtins__.__NUMPY_SETUP__ = False +- set_builtin("__NUMPY_SETUP__", False) import numpy + self.include_dirs.append(numpy.get_include()) - diff --git a/net-wireless/urh/urh-2.9.5.ebuild b/net-wireless/urh/urh-2.9.5.ebuild deleted file mode 100644 index 656c0488c09c..000000000000 --- a/net-wireless/urh/urh-2.9.5.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# 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-2.9.4.ebuild b/net-wireless/urh/urh-2.9.6_p20240428.ebuild index fbf539dbce42..dc4f6ce3bf49 100644 --- a/net-wireless/urh/urh-2.9.4.ebuild +++ b/net-wireless/urh/urh-2.9.6_p20240428.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 virtualx @@ -15,7 +15,10 @@ 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" + COMMIT="544efd35ac4e0105cb63a31f2dc209c3834bc7bd" + SRC_URI="https://github.com/jopohl/urh/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + #SRC_URI="https://github.com/jopohl/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -44,7 +47,7 @@ RDEPEND="${DEPEND} distutils_enable_tests pytest -PATCHES=( "${FILESDIR}/${P}-no-numpy-setup.patch" ) +PATCHES=( "${FILESDIR}/${PN}-2.9.7-no-numpy-setup.patch" ) python_configure_all() { DISTUTILS_ARGS=( diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild index ed1d620f7de7..ea6072eaa290 100644 --- a/net-wireless/urh/urh-9999.ebuild +++ b/net-wireless/urh/urh-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 virtualx 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/wepattack-0.1.3-r6.ebuild b/net-wireless/wepattack/wepattack-0.1.3-r6.ebuild index a58936f4d107..03952ca51a7a 100644 --- a/net-wireless/wepattack/wepattack-0.1.3-r6.ebuild +++ b/net-wireless/wepattack/wepattack-0.1.3-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ 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" +SRC_URI="https://downloads.sourceforge.net/wepattack/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild index 7ea4ad0436cc..33ea4d37940a 100644 --- a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild +++ b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Enhanced version of WepAttack a tool for breaking 802.11 WEP keys" HOMEPAGE="http://wepdecrypt.sourceforge.net/" -SRC_URI="mirror://sourceforge/wepdecrypt/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/wepdecrypt/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest index 82e5206f1dc5..db755680880a 100644 --- a/net-wireless/wireless-regdb/Manifest +++ b/net-wireless/wireless-regdb/Manifest @@ -1,2 +1,3 @@ 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 +DIST wireless-regdb-2024.05.08.tar.xz 27716 BLAKE2B 223268c6ba9e3f616b28a9317d62ac687cd09c9ff3cc8e0d0827b3a59efa7b3bc64c0c094b70aaceb87cffba7d36d36d550c001d0778238adcf2ac5cbe3f6b93 SHA512 edb562d708be7119e80bb48d7520c11e409b81178168f9c6873ea97a2e4d9277d02d3b72b1af9f0302ba2e252d94d14c4468ee4cc1a6bb186a17d74c57d7594d diff --git a/net-wireless/wireless-regdb/metadata.xml b/net-wireless/wireless-regdb/metadata.xml index 101c017e6f75..a61f7bfb3196 100644 --- a/net-wireless/wireless-regdb/metadata.xml +++ b/net-wireless/wireless-regdb/metadata.xml @@ -6,7 +6,4 @@ <name>Rick Farina</name> </maintainer> <stabilize-allarches/> - <use> - <flag name="crda">Use obsolete <pkg>net-wireless/crda</pkg> for regulatory domain loading instead of in-kernel (4.15+) support</flag> - </use> </pkgmetadata> diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild index 4bf9984598e8..8860373ea93f 100644 --- a/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild +++ b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,11 +14,6 @@ S="${WORKDIR}/${MY_P}" LICENSE="ISC" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="crda" - -#PDEPEND is required here or crda test dep causes circular deps -PDEPEND="crda? ( net-wireless/crda )" - REQUIRED_USE="kernel_linux" pkg_pretend() { @@ -40,12 +35,6 @@ pkg_pretend() { ewarn "You can safely disable CFG80211_CRDA_SUPPORT" fi fi - - if has_version net-wireless/crda || use crda; then - ewarn "Starting from kernel version 4.15 net-wireless/crda is no longer needed." - ewarn "The crda USE flag will be removed on or after Feb 01, 2024" - fi - else CONFIG_CHECK="~CFG80211_CRDA_SUPPORT" WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: \ @@ -61,15 +50,6 @@ src_compile() { } src_install() { - if use crda; then - # This file is not ABI-specific, and crda itself always hardcodes - # this path. So install into a common location for all ABIs to use. - insinto /usr/lib/crda - doins regulatory.bin - - insinto /etc/wireless-regdb/pubkeys - doins sforshee.key.pub.pem - fi # install the files the kernel needs unconditionally, # they are small and kernels get upgraded insinto /lib/firmware diff --git a/net-wireless/wireless-regdb/wireless-regdb-20240508.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20240508.ebuild new file mode 100644 index 000000000000..8860373ea93f --- /dev/null +++ b/net-wireless/wireless-regdb/wireless-regdb-20240508.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/wpa_supplicant/files/wpa_cli-r1.sh b/net-wireless/wpa_supplicant/files/wpa_cli-r1.sh new file mode 100644 index 000000000000..dc852f427f4c --- /dev/null +++ b/net-wireless/wpa_supplicant/files/wpa_cli-r1.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# Copyright 1999-2011 Gentoo Foundation +# Written by Roy Marples <uberlord@gentoo.org> +# Distributed under the terms of the GNU General Public License v2 +# Alternatively, this file may be distributed under the terms of the BSD License + +if [ -z "$1" -o -z "$2" ]; then + logger -t wpa_cli "Insufficient parameters" + exit 1 +fi + +INTERFACE="$1" +ACTION="$2" + +# Note, the below action must NOT mark the interface down via ifconfig, ip or +# similar. Addresses can be removed, changed and daemons can be stopped, but +# the interface must remain up for wpa_supplicant to work. + +if [ -f /etc/gentoo-release ]; then + EXEC="/etc/init.d/net.${INTERFACE} --quiet" +else + logger -t wpa_cli "I don't know what to do with this distro!" + exit 1 +fi + +case ${ACTION} in + CONNECTED) + EXEC="${EXEC} start" + ;; + DISCONNECTED) + EXEC="${EXEC} --nodeps stop" + ;; + *) + logger -t wpa_cli "Unknown action ${ACTION}" + exit 1 + ;; +esac + +# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't +# stopping the interface and a background process - like wpa_cli - is. +export IN_BACKGROUND=true + +logger -t wpa_cli "interface ${INTERFACE} ${ACTION}" +${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed" diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml index ecb638b513dc..489b2ea119fd 100644 --- a/net-wireless/wpa_supplicant/metadata.xml +++ b/net-wireless/wpa_supplicant/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="ap">Add support for access point mode</flag> <flag name="broadcom-sta">Flag to help users disable features not supported by broadcom-sta driver</flag> - <flag name="crda">Use <pkg>net-wireless/crda</pkg> for regulatory domain loading instead of in-kernel (4.15+) support</flag> <flag name="eap-sim">Add support for EAP-SIM authentication algorithm</flag> <flag name="eapol-test">Build and install eapol_test binary</flag> <flag name="fasteap">Add support for FAST-EAP authentication algorithm</flag> diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild deleted file mode 100644 index dbd441303c31..000000000000 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild +++ /dev/null @@ -1,509 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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/" -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 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" - SRC_URI="https://w1.fi/releases/${P}.tar.gz" -fi - -SLOT="0" -IUSE="ap +crda 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. bug #684442 -REQUIRED_USE=" - macsec? ( !privsep ) - privsep? ( !macsec ) - broadcom-sta? ( !fils !mesh !mbo ) -" - -DEPEND=" - >=dev-libs/openssl-1.0.2k:= - dbus? ( sys-apps/dbus ) - kernel_linux? ( - >=dev-libs/libnl-3.2:3 - 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 ) - kernel_linux? ( - net-wireless/wireless-regdb - crda? ( net-wireless/crda ) - ) -" -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 -} - -pkg_pretend() { - CONFIG_CHECK="" - - 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 - - check_extra_config - - if ! use crda ; then - if linux_config_exists && 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 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 - 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 -} - -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 - - 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 - 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 - 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 - 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 use kernel_linux ; 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 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. - 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-2.10-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild index 66d2b2c226df..51b2075c6830 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://w1.fi/hostap.git" else - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~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 @@ -59,9 +59,9 @@ 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 + /etc/wpa_supplicant/wpa_supplicant.conf An example configuration file is available for reference in - ${EROOT}/usr/share/doc/${PF}/ + /usr/share/doc/${PF}/ " S="${WORKDIR}/${P}/${PN}" @@ -389,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 diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.ebuild index 656297bfa793..e2f919e5221e 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -59,9 +59,9 @@ 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 + /etc/wpa_supplicant/wpa_supplicant.conf An example configuration file is available for reference in - ${EROOT}/usr/share/doc/${PF}/ + /usr/share/doc/${PF}/ " S="${WORKDIR}/${P}/${PN}" @@ -122,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 } @@ -385,21 +389,11 @@ 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 + newexe "${FILESDIR}/wpa_cli-r1.sh" wpa_cli.sh readme.gentoo_create_doc dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild index 8c93c31c2554..b6b9865b98bc 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://w1.fi/hostap.git" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 @@ -59,9 +59,9 @@ 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 + /etc/wpa_supplicant/wpa_supplicant.conf An example configuration file is available for reference in - ${EROOT}/usr/share/doc/${PF}/ + /usr/share/doc/${PF}/ " S="${WORKDIR}/${P}/${PN}" @@ -124,6 +124,7 @@ src_prepare() { # 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 @@ -388,21 +389,11 @@ 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 + newexe "${FILESDIR}/wpa_cli-r1.sh" wpa_cli.sh readme.gentoo_create_doc dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ |