summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/aic8800/Manifest1
-rw-r--r--net-wireless/aic8800/aic8800-1.0.3.ebuild58
-rw-r--r--net-wireless/aic8800/metadata.xml13
-rw-r--r--net-wireless/bdaddr/Manifest2
-rw-r--r--net-wireless/bdaddr/bdaddr-0_p20210511.ebuild56
-rw-r--r--net-wireless/bdaddr/metadata.xml11
-rw-r--r--net-wireless/bladerf/bladerf-2021.03-r1.ebuild4
-rw-r--r--net-wireless/bladerf/bladerf-2023.02.ebuild4
-rw-r--r--net-wireless/bladerf/bladerf-9999.ebuild4
-rw-r--r--net-wireless/bluez/Manifest4
-rw-r--r--net-wireless/bluez/bluez-5.70-r1.ebuild (renamed from net-wireless/bluez/bluez-5.68.ebuild)12
-rw-r--r--net-wireless/bluez/bluez-5.71-r1.ebuild (renamed from net-wireless/bluez/bluez-5.70.ebuild)3
-rw-r--r--net-wireless/bluez/bluez-5.72.ebuild (renamed from net-wireless/bluez/bluez-5.69.ebuild)2
-rw-r--r--net-wireless/bluez/files/bluez-5.68-bap-dettach-io.patch101
-rw-r--r--net-wireless/bluez/files/bluez-5.68-bap-ebusy-fix.patch206
-rw-r--r--net-wireless/bluez/files/bluez-5.68-bap-nonzero.patch27
-rw-r--r--net-wireless/bluez/files/bluez-5.68-bap-resume.patch187
-rw-r--r--net-wireless/bluez/files/bluez-5.68-clang-midi.patch83
-rw-r--r--net-wireless/bluez/files/bluez-5.68-heap-use-after-free.patch41
-rw-r--r--net-wireless/bluez/files/bluez-5.68-monitor-decoding.patch45
-rw-r--r--net-wireless/bluez/files/bluez-5.70-CVE-2023-45866.patch43
-rw-r--r--net-wireless/bluez/files/bluez-5.71-link-old-kernels.patch163
-rw-r--r--net-wireless/crda/crda-4.15-r2.ebuild2
-rw-r--r--net-wireless/gnome-bluetooth/Manifest2
-rw-r--r--net-wireless/gnome-bluetooth/gnome-bluetooth-42.7.ebuild4
-rw-r--r--net-wireless/gnome-bluetooth/gnome-bluetooth-42.8.ebuild (renamed from net-wireless/gnome-bluetooth/gnome-bluetooth-42.6.ebuild)16
-rw-r--r--net-wireless/gnuradio/Manifest4
-rw-r--r--net-wireless/gnuradio/files/PR7093.patch76
-rw-r--r--net-wireless/gnuradio/files/gnuradio-3.10.3.0-fix-fmt-v9.patch145
-rw-r--r--net-wireless/gnuradio/files/gnuradio-3.10.4.0-fix-blockinterleaving.patch26
-rw-r--r--net-wireless/gnuradio/files/gnuradio-3.10.6.0-fix-stdint.patch20
-rw-r--r--net-wireless/gnuradio/gnuradio-3.10.4.0-r2.ebuild248
-rw-r--r--net-wireless/gnuradio/gnuradio-3.10.6.0-r2.ebuild249
-rw-r--r--net-wireless/gnuradio/gnuradio-3.10.9.2-r1.ebuild (renamed from net-wireless/gnuradio/gnuradio-3.10.7.0-r1.ebuild)19
-rw-r--r--net-wireless/gnuradio/gnuradio-9999.ebuild15
-rw-r--r--net-wireless/gr-osmosdr/Manifest3
-rw-r--r--net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild91
-rw-r--r--net-wireless/gr-osmosdr/gr-osmosdr-0.2.5-r1.ebuild (renamed from net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild)27
-rw-r--r--net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild27
-rw-r--r--net-wireless/gr-osmosdr/metadata.xml3
-rw-r--r--net-wireless/gr-paint/gr-paint-0.0_p20230427.ebuild4
-rw-r--r--net-wireless/hostapd/Manifest1
-rw-r--r--net-wireless/hostapd/hostapd-2.10-r1.ebuild267
-rw-r--r--net-wireless/hostapd/hostapd-2.10-r2.ebuild267
-rw-r--r--net-wireless/hostapd/metadata.xml1
-rw-r--r--net-wireless/iw/Manifest1
-rw-r--r--net-wireless/iw/iw-6.7.ebuild40
-rw-r--r--net-wireless/iwd/Manifest6
-rw-r--r--net-wireless/iwd/iwd-2.13.ebuild (renamed from net-wireless/iwd/iwd-2.10.ebuild)2
-rw-r--r--net-wireless/iwd/iwd-2.14.ebuild (renamed from net-wireless/iwd/iwd-2.9.ebuild)4
-rw-r--r--net-wireless/iwd/iwd-2.3.ebuild185
-rw-r--r--net-wireless/iwd/iwd-2.4.ebuild185
-rw-r--r--net-wireless/iwd/iwd-2.8-r2.ebuild4
-rw-r--r--net-wireless/iwd/metadata.xml1
-rw-r--r--net-wireless/kismet/kismet-2022.08.1-r2.ebuild2
-rw-r--r--net-wireless/kismet/kismet-2023.07.1.ebuild2
-rw-r--r--net-wireless/kismet/kismet-9999.ebuild5
-rw-r--r--net-wireless/kismet/metadata.xml5
-rw-r--r--net-wireless/mfoc/mfoc-0.10.7-r1.ebuild7
-rw-r--r--net-wireless/nanovna-saver/Manifest1
-rw-r--r--net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild7
-rw-r--r--net-wireless/nanovna-saver/nanovna-saver-0.6.3.ebuild47
-rw-r--r--net-wireless/nanovna-saver/nanovna-saver-9999.ebuild7
-rw-r--r--net-wireless/neard/neard-0.19.ebuild4
-rw-r--r--net-wireless/osmo-fl2k/Manifest2
-rw-r--r--net-wireless/osmo-fl2k/osmo-fl2k-0.2.0.ebuild (renamed from net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild)16
-rw-r--r--net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild6
-rw-r--r--net-wireless/portapack-firmware/portapack-firmware-20190405.ebuild12
-rw-r--r--net-wireless/portapack-havoc/portapack-havoc-0.0_p20180612.ebuild9
-rw-r--r--net-wireless/rtl-sdr/Manifest1
-rw-r--r--net-wireless/rtl-sdr/metadata.xml3
-rw-r--r--net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild3
-rw-r--r--net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild5
-rw-r--r--net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild3
-rw-r--r--net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild52
-rw-r--r--net-wireless/rtl-sdr/rtl-sdr-9999.ebuild20
-rw-r--r--net-wireless/soapyplutosdr/Manifest2
-rw-r--r--net-wireless/soapyplutosdr/soapyplutosdr-0.2.1_p20220710.ebuild27
-rw-r--r--net-wireless/soapyplutosdr/soapyplutosdr-0.2.2.ebuild27
-rw-r--r--net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild8
-rw-r--r--net-wireless/uhd/Manifest2
-rw-r--r--net-wireless/uhd/uhd-4.4.0.0.ebuild4
-rw-r--r--net-wireless/uhd/uhd-4.6.0.0.ebuild148
-rw-r--r--net-wireless/unifi/Manifest2
-rw-r--r--net-wireless/unifi/unifi-6.5.55-r2.ebuild7
-rw-r--r--net-wireless/unifi/unifi-7.5.187.ebuild7
-rw-r--r--net-wireless/unifi/unifi-8.0.28.ebuild (renamed from net-wireless/unifi/unifi-8.0.7.ebuild)7
-rw-r--r--net-wireless/wavemon/Manifest1
-rw-r--r--net-wireless/wavemon/wavemon-0.9.5.ebuild59
-rw-r--r--net-wireless/wireless-regdb/metadata.xml3
-rw-r--r--net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild22
-rw-r--r--net-wireless/wpa_supplicant/metadata.xml1
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild26
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild2
94 files changed, 998 insertions, 2591 deletions
diff --git a/net-wireless/aic8800/Manifest b/net-wireless/aic8800/Manifest
new file mode 100644
index 000000000000..8f1cc433fd6e
--- /dev/null
+++ b/net-wireless/aic8800/Manifest
@@ -0,0 +1 @@
+DIST aic8800-1.0.3.deb 535400 BLAKE2B 0e337bded43f99a00fb3d786742418d7faf0adf3d6e517933d4d4a82e7e723e5f45798991238a02fb1836529a5d72cc56181356939eb150feb4c26f14dcd762e SHA512 0917ac4f5a594adb68c084f38bedacb92f3c0700d13dda497943d199bd883c18fc624ffc579091b40fdc6322dc2e5b81cc21add06b27ae8364ee2f8f9f119a7d
diff --git a/net-wireless/aic8800/aic8800-1.0.3.ebuild b/net-wireless/aic8800/aic8800-1.0.3.ebuild
new file mode 100644
index 000000000000..79471e659a08
--- /dev/null
+++ b/net-wireless/aic8800/aic8800-1.0.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit linux-mod-r1 udev unpacker
+
+DESCRIPTION="aic8800 driver for AICSemi AIC8800/8801/8800DC/8800DW/8800FC Wifi/Bluetooth"
+HOMEPAGE="https://www.aicsemi.com/ https://linux.brostrend.com/troubleshooting/source-code/"
+
+SRC_URI="https://linux.brostrend.com/${PN}-dkms.deb -> ${P}.deb"
+
+LICENSE="GPL-2+ firmware? ( freedist )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+firmware udev"
+
+CONFIG_CHECK="~MAC80211 ~BT_HCIBTUSB"
+
+BDEPEND+="
+ $(unpacker_src_uri_depends)"
+
+S="${WORKDIR}/usr/src/${P}"
+
+src_compile() {
+ MODULES_MAKEARGS+=(
+ KDIR="${KV_OUT_DIR}"
+ )
+ emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+ linux_moduleinto kernel/drivers/net/wireless/${PN}
+ linux_domodule aic8800_fdrv/aic8800_fdrv.ko aic_load_fw/aic_load_fw.ko
+ modules_post_process
+ if use firmware; then
+ insinto /lib/firmware
+ doins -r "${WORKDIR}/lib/firmware/aic8800DC"
+ fi
+ if use udev; then
+ # install udev rules for USB mode switching
+ udev_newrules "${WORKDIR}/lib/udev/rules.d/aic.rules" 99-aic-modeswitch.rules
+ fi
+}
+
+pkg_postinst() {
+ if use udev; then
+ udev_reload
+ fi
+ linux-mod-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ if use udev; then
+ udev_reload
+ fi
+}
diff --git a/net-wireless/aic8800/metadata.xml b/net-wireless/aic8800/metadata.xml
new file mode 100644
index 000000000000..567331d7b4af
--- /dev/null
+++ b/net-wireless/aic8800/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chithanh@gentoo.org</email>
+ <name>Chí-Thanh Christopher Nguyễn</name>
+ </maintainer>
+ <longdescription>Upstream out-of-tree aic8800 linux driver for the following chips:
+AIC8800 AIC8801 AIC8800DC AIC8800DW AIC8800FC</longdescription>
+ <use>
+ <flag name="firmware">Install device firmware</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-wireless/bdaddr/Manifest b/net-wireless/bdaddr/Manifest
new file mode 100644
index 000000000000..180301cd51cb
--- /dev/null
+++ b/net-wireless/bdaddr/Manifest
@@ -0,0 +1,2 @@
+DIST bdaddr-0_p20210511-idiomatic-makefile-r1.patch 883 BLAKE2B 805f5faf7bc1260f7f415eb92d02e0269ec6b753e31106f81970c28e1692226ce2f6fb08eb05438b190a321a6789fe600fd9ae6006a1fb54d92a96f55a6db80c SHA512 1938644c359c061966e1278bf97cd622cfa9c74eac7e5c0373df1ce0bc6b36a3034e47bb95601d31d28ec2a0627e0e2b3bb2174d1613368fbf2f2eb0ec237043
+DIST bdaddr-0_p20210511.tar.gz 5236 BLAKE2B a445586cc016f57f1922d6cff9dcf3141d35122a0dd4a3c338cc98515dadcf40265c3f4dcb2da03d3cd4214ab3d57172d78677afe9099d380e1241677d13b486 SHA512 956e1207c4b082d6322ab0ce9cdc76c9c2c9f17fe4ecb3d03b4839025b49f102a4e35b05e2489eca3fee6fc4a611d942e598c97cab7db6b530e895818e33a150
diff --git a/net-wireless/bdaddr/bdaddr-0_p20210511.ebuild b/net-wireless/bdaddr/bdaddr-0_p20210511.ebuild
new file mode 100644
index 000000000000..8686e8e58f20
--- /dev/null
+++ b/net-wireless/bdaddr/bdaddr-0_p20210511.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Utility for changing the Bluetooth device address"
+HOMEPAGE="https://github.com/thxomas/bdaddr"
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/thxomas/bdaddr"
+else
+ MY_COMMIT=53dae3f6a33bca202ddae0e7b14beeaf2d7d653b
+ SRC_URI="
+ https://github.com/thxomas/bdaddr/archive/${MY_COMMIT}.tar.gz
+ -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64"
+ S="${WORKDIR}/${PN}-${MY_COMMIT}"
+fi
+
+# https://github.com/thxomas/bdaddr/pull/6
+SRC_URI+="
+ https://github.com/Flowdalic/bdaddr/commit/85eeb2a13ab664432ce357cdb0641163fc541a99.patch
+ -> ${PN}-0_p20210511-idiomatic-makefile-r1.patch
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+COMMON_DEPEND="
+ net-wireless/bluez:=
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ sys-apps/hwdata
+"
+DEPEND="
+ ${COMMON_DEPEND}
+"
+BDEPEND="dev-go/go-md2man"
+
+PATCHES=(
+ "${DISTDIR}"/${PN}-0_p20210511-idiomatic-makefile-r1.patch
+)
+
+src_compile() {
+ emake
+
+ go-md2man -in README.md -out ${PN}.1 || die
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1
+ dosym ../hwdata/oui.txt usr/share/misc/oui.txt
+}
diff --git a/net-wireless/bdaddr/metadata.xml b/net-wireless/bdaddr/metadata.xml
new file mode 100644
index 000000000000..b25bbf170df9
--- /dev/null
+++ b/net-wireless/bdaddr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <name>Florian Schmaus</name>
+ <email>flow@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">thxomas/bdaddr</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-wireless/bladerf/bladerf-2021.03-r1.ebuild b/net-wireless/bladerf/bladerf-2021.03-r1.ebuild
index 1f66fd37bef7..8a79fa7bc6a3 100644
--- a/net-wireless/bladerf/bladerf-2021.03-r1.ebuild
+++ b/net-wireless/bladerf/bladerf-2021.03-r1.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
@@ -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}
diff --git a/net-wireless/bladerf/bladerf-2023.02.ebuild b/net-wireless/bladerf/bladerf-2023.02.ebuild
index 0e056e6784c4..1601aecb09fe 100644
--- a/net-wireless/bladerf/bladerf-2023.02.ebuild
+++ b/net-wireless/bladerf/bladerf-2023.02.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
@@ -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}
diff --git a/net-wireless/bladerf/bladerf-9999.ebuild b/net-wireless/bladerf/bladerf-9999.ebuild
index 30f5ea73a4e7..8ad97269887b 100644
--- a/net-wireless/bladerf/bladerf-9999.ebuild
+++ b/net-wireless/bladerf/bladerf-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
@@ -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}
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index feaf3df7eb22..ad631202f4f3 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,3 +1,3 @@
-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.71.tar.xz 2381208 BLAKE2B 73e5f08771f821c90a70c553c600c48c4f1adb85aa9cb1a1eaae61a33b2dda73b7825fe769b3ea1daaaadedc39ad3fb71d84b336408f5ce6963f0373e9f7dcce SHA512 648394bbe470405aa0e2d3914474e95c122f567deaaac20a5dd74bac29fa430dfb64cdb7bdb4fb7510e62fa73e96112a97197fc212b421bf480b8d1bb24cfb5d
+DIST bluez-5.72.tar.xz 2390792 BLAKE2B b5d1bc290c9bad5aa32de16433c34d0ac5aed7164077ef941a0bf90eddc5e22a6cf19f972bcae33061b41e3c344f7abeb65a11b6013c13fd53059ac93d83240a SHA512 1c6560f60ac0654d7c25ed8ab2f0f3a3a9ca8688ee28e1c476ffc7ae38737e739d27bbb88789c86b03fc600a8a68496d90a7b395ec393dd2bbf69be62357991a
diff --git a/net-wireless/bluez/bluez-5.68.ebuild b/net-wireless/bluez/bluez-5.70-r1.ebuild
index 37f02d578577..2595b6e1428f 100644
--- a/net-wireless/bluez/bluez-5.68.ebuild
+++ b/net-wireless/bluez/bluez-5.70-r1.ebuild
@@ -7,7 +7,7 @@ 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"
+HOMEPAGE="http://www.bluez.org https://github.com/bluez/bluez"
SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
LICENSE="GPL-2+ LGPL-2.1+"
@@ -71,14 +71,8 @@ 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
+ # Backport CVE-2023-45866 fix (bug #919383)
+ "${FILESDIR}"/${PN}-5.70-CVE-2023-45866.patch
)
pkg_setup() {
diff --git a/net-wireless/bluez/bluez-5.70.ebuild b/net-wireless/bluez/bluez-5.71-r1.ebuild
index 657bb53be4c7..c7392ed1615f 100644
--- a/net-wireless/bluez/bluez-5.70.ebuild
+++ b/net-wireless/bluez/bluez-5.71-r1.ebuild
@@ -70,6 +70,9 @@ PATCHES=(
# 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
+
+ # https://github.com/bluez/bluez/issues/686
+ "${FILESDIR}"/${P}-link-old-kernels.patch
)
pkg_setup() {
diff --git a/net-wireless/bluez/bluez-5.69.ebuild b/net-wireless/bluez/bluez-5.72.ebuild
index 657bb53be4c7..cf1139d2a7b8 100644
--- a/net-wireless/bluez/bluez-5.69.ebuild
+++ b/net-wireless/bluez/bluez-5.72.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
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.70-CVE-2023-45866.patch b/net-wireless/bluez/files/bluez-5.70-CVE-2023-45866.patch
new file mode 100644
index 000000000000..6e5ac253585c
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.70-CVE-2023-45866.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/919383
+https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=25a471a83e02e1effb15d5a488b3f0085eaeb675
+
+From 25a471a83e02e1effb15d5a488b3f0085eaeb675 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Date: Tue, 10 Oct 2023 13:03:12 -0700
+Subject: input.conf: Change default of ClassicBondedOnly
+
+This changes the default of ClassicBondedOnly since defaulting to false
+is not inline with HID specification which mandates the of Security Mode
+4:
+
+BLUETOOTH SPECIFICATION Page 84 of 123
+Human Interface Device (HID) Profile:
+
+ 5.4.3.4.2 Security Modes
+ Bluetooth HID Hosts shall use Security Mode 4 when interoperating with
+ Bluetooth HID devices that are compliant to the Bluetooth Core
+ Specification v2.1+EDR[6].
+--- a/profiles/input/device.c
++++ b/profiles/input/device.c
+@@ -81,7 +81,7 @@ struct input_device {
+
+ static int idle_timeout = 0;
+ static bool uhid_enabled = false;
+-static bool classic_bonded_only = false;
++static bool classic_bonded_only = true;
+
+ void input_set_idle_timeout(int timeout)
+ {
+--- a/profiles/input/input.conf
++++ b/profiles/input/input.conf
+@@ -17,7 +17,7 @@
+ # platforms may want to make sure that input connections only come from bonded
+ # device connections. Several older mice have been known for not supporting
+ # pairing/encryption.
+-# Defaults to false to maximize device compatibility.
++# Defaults to true for security.
+ #ClassicBondedOnly=true
+
+ # LE upgrade security
+--
+cgit 1.2.3-korg
diff --git a/net-wireless/bluez/files/bluez-5.71-link-old-kernels.patch b/net-wireless/bluez/files/bluez-5.71-link-old-kernels.patch
new file mode 100644
index 000000000000..33cee137f277
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.71-link-old-kernels.patch
@@ -0,0 +1,163 @@
+From 7ad5669402c9acff8e4cc808edc12a41df36654e Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Date: Wed, 20 Dec 2023 12:20:03 -0500
+Subject: [PATCH] adapter: Fix link key address type for old kernels
+
+On old kernels only BDADDR_BREDR is supported so this attempts to detect
+that and retry.
+
+Fixes: https://github.com/bluez/bluez/issues/686
+---
+ src/adapter.c | 59 ++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 44 insertions(+), 15 deletions(-)
+
+diff --git a/src/adapter.c b/src/adapter.c
+index ee70b00d2..022390f0d 100644
+--- a/src/adapter.c
++++ b/src/adapter.c
+@@ -311,6 +311,7 @@ struct btd_adapter {
+ bool pincode_requested; /* PIN requested during last bonding */
+ GSList *connections; /* Connected devices */
+ GSList *devices; /* Devices structure pointers */
++ GSList *load_keys; /* Devices keys to be loaded */
+ GSList *connect_list; /* Devices to connect when found */
+ struct btd_device *connect_le; /* LE device waiting to be connected */
+ sdp_list_t *services; /* Services associated to adapter */
+@@ -4284,6 +4285,9 @@ static int set_privacy(struct btd_adapter *adapter, uint8_t privacy)
+ return -1;
+ }
+
++static void load_link_keys(struct btd_adapter *adapter, bool debug_keys,
++ bool retry);
++
+ static void load_link_keys_complete(uint8_t status, uint16_t length,
+ const void *param, void *user_data)
+ {
+@@ -4293,18 +4297,31 @@ static void load_link_keys_complete(uint8_t status, uint16_t length,
+ btd_error(adapter->dev_id,
+ "Failed to load link keys for hci%u: %s (0x%02x)",
+ adapter->dev_id, mgmt_errstr(status), status);
++
++ if (status == MGMT_STATUS_INVALID_PARAMS) {
++ load_link_keys(adapter, btd_opts.debug_keys, true);
++ /* Release keys after retry since we shall only retry
++ * once.
++ */
++ goto done;
++ }
++
+ return;
+ }
+
+ DBG("link keys loaded for hci%u", adapter->dev_id);
++
++done:
++ g_slist_free_full(adapter->load_keys, g_free);
++ adapter->load_keys = NULL;
+ }
+
+-static void load_link_keys(struct btd_adapter *adapter, GSList *keys,
+- bool debug_keys)
++static void load_link_keys(struct btd_adapter *adapter, bool debug_keys,
++ bool retry)
+ {
+ struct mgmt_cp_load_link_keys *cp;
+ struct mgmt_link_key_info *key;
+- size_t key_count, cp_size;
++ size_t count, cp_size;
+ unsigned int id;
+ GSList *l;
+
+@@ -4318,12 +4335,14 @@ static void load_link_keys(struct btd_adapter *adapter, GSList *keys,
+ if (!(adapter->supported_settings & MGMT_SETTING_BREDR))
+ return;
+
+- key_count = g_slist_length(keys);
++ count = g_slist_length(adapter->load_keys);
++ if (!count)
++ return;
+
+- DBG("hci%u keys %zu debug_keys %d", adapter->dev_id, key_count,
+- debug_keys);
++ DBG("hci%u keys %zu debug_keys %d retry %s", adapter->dev_id, count,
++ debug_keys, retry ? "true" : "false");
+
+- cp_size = sizeof(*cp) + (key_count * sizeof(*key));
++ cp_size = sizeof(*cp) + (count * sizeof(*key));
+
+ cp = g_try_malloc0(cp_size);
+ if (cp == NULL) {
+@@ -4341,13 +4360,18 @@ static void load_link_keys(struct btd_adapter *adapter, GSList *keys,
+ * behavior for debug keys.
+ */
+ cp->debug_keys = debug_keys;
+- cp->key_count = htobs(key_count);
++ cp->key_count = htobs(count);
+
+- for (l = keys, key = cp->keys; l != NULL; l = g_slist_next(l), key++) {
++ for (l = adapter->load_keys, key = cp->keys; l != NULL;
++ l = g_slist_next(l), key++) {
+ struct link_key_info *info = l->data;
+
+ bacpy(&key->addr.bdaddr, &info->bdaddr);
+- key->addr.type = info->bdaddr_type;
++ /* Old kernels might only support loading with type set to
++ * BDADDR_BREDR so on retry set that instead of using the stored
++ * info.
++ */
++ key->addr.type = retry ? BDADDR_BREDR : info->bdaddr_type;
+ key->type = info->type;
+ memcpy(key->val, info->key, 16);
+ key->pin_len = info->pin_len;
+@@ -4359,9 +4383,12 @@ static void load_link_keys(struct btd_adapter *adapter, GSList *keys,
+
+ g_free(cp);
+
+- if (id == 0)
++ if (id == 0) {
+ btd_error(adapter->dev_id, "Failed to load link keys for hci%u",
+ adapter->dev_id);
++ g_slist_free_full(adapter->load_keys, g_free);
++ adapter->load_keys = NULL;
++ }
+ }
+
+ static void load_ltks_complete(uint8_t status, uint16_t length,
+@@ -4873,7 +4900,6 @@ static void load_defaults(struct btd_adapter *adapter)
+ static void load_devices(struct btd_adapter *adapter)
+ {
+ char dirname[PATH_MAX];
+- GSList *keys = NULL;
+ GSList *ltks = NULL;
+ GSList *irks = NULL;
+ GSList *params = NULL;
+@@ -4964,7 +4990,8 @@ static void load_devices(struct btd_adapter *adapter)
+ }
+
+ if (key_info)
+- keys = g_slist_append(keys, key_info);
++ adapter->load_keys = g_slist_append(adapter->load_keys,
++ key_info);
+
+ if (ltk_info)
+ ltks = g_slist_append(ltks, ltk_info);
+@@ -5013,8 +5040,7 @@ static void load_devices(struct btd_adapter *adapter)
+
+ closedir(dir);
+
+- load_link_keys(adapter, keys, btd_opts.debug_keys);
+- g_slist_free_full(keys, g_free);
++ load_link_keys(adapter, btd_opts.debug_keys, false);
+
+ load_ltks(adapter, ltks);
+ g_slist_free_full(ltks, g_free);
+@@ -6930,6 +6956,9 @@ static void adapter_remove(struct btd_adapter *adapter)
+ g_slist_free(adapter->devices);
+ adapter->devices = NULL;
+
++ g_slist_free(adapter->load_keys);
++ adapter->load_keys = NULL;
++
+ discovery_cleanup(adapter, 0);
+
+ unload_drivers(adapter);
diff --git a/net-wireless/crda/crda-4.15-r2.ebuild b/net-wireless/crda/crda-4.15-r2.ebuild
index 74648f669a84..904768259fb4 100644
--- a/net-wireless/crda/crda-4.15-r2.ebuild
+++ b/net-wireless/crda/crda-4.15-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapsho
LICENSE="ISC"
SLOT="0"
-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"
IUSE="gcrypt test"
RESTRICT="!test? ( test )"
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 8ed0c18baef9..69b8a0e4dfbc 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
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.7.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.7.ebuild
index 023a1ce96473..8949df16f0f7 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.7.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.7.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 @@ LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version
IUSE="gtk-doc +introspection sendto test"
RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
DEPEND="
>=dev-libs/glib-2.44:2
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.6.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.8.ebuild
index 72c4d5ad6972..bb80dbb3a638 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"
@@ -12,7 +12,7 @@ LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version
IUSE="gtk-doc +introspection sendto test"
RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
DEPEND="
>=dev-libs/glib-2.44:2
@@ -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.6.0-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.10.6.0-r2.ebuild
deleted file mode 100644
index 77586bdcbe51..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.10.6.0-r2.ebuild
+++ /dev/null
@@ -1,249 +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 desktop 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}]')
- virtual/pkgconfig
- doc? (
- >=app-doc/doxygen-1.5.7.1
- <dev-libs/mathjax-3
- )
- grc? ( x11-misc/xdg-utils )
- modtool? ( $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') )
- oss? ( virtual/os-headers )
- test? ( >=dev-util/cppunit-1.9.14 )
- zeromq? ( net-libs/cppzmq )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.10.3.0-fix-fmt-v9.patch" #858659
- "${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}/${PN}-grc.desktop"
- for size in 16 24 32 48 64 128 256; do
- newicon -s $size "${fd_path}/"grc-icon-$size.png ${PN}-grc.png
- done
- fi
-
- python_fix_shebang "${ED}"
- # Remove incorrectly byte-compiled Python files and replace
- find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
- 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-r1.ebuild
index 0cbd9b310c61..bbbc55d8c42e 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.7.0-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r1.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 ) )
@@ -87,11 +85,11 @@ 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}]')
+ $(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]')
)
sdl? ( >=media-libs/libsdl-1.2.0 )
trellis? ( dev-python/scipy )
@@ -121,7 +119,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 +129,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 +224,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..6270b80fb9f0 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 ) )
@@ -87,11 +85,11 @@ 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}]')
+ $(python_gen_cond_dep 'net-wireless/soapysdr:=[${PYTHON_USEDEP}]')
)
sdl? ( >=media-libs/libsdl-1.2.0 )
trellis? ( dev-python/scipy )
@@ -121,7 +119,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 +222,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/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 453f9b2916af..5c2f7e00a90c 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,2 +1 @@
-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
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild
deleted file mode 100644
index 6bc31cd56c18..000000000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild
+++ /dev/null
@@ -1,91 +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} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
-HOMEPAGE="
- https://sdr.osmocom.org/trac/wiki/GrOsmoSDR
- https://gitea.osmocom.org/sdr/gr-osmosdr
-"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
-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"
- KEYWORDS="~amd64 ~arm ~riscv ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="airspy bladerf doc hackrf iqbalance python 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}]
- sci-libs/volk:=
- airspy? ( net-wireless/airspy )
- bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
- hackrf? ( net-libs/libhackrf:= )
- iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
- rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
- sdrplay? ( net-wireless/sdrplay )
- soapy? ( net-wireless/soapysdr:= )
- uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )
- xtrx? ( net-wireless/libxtrx )
- "
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
- doc? ( app-doc/doxygen )
- "
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-enable-python.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DEFAULT=OFF
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DENABLE_FILE=ON
- -DENABLE_AIRSPY="$(usex airspy ON OFF)"
- -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_RTL="$(usex rtlsdr ON OFF)"
- -DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)"
- -DENABLE_SDRPLAY="$(usex sdrplay ON OFF)"
- -DENABLE_NONFREE="$(usex sdrplay ON OFF)"
- -DENABLE_SOAPY="$(usex soapy ON OFF)"
- -DENABLE_UHD="$(usex uhd ON OFF)"
- -DENABLE_XTRX="$(usex xtrx ON OFF)"
- -DENABLE_DOXYGEN="$(usex doc ON OFF)"
- )
-
- cmake_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}"
-}
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5-r1.ebuild
index 189e5849f7f1..23381a80024d 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.5-r1.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,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-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index c2a2986ffc9f..23381a80024d 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-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
@@ -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.ebuild
index be25ed418e88..73b6850eeac2 100644
--- a/net-wireless/gr-paint/gr-paint-0.0_p20230427.ebuild
+++ b/net-wireless/gr-paint/gr-paint-0.0_p20230427.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
@@ -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/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..01fb23af1d28 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,5 +1,3 @@
-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.13.tar.xz 1081288 BLAKE2B d888a67bdb8ea86d1e8f1c2ad74a062aa4e8b0559c79764729d5d536d6f18e21432c022c2c3284af2e5f666595c0ab9962c3442e555ad7656961ec1fa41d0a6f SHA512 2ad082579445c2c95d91dbbb3fc6d5e7afc15db000c42ab21b766340ba9e5e9e0e61756410ae537376f67542f1046a86bad2cb943eeb16ff732e3dbac4c0304f
+DIST iwd-2.14.tar.xz 1082236 BLAKE2B ae50866ad0b3f0139352467f50b9babf054a91ec3c6298ac79842fa91f6df6802ea2b1e51688dce8d6487210b923a84b546a0afe996df7be9bad5eeb13129a7b SHA512 6af763d8dda4a8e99d96a6c94a72c16d298274fb224cc11912b4ec9eb8c80b599b49145b0fc979f213d14f6af100eb03477b6140272d303277d851eb8c8f9e07
DIST iwd-2.8.tar.xz 1067700 BLAKE2B ac691dfff675bd331a7af9e02179a5df61f0e20299c4a2851bd31950cbd0b696369069bd4a635cb25d24aec75996190bf8e47c2626eeff43b7ab37af5f932989 SHA512 bd208dc5ff391dccfe1b4a12f4b587ca8cedc1c1a7a2ddb34999c23acfad0e590e0463ac1ddc5093cb6489eb8ab8a090c01bcf06d679cfaf59c4b81469631795
-DIST iwd-2.9.tar.xz 1079944 BLAKE2B 161146c2c0f8354af9816f89369c41d1313183705f2abf20fbfb711c04c4b393f840af71d5da91e709eab1c2b31074b7ab5958b8e8ca682886799515b933422b SHA512 4444ec8f0ce4b45528fe4e5ea1e5904e80fc4e71b47c098493099147f3010562e31b8cf78cc3faeeb66b84106198c73ad0173adcb379a7ce4ebf4504b989e1cc
diff --git a/net-wireless/iwd/iwd-2.10.ebuild b/net-wireless/iwd/iwd-2.13.ebuild
index 057b4366d14e..bbb79d5e4e66 100644
--- a/net-wireless/iwd/iwd-2.10.ebuild
+++ b/net-wireless/iwd/iwd-2.13.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
diff --git a/net-wireless/iwd/iwd-2.9.ebuild b/net-wireless/iwd/iwd-2.14.ebuild
index c55b3ade1442..f2cca4a2357e 100644
--- a/net-wireless/iwd/iwd-2.9.ebuild
+++ b/net-wireless/iwd/iwd-2.14.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.60"
+ELL_REQ="0.62"
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.8-r2.ebuild b/net-wireless/iwd/iwd-2.8-r2.ebuild
index 3bdc0a6094ed..e871172bf232 100644
--- a/net-wireless/iwd/iwd-2.8-r2.ebuild
+++ b/net-wireless/iwd/iwd-2.8-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,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/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/kismet-2022.08.1-r2.ebuild b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
index 934221430f72..0965409505a7 100644
--- a/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
+++ b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
inherit autotools python-single-r1 udev systemd
diff --git a/net-wireless/kismet/kismet-2023.07.1.ebuild b/net-wireless/kismet/kismet-2023.07.1.ebuild
index 4fcac1c602f0..d811631a3fe8 100644
--- a/net-wireless/kismet/kismet-2023.07.1.ebuild
+++ b/net-wireless/kismet/kismet-2023.07.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
inherit autotools python-single-r1 udev systemd
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index f89567fabd66..84a92eaf262c 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
inherit autotools python-single-r1 udev systemd
@@ -33,7 +33,7 @@ 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}"
CDEPEND="
@@ -121,6 +121,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/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..bdd8dcf31023 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
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild
index f9bae222d086..e564e750411f 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,6 @@ 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"
@@ -17,12 +16,10 @@ if [ "${PV}" = "9999" ]; then
EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
else
SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
fi
-IUSE=""
-DEPEND=""
RDEPEND="${DEPEND}
dev-python/cython[${PYTHON_USEDEP}]
dev-python/pyserial[${PYTHON_USEDEP}]
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.3.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.3.ebuild
new file mode 100644
index 000000000000..ac921ab992af
--- /dev/null
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
+HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
+else
+ SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+fi
+
+RDEPEND="${DEPEND}
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets]
+ dev-python/PyQt6-sip[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install() {
+ distutils-r1_python_install
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
index f9bae222d086..ac921ab992af 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,6 @@ 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..a5a95d20a167 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
@@ -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..8f65fea32bc7 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,2 +1,3 @@
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
index bbdfee3faae7..1a6acb86c807 100644
--- 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
@@ -10,7 +10,6 @@ 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
@@ -24,7 +23,7 @@ else
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
fi
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
IUSE="+zerocopy"
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
index f7b88d47150c..ad11e988cd5f 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
@@ -3,14 +3,13 @@
EAPI=7
-inherit cmake multilib
+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
@@ -24,7 +23,7 @@ else
KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
fi
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
IUSE="+zerocopy"
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild
index 1da1818e4d31..62c75adae478 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild
@@ -10,7 +10,6 @@ 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
@@ -24,7 +23,7 @@ else
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
fi
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
IUSE="+zerocopy"
diff --git a/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild
new file mode 100644
index 000000000000..0a5b8cebc9b0
--- /dev/null
+++ b/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild
@@ -0,0 +1,52 @@
+# 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
+ EGIT_REPO_URI="https://git.osmocom.org/${PN}"
+else
+ #COMMIT="142325a93c6ad70f851f43434acfdf75e12dfe03"
+ #SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ #S="${WORKDIR}/${PN}-${COMMIT}"
+ SRC_URI="https://github.com/osmocom/rtl-sdr/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+zerocopy"
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
+)
+
+src_configure() {
+ #the udev rules are 666, we don't want that
+ local mycmakeargs=(
+ -DINSTALL_UDEV_RULES=OFF
+ -DDETACH_KERNEL_DRIVER=ON
+ -DENABLE_ZEROCOPY="$(usex zerocopy)"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp
+ newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp
+}
+
+pkg_postinst() {
+ elog "Only users in the usb group can capture."
+ elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
+}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index 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/soapyplutosdr/Manifest b/net-wireless/soapyplutosdr/Manifest
index 4d0ae4a95984..73b6c739b281 100644
--- a/net-wireless/soapyplutosdr/Manifest
+++ b/net-wireless/soapyplutosdr/Manifest
@@ -1 +1,3 @@
DIST soapyplutosdr-0.2.1.tar.gz 17597 BLAKE2B d5b6205da7aa64406ccf84d198088094c10397ca874925926dfe2ee3134e045c3ab80b68db06ee84448ae8966e2d8edecb2517ef70b10bbddd9681fcbf09385a SHA512 40cc7c83c13f1d81212c5b0b6028d49de6c9e0b4df9e479c5cb577f60a92b415f76e159d45ecf19aad2deac507f7bd779b7cce1f7bc5e6fd2ea9a3f24399dfe7
+DIST soapyplutosdr-0.2.1_p20220710.tar.gz 25233 BLAKE2B b7151f6a00f820edf958006c6ece78e75ad0f5b5b07a232d82dbbf8cf86fa414eed085ee769ecf66fb707dac5d006925791dfd39c1a7fc35f8f887543fe0daf3 SHA512 55757db81d715466148c8376d713783af85ce072036d97ea80b5bd1993fa2180f2f8ca20391d83d1fc5cb6a2ff9977f34d95ddc2beff9ed21282af40b47ea160
+DIST soapyplutosdr-0.2.2.tar.gz 25472 BLAKE2B 100b366edf268c76109be2d335b6d4d6a5723a219f1f160d481385e7ac7c89e3cd25860e9916b754f67708f83d90e6f82262572c6a62eb045483a2bba6a794b3 SHA512 dd5514cde4867bd915b2ef1f0257af85359986b93a7650f00f665fd83a7d7a2c8621f79fe91ce1c16867fdff0c0c14b700628cd9a94746c11b854da1afd7daf7
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-0.2.1_p20220710.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-0.2.1_p20220710.ebuild
new file mode 100644
index 000000000000..254e0ba2adb5
--- /dev/null
+++ b/net-wireless/soapyplutosdr/soapyplutosdr-0.2.1_p20220710.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Soapy SDR plugin for the Pluto SDR"
+HOMEPAGE="https://github.com/pothosware/SoapyPlutoSDR"
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/pothosware/SoapyPlutoSDR.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
+ COMMIT="b906b27e6820fe44fcc3527cc876771f7dac85d2"
+ SRC_URI="https://github.com/pothosware/SoapyPlutoSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/SoapyPlutoSDR-${COMMIT}
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr:=
+ net-libs/libiio:=
+ net-libs/libad9361-iio:="
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-0.2.2.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-0.2.2.ebuild
new file mode 100644
index 000000000000..115e42eb16c6
--- /dev/null
+++ b/net-wireless/soapyplutosdr/soapyplutosdr-0.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Soapy SDR plugin for the Pluto SDR"
+HOMEPAGE="https://github.com/pothosware/SoapyPlutoSDR"
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/pothosware/SoapyPlutoSDR.git"
+ inherit git-r3
+else
+ 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
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr:=
+ net-libs/libiio:=
+ net-libs/libad9361-iio:="
+DEPEND="${RDEPEND}"
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/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/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..514bdaafdd63
--- /dev/null
+++ b/net-wireless/uhd/uhd-4.6.0.0.ebuild
@@ -0,0 +1,148 @@
+# 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"
+
+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..8200eadc448a 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,3 +1,3 @@
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.0.28.zip 158243946 BLAKE2B 396517012acc6efae37ab1894cfa5d605b9bb5474af35a8facf19985393d7647df853e9ba3676abc482c9021a97e149f61b093c4b9b22d211907e7be582e7be1 SHA512 50ec9d56e8358e934806ef85e9635c6bf5bb3374ec4897ff4ede708073fad276a9aabdf06108a780f077612b49d2d99b2f9ae15dfa9c558c941a4af1dfa30432
diff --git a/net-wireless/unifi/unifi-6.5.55-r2.ebuild b/net-wireless/unifi/unifi-6.5.55-r2.ebuild
index ec2a20c228d4..b4143f5dbd3e 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
@@ -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..e69fe1615e36 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
@@ -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.0.28.ebuild
index b6765b4de8b5..807b16659d5e 100644
--- a/net-wireless/unifi/unifi-8.0.7.ebuild
+++ b/net-wireless/unifi/unifi-8.0.28.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
@@ -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/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/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/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
index dbd441303c31..867bb37f63ac 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.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
@@ -18,7 +18,7 @@ else
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"
+IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps"
# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
# interface functions used for MACsec, so this combination cannot be used
@@ -52,7 +52,6 @@ RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-networkmanager )
kernel_linux? (
net-wireless/wireless-regdb
- crda? ( net-wireless/crda )
)
"
BDEPEND="virtual/pkgconfig"
@@ -90,22 +89,15 @@ Kconfig_style_config() {
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
+ 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
}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
index 66d2b2c226df..b4b8610aa549 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
@@ -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