diff options
Diffstat (limited to 'net-wireless')
18 files changed, 1058 insertions, 83 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz Binary files differindex 67d186f4cbf9..7391ff6dc321 100644 --- a/net-wireless/Manifest.gz +++ b/net-wireless/Manifest.gz diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest index 1d70aabbd157..2d59bc911037 100644 --- a/net-wireless/blueman/Manifest +++ b/net-wireless/blueman/Manifest @@ -1,5 +1,7 @@ AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b DIST blueman-2.4.3.tar.xz 1567044 BLAKE2B 1ecd7e70ab5e84e68115cdfc6a6dbdcaa539973fc4fd93740495c822a0b08b1fc2e9fd46b421282fd0ba4a4ce5deccef6724e7fa23466b9c68d9523eacfecd97 SHA512 387e51d143b90ee34d156595f83d032930e427baee4065cb07809b8273f4da641893caa4113cc034c81bfacdb9b2caffb316b6d8738a44aba90ca6941aefc13f +DIST blueman-2.4.4.tar.xz 1633652 BLAKE2B b83bec9ec2e51fec0897ed43e1853759c5164747a78e600c3397d2b05297b41c0976237af1d3a4897d7ddabd87d9b9feb29bd8767400b6abcb9fc6ddbac92f09 SHA512 319f2ccf253decf003731ecbbf93bb50685589c4a4a954ae848a09998583d85ce608a38bdfa37d81d3ebd5172b428063e0b4c6a30b1bab53c8419f597d2a2fa8 EBUILD blueman-2.4.3.ebuild 3673 BLAKE2B 81d5a5f8fc846bc9e473fec38114ce5d643d04408dcc155f5f51c9f3b82dbfb2e9eb0de09ab1df4f5195c38582c13efbb2174ac9e1908dfc28df6124ce409a4b SHA512 f16df96bcc82004267a882bfcd3aabecf4c38a57927b41b30294e25407894c079c821bddbb4f5d39e752799cf5fefc04f8bd3351b5cf1191fd09ab9cc9239a21 +EBUILD blueman-2.4.4.ebuild 3679 BLAKE2B 8ff4ff7147d78c5896b909a8bde023a6311933cd47c4e737a73ae2577b8a350117e30198c25afab63ff85598f88fc28c2f47cd453341c63841ecf70006ae3128 SHA512 ada1fc7e047a3e9b787f9db3918b411b460e5b4d0f2346d2ab26bb5d7a78802fd3faefc36ab7d8e0aa221e2eaa6a5b52b5be38b7fb2e163a1ecaf4b86deac71f EBUILD blueman-9999.ebuild 3683 BLAKE2B 4b372b960cefbc6d1735d52136e2da7b30aa11c3236f17379e627819c53d1f886ad2fcf48125ed4f13b176b65c2290f989948a82f99819ea6011ed66552e2a75 SHA512 7dea4884ef5d285481d10062bdbe7bd8f9363b551dbee59a2f9c30c658627111718093679a7eb0f3f9d7fd2d5f3e2dbb506350aa186848b77fb16d5d946ce597 MISC metadata.xml 499 BLAKE2B 54e6fc4cc7b9922abf5a8bae572c282bded5bce21add03e418effeb5009ce7700a3fbede5f132638aa934b71b0898310e1b8315c48a76216045d56e53c7cf1dc SHA512 30e120ce07c4b4bfc278dfcfcad987bf878ed1ebc0ec92d859cf943270c439cdf717b5a9f01ee36399a64743c98aa73f9cd91db4fc85e0c0cf6b73c75d62a817 diff --git a/net-wireless/blueman/blueman-2.4.4.ebuild b/net-wireless/blueman/blueman-2.4.4.ebuild new file mode 100644 index 000000000000..8502df3fcefb --- /dev/null +++ b/net-wireless/blueman/blueman-2.4.4.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=no +PYTHON_COMPAT=( python3_{10..13} ) + +inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils + +DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager" +HOMEPAGE="https://github.com/blueman-project/blueman/" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/blueman-project/blueman.git" +else + SRC_URI=" + https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz + " + S=${WORKDIR}/${P/_/.} + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +# icons are GPL-2 +# source files are mixed GPL-3+ and GPL-2+ +LICENSE="GPL-3+ GPL-2" +SLOT="0" +IUSE="network nls policykit pulseaudio" + +DEPEND=" + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + >=net-wireless/bluez-5:= +" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + test? ( + dev-python/python-dbusmock[${PYTHON_USEDEP}] + media-libs/libpulse + >=net-misc/networkmanager-0.8[introspection] + ) + ') + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${DEPEND} + $(python_gen_cond_dep ' + dev-python/pycairo[${PYTHON_USEDEP}] + ') + sys-apps/dbus + x11-libs/gtk+:3[introspection,X] + x11-libs/libnotify[introspection] + || ( + x11-themes/adwaita-icon-theme + x11-themes/faenza-icon-theme + x11-themes/mate-icon-theme + ) + network? ( + net-firewall/iptables + || ( + sys-apps/net-tools + sys-apps/iproute2 + ) + || ( + net-dns/dnsmasq + net-misc/dhcp + >=net-misc/networkmanager-0.8[introspection] + ) + ) + policykit? ( + sys-auth/polkit + ) + pulseaudio? ( + || ( + media-sound/pulseaudio-daemon[bluetooth] + media-video/pipewire[bluetooth] + <media-sound/pulseaudio-15.99.1[bluetooth] + ) + ) +" + +distutils_enable_tests unittest + +pkg_pretend() { + if use network; then + local CONFIG_CHECK=" + ~BRIDGE + ~IP_NF_IPTABLES + ~IP_NF_NAT + ~IP_NF_TARGET_MASQUERADE + " + check_extra_config + fi +} + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + # Run else fails on newer automake: https://bugs.gentoo.org/936065 + eautoreconf + distutils-r1_src_prepare +} + +python_configure() { + local myconf=( + --disable-runtime-deps-check + --disable-static + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-systemduserunitdir="$(systemd_get_userunitdir)" + --with-dhcp-config="/etc/dhcp/dhcpd.conf" + $(use_enable policykit polkit) + $(use_enable nls) + $(use_enable pulseaudio) + # thunar integration is a single data file with no extra deps + # so install it unconditionally + --enable-thunar-sendto + ) + econf "${myconf[@]}" +} + +python_compile() { + default +} + +python_test() { + local -x PYTHONPATH=module/.libs + + if [[ ! -f /dev/rfkill ]]; then + # Tests attempt to import these modules if present, but they + # require /dev/rfkill. Hide them to make the tests pass. + mv blueman/plugins/mechanism/RfKill.py{,~} || die + mv blueman/plugins/applet/KillSwitch.py{,~} || die + fi + + local failed= + nonfatal eunittest || failed=1 + + if [[ ! -f /dev/rfkill ]]; then + mv blueman/plugins/mechanism/RfKill.py{~,} || die + mv blueman/plugins/applet/KillSwitch.py{~,} || die + fi + + [[ ${failed} ]] && die "Tests failed with ${EPYTHON}" +} + +python_install() { + default + + if use policykit; then + # Allow users in plugdev group to modify connections + insinto /usr/share/polkit-1/rules.d + doins "${FILESDIR}/01-org.blueman.rules" + fi + + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 02720e875a49..43288bf0799e 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,9 +1,10 @@ +AUX 7570.patch 1549 BLAKE2B e7e9f0f745465549046eec50806fedf8f8b4a5850f203893abcf21438e9a6567b1d796f6f84aadbb371f858d806c9db313e7b90e4a88a48eed522487d7325d2b SHA512 8a8cfa32dc707e4bd293d5e818029a029c6eb64ef7e9a08493d86a40c84169e55bfd303adecf2de1fa2cbf3a10eb17019ba4d2062084821f55b1c73449549154 AUX PR7093.patch 3317 BLAKE2B d369dfa91c8de3c62d1c14be52f5ad9491bf10f8fb904295bb92497a43150bcf9d1576442f3087b439e54fb4dac572d421e3cac95d71d01604cf329284e7ff5a SHA512 01758de8ecb721fcaadd31d478551420290b5e59c9b8fa3d421d4170665915c21e50ed765a9647b81d4f6acf71099c98628b823a66897b4f5e57df3c3b2643ba AUX gnuradio-3.10.11.0-boost-1.87.patch 6533 BLAKE2B dea2f7d662c2c7119234f6cddd1405bd2b942257bea75110c3c2464b5f5137887fab7e2ec8cc2851770af44f2bcd44a8499ba3f6a9ad3f6dd21311ec8ccc9904 SHA512 1a7656d7310e59cd8fd8259920bbcffb443948bbe8193bddc65610b1e4418ec3ea806d0fb21b565aa9a54ec8302f9d2e408c07ba912a6fe910a4c51ab416e775 AUX gnuradio-3.10.9.2-libfmt-11.patch 1624 BLAKE2B a50f5db97a276ec1c1fbaa28338db377de8659ce8b1f19b271cb79672f807e152cec57f83b9e32ff39492e11b4b6e655a69cd77a5e925f0b2b598d66b2ad2381 SHA512 50398cbeba0bad9908d3f96795833a7ca683e169634ef4a89e1502c304c4a695be44538e99236b691c2e4ea105604e882048b0500579031a9516fbeba4984173 DIST gnuradio-3.10.11.0.tar.gz 4659646 BLAKE2B 21d523030e578ac335dc1497da27a957026206b36323473d5e96d9bc3832a06765d26684c46c03017e23c0bc6302429c366befac40113f9987840d5c22f978af SHA512 faf47956924832b04c66469ba3bdf174876d25c41e0f1c1dde3755596d232e2d18f5dab7aa848463f2d23ec8bcda0283ee8ede34fd57b079fe3cdb62c6470a82 DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd -EBUILD gnuradio-3.10.11.0.ebuild 7203 BLAKE2B 8865037aea821433bdf7f71497007f7b9092732fba5180b85d64774ba53503833264020473b5bb3f74ea9da7e6bdaa195b21ad9e3e48b6922875f7830a6688c6 SHA512 800484b01de328e97525befb78717450982acd488bf05f0b3ee7b1d68a5f6a8133becedc0c659d7126978d97847f83ba58fe61cf74e32407888d459147b2bbfd +EBUILD gnuradio-3.10.11.0.ebuild 7074 BLAKE2B 7cfc3d8071da0819ce2cf9d4c779938808e013536fe5de8f0654f27c6b1e84fccf816ae2b827f49e6b44aafeda54bd27f8acf6e375bf54d8b0b15ab624693882 SHA512 689c4e862b5ad24c1a0d01872b9fac9431e3e346c8ec6c8101ec8697f2113317696bfea3695f158032207c3c7aadb4f7c9f1fd9a6095bcf89c8cb484c4cec31e EBUILD gnuradio-3.10.9.2-r6.ebuild 7168 BLAKE2B 6d7c121fd4f1bb6c614ea78417436d58cf03f64c39b7f3a776edc72cf81d2b775eb813821f5c5cc4ece13dce4f6db847a6ae004b03727ff9d52f15e0184ca3d2 SHA512 8162308fe3edee23d865fb4c0a3c507ae64a4407fa23b2adce5e8ea8a0a024feaa5639692e26470245536378bf440fb7b1a284080bed32aa69bfea60fbd8d3d6 -EBUILD gnuradio-9999.ebuild 7142 BLAKE2B 7d745da9a915959565a1ba95e34d778e3b2b2b3b8d488ed953e5a2a18bcec639aef9a27783dbb501012b879b5bdd56aa0369daa35c4efb74bf482b857cf07bcb SHA512 0c952b388e2a989f1ab2e7b6be8b413807c8e881bb443070e6e7ebc345f7a0540b600a5a61f90f9400fc4a97262426e3c07a5a1a527632260fb79913c00e753a +EBUILD gnuradio-9999.ebuild 6987 BLAKE2B c70ae3d3f797cba882c6d1d5009c5c29935852492a437033d01d7baaca3ad00d6a022c9656ebef51bcfdc92d685557d4c806ab80ae3b692550c9c39198333d29 SHA512 1a1c530447c089e067a15e6476db9a9f911609f8a956f7c1d3ad5a6c38d2eac6f3ee56b048e9af5bd026acdf54c1175e6b0256542094050bdf64444bbb62ee2b MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0 diff --git a/net-wireless/gnuradio/files/7570.patch b/net-wireless/gnuradio/files/7570.patch new file mode 100644 index 000000000000..1adefd1674bb --- /dev/null +++ b/net-wireless/gnuradio/files/7570.patch @@ -0,0 +1,34 @@ +From dc208e8c91a772ea3da462efd16d912cef44316c Mon Sep 17 00:00:00 2001 +From: Clayton Smith <argilo@gmail.com> +Date: Fri, 30 Aug 2024 11:19:19 -0400 +Subject: [PATCH] digital: Fix NumPy 2 compatibility + +Signed-off-by: Clayton Smith <argilo@gmail.com> +--- + gr-digital/python/digital/qa_correlate_access_code_XX_ts.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py b/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py +index c0fdc9dc246..8c242f2f792 100644 +--- a/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py ++++ b/gr-digital/python/digital/qa_correlate_access_code_XX_ts.py +@@ -12,6 +12,7 @@ + from gnuradio import gr, gr_unittest, digital, blocks + import pmt + import numpy ++import struct + + default_access_code = '\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC' + +@@ -74,8 +75,9 @@ def _variable_payload_t(self, payload_len=2**15 + 3): + # header contains packet length, twice (bit-swapped) + header = numpy.array([(payload_len & 0xFF00) >> 8, payload_len & 0xFF] * 2, dtype=numpy.uint8) + # make sure we've built the length header correctly +- self.assertEqual(header[0] * 256 + header[1], header[2] * 256 + header[3]) +- self.assertEqual(header[0] * 256 + header[1], len(payload)) ++ length1, length2 = struct.unpack(">HH", header) ++ self.assertEqual(length1, length2) ++ self.assertEqual(length1, len(payload)) + + packet = numpy.concatenate((header, payload)) + pad = (0,) * PADDING_LEN diff --git a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild index 1afef5f54a9e..37cadf28ce7e 100644 --- a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -135,6 +135,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.10.11.0-boost-1.87.patch + "${FILESDIR}"/7570.patch ) src_prepare() { @@ -231,9 +232,7 @@ src_install() { src_test() { # skip test which needs internet (metainfo_test) - # skip test which is currently broken (qa_correlate_access_code_XX_ts) - # https://github.com/gnuradio/gnuradio/issues/7566 - virtx cmake_src_test -E 'metainfo_test|qa_correlate_access_code_XX_ts' --output-on-failure + 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 27cb13c82bc0..a7011ffe6be8 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -227,9 +227,7 @@ src_install() { src_test() { # skip test which needs internet (metainfo_test) - # skip test which is currently broken (qa_correlate_access_code_XX_ts) - # https://github.com/gnuradio/gnuradio/issues/7566 - virtx cmake_src_test -E 'metainfo_test|qa_correlate_access_code_XX_ts' --output-on-failure + virtx cmake_src_test -E 'metainfo_test' --output-on-failure } pkg_postinst() { diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest index 6902e3ad1605..9d49bffea40b 100644 --- a/net-wireless/gqrx/Manifest +++ b/net-wireless/gqrx/Manifest @@ -1,4 +1,4 @@ DIST gqrx-2.17.2.tar.gz 3620793 BLAKE2B a8354212c5084160315581840a19a28f737d2492f16aad2f58f4e508e0ac4dfda7fa139eccd38694ebd0777a4c2062f984840baa2cc2313524e0566e695dc638 SHA512 7e387dd909d0dda710e8fb7766bcd6f26abc2a6bef73d2bdf4d9c96b8cf698d3b6c6c1b2fbd51e91f907f446bb1e551b9fb99503851e02777599193717a72e35 -EBUILD gqrx-2.17.2-r1.ebuild 1261 BLAKE2B 85635644b1ecd1129b98de772926b52df219777177ca2a866981b03fadb9a9784a007b8b907e592a407bd8c5674039bd0f4718313268edc2ef4e134b6e554b3e SHA512 2e3da1e6bbdad31ae17770eeeb6ea48a6829cc2a7d3a857859c5c5fc4a113a1cd5ad74cfede871ebbed1b4f0effc7a1d26dfe89b87893f55461b879ab7fe8307 -EBUILD gqrx-9999.ebuild 1261 BLAKE2B 85635644b1ecd1129b98de772926b52df219777177ca2a866981b03fadb9a9784a007b8b907e592a407bd8c5674039bd0f4718313268edc2ef4e134b6e554b3e SHA512 2e3da1e6bbdad31ae17770eeeb6ea48a6829cc2a7d3a857859c5c5fc4a113a1cd5ad74cfede871ebbed1b4f0effc7a1d26dfe89b87893f55461b879ab7fe8307 -MISC metadata.xml 527 BLAKE2B b03059834f7f1ce5a2ccac25c831783f824c93b7d45aa1a670751e135a6c5e208d759ef97b40bb3215940072a82db8e51fc4f974438a1273f3777fe623049243 SHA512 325283161c65ef63717a64d04da6aa4226ff0688e0151eebf4d4b9acb3c3fb51cb0a8d474da637a513f7fbcf062a04f20f08fb4da3e958284f41c9b00bc608fd +EBUILD gqrx-2.17.2-r1.ebuild 1224 BLAKE2B 6882868a45feae6b2d5a79367b9eaad8bec9aa022573a01d5ef3e29a6363fa46487ce40c473d151b9b2e6b90b62962e2b6313c2cc4d7011173bb4ac37cb5aa2a SHA512 e3a8998d3d6d2066c53b97c01b2171098353d9880eeae775473ffc334c8878678e807b644fa95617c6caf3c5d6fc11c703fcba8a0cb5be5bb0494e2f38bdc7d2 +EBUILD gqrx-9999.ebuild 1224 BLAKE2B 6882868a45feae6b2d5a79367b9eaad8bec9aa022573a01d5ef3e29a6363fa46487ce40c473d151b9b2e6b90b62962e2b6313c2cc4d7011173bb4ac37cb5aa2a SHA512 e3a8998d3d6d2066c53b97c01b2171098353d9880eeae775473ffc334c8878678e807b644fa95617c6caf3c5d6fc11c703fcba8a0cb5be5bb0494e2f38bdc7d2 +MISC metadata.xml 425 BLAKE2B 46525cc3c3e93576e1f4e4b874c969e302f6ae83d5171d33241ef6329666d49bf28ae9218f6af8b0039bf1a18d7cb32d44186cffb47fdaef19f3068752cccff4 SHA512 42112bf05fefbd5883cb570903c760051cf4e2f793d14ef36e120105d9a36c30bda9f3209b6a3a9eeadc862416c6fef9ae92e8c84a6cac759639b25347780453 diff --git a/net-wireless/gqrx/gqrx-2.17.2-r1.ebuild b/net-wireless/gqrx/gqrx-2.17.2-r1.ebuild index 5853ad507b1f..8add0b3ddd79 100644 --- a/net-wireless/gqrx/gqrx-2.17.2-r1.ebuild +++ b/net-wireless/gqrx/gqrx-2.17.2-r1.ebuild @@ -18,8 +18,8 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="gr-audio portaudio pulseaudio" -REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )" +IUSE="portaudio pulseaudio" +REQUIRED_USE="?? ( pulseaudio portaudio )" RDEPEND=" dev-qt/qtbase:6[gui,network,widgets] @@ -39,7 +39,7 @@ src_configure() { LINUX_AUDIO_BACKEND=Pulseaudio elif use portaudio; then LINUX_AUDIO_BACKEND=Portaudio - elif use gr-audio; then + else LINUX_AUDIO_BACKEND=Gr-audio fi diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild index 5853ad507b1f..8add0b3ddd79 100644 --- a/net-wireless/gqrx/gqrx-9999.ebuild +++ b/net-wireless/gqrx/gqrx-9999.ebuild @@ -18,8 +18,8 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="gr-audio portaudio pulseaudio" -REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )" +IUSE="portaudio pulseaudio" +REQUIRED_USE="?? ( pulseaudio portaudio )" RDEPEND=" dev-qt/qtbase:6[gui,network,widgets] @@ -39,7 +39,7 @@ src_configure() { LINUX_AUDIO_BACKEND=Pulseaudio elif use portaudio; then LINUX_AUDIO_BACKEND=Portaudio - elif use gr-audio; then + else LINUX_AUDIO_BACKEND=Gr-audio fi diff --git a/net-wireless/gqrx/metadata.xml b/net-wireless/gqrx/metadata.xml index d9c43c9d0981..c9d82f41a762 100644 --- a/net-wireless/gqrx/metadata.xml +++ b/net-wireless/gqrx/metadata.xml @@ -9,9 +9,6 @@ <email>radio@gentoo.org</email> <name>Radio</name> </maintainer> - <use> - <flag name="gr-audio">Use audio support from <pkg>net-wireless/gnuradio</pkg></flag> - </use> <upstream> <remote-id type="github">gqrx-sdr/gqrx</remote-id> </upstream> diff --git a/net-wireless/tempestsdr/Manifest b/net-wireless/tempestsdr/Manifest index 2bb31a254a1b..15d49f0ab355 100644 --- a/net-wireless/tempestsdr/Manifest +++ b/net-wireless/tempestsdr/Manifest @@ -1,4 +1,4 @@ -DIST tempestsdr-0.0_p20200221.tar.gz 67322675 BLAKE2B 6ad4b5c4a32e70e7336d1bcac9f9c3e0dd1bdc0ca42e67bef20e9f31475e127f212d3558e20d275e18651cef018c134e233c5b8c0c9e85e558414e2c15993ac6 SHA512 2f29ad22d8ae2e71cdd359e066989928576a7e8c0ff344833445843df4cdb343ae1d6336810595fe720cb3d56867c8c17d8776dcb3bfda02eb53b85c9c930ef1 -EBUILD tempestsdr-0.0_p20200221-r1.ebuild 1064 BLAKE2B a52b152f6de8b6ed554fc0871ac74f492550619f9c7d99a1ce90c7628cb90b71c5da3aaf6f6cdf9ac708387f154ad2fea455b4344ba2efe92e41c41dcac3f0d7 SHA512 9dc5bb2557ef8ae1e41c556a238099d5bc1ce41e7099acb7d3d2914e4b4835a59c29d1c01e44bab6a1e7f93300a98c790181cfd7f0c2b9d0e33f14177a0b204b -EBUILD tempestsdr-9999.ebuild 1064 BLAKE2B a52b152f6de8b6ed554fc0871ac74f492550619f9c7d99a1ce90c7628cb90b71c5da3aaf6f6cdf9ac708387f154ad2fea455b4344ba2efe92e41c41dcac3f0d7 SHA512 9dc5bb2557ef8ae1e41c556a238099d5bc1ce41e7099acb7d3d2914e4b4835a59c29d1c01e44bab6a1e7f93300a98c790181cfd7f0c2b9d0e33f14177a0b204b +DIST tempestsdr-0.0_p20250122.tar.gz 67322644 BLAKE2B 20f8a91ef69462016b5cc4b83408f81780bd6c9299f82d35a96d5c3259c67ea1b63b2a22991443cfbd8a19c1eb2f4489e9e28c0703399e47ea804edf2c19a557 SHA512 1fbbca5926019028a2b1d6fa9ddecee83849d6a95b7dc0d87fcddbf59fe54b3a9f6f903eb38d187ef1de5932bc109cadd6144e5b4ce7f7f89ed10e1c1b608399 +EBUILD tempestsdr-0.0_p20250122-r1.ebuild 918 BLAKE2B 1f22708507a80991c3968f15ea4fb7d2b89f016a275f991181d22623dfd62dddb1ae7b7b42db64be05c890dcdff517e59e02668001a90ac738a966beb5319643 SHA512 fa54dcf66f5f15aa6a5a5a1d031291a2860527db4c4b3ad18f3e8da7937984723a5a8f902ad0545c6f7082996b69d0a172ff144d860a946216d26adaa7123b30 +EBUILD tempestsdr-9999.ebuild 918 BLAKE2B 1f22708507a80991c3968f15ea4fb7d2b89f016a275f991181d22623dfd62dddb1ae7b7b42db64be05c890dcdff517e59e02668001a90ac738a966beb5319643 SHA512 fa54dcf66f5f15aa6a5a5a1d031291a2860527db4c4b3ad18f3e8da7937984723a5a8f902ad0545c6f7082996b69d0a172ff144d860a946216d26adaa7123b30 MISC metadata.xml 306 BLAKE2B 95dd53ef93bb991ebd4da610eacc3590536bfefff9d8877714d955e2f1c5aae4f951bfc464df1dae323a1f89fc93c6fa9dbeaf2bf165e1653a62d6b11df54e8c SHA512 d95db8dab59555e0506a106b3b8bcc8fd952d8d51c7984a2ccba1610b1d1be4faf4a3ff56639b58528934480706f278f76f0e993b6f0ed82e831b07a9d9a0b6d diff --git a/net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild b/net-wireless/tempestsdr/tempestsdr-0.0_p20250122-r1.ebuild index 1301229d0e69..674c234f099f 100644 --- a/net-wireless/tempestsdr/tempestsdr-0.0_p20200221-r1.ebuild +++ b/net-wireless/tempestsdr/tempestsdr-0.0_p20250122-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,33 +15,22 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/deltj/TempestSDR.git" else KEYWORDS="~amd64 ~x86" - COMMIT="93c238725bdcf2f50c8a1d3789cf56e90f7bab7f" + COMMIT="59201a2cb21ab193125719eb318dcfbbf979c32e" SRC_URI="https://github.com/deltj/TempestSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/TempestSDR-${COMMIT}" fi -IUSE="" +RDEPEND=">=virtual/jre-1.8:* + dev-libs/boost:= + net-wireless/airspy + net-wireless/uhd:= + net-wireless/rtl-sdr + net-wireless/bladerf:= + net-wireless/hackrf-tools" DEPEND=">=virtual/jdk-1.8:* - dev-libs/boost:= - net-wireless/airspy - net-wireless/uhd:= - net-wireless/rtl-sdr - net-wireless/bladerf:= - net-wireless/hackrf-tools" -RDEPEND="${DEPEND}" -BDEPEND="" - -src_compile() { - emake all -} + ${RDEPEND}" src_install() { - insinto /usr/share/${PN} - doins JavaGUI/JTempestSDR.jar - dodir /usr/bin - cat <<-EOF > "${ED}/usr/bin/tempestsdr" -#!/bin/sh -java -jar /usr/share/tempestsdr/JTempestSDR.jar -EOF - fperms +x /usr/bin/tempestsdr + java-pkg_dojar JavaGUI/JTempestSDR.jar + java-pkg_dolauncher tempestsdr --jar JTempestSDR.jar } diff --git a/net-wireless/tempestsdr/tempestsdr-9999.ebuild b/net-wireless/tempestsdr/tempestsdr-9999.ebuild index 1301229d0e69..674c234f099f 100644 --- a/net-wireless/tempestsdr/tempestsdr-9999.ebuild +++ b/net-wireless/tempestsdr/tempestsdr-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,33 +15,22 @@ if [ "${PV}" = "9999" ]; then EGIT_REPO_URI="https://github.com/deltj/TempestSDR.git" else KEYWORDS="~amd64 ~x86" - COMMIT="93c238725bdcf2f50c8a1d3789cf56e90f7bab7f" + COMMIT="59201a2cb21ab193125719eb318dcfbbf979c32e" SRC_URI="https://github.com/deltj/TempestSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/TempestSDR-${COMMIT}" fi -IUSE="" +RDEPEND=">=virtual/jre-1.8:* + dev-libs/boost:= + net-wireless/airspy + net-wireless/uhd:= + net-wireless/rtl-sdr + net-wireless/bladerf:= + net-wireless/hackrf-tools" DEPEND=">=virtual/jdk-1.8:* - dev-libs/boost:= - net-wireless/airspy - net-wireless/uhd:= - net-wireless/rtl-sdr - net-wireless/bladerf:= - net-wireless/hackrf-tools" -RDEPEND="${DEPEND}" -BDEPEND="" - -src_compile() { - emake all -} + ${RDEPEND}" src_install() { - insinto /usr/share/${PN} - doins JavaGUI/JTempestSDR.jar - dodir /usr/bin - cat <<-EOF > "${ED}/usr/bin/tempestsdr" -#!/bin/sh -java -jar /usr/share/tempestsdr/JTempestSDR.jar -EOF - fperms +x /usr/bin/tempestsdr + java-pkg_dojar JavaGUI/JTempestSDR.jar + java-pkg_dolauncher tempestsdr --jar JTempestSDR.jar } diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index 46da309d9a88..9633a80e1e46 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -2,11 +2,13 @@ AUX wpa_cli-r1.sh 1200 BLAKE2B f3dca6e7810b004a567802f59eaa414b4eaadf2eb1fb1338d AUX wpa_cli.sh 1284 BLAKE2B 50757aa432bf714923d0ff5e2e8357bf3126c82dcfebbc2c342325ad97e3ca95a15ea138f9a55e5a7b9ac86cb2518c173e7d5186d5feb3e57ac762a71b11ef85 SHA512 250372231eda6f7228fcf76b13fc1b95637d0d9dec96b7bef820bfa1af1496f218909f521daf2ddb2ca81d0ebb3162500f833575b64d8d2b4820c247499e1c56 AUX wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch 2386 BLAKE2B cd4db56d476e4bde8d4343c6d2f20bad644d9794184f55313c3d5a9ea04392b0173791335476cadc3bafec8d588e29be971e573b27fd975280a059f0bf22c63c SHA512 d1f7e17dd1f6e9974825f26e549c194a450190191320251e5158432d88795a502ff4d06014af43c75338c9c7b0540f13f1fdf1173bec78ce78e681388bbd04d0 AUX wpa_supplicant-2.10-allow-legacy-renegotiation.patch 1172 BLAKE2B 90af7a43418babd981d6d092c77852ff515b187ce05a3dce6497710582ddefa5d3103ddbf1f0e2481fa102cfb9d28e775646601f139ad61633f3cfc74554dbdc SHA512 afbb89ef8248b8e32a4f537092f8255f3c17fa6281811c25cfc6dec6bae69a4fda9e65a69dae2034a4d3e8e29ecf67b867604c80fd9726cb8f26a059c3bfe8a0 +AUX wpa_supplicant-2.10-use-qt6.patch 12334 BLAKE2B af1a34db36e8ff3295b6b35782cf9d630a4770961f7dc59027133163cb8823e3688d93ab24583bc87dafb721b49437d03d6b1c11369e007f18e74382bc01ce10 SHA512 961a130ab5a0ef65badecb3885fb7d81a0e2722386dd8e744a65a52044843a083b23f16eb997b148069051ac80de3b1cbb25884d4a6c438ae1fc4ad96e4b213a AUX wpa_supplicant-2.6-do-not-call-dbus-functions-with-NULL-path.patch 486 BLAKE2B 877e15a45851331a1499cf8bc96fd514d88b6b270f54d52760e46cc7edbcc4b74a48a0271f0c93b546bb659203c56fdfba63b231757c21ca8ee6ade98406ac2e SHA512 dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f649489afd1636105cdddc29d58d45659c5368cc177f919ce94a7e2b5a9ed3fe8ddccd1fba3d059d270bae1a8 SHA512 6bbb9d4f6132b3d4e20cd65f27245ccadd60712ef5794261499f882057a930a393297e491d8147e04e30c0a53645af0eb3514332587118c19b5594f23f1d62ad AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e140f56fc1d3e6b16454351a270e566dd7fc4717b92251193bdf59a77f57fc3fdd1d53b067f2e5253796c041b SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403 AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535992d14fa2f87a095b6c7226fbdf6b2d2ecd5fdcc13fb413fc56d5294f906c840ab3f9386c99ea69139fc SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8 DIST wpa_supplicant-2.10.tar.gz 3511622 BLAKE2B 7f6045e5dcf24f7ccf1ea75c99541f9d68fadaea858a6ca11a95c997de14e33b3aa89138e748664579b5a4ea493d247cf6613da3c5fae49a4dbb5cd58dace752 SHA512 021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1 EBUILD wpa_supplicant-2.10-r5.ebuild 12406 BLAKE2B ebaaf0685a183b849bbcba4978f717ea385d66e3bc8e56c557dbd289fc60b2eeb75d7b63adfadbedcee846590bb62d45d66ce68024d5dfc89da11a07d2cd4b6b SHA512 a21336436bdabd80c2e945592afb1722548bd7dfb8c1d70be06688d6394d82ab63945c2c3e5d349b53458c89ab94fed7205c5698b04523cf35cc5e7161ecb74b -EBUILD wpa_supplicant-9999.ebuild 12328 BLAKE2B 022856291571a65d91107de35988263d6c0173c3524f9bf486e95bd980d0dccac20dc39a868ca827178f242b78f192e4df5e876c5024069dbc82852ce3226248 SHA512 0cd0eac42b4668167df1c547ed639821db2544dfa08c9ddce24b2693ea4df0ace5a9d24953c7bebc2c04d6cd5201f5ab719e41ac3335e8df88d942d1d09cf30d +EBUILD wpa_supplicant-2.10-r6.ebuild 12451 BLAKE2B a5b23ffef96a7073489be36b6c88023cd13bed2e79c5d4f0556d40cdfb8990e333792ef11129b1dcf65cf924a1c2155002959ebb3ddc579150b678cef2f7b5ee SHA512 2749cfbd08a458511581ce070731231d256253db3614d1dbbfaf60848207f4d29b3d5051985331cbbf7b7ce9a699e942380c03fd7d76eb3d5afcd06effc45473 +EBUILD wpa_supplicant-9999.ebuild 12367 BLAKE2B 92d734b372fed84155a6982ff956ab78d8c3ab69100c3da5b3f385cf1708599744945a393f352e85dab95bf620d557696130a1d18f4d2649e5c6182738607a25 SHA512 7b5a8de61d92673790d8bfc5e737fba747e9506a890b58a757773101b7e511b2e74f72f143c6c806168f372a9a67ea62b9c2fd6255a923f36b82a55c9a9fe09e MISC metadata.xml 1882 BLAKE2B fc23e2184bd2c01f590800a2087461ba6c5d9d5021f6300f1505671369694374a26d333556b467ca0f41fb90d676a5fcad5b87e80ab8f2b2b891255afa0bcd6b SHA512 05ca61dcaf7c3d7543085be7d375088e5372eb6e3dee0cd9920b763e34f528aa988a8ec484328e122812e0f3208aac308d6011995e5ab1c9599fc7d5b9dc6733 diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-use-qt6.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-use-qt6.patch new file mode 100644 index 000000000000..2dd2b753763f --- /dev/null +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-use-qt6.patch @@ -0,0 +1,311 @@ +From 0ead8bb4889977af735f4d0b578497830ee6d6f7 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" <Jason@zx2c4.com> +Date: Fri, 10 Jan 2025 03:43:23 +0100 +Subject: [PATCH] wpa_gui: Port to Qt6 + +This appears to be working. Fairly straight forward. Lightly tested. +Distros are getting ready to remove Qt5, so this is somewhat important +to do. + +Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> +--- + wpa_supplicant/wpa_gui-qt4/eventhistory.h | 2 +- + wpa_supplicant/wpa_gui-qt4/main.cpp | 8 ++++---- + wpa_supplicant/wpa_gui-qt4/networkconfig.cpp | 8 ++++---- + wpa_supplicant/wpa_gui-qt4/networkconfig.h | 2 +- + wpa_supplicant/wpa_gui-qt4/peers.cpp | 10 +++++----- + wpa_supplicant/wpa_gui-qt4/peers.h | 2 +- + wpa_supplicant/wpa_gui-qt4/scanresults.cpp | 2 +- + wpa_supplicant/wpa_gui-qt4/scanresults.h | 2 +- + wpa_supplicant/wpa_gui-qt4/userdatarequest.h | 2 +- + wpa_supplicant/wpa_gui-qt4/wpagui.cpp | 16 ++++++++-------- + wpa_supplicant/wpa_gui-qt4/wpagui.h | 2 +- + wpa_supplicant/wpa_gui-qt4/wpamsg.h | 4 ++-- + 12 files changed, 30 insertions(+), 30 deletions(-) + +diff --git a/wpa_supplicant/wpa_gui-qt4/eventhistory.h b/wpa_supplicant/wpa_gui-qt4/eventhistory.h +index afd7b6346..2122ab45a 100644 +--- a/wpa_supplicant/wpa_gui-qt4/eventhistory.h ++++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.h +@@ -40,7 +40,7 @@ class EventHistory : public QDialog, public Ui::EventHistory + + public: + EventHistory(QWidget *parent = 0, const char *name = 0, +- bool modal = false, Qt::WindowFlags fl = 0); ++ bool modal = false, Qt::WindowFlags fl = Qt::Widget); + ~EventHistory(); + + public slots: +diff --git a/wpa_supplicant/wpa_gui-qt4/main.cpp b/wpa_supplicant/wpa_gui-qt4/main.cpp +index bbd45c6e1..d395aa135 100644 +--- a/wpa_supplicant/wpa_gui-qt4/main.cpp ++++ b/wpa_supplicant/wpa_gui-qt4/main.cpp +@@ -40,10 +40,10 @@ int main(int argc, char *argv[]) + int ret; + + locale = QLocale::system().name(); +- resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); +- if (!translator.load("wpa_gui_" + locale, resourceDir)) +- translator.load("wpa_gui_" + locale, "lang"); +- app.installTranslator(&translator); ++ resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath); ++ if (translator.load("wpa_gui_" + locale, resourceDir) || ++ translator.load("wpa_gui_" + locale, "lang")) ++ app.installTranslator(&translator); + + WpaGui w(&app); + +diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp +index 2727318bc..59af84504 100644 +--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp ++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp +@@ -37,7 +37,7 @@ NetworkConfig::NetworkConfig(QWidget *parent, const char *, bool, + SLOT(authChanged(int))); + connect(cancelButton, SIGNAL(clicked()), this, SLOT(close())); + connect(addButton, SIGNAL(clicked()), this, SLOT(addNetwork())); +- connect(encrSelect, SIGNAL(activated(const QString &)), this, ++ connect(encrSelect, SIGNAL(textActivated(const QString &)), this, + SLOT(encrChanged(const QString &))); + connect(removeButton, SIGNAL(clicked()), this, SLOT(removeNetwork())); + connect(eapSelect, SIGNAL(activated(int)), this, +@@ -204,8 +204,8 @@ void NetworkConfig::addNetwork() + } + + if (idstrEdit->isEnabled() && !idstrEdit->text().isEmpty()) { +- QRegExp rx("^(\\w|-)+$"); +- if (rx.indexIn(idstrEdit->text()) < 0) { ++ QRegularExpression rx("^(\\w|-)+$"); ++ if (!rx.match(idstrEdit->text()).hasMatch()) { + QMessageBox::warning( + this, tr("Network ID Error"), + tr("Network ID String contains non-word " +@@ -797,7 +797,7 @@ void NetworkConfig::removeNetwork() + tr("This will permanently remove the network\n" + "from the configuration. Do you really want\n" + "to remove this network?"), +- tr("Yes"), tr("No")) != 0) ++ QMessageBox::Yes, QMessageBox::No) != 0) + return; + + snprintf(cmd, sizeof(cmd), "REMOVE_NETWORK %d", edit_network_id); +diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.h b/wpa_supplicant/wpa_gui-qt4/networkconfig.h +index fd09dec54..a3a7d9792 100644 +--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.h ++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.h +@@ -20,7 +20,7 @@ class NetworkConfig : public QDialog, public Ui::NetworkConfig + + public: + NetworkConfig(QWidget *parent = 0, const char *name = 0, +- bool modal = false, Qt::WindowFlags fl = 0); ++ bool modal = false, Qt::WindowFlags fl = Qt::Widget); + ~NetworkConfig(); + + virtual void paramsFromScanResults(QTreeWidgetItem *sel); +diff --git a/wpa_supplicant/wpa_gui-qt4/peers.cpp b/wpa_supplicant/wpa_gui-qt4/peers.cpp +index 0a0b3ffcb..268aba8b3 100644 +--- a/wpa_supplicant/wpa_gui-qt4/peers.cpp ++++ b/wpa_supplicant/wpa_gui-qt4/peers.cpp +@@ -403,7 +403,7 @@ void Peers::ctx_p2p_start_group() + + void Peers::add_station(QString info) + { +- QStringList lines = info.split(QRegExp("\\n")); ++ QStringList lines = info.split(QRegularExpression("\\n")); + QString name; + + for (QStringList::Iterator it = lines.begin(); +@@ -518,7 +518,7 @@ void Peers::add_p2p_group_client(QStandardItem * /*parent*/, QString params) + */ + + QStringList items = +- params.split(QRegExp(" (?=[^']*('[^']*'[^']*)*$)")); ++ params.split(QRegularExpression(" (?=[^']*('[^']*'[^']*)*$)")); + QString addr = ""; + QString name = ""; + int config_methods = 0; +@@ -591,7 +591,7 @@ bool Peers::add_bss(const char *cmd) + QString ssid, bssid, flags, wps_name, pri_dev_type; + int id = -1; + +- QStringList lines = bss.split(QRegExp("\\n")); ++ QStringList lines = bss.split(QRegularExpression("\\n")); + for (QStringList::Iterator it = lines.begin(); + it != lines.end(); it++) { + int pos = (*it).indexOf('=') + 1; +@@ -643,7 +643,7 @@ bool Peers::add_bss(const char *cmd) + item->setData(ssid, peer_role_ssid); + model.appendRow(item); + +- lines = bss.split(QRegExp("\\n")); ++ lines = bss.split(QRegularExpression("\\n")); + for (QStringList::Iterator it = lines.begin(); + it != lines.end(); it++) { + if ((*it).startsWith("p2p_group_client:")) +@@ -903,7 +903,7 @@ void Peers::event_notify(WpaMsg msg) + * group_capab=0x0 + */ + QStringList items = +- text.split(QRegExp(" (?=[^']*('[^']*'[^']*)*$)")); ++ text.split(QRegularExpression(" (?=[^']*('[^']*'[^']*)*$)")); + QString addr = items[1]; + QString name = ""; + QString pri_dev_type; +diff --git a/wpa_supplicant/wpa_gui-qt4/peers.h b/wpa_supplicant/wpa_gui-qt4/peers.h +index bb7373749..c44bba99a 100644 +--- a/wpa_supplicant/wpa_gui-qt4/peers.h ++++ b/wpa_supplicant/wpa_gui-qt4/peers.h +@@ -22,7 +22,7 @@ class Peers : public QDialog, public Ui::Peers + + public: + Peers(QWidget *parent = 0, const char *name = 0, +- bool modal = false, Qt::WindowFlags fl = 0); ++ bool modal = false, Qt::WindowFlags fl = Qt::Widget); + ~Peers(); + void setWpaGui(WpaGui *_wpagui); + void event_notify(WpaMsg msg); +diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp +index a2e3072fb..ba04b4f38 100644 +--- a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp ++++ b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp +@@ -77,7 +77,7 @@ void ScanResults::updateResults() + + QString ssid, bssid, freq, signal, flags; + +- QStringList lines = bss.split(QRegExp("\\n")); ++ QStringList lines = bss.split(QRegularExpression("\\n")); + for (QStringList::Iterator it = lines.begin(); + it != lines.end(); it++) { + int pos = (*it).indexOf('=') + 1; +diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.h b/wpa_supplicant/wpa_gui-qt4/scanresults.h +index 2cddd133f..39bba90ce 100644 +--- a/wpa_supplicant/wpa_gui-qt4/scanresults.h ++++ b/wpa_supplicant/wpa_gui-qt4/scanresults.h +@@ -20,7 +20,7 @@ class ScanResults : public QDialog, public Ui::ScanResults + + public: + ScanResults(QWidget *parent = 0, const char *name = 0, +- bool modal = false, Qt::WindowFlags fl = 0); ++ bool modal = false, Qt::WindowFlags fl = Qt::Widget); + ~ScanResults(); + + public slots: +diff --git a/wpa_supplicant/wpa_gui-qt4/userdatarequest.h b/wpa_supplicant/wpa_gui-qt4/userdatarequest.h +index b6d1ad2f4..3f7dccb28 100644 +--- a/wpa_supplicant/wpa_gui-qt4/userdatarequest.h ++++ b/wpa_supplicant/wpa_gui-qt4/userdatarequest.h +@@ -20,7 +20,7 @@ class UserDataRequest : public QDialog, public Ui::UserDataRequest + + public: + UserDataRequest(QWidget *parent = 0, const char *name = 0, +- bool modal = false, Qt::WindowFlags fl = 0); ++ bool modal = false, Qt::WindowFlags fl = Qt::Widget); + ~UserDataRequest(); + + int setParams(WpaGui *_wpagui, const char *reqMsg); +diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +index 9404ab424..0c125d90f 100644 +--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp ++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +@@ -99,9 +99,9 @@ WpaGui::WpaGui(QApplication *_app, QWidget *parent, const char *, + connect(disconnectButton, SIGNAL(clicked()), this, SLOT(disconnect())); + connect(scanButton, SIGNAL(clicked()), this, SLOT(scan())); + connect(connectButton, SIGNAL(clicked()), this, SLOT(connectB())); +- connect(adapterSelect, SIGNAL(activated(const QString&)), this, ++ connect(adapterSelect, SIGNAL(textActivated(const QString&)), this, + SLOT(selectAdapter(const QString&))); +- connect(networkSelect, SIGNAL(activated(const QString&)), this, ++ connect(networkSelect, SIGNAL(textActivated(const QString&)), this, + SLOT(selectNetwork(const QString&))); + connect(addNetworkButton, SIGNAL(clicked()), this, SLOT(addNetwork())); + connect(editNetworkButton, SIGNAL(clicked()), this, +@@ -1078,7 +1078,7 @@ void WpaGui::selectNetwork( const QString &sel ) + char reply[10]; + size_t reply_len = sizeof(reply); + +- if (cmd.contains(QRegExp("^\\d+:"))) ++ if (cmd.contains(QRegularExpression("^\\d+:"))) + cmd.truncate(cmd.indexOf(':')); + else + cmd = "any"; +@@ -1095,7 +1095,7 @@ void WpaGui::enableNetwork(const QString &sel) + char reply[10]; + size_t reply_len = sizeof(reply); + +- if (cmd.contains(QRegExp("^\\d+:"))) ++ if (cmd.contains(QRegularExpression("^\\d+:"))) + cmd.truncate(cmd.indexOf(':')); + else if (!cmd.startsWith("all")) { + debug("Invalid editNetwork '%s'", +@@ -1114,7 +1114,7 @@ void WpaGui::disableNetwork(const QString &sel) + char reply[10]; + size_t reply_len = sizeof(reply); + +- if (cmd.contains(QRegExp("^\\d+:"))) ++ if (cmd.contains(QRegularExpression("^\\d+:"))) + cmd.truncate(cmd.indexOf(':')); + else if (!cmd.startsWith("all")) { + debug("Invalid editNetwork '%s'", +@@ -1132,7 +1132,7 @@ void WpaGui::editNetwork(const QString &sel) + QString cmd(sel); + int id = -1; + +- if (cmd.contains(QRegExp("^\\d+:"))) { ++ if (cmd.contains(QRegularExpression("^\\d+:"))) { + cmd.truncate(cmd.indexOf(':')); + id = cmd.toInt(); + } +@@ -1204,7 +1204,7 @@ void WpaGui::removeNetwork(const QString &sel) + char reply[10]; + size_t reply_len = sizeof(reply); + +- if (cmd.contains(QRegExp("^\\d+:"))) ++ if (cmd.contains(QRegularExpression("^\\d+:"))) + cmd.truncate(cmd.indexOf(':')); + else if (!cmd.startsWith("all")) { + debug("Invalid editNetwork '%s'", +@@ -1476,7 +1476,7 @@ void WpaGui::showTrayStatus() + + QString msg, status(buf); + +- QStringList lines = status.split(QRegExp("\\n")); ++ QStringList lines = status.split(QRegularExpression("\\n")); + for (QStringList::Iterator it = lines.begin(); + it != lines.end(); it++) { + int pos = (*it).indexOf('=') + 1; +diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.h b/wpa_supplicant/wpa_gui-qt4/wpagui.h +index f0a34c97e..898722bd9 100644 +--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h ++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h +@@ -49,7 +49,7 @@ public: + }; + + WpaGui(QApplication *app, QWidget *parent = 0, const char *name = 0, +- Qt::WindowFlags fl = 0); ++ Qt::WindowFlags fl = Qt::Widget); + ~WpaGui(); + + virtual int ctrlRequest(const char *cmd, char *buf, size_t *buflen); +diff --git a/wpa_supplicant/wpa_gui-qt4/wpamsg.h b/wpa_supplicant/wpa_gui-qt4/wpamsg.h +index 8f2fcdc41..fe36e2044 100644 +--- a/wpa_supplicant/wpa_gui-qt4/wpamsg.h ++++ b/wpa_supplicant/wpa_gui-qt4/wpamsg.h +@@ -10,7 +10,7 @@ + #define WPAMSG_H + + #include <QDateTime> +-#include <QLinkedList> ++#include <QList> + + class WpaMsg { + public: +@@ -30,6 +30,6 @@ private: + QDateTime timestamp; + }; + +-typedef QLinkedList<WpaMsg> WpaMsgList; ++typedef QList<WpaMsg> WpaMsgList; + + #endif /* WPAMSG_H */ +-- +2.48.0 + diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r6.ebuild new file mode 100644 index 000000000000..6f5307e422d3 --- /dev/null +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r6.ebuild @@ -0,0 +1,478 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs + +DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" +HOMEPAGE="https://w1.fi/wpa_supplicant/" +LICENSE="|| ( GPL-2 BSD )" + +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://w1.fi/hostap.git" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI="https://w1.fi/releases/${P}.tar.gz" +fi + +SLOT="0" +IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt6 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps" + +# CONFIG_PRIVSEP=y does not have sufficient support for the new driver +# interface functions used for MACsec, so this combination cannot be used +# at least for now. bug #684442 +REQUIRED_USE=" + macsec? ( !privsep ) + privsep? ( !macsec ) + broadcom-sta? ( !fils !mesh !mbo ) +" + +DEPEND=" + >=dev-libs/openssl-1.0.2k:= + dbus? ( sys-apps/dbus ) + kernel_linux? ( + >=dev-libs/libnl-3.2:3 + eap-sim? ( sys-apps/pcsc-lite ) + ) + !kernel_linux? ( net-libs/libpcap ) + qt6? ( + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtsvg:6 + ) + readline? ( + sys-libs/ncurses:0= + sys-libs/readline:0= + ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-networkmanager ) + kernel_linux? ( + net-wireless/wireless-regdb + ) +" +BDEPEND="virtual/pkgconfig" + +DOC_CONTENTS=" + If this is a clean installation of wpa_supplicant, you + have to create a configuration file named + /etc/wpa_supplicant/wpa_supplicant.conf + An example configuration file is available for reference in + /usr/share/doc/${PF}/ +" + +S="${WORKDIR}/${P}/${PN}" + +Kconfig_style_config() { + #param 1 is CONFIG_* item + #param 2 is what to set it = to, defaulting in y + CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1" + setting="${2:-y}" + + if [ ! $setting = n ]; then + #first remove any leading "# " if $2 is not n + sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" + #set item = $setting (defaulting to y) + if ! sed -i "/^$CONFIG_PARAM\>/s/=.*/=$setting/" .config; then + echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" + fi + if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then + echo "$CONFIG_PARAM=$setting" >>.config + fi + else + #ensure item commented out + if ! sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config; then + echo "Kconfig_style_config error commenting $CONFIG_PARAM" + fi + fi +} + +src_prepare() { + default + + # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD + sed -i \ + -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \ + ../src/l2_packet/l2_packet_freebsd.c || die + + # Change configuration to match Gentoo locations (bug #143750) + sed -i \ + -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ + -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ + wpa_supplicant.conf || die + + # systemd entries to D-Bus service files (bug #372877) + echo 'SystemdService=wpa_supplicant.service' \ + | tee -a dbus/*.service >/dev/null || die + + cd "${WORKDIR}/${P}" || die + + if use wimax; then + # generate-libeap-peer.patch comes before + # fix-undefined-reference-to-random_get_bytes.patch + eapply "${FILESDIR}/${P}-generate-libeap-peer.patch" + + # multilib-strict fix (bug #373685) + sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile || die + fi + + # bug (320097) + eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch" + + # bug (912315) + eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch" + eapply "${FILESDIR}/${PN}-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch" + + # bug (948052) + eapply "${FILESDIR}/${PN}-2.10-use-qt6.patch" + + # bug (640492) + sed -i 's#-Werror ##' wpa_supplicant/Makefile || die +} + +src_configure() { + # Toolchain setup + tc-export CC PKG_CONFIG + + cp defconfig .config || die + + # Basic setup + Kconfig_style_config CTRL_IFACE + Kconfig_style_config MATCH_IFACE + Kconfig_style_config BACKEND file + Kconfig_style_config IBSS_RSN + Kconfig_style_config IEEE80211W + Kconfig_style_config IEEE80211R + Kconfig_style_config HT_OVERRIDES + Kconfig_style_config VHT_OVERRIDES + Kconfig_style_config OCV + Kconfig_style_config TLSV11 + Kconfig_style_config TLSV12 + Kconfig_style_config GETRANDOM + + # Basic authentication methods + # NOTE: we don't set GPSK or SAKE as they conflict + # with the below options + Kconfig_style_config EAP_GTC + Kconfig_style_config EAP_MD5 + Kconfig_style_config EAP_OTP + Kconfig_style_config EAP_PAX + Kconfig_style_config EAP_PSK + Kconfig_style_config EAP_TLV + Kconfig_style_config EAP_EXE + Kconfig_style_config IEEE8021X_EAPOL + Kconfig_style_config PKCS12 + Kconfig_style_config PEERKEY + Kconfig_style_config EAP_LEAP + Kconfig_style_config EAP_MSCHAPV2 + Kconfig_style_config EAP_PEAP + Kconfig_style_config EAP_TEAP + Kconfig_style_config EAP_TLS + Kconfig_style_config EAP_TTLS + + # Enabling background scanning. + Kconfig_style_config BGSCAN_SIMPLE + Kconfig_style_config BGSCAN_LEARN + + if use dbus ; then + Kconfig_style_config CTRL_IFACE_DBUS + Kconfig_style_config CTRL_IFACE_DBUS_NEW + Kconfig_style_config CTRL_IFACE_DBUS_INTRO + else + Kconfig_style_config CTRL_IFACE_DBUS n + Kconfig_style_config CTRL_IFACE_DBUS_NEW n + Kconfig_style_config CTRL_IFACE_DBUS_INTRO n + fi + + if use eapol-test ; then + Kconfig_style_config EAPOL_TEST + fi + + # Enable support for writing debug info to a log file and syslog. + Kconfig_style_config DEBUG_FILE + Kconfig_style_config DEBUG_SYSLOG + + if use hs2-0 ; then + Kconfig_style_config INTERWORKING + Kconfig_style_config HS20 + fi + + if use mbo ; then + Kconfig_style_config MBO + else + Kconfig_style_config MBO n + fi + + if use uncommon-eap-types; then + Kconfig_style_config EAP_GPSK + Kconfig_style_config EAP_SAKE + Kconfig_style_config EAP_GPSK_SHA256 + Kconfig_style_config EAP_IKEV2 + Kconfig_style_config EAP_EKE + fi + + if use eap-sim ; then + # Smart card authentication + Kconfig_style_config EAP_SIM + Kconfig_style_config EAP_AKA + Kconfig_style_config EAP_AKA_PRIME + Kconfig_style_config PCSC + fi + + if use fasteap ; then + Kconfig_style_config EAP_FAST + fi + + if use readline ; then + # readline/history support for wpa_cli + Kconfig_style_config READLINE + else + #internal line edit mode for wpa_cli + Kconfig_style_config WPA_CLI_EDIT + fi + + Kconfig_style_config TLS openssl + Kconfig_style_config FST + + Kconfig_style_config EAP_PWD + if use fils; then + Kconfig_style_config FILS + Kconfig_style_config FILS_SK_PFS + fi + if use mesh; then + Kconfig_style_config MESH + else + Kconfig_style_config MESH n + fi + # WPA3 + Kconfig_style_config OWE + Kconfig_style_config SAE + Kconfig_style_config DPP + Kconfig_style_config DPP2 + Kconfig_style_config SUITEB192 + Kconfig_style_config SUITEB + + if use wep ; then + Kconfig_style_config WEP + else + Kconfig_style_config WEP n + fi + + # Watch out, reversed logic + if use tkip ; then + Kconfig_style_config NO_TKIP n + else + Kconfig_style_config NO_TKIP + fi + + if use smartcard ; then + Kconfig_style_config SMARTCARD + else + Kconfig_style_config SMARTCARD n + fi + + if use tdls ; then + Kconfig_style_config TDLS + fi + + if use kernel_linux ; then + # Linux specific drivers + Kconfig_style_config DRIVER_ATMEL + Kconfig_style_config DRIVER_HOSTAP + Kconfig_style_config DRIVER_IPW + Kconfig_style_config DRIVER_NL80211 + Kconfig_style_config DRIVER_RALINK + Kconfig_style_config DRIVER_WEXT + Kconfig_style_config DRIVER_WIRED + + if use macsec ; then + #requires something, no idea what + #Kconfig_style_config DRIVER_MACSEC_QCA + Kconfig_style_config DRIVER_MACSEC_LINUX + Kconfig_style_config MACSEC + else + # bug #831369 and bug #684442 + Kconfig_style_config DRIVER_MACSEC_LINUX n + Kconfig_style_config MACSEC n + fi + + if use ps3 ; then + Kconfig_style_config DRIVER_PS3 + fi + fi + + # Wi-Fi Protected Setup (WPS) + if use wps ; then + Kconfig_style_config WPS + Kconfig_style_config WPS2 + # USB Flash Drive + Kconfig_style_config WPS_UFD + # External Registrar + Kconfig_style_config WPS_ER + # Universal Plug'n'Play + Kconfig_style_config WPS_UPNP + # Near Field Communication + Kconfig_style_config WPS_NFC + else + Kconfig_style_config WPS n + Kconfig_style_config WPS2 n + Kconfig_style_config WPS_UFD n + Kconfig_style_config WPS_ER n + Kconfig_style_config WPS_UPNP n + Kconfig_style_config WPS_NFC n + fi + + # Wi-Fi Direct (WiDi) + if use p2p ; then + Kconfig_style_config P2P + Kconfig_style_config WIFI_DISPLAY + else + Kconfig_style_config P2P n + Kconfig_style_config WIFI_DISPLAY n + fi + + # Access Point Mode + if use ap ; then + Kconfig_style_config AP + else + Kconfig_style_config AP n + fi + + # Enable essentials for AP/P2P + if use ap || use p2p ; then + # Enabling HT support (802.11n) + Kconfig_style_config IEEE80211N + + # Enabling VHT support (802.11ac) + Kconfig_style_config IEEE80211AC + fi + + # Enable mitigation against certain attacks against TKIP + Kconfig_style_config DELAYED_MIC_ERROR_REPORT + + if use privsep ; then + Kconfig_style_config PRIVSEP + fi + + if use kernel_linux ; then + Kconfig_style_config LIBNL32 + fi + + if use qt6 ; then + pushd "${S}"/wpa_gui-qt4 > /dev/null || die + eqmake6 wpa_gui.pro + popd > /dev/null || die + fi +} + +src_compile() { + einfo "Building wpa_supplicant" + emake V=1 BINDIR=/usr/sbin + + if use wimax; then + emake -C ../src/eap_peer clean + emake -C ../src/eap_peer + fi + + if use qt6; then + einfo "Building wpa_gui" + emake -C "${S}"/wpa_gui-qt4 + fi + + if use eapol-test ; then + emake eapol_test + fi +} + +src_install() { + dosbin wpa_supplicant + use privsep && dosbin wpa_priv + dobin wpa_cli wpa_passphrase + + newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant + newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant + + exeinto /etc/wpa_supplicant/ + newexe "${FILESDIR}/wpa_cli-r1.sh" wpa_cli.sh + + readme.gentoo_create_doc + dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ + wpa_supplicant.conf + + newdoc .config build-config + + if [ "${PV}" != "9999" ]; then + doman doc/docbook/*.{5,8} + fi + + if use qt6 ; then + into /usr + dobin wpa_gui-qt4/wpa_gui + doicon wpa_gui-qt4/icons/wpa_gui.svg + domenu wpa_gui-qt4/wpa_gui.desktop + else + rm "${ED}"/usr/share/man/man8/wpa_gui.8 + fi + + use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install + + if use dbus ; then + pushd "${S}"/dbus > /dev/null || die + insinto /etc/dbus-1/system.d + newins dbus-wpa_supplicant.conf wpa_supplicant.conf + insinto /usr/share/dbus-1/system-services + doins fi.w1.wpa_supplicant1.service + popd > /dev/null || die + + # This unit relies on dbus support, bug 538600. + systemd_dounit systemd/wpa_supplicant.service + fi + + if use eapol-test ; then + dobin eapol_test + fi + + systemd_dounit "systemd/wpa_supplicant@.service" + systemd_dounit "systemd/wpa_supplicant-nl80211@.service" + systemd_dounit "systemd/wpa_supplicant-wired@.service" +} + +pkg_postinst() { + readme.gentoo_print_elog + + if [[ -e "${EROOT}"/etc/wpa_supplicant.conf ]] ; then + echo + ewarn "WARNING: your old configuration file ${EROOT}/etc/wpa_supplicant.conf" + ewarn "needs to be moved to ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf" + fi + if ! use wep; then + einfo "WARNING: You are building with WEP support disabled, which is recommended since" + einfo "this protocol is deprecated and insecure. If you still need to connect to" + einfo "WEP-enabled networks, you may turn this flag back on. With this flag off," + einfo "WEP-enabled networks will not even show up as available." + einfo "If your network is missing you may wish to USE=wep" + fi + if ! use tkip; then + ewarn "WARNING: You are building with TKIP support disabled, which is recommended since" + ewarn "this protocol is deprecated and insecure. If you still need to connect to" + ewarn "TKIP-enabled networks, you may turn this flag back on. With this flag off," + ewarn "TKIP-enabled networks, including mixed mode TKIP/AES-CCMP will not even show up" + ewarn "as available. If your network is missing you may wish to USE=tkip" + fi + + # Mea culpa, feel free to remove that after some time --mgorny. + local fn + for fn in wpa_supplicant{,@wlan0}.service; do + if [[ -e "${EROOT}"/etc/systemd/system/network.target.wants/${fn} ]] + then + ebegin "Moving ${fn} to multi-user.target" + mv "${EROOT}"/etc/systemd/system/network.target.wants/${fn} \ + "${EROOT}"/etc/systemd/system/multi-user.target.wants/ || die + eend ${?} \ + "Please try to re-enable ${fn}" + fi + done + + systemd_reenable wpa_supplicant.service +} diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild index ffa8b14e9a08..9fef0e62ce8c 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 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 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 qt6 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 @@ -37,11 +37,9 @@ DEPEND=" eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 + qt6? ( + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtsvg:6 ) readline? ( sys-libs/ncurses:0= @@ -125,6 +123,9 @@ src_prepare() { # bug (912315) eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch" + # bug (948052) + eapply "${FILESDIR}/${PN}-2.10-use-qt6.patch" + # bug (640492) sed -i 's#-Werror ##' wpa_supplicant/Makefile || die } @@ -357,9 +358,9 @@ src_configure() { Kconfig_style_config LIBNL32 fi - if use qt5 ; then + if use qt6 ; then pushd "${S}"/wpa_gui-qt4 > /dev/null || die - eqmake5 wpa_gui.pro + eqmake6 wpa_gui.pro popd > /dev/null || die fi } @@ -373,7 +374,7 @@ src_compile() { emake -C ../src/eap_peer fi - if use qt5; then + if use qt6; then einfo "Building wpa_gui" emake -C "${S}"/wpa_gui-qt4 fi @@ -404,7 +405,7 @@ src_install() { doman doc/docbook/*.{5,8} fi - if use qt5 ; then + if use qt6 ; then into /usr dobin wpa_gui-qt4/wpa_gui doicon wpa_gui-qt4/icons/wpa_gui.svg |