diff options
Diffstat (limited to 'net-wireless')
40 files changed, 458 insertions, 1386 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz Binary files differindex 72dac6895cec..28bcc6f53a9f 100644 --- a/net-wireless/Manifest.gz +++ b/net-wireless/Manifest.gz diff --git a/net-wireless/bdaddr/Manifest b/net-wireless/bdaddr/Manifest index b1c67ce1fd8c..6090efe63a7c 100644 --- a/net-wireless/bdaddr/Manifest +++ b/net-wireless/bdaddr/Manifest @@ -1,4 +1,4 @@ DIST bdaddr-0_p20210511-idiomatic-makefile-r1.patch 883 BLAKE2B 805f5faf7bc1260f7f415eb92d02e0269ec6b753e31106f81970c28e1692226ce2f6fb08eb05438b190a321a6789fe600fd9ae6006a1fb54d92a96f55a6db80c SHA512 1938644c359c061966e1278bf97cd622cfa9c74eac7e5c0373df1ce0bc6b36a3034e47bb95601d31d28ec2a0627e0e2b3bb2174d1613368fbf2f2eb0ec237043 DIST bdaddr-0_p20210511.tar.gz 5236 BLAKE2B a445586cc016f57f1922d6cff9dcf3141d35122a0dd4a3c338cc98515dadcf40265c3f4dcb2da03d3cd4214ab3d57172d78677afe9099d380e1241677d13b486 SHA512 956e1207c4b082d6322ab0ce9cdc76c9c2c9f17fe4ecb3d03b4839025b49f102a4e35b05e2489eca3fee6fc4a611d942e598c97cab7db6b530e895818e33a150 EBUILD bdaddr-0_p20210511.ebuild 1145 BLAKE2B a00a6daef34459f250c661861381492dfa9f6e44d0c5cbbaa462730bf23593ea9e71579d7f5ec4e79a15dedb296d04b5c849b965c805c035ae63d6e43e2bbc9c SHA512 7f290a3ceb52be13f030c72448594917116f198838a4a2550ee478c1a8f9c42f460559aca20cc9c01f6a58fd2bb910326c58b914ff867f315b41fee4ee21245e -MISC metadata.xml 325 BLAKE2B 8f199664da0bdffcaf523f26ef724d3ec28c7146cc82b8bf8e7644ec94cbb0438fb3ece3c5e106051e33ffd96b285b6b60cee5049163efdce9e9f6ba41e1e896 SHA512 543ac251b372121280d8255b170b350999d0053f746e1a0fcd86e6f12463e0cdaa17f527b00613220a275c7a2eb57e469cae78cc264a16e6c6a5f3bf80090f7c +MISC metadata.xml 326 BLAKE2B faa91c7503d3719c625b45cbd4873a7c6523555adabb11dc4244f6a6ff9ad07e6823509f467a6591094ba0bff418735f496462aaeae18054c35e225ffd499a94 SHA512 cd184dde3fc6a93e87f69abaf4960312e747e407b7d2591a8d427251e4cb1cde35e56b5b7a6cfcb9b0f0c4d508fa1d30242a9f58bb4b322e12f4c3dace31dabb diff --git a/net-wireless/bdaddr/metadata.xml b/net-wireless/bdaddr/metadata.xml index b25bbf170df9..0332b97da298 100644 --- a/net-wireless/bdaddr/metadata.xml +++ b/net-wireless/bdaddr/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <name>Florian Schmaus</name> diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 7767c7c8ad1c..3f25e707eb66 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,10 +1,10 @@ AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch 698 BLAKE2B 41f16a7227518616160aecd016f462f2e636166ddc546aa4fe099e3c6146648b2e0985b97b97eeb3941ebb8666a9ba83803dc773e3d752adc1177c50e7073390 SHA512 144cfa6b1608c59cd49f23871d3fb63fd4b4d08bd0a5fe51ce775218d8d46ef22bd11e2ae3b571d42b7571bbbfe1d5b5e7e49864f1e147242ecddb1c3976b611 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96 -AUX bluez-5.73-configure-cups.patch 1245 BLAKE2B f9ce853b68e85b671fd9531700e0556273dcb2f3b16468ba1182f7746d467cced106b47c920be102cb3a1383e7dda8e49fba26e818f098b455d022fd00b9cd71 SHA512 35559f4d67befaa86e149d46e95bc473bc970beb38fab837cb40b5ca6f9de9bbff3fb437138cb165394fd27e48e0869d6f42af07d1eb1f0da3663c4a8f4e74c2 +AUX bluez-5.78-musl-1.2.5.patch 8604 BLAKE2B 03d961af3e05de95a7c14aa8bbbb70baebd521a433ff7cbcede2532d2db10792718f4d0df024a39cbb23a53a2a1b1a42b23dac2a9ec1069d6c0292bce34ccd03 SHA512 29fe6de760478943622700217a0648738cd5b42e354fcf6866ada2cbe24de5212ff0489c3f349ca25ea7538f4efbbebeb453f7d789c41e10b982ee968638e1c8 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6 -DIST bluez-5.76.tar.xz 2418848 BLAKE2B 658e67ec3ac568fd4d8bdc434eabfc63fd8cddd287f7cf6a8967771673e79fe95c509be654ae2495d1b3aedb1e23ca710d545f5ded281a64fd44058b0cdf7afe SHA512 30dc3faef74a2225fd6027178376dca4166082d1ed5188021e13d13582db5846aef60b753f173d525bfd0c040f26c3e7dab0283ecafbd34c4a06855d13abb389 DIST bluez-5.77.tar.xz 2432176 BLAKE2B 9c1a8c78ad11a79080af12333338a6b75189ac51f8c49545de9eede8544fea531a7d8f50676f6e26c84289828fe8327bbc3e5b50ad4d9c08822cf0353a82ecaf SHA512 cf0faba4ddbfe6cc3c2d86cbd809483ed82327cbd7e4970ef53cf19053de7b355a505cab88844aebe7a6aa1947ec7a366250d3cbf48cf309db413d287289ff99 -EBUILD bluez-5.76-r1.ebuild 8716 BLAKE2B 3e60db8c15d28986482467668d73be83934caa2f2d433b17977b95755868ca32a5774ac8f8bc17171139ecea54d9d194cc02b981ebabfc08121c66a79ca2299f SHA512 586ad637ca9951c34c7f3c8d5ca460455a6e0456b491eac1c394f38618c08b8fd692f46aa58431c9bd3d597eb0dac3a3abe733e05861cfcf9ef04d13f367d2b2 +DIST bluez-5.78.tar.xz 2441672 BLAKE2B 7fe65e926b2a692fcf96bb9c694c42ad8c0bd2d19bf534427128bfbd1eb4d9e3e63f2bdc4659ee8654967a0ac7866a561bc4bd4656d19e0dcb7cc5ce976eb6b2 SHA512 0c591a42742c167ff51e088d898b751f11cb4808ec2f17d9a85bc247a32d4fe18fa17503d188ffad6d9393ad590574518055abe5beeb788aca07d5ba957e4e4d EBUILD bluez-5.77.ebuild 8589 BLAKE2B 5fe0431297fd7a7ff8439d8097346917c9af21a59b0b133c8be168e15dd0eb74aed6979b7db2ee7b25aa4cd0734f38428d4cd6a2f76213c2391b5d7eed15d3f3 SHA512 209d2fdac38bbee4b055987b591edae4d5f85ba3835b82914ccecde17a1ffb1f1321f1159acc36b39cf341c3c450b716a388c56744ec750c08e1e818cb17a0a1 +EBUILD bluez-5.78.ebuild 8693 BLAKE2B a5173d38c85234b3b3c78c203302b2bd367d732463f85a074cb641ddd1c65aceb6922584cfcac3b6ba0d844d6341fe61129b9b941675c4dbc78b88aba8a591a9 SHA512 b830ea9b58822c14543c3221c2d0c58212c78e34576560b8d3db12d6aa92749c53c509f2bdb579f72defc7c01f3c9d98869d138f1a9e743296daeea4ee0a51df MISC metadata.xml 1150 BLAKE2B 830a8e0c89fcc18af92e063ceb3632c97eed9f7424ac5214dd4c853b142d03bba6d629b86fc41ecc28a450a9b7989a21faaae1b95654cb8f16ce2ceb3a97e025 SHA512 44e4489f48634d1b1ff300ccba0f7caa74b76ac7325d38d395ee53763906743f7b622b028a01d32e963952a23da560c16b8cd6771a9001ba90845b59293a6101 diff --git a/net-wireless/bluez/bluez-5.76-r1.ebuild b/net-wireless/bluez/bluez-5.78.ebuild index 47eb7a23592b..9428a4093a9a 100644 --- a/net-wireless/bluez/bluez-5.76-r1.ebuild +++ b/net-wireless/bluez/bluez-5.78.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit autotools flag-o-matic linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 @@ -66,6 +66,9 @@ PATCHES=( # https://bugs.gentoo.org/539844 # https://github.com/bluez/bluez/issues/268 "${FILESDIR}"/${PN}-udevadm-path-r1.patch + # bug #926344 + # https://github.com/bluez/bluez/issues/843 + "${FILESDIR}"/${PN}-5.78-musl-1.2.5.patch ) pkg_setup() { @@ -100,9 +103,6 @@ pkg_setup() { src_prepare() { default - # https://github.com/bluez/bluez/issues/773 - eapply "${FILESDIR}"/${PN}-5.73-configure-cups.patch - # https://github.com/bluez/bluez/issues/806 eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch @@ -247,7 +247,6 @@ multilib_src_install_all() { # Setup auto enable as Fedora does for allowing to use # keyboards/mouse as soon as possible - sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die insinto /etc/bluetooth doins src/main.conf @@ -258,6 +257,7 @@ multilib_src_install_all() { use doc && dodoc doc/*.txt # https://bugs.gentoo.org/929017 + # https://github.com/bluez/bluez/issues/329#issuecomment-1102459104 fperms 0555 /etc/bluetooth # https://bugs.gentoo.org/932172 diff --git a/net-wireless/bluez/files/bluez-5.73-configure-cups.patch b/net-wireless/bluez/files/bluez-5.73-configure-cups.patch deleted file mode 100644 index 1ab1f96915ee..000000000000 --- a/net-wireless/bluez/files/bluez-5.73-configure-cups.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b2237fe8efed9aee25a46934f028373cd0632daa Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gmx.de> -Date: Fri, 22 Mar 2024 09:08:24 +0100 -Subject: [PATCH] configure.ac: Fix --disable-cups - -or else we get: - configure: error: conditional "CUPS_SERVERBIN" was never defined. - Usually this means the macro was only invoked conditionally. - -Fixes: #773 ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9ebc250cf..047ec1a7f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -249,12 +249,12 @@ AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no") - if (test "${enable_cups}" != "no"); then - AC_MSG_CHECKING([cups directory]) - cups_serverbin=`$PKG_CONFIG cups --variable=cups_serverbin` -- AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") -- if (test "${cups_serverbin}" != ""); then -- AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) -- fi - AC_MSG_RESULT([${cups_serverbin}]) - fi -+AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") -+AS_IF([test "${cups_serverbin}" != ""],[ -+ AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) -+]) - - AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh], - [enable Mesh profile support]), [enable_mesh=${enableval}]) diff --git a/net-wireless/bluez/files/bluez-5.78-musl-1.2.5.patch b/net-wireless/bluez/files/bluez-5.78-musl-1.2.5.patch new file mode 100644 index 000000000000..0ee929faa3e4 --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.78-musl-1.2.5.patch @@ -0,0 +1,312 @@ +https://bugs.gentoo.org/926344 + +hex2hcd: https://github.com/bluez/bluez/pull/897 (https://lore.kernel.org/linux-bluetooth/20240710123002.5639-1-rahul@sandhuservices.dev/) +rpl: + 1) https://github.com/bluez/bluez/commit/690eccbe8562cc33f33503af67beb313ca737817 + 2) https://github.com/bluez/bluez/issues/843#issuecomment-2354143400 + +From e2f12111385dc4c21e2ef435025e1ddf8c386fa2 Mon Sep 17 00:00:00 2001 +From: Rahul Sandhu <rahul@sandhuservices.dev> +Date: Wed, 10 Jul 2024 11:12:30 +0100 +Subject: [PATCH] tools/hex2hcd: fix musl compatibility + +The call to basename() relies on a GNU extension +to take a const char * vs a char *. Let's define +a trivial helper function to ensure compatibility +with musl. + +Downstream gentoo bug: https://bugs.gentoo.org/926344 +Fixes: #843 +Signed-off-by: Rahul Sandhu <rahul@sandhuservices.dev> +--- + tools/hex2hcd.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tools/hex2hcd.c b/tools/hex2hcd.c +index e6dca5a810..42c95b759b 100644 +--- a/tools/hex2hcd.c ++++ b/tools/hex2hcd.c +@@ -285,6 +285,11 @@ static void ver_parse_file(const char *pathname) + prev->next = ver; + } + ++static const char *helper_basename(const char *path) { ++ const char *base = strrchr(path, '/'); ++ return base ? base + 1 : path; ++} ++ + static void ver_parse_entry(const char *pathname) + { + struct stat st; +@@ -302,7 +307,7 @@ static void ver_parse_entry(const char *pathname) + } + + if (S_ISREG(st.st_mode)) { +- ver_parse_file(basename(pathname)); ++ ver_parse_file(helper_basename(pathname)); + goto done; + } + +From 690eccbe8562cc33f33503af67beb313ca737817 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 27 Aug 2024 23:09:26 -0700 +Subject: [PATCH] mesh: Provide GNU basename compatible implementation + +Call to basename() relies on a GNU extension +to take a const char * vs a char *. Let's define +a trivial helper function to ensure compatibility +with musl. + +Fixes: https://github.com/bluez/bluez/issues/843 +--- + configure.ac | 11 ++++++++++- + mesh/mesh-config-json.c | 4 +++- + mesh/missing.h | 21 +++++++++++++++++++++ + mesh/rpl.c | 1 + + tools/hex2hcd.c | 1 + + tools/missing.h | 21 +++++++++++++++++++++ + 6 files changed, 57 insertions(+), 2 deletions(-) + create mode 100644 mesh/missing.h + create mode 100644 tools/missing.h + +diff --git a/configure.ac b/configure.ac +index 790a19560d..7093e41ff7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -70,7 +70,16 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, + AC_CHECK_LIB(dl, dlopen, dummy=yes, + AC_MSG_ERROR(dynamic linking loader is required)) + +-AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) ++AC_CHECK_HEADERS(string.h linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) ++ ++# basename may be only available in libgen.h with the POSIX behavior, ++# not desired here ++AC_CHECK_DECLS([basename], [], ++ AC_MSG_WARN([GNU basename extension not found]), ++ [#define _GNU_SOURCE 1 ++ #include <string.h> ++ ]) ++ + + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28) + +diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c +index c198627c6f..a17a48b6d1 100644 +--- a/mesh/mesh-config-json.c ++++ b/mesh/mesh-config-json.c +@@ -28,6 +28,7 @@ + #include <ell/ell.h> + #include <json-c/json.h> + ++#include "mesh/missing.h" + #include "mesh/mesh-defs.h" + #include "mesh/util.h" + #include "mesh/mesh-config.h" +@@ -2694,7 +2695,8 @@ bool mesh_config_load_nodes(const char *cfgdir_name, mesh_config_node_func_t cb, + + void mesh_config_destroy_nvm(struct mesh_config *cfg) + { +- char *node_dir, *node_name; ++ char *node_dir; ++ const char *node_name; + char uuid[33]; + + if (!cfg) +diff --git a/mesh/missing.h b/mesh/missing.h +new file mode 100644 +index 0000000000..464df9b1c3 +--- /dev/null ++++ b/mesh/missing.h +@@ -0,0 +1,21 @@ ++// SPDX-License-Identifier: LGPL-2.1-or-later ++/* ++ * ++ * BlueZ - Bluetooth protocol stack for Linux ++ * ++ * Copyright (C) 2024 Khem Raj <raj.khem@gmail.com> ++ * ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++#if !HAVE_DECL_BASENAME ++#include <string.h> ++static inline const char *basename(const char *path) ++{ ++ const char *base = strrchr(path, '/'); ++ ++ return base ? base + 1 : path; ++} ++#endif +diff --git a/mesh/rpl.c b/mesh/rpl.c +index fb225dddd6..2fa17d72f6 100644 +--- a/mesh/rpl.c ++++ b/mesh/rpl.c +@@ -24,6 +24,7 @@ + + #include <ell/ell.h> + ++#include "mesh/missing.h" + #include "mesh/mesh-defs.h" + + #include "mesh/node.h" +diff --git a/tools/hex2hcd.c b/tools/hex2hcd.c +index e6dca5a810..452ab2beb5 100644 +--- a/tools/hex2hcd.c ++++ b/tools/hex2hcd.c +@@ -24,6 +24,7 @@ + #include <stdlib.h> + #include <stdbool.h> + #include <sys/stat.h> ++#include "tools/missing.h" + + static ssize_t process_record(int fd, const char *line, uint16_t *upper_addr) + { +diff --git a/tools/missing.h b/tools/missing.h +new file mode 100644 +index 0000000000..464df9b1c3 +--- /dev/null ++++ b/tools/missing.h +@@ -0,0 +1,21 @@ ++// SPDX-License-Identifier: LGPL-2.1-or-later ++/* ++ * ++ * BlueZ - Bluetooth protocol stack for Linux ++ * ++ * Copyright (C) 2024 Khem Raj <raj.khem@gmail.com> ++ * ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++#if !HAVE_DECL_BASENAME ++#include <string.h> ++static inline const char *basename(const char *path) ++{ ++ const char *base = strrchr(path, '/'); ++ ++ return base ? base + 1 : path; ++} ++#endif + +From e882342db836d267a9ca4d0886e6828a2aba67b4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Sep 2024 15:11:01 -0700 +Subject: [PATCH] mesh: Move local basename into utility file + +Defining an override via a missing.h can prove difficult when a file +needs to use basename and dirname both the APIs and needs to include +libgen.h for them, in such situations there will be signature clash +for basename function. +--- + mesh/mesh-config-json.c | 3 +-- + mesh/missing.h | 21 --------------------- + mesh/rpl.c | 3 +-- + mesh/util.c | 10 ++++++++++ + mesh/util.h | 5 +++++ + 5 files changed, 17 insertions(+), 25 deletions(-) + delete mode 100644 mesh/missing.h + +diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c +index a17a48b6d..5372130d7 100644 +--- a/mesh/mesh-config-json.c ++++ b/mesh/mesh-config-json.c +@@ -28,7 +28,6 @@ + #include <ell/ell.h> + #include <json-c/json.h> + +-#include "mesh/missing.h" + #include "mesh/mesh-defs.h" + #include "mesh/util.h" + #include "mesh/mesh-config.h" +@@ -2708,7 +2707,7 @@ void mesh_config_destroy_nvm(struct mesh_config *cfg) + if (!hex2str(cfg->uuid, 16, uuid, sizeof(uuid))) + return; + +- node_name = basename(node_dir); ++ node_name = mesh_basename(node_dir); + + /* Make sure path name of node follows expected guidelines */ + if (strcmp(node_name, uuid)) +diff --git a/mesh/missing.h b/mesh/missing.h +deleted file mode 100644 +index 464df9b1c..000000000 +--- a/mesh/missing.h ++++ /dev/null +@@ -1,21 +0,0 @@ +-// SPDX-License-Identifier: LGPL-2.1-or-later +-/* +- * +- * BlueZ - Bluetooth protocol stack for Linux +- * +- * Copyright (C) 2024 Khem Raj <raj.khem@gmail.com> +- * +- */ +- +-#ifdef HAVE_CONFIG_H +-#include <config.h> +-#endif +-#if !HAVE_DECL_BASENAME +-#include <string.h> +-static inline const char *basename(const char *path) +-{ +- const char *base = strrchr(path, '/'); +- +- return base ? base + 1 : path; +-} +-#endif +diff --git a/mesh/rpl.c b/mesh/rpl.c +index 2fa17d72f..69533bf43 100644 +--- a/mesh/rpl.c ++++ b/mesh/rpl.c +@@ -24,7 +24,6 @@ + + #include <ell/ell.h> + +-#include "mesh/missing.h" + #include "mesh/mesh-defs.h" + + #include "mesh/node.h" +@@ -147,7 +146,7 @@ static void get_entries(const char *iv_path, struct l_queue *rpl_list) + if (!dir) + return; + +- iv_txt = basename(iv_path); ++ iv_txt = mesh_basename(iv_path); + if (sscanf(iv_txt, "%08x", &iv_index) != 1) { + closedir(dir); + return; +diff --git a/mesh/util.c b/mesh/util.c +index 82b57f642..73f13aab7 100644 +--- a/mesh/util.c ++++ b/mesh/util.c +@@ -161,3 +161,13 @@ void enable_debug(void) + debug_enabled = true; + l_debug_enable("*"); + } ++ ++#if !HAVE_DECL_BASENAME ++#include <string.h> ++const char *mesh_basename(const char *path) ++{ ++ const char *base = strrchr(path, '/'); ++ ++ return base ? base + 1 : path; ++} ++#endif +diff --git a/mesh/util.h b/mesh/util.h +index 085ec3330..bb417dc40 100644 +--- a/mesh/util.h ++++ b/mesh/util.h +@@ -16,3 +16,8 @@ void print_packet(const char *label, const void *data, uint16_t size); + int create_dir(const char *dir_name); + void del_path(const char *path); + void enable_debug(void); ++#if !HAVE_DECL_BASENAME ++const char *mesh_basename(const char *path); ++#else ++#define mesh_basename basename ++#endif diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest index 96a8671f2d8e..c9ac07f86502 100644 --- a/net-wireless/gnome-bluetooth/Manifest +++ b/net-wireless/gnome-bluetooth/Manifest @@ -1,5 +1,7 @@ DIST gnome-bluetooth-42.8.tar.xz 304908 BLAKE2B c487e0c278b316ecdcbdd39421389ce95024b06bf0e350d59dcac06d7a7e8b982da12b1088701e479d0b5c64b123899a5351a00c477208946bb1f44f3c8f30a6 SHA512 1c3d1db874b54ebae3cf59e526db8ff71131daea0c994abeefd95b51abf590bbba0baa8314ebbd1d3efe7973021327c7b8257163ed8f0567fe610b4e0c3dba88 DIST gnome-bluetooth-46.0.tar.xz 306148 BLAKE2B cc2ecb80b69bab74f878eb640f8b65505b0a5e12d4c661bd2491cbb70c4020db7f191e604805df788e3bd45c46de38c8069434a8615874006368e027dd5608b6 SHA512 48ed8aeaa59aba1997991a6ae6113a4d3c9e286aa4e34f3f2611e33582ffa53f9f3f5a81052320292ccb576904d0f3cf8074c0fff6d0f56995266188441e6f7b +DIST gnome-bluetooth-46.2.tar.xz 306076 BLAKE2B 5696ec06cde737d833f02edd89f265172a3b8c4e3486cbb09b3e2e046ead445e6a3aac23a92223dada9f8a6cadd7969755bed661b3a95161fb3874f545172f38 SHA512 e0745ae67e5c30000ace8161c114caecc1f3b8e99b824b961ed695ba78a088247d797ad3cb284fc7cf91dd7c37b94c5ce0bdc4c1118b9bf059039effeb79313a EBUILD gnome-bluetooth-42.8.ebuild 1875 BLAKE2B e03b1111eb8fad8b7b3db08b409aa3255de139bdbc970c1e0f50dde212538af66aad9f6c5a0fe42b6de9681070b72c9627a529bd8f32c50d4b7a19fd63575ca3 SHA512 c7cdd4def3ff2630b63af4502382fe164cfdfad9a18ebef6ded0339781712c57377dca2b4012c1465f8e37cbe761857245ecd85c0b421aa80a70b96430ac2779 EBUILD gnome-bluetooth-46.0.ebuild 1878 BLAKE2B d5e5e6a771fb2f80561b16282a8b980162b41d48777fc57321dc0940ab40ac661fd6897cc29ff16b0323dfc7fcade6e9bc4eac288c62c475a91ea32ea2133848 SHA512 8f31d6a9ee695192277c1b1a1d9d519378c5bc420788cf7a3b5be9698af8dc19ddbd36dee788c612ce3efbf89f4833aa4ad4c3d89e93d143bce6e821f80f8df3 +EBUILD gnome-bluetooth-46.2.ebuild 1879 BLAKE2B 8dcb33e8ec362417a6f816727c89609eba8a94ecd28a1c44986175541f621fb901f28e12dade4e81f01c6ee244fa49d53e8f479b0b647784d396290668a25fda SHA512 ad7cf7f4276c7b82cc96a68f08a3d15e5fd7e0034c7d8ab21f74922646949bde246dbff50de534707e26d2a0550798505d493e55a5557492c515934d483443d7 MISC metadata.xml 486 BLAKE2B f7080e058845d3931203b7912dfe5c31ecf36573241f33878cba7ca2ae240d62d067ea470845f6dfbb261631550916d430656040b8efcaec20123eb2be9ad5e4 SHA512 7b7f53d1648ad533caa02a18b859a3498e62a964f24a0e321f7661feecf95c02516f0ec65f23891a375a834d625dba7222c8e0919bc721558e747d582b6a4197 diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-46.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-46.2.ebuild new file mode 100644 index 000000000000..1d6cca82ab38 --- /dev/null +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-46.2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) +inherit gnome.org gnome2-utils meson python-any-r1 xdg + +DESCRIPTION="Bluetooth graphical utilities integrated with GNOME" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-bluetooth" +LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" +SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version + +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + +IUSE="gtk-doc +introspection sendto test" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.44:2 + >=gui-libs/gtk-4.4:4[introspection?] + media-libs/gsound + >=gui-libs/libadwaita-1.1:1 + >=x11-libs/libnotify-0.7.0 + virtual/libudev:= + >=sys-power/upower-0.99.14:= + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +RDEPEND="${DEPEND} + acct-group/plugdev + virtual/udev + >=net-wireless/bluez-5 + sendto? ( !net-wireless/gnome-bluetooth:2 ) +" +BDEPEND=" + ${PYTHON_DEPS} + dev-libs/libxml2:2 + dev-util/gdbus-codegen + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.9 ) + virtual/pkgconfig + test? ( + $(python_gen_any_dep ' + >=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + ') + ) +" + +python_check_deps() { + if use test; then + python_has_version ">=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]" && + python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + # Check for python is unconditional + python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_use sendto) + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + ) + meson_src_configure +} + +src_test() { + # Workaround test failures caused by flatpak being installed that adds to XDG_DATA_DIRS + gnome2_environment_reset + export XDG_DATA_DIRS="${EPREFIX}"/usr/share + + meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst +} diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest index b9ee43357a27..0e0339d8b3be 100644 --- a/net-wireless/iw/Manifest +++ b/net-wireless/iw/Manifest @@ -4,5 +4,5 @@ DIST iw-6.7.tar.xz 158928 BLAKE2B f0ed86c35edb9a70549f1fcc1bccc33ca18e20051f8c4d EBUILD iw-5.19-r1.ebuild 971 BLAKE2B 2f8d83d73afb683db1e35ef78d1cf610dfbe78b64b0f9e904184bfe68a8ad04e63d2f95c007477052aa215fee712915c0dfe040c2894ff736b19b20f6ceca3dc SHA512 24552d45124d0bb87116128a9b34c4b40e26b6f59895a732b1d890ffd3d3d222a01bd71b9d638b21bc7ff6d6db11bde04225a9a6773d383bf1663c75e31f83a1 EBUILD iw-5.19.ebuild 877 BLAKE2B a02419e919cfbf49483179477d1c4e98b577109cfcc7e3fe34e351713c55b91e30753cbb1d5917553dc15887e7abc85bffbd5526cf5a840befc30a80da1198c9 SHA512 1252f4bc89d40406ebe7aa5b5a1b357a8ce81623a303d20edf04fe50d1230d9d9b80cb8b21bd0562601d0905981719aa411839dadcde36c3e7217d812830dbbe EBUILD iw-5.9.ebuild 862 BLAKE2B 22b2c65957b58261c1ae778d5b901bcd69eb96e58d2f381c6c538f5973c55f0383a530f2fb1a207e0fb72a6e99aa53c4e30fed547a61c42a32f40e69ab47800f SHA512 ca57a9d4623eb36b98bcfa82384b68ab811c1ae85c407b14ec2eadec8fc4e6833e4143e53d89a9469fc8a2b5ec0ebc991a22c905b2680920b6c1a8ec8aeb674b -EBUILD iw-6.7.ebuild 971 BLAKE2B 2f8d83d73afb683db1e35ef78d1cf610dfbe78b64b0f9e904184bfe68a8ad04e63d2f95c007477052aa215fee712915c0dfe040c2894ff736b19b20f6ceca3dc SHA512 24552d45124d0bb87116128a9b34c4b40e26b6f59895a732b1d890ffd3d3d222a01bd71b9d638b21bc7ff6d6db11bde04225a9a6773d383bf1663c75e31f83a1 +EBUILD iw-6.7.ebuild 965 BLAKE2B 67e4fd7b91978bcab7dadf8eab1414d1f0608017c5e4803b499db0a49af4414c2df2a4e1c4909a7515478e86b7a5d226651f115fc2b367516684959c5f653fc3 SHA512 32c0169a3e717a3858cce2a14a18ea063ef341ccc18cab2b46f95b7149108dc2ff37879c10089f4a636f13bfd2be86ecd1ffc4c00b13cf0259c3e332bb5b537b MISC metadata.xml 326 BLAKE2B b542a288462866aab338ad36546026aa12ce0c8b0e8abf2eff3cbff0bd591c6402379d68df77686b36524f1127ed0c061f57f223f4559f4456728009226a663c SHA512 32b6a69e2ad35466321ffa8ae5a9ffde83f99b64b91e65ffca3662fb7dc3c6c2d7d46acb0d8da40e46de3c1b9764abb836bdb0934d727837c4c7d5bacd501a0b diff --git a/net-wireless/iw/iw-6.7.ebuild b/net-wireless/iw/iw-6.7.ebuild index f1bbe2108630..2178ebee3c43 100644 --- a/net-wireless/iw/iw-6.7.ebuild +++ b/net-wireless/iw/iw-6.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 @@ -11,7 +11,7 @@ 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" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" DEPEND="dev-libs/libnl:=" RDEPEND=" diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest index 9daa76b00427..105bdf7b6481 100644 --- a/net-wireless/iwd/Manifest +++ b/net-wireless/iwd/Manifest @@ -1,11 +1,8 @@ AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28 -DIST iwd-2.17.tar.xz 1083756 BLAKE2B f930c13cafa7bcfe30b481891d2a8a7a439b316aaafb5ca9b05b2c2123cfe76ec032e8194e3bf1de34ce4330016a14c7fc316d15c03428f7832213220789f486 SHA512 06630fa1fdedbe82dc294eb0b44b542e79c11c09ffed8d8dcd4e38089ab43b8f5fbcfb2af29df494441fd54bc87d76c988fde2c639c219a890bbc45de3fff53d -DIST iwd-2.19.tar.xz 1088892 BLAKE2B 0bd332b41b205ed8b396e672fb869c8d78a9b18d94691851ccc63b43602a61e96fb5029797c3fe2863fc4964ae0c51d1395f67a9bdc977dfe4dc2c49111f41be SHA512 e06f1936be25be042f6c48d3ff86db6b3b07a2d9406c234e74258e7bb3df7a7efd1510929851830922006613d02d4904b26c2d8a67bab2daa14c2eae086c2eb6 -DIST iwd-2.20.tar.xz 1092832 BLAKE2B 34001bc34c07a40f34bb8a30258d9493a38957fd0d5ea83f5721d4441b78c5c061e2bb84380932422cdd695f37eac4b1c40d6535965b06d5f255fae64734d956 SHA512 ddfcc22539185be8847dedde4d3c8e86af0d71f3d1befd5bfaa57d5e75222676db3f49530f1082b531149164aee0411dcf76e4a78a41c3d878b2920197bfccea -EBUILD iwd-2.17.ebuild 4133 BLAKE2B 6032396d37887128a0778d57b0bf2bebc582c814dac22b170e3ddbae16d3e909b8e56c72e5a4f8ceecf67a798ebe7f62f2eed406ecab96818a7552f73449cf5b SHA512 cdbbec2221bdccc4292fc2b267e5f7953440ee78880b12f82e2f83202d59e9c6db6679badd1ca4ca625e83b6762a828deeb452e6e381b95dce61b16463dca62b -EBUILD iwd-2.19-r1.ebuild 4138 BLAKE2B 99db003f44c84e7d90aca527a8b9e8cb95863147145c3b24778f685941140b426b140d39cfc5c3910fa7908a9f1db8a3e9c7d4f1f89470aa2798bd19e3ddae02 SHA512 bffcc9b757218013218f35f91120dc82d9c9010779ba63acd6e343da6343e90e004a664645626e74254dab8af5f2c3130de96a647b6341bdb6a24615ebeb50d6 -EBUILD iwd-2.19.ebuild 4139 BLAKE2B 21577e2565de239bfe1b8d9c92620d1c69df538f7b28a8678a00f0c40edf213ec8f7c4c6d6cf2948b0ef5b2b3915b1a360ce9cd5e1b8dd89ca75ac212418bc68 SHA512 28218017bc143ab5853c5f54c63528a8fb9fe7885b1cc333d28ac7c4b7b08fb6321e617a4bb82b02d5ca30f4088c386674dc11b799ee001c275e705d4672063a -EBUILD iwd-2.20.ebuild 4138 BLAKE2B b0a627620b691a856b8c5d490b3b7104d15be470dfac2a2b10f29b0ae348486a71df96e9c64585fd9c12ebdb3ec2d6d3a6a9adbd034df037915d5d72703a11f0 SHA512 b5b1b28cb871b4601196a5334914c1c22531a5a8291ad98f6a8923281aa67b6acdb4d19610e4126dc6e4cc9adbdcb68e1ca5f54138d662b09ec69a8ab7475764 -EBUILD iwd-9999.ebuild 4134 BLAKE2B fc962b5d779c059553cdb33cda2ca2824c7dcea091de99b884d2d6bc7e89cc2b2b43bc5cd4064b50386b7be21b1516cf9435c47276cde6f2ec2dcde284f18b65 SHA512 7e9ed114434f2d26b7b85a03f458ee30fcdcc12622da4501d00e685e712b4bb706939b2e0ffba358375b6025816a9b9ca9bd19d8ea7aac228662dad3dfc48baa +DIST iwd-2.22.tar.xz 1095092 BLAKE2B 69db8bf4d0c5dae0d3b569f7f04f2361b3b3eef0ba5084d5c12684a9d18611611708ac077efe2df2085c7352273d28fe23c7e1145883c513cb4fdfed0f1f835e SHA512 fca6f50b849e6b4fc18a8cf0163e0d532f09b71e593d37f21bdc1b4878bddd7c96b481a3bb45ee6d36f4b1fd2ad76e428f9d1dd1b64ba77545227d3740b1a210 +DIST iwd-3.0.tar.xz 1096812 BLAKE2B a459a1d27a03631897a40c958dcf5ba451d09a1621207beaca20002e4056b0b72eade0b1cfbf26d3365346fbe204720841175f9f1e5370482375314c4a74b851 SHA512 d3c02fb034c471358817dc3f72eb0b96570004e042b704eee619a4ef44881486cfcfe9dfeedd0ff4ac9f70d07a5e68ce5626dc1f7f68fa190887d96f781bd0cd +EBUILD iwd-2.22.ebuild 4126 BLAKE2B c11be9060c2a82bace4e08a6efc480b929528f899be0129c6fcf25e9f6b3af9417093ee9a10462dcc008ac287e0fd9243b2e830eca22ca20a035f626863453d6 SHA512 379569ea25937e57b3b9f8529d85ded177752a33dbde6fce921edea6f7b4f7b528f407f641d98d58b2e54b0df1b54d896a76bd18bbf70823a6b3f1a874e0ffaf +EBUILD iwd-3.0.ebuild 4132 BLAKE2B 161e800653ec7d026ee242d2ffef2578f02cdce60a3a68bf9a9ddfe655873f91e7ce0d0655bec2c11bf89cc57e12c2b4d35c0270f28956abb8a1c4f6049d9372 SHA512 318c57cb8a4ffbbd4b6f19f49a76446bd4e72b3cc69df422a7e93913d244c4b7436c659457d319e5ae768b3fe04a1fa1dbfebda04cb8e737a9b06310678ba875 +EBUILD iwd-9999.ebuild 4128 BLAKE2B 87520b1e69bddd0844e79343475a929aa1cac55669949bf60e9602d14bbc8ae4817d6260d2d4a69efcf21face015b1a809d680c1ed5428afc0ed583434159079 SHA512 9ef3d68bc3b0da527364af1aec3dfc0af37965e64f302aa6b830f38c087fe2f73f7cd6ef33f8b6da95ae76ab691dea929b108e4b5c124a188d4af7cb51aaf07a MISC metadata.xml 717 BLAKE2B 4619afbff3a4275ff2307476c044c1a4f7c2a14ec4fbeec0db02cd35d8ec98a5d3febcde34dbc43a358129d02369ee6178e02d3938b7cace99946a963d235d99 SHA512 46809c9157af3809f720d38e71e900bb4ee8418f79030cda45e7c4547dca9f2f3b5932c5b481c44ae6bbfd0b48c0997106ada3be30ef5f2110cc287738f24473 diff --git a/net-wireless/iwd/iwd-2.17.ebuild b/net-wireless/iwd/iwd-2.17.ebuild deleted file mode 100644 index 0e2691f3d992..000000000000 --- a/net-wireless/iwd/iwd-2.17.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# 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.64" - -if [[ ${PV} == *9999* ]]; then - inherit autotools git-r3 - IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git" - ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" -else - SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" - MYRST2MAN="RST2MAN=:" -fi - -DESCRIPTION="Wireless daemon for linux" -HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired" - -DEPEND=" - sys-apps/dbus - client? ( sys-libs/readline:0= ) -" - -[[ -z "${ELL_REQ}" ]] || DEPEND+=" >=dev-libs/ell-${ELL_REQ}" - -RDEPEND=" - ${DEPEND} - acct-group/netdev - net-wireless/wireless-regdb - selinux? ( sec-policy/selinux-networkmanager ) - standalone? ( - systemd? ( sys-apps/systemd ) - !systemd? ( virtual/resolvconf ) - ) -" - -BDEPEND=" - virtual/pkgconfig -" - -[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils" - -pkg_setup() { - CONFIG_CHECK=" - ~ASYMMETRIC_KEY_TYPE - ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE - ~CFG80211 - ~CRYPTO_AES - ~CRYPTO_CBC - ~CRYPTO_CMAC - ~CRYPTO_DES - ~CRYPTO_ECB - ~CRYPTO_HMAC - ~CRYPTO_MD4 - ~CRYPTO_MD5 - ~CRYPTO_RSA - ~CRYPTO_SHA1 - ~CRYPTO_SHA256 - ~CRYPTO_SHA512 - ~CRYPTO_USER_API_HASH - ~CRYPTO_USER_API_SKCIPHER - ~KEY_DH_OPERATIONS - ~PKCS7_MESSAGE_PARSER - ~RFKILL - ~X509_CERTIFICATE_PARSER - " - - if use amd64;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64" - WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance" - fi - - if use cpu_flags_x86_aes;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL" - WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance" - fi - - if use cpu_flags_x86_ssse3 && use amd64; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3" - WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance" - fi - - if use kernel_linux && kernel_is -ge 4 20; then - CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER" - fi - - check_extra_config -} - -src_unpack() { - if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack - EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack - else - default - fi -} - -src_prepare() { - default - if [[ ${PV} == *9999* ]] ; then - eautoreconf - fi - - sed -e "s:Exec=/bin/false:Exec=${EPREFIX}/usr/libexec/iwd:g" -i src/net.connman.iwd.service || die -} - -src_configure() { - append-cflags "-fsigned-char" - local myeconfargs=( - --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var - "$(use_enable client)" - "$(use_enable monitor)" - "$(use_enable ofono)" - "$(use_enable wired)" - --enable-systemd-service - --with-systemd-unitdir="$(systemd_get_systemunitdir)" - --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d" - --with-systemd-networkdir="$(systemd_get_utildir)/network" - ) - [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake "${MYRST2MAN}" -} - -src_install() { - emake DESTDIR="${D}" "${MYRST2MAN}" install - keepdir "/var/lib/${PN}" - - newinitd "${FILESDIR}/iwd.initd-r1" iwd - - if use wired;then - newinitd "${FILESDIR}/ead.initd" ead - fi - - if [[ ${PV} == *9999* ]] ; then - exeinto /usr/share/iwd/scripts/ - doexe test/* - fi - - if use standalone ; then - local iwdconf="${ED}/etc/iwd/main.conf" - dodir /etc/iwd - cat << EOF > "${iwdconf}" -[General] -EnableNetworkConfiguration=true - -[Network] -NameResolvingService=$(usex systemd systemd resolvconf) -EOF - dodir /etc/conf.d - echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd - fi -} diff --git a/net-wireless/iwd/iwd-2.19.ebuild b/net-wireless/iwd/iwd-2.19.ebuild deleted file mode 100644 index 36e245150607..000000000000 --- a/net-wireless/iwd/iwd-2.19.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# 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.67" - -if [[ ${PV} == *9999* ]]; then - inherit autotools git-r3 - IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git" - ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" -else - SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" - MYRST2MAN="RST2MAN=:" -fi - -DESCRIPTION="Wireless daemon for linux" -HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired" - -DEPEND=" - sys-apps/dbus - client? ( sys-libs/readline:0= ) -" - -[[ -z "${ELL_REQ}" ]] || DEPEND+=" >=dev-libs/ell-${ELL_REQ}" - -RDEPEND=" - ${DEPEND} - acct-group/netdev - net-wireless/wireless-regdb - selinux? ( sec-policy/selinux-networkmanager ) - standalone? ( - systemd? ( sys-apps/systemd ) - !systemd? ( virtual/resolvconf ) - ) -" - -BDEPEND=" - virtual/pkgconfig -" - -[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils" - -pkg_setup() { - CONFIG_CHECK=" - ~ASYMMETRIC_KEY_TYPE - ~ASYMMETRIC_PUBLIC_KEY_SUBTYPE - ~CFG80211 - ~CRYPTO_AES - ~CRYPTO_CBC - ~CRYPTO_CMAC - ~CRYPTO_DES - ~CRYPTO_ECB - ~CRYPTO_HMAC - ~CRYPTO_MD4 - ~CRYPTO_MD5 - ~CRYPTO_RSA - ~CRYPTO_SHA1 - ~CRYPTO_SHA256 - ~CRYPTO_SHA512 - ~CRYPTO_USER_API_HASH - ~CRYPTO_USER_API_SKCIPHER - ~KEY_DH_OPERATIONS - ~PKCS7_MESSAGE_PARSER - ~RFKILL - ~X509_CERTIFICATE_PARSER - " - - if use amd64;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64" - WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance" - fi - - if use cpu_flags_x86_aes;then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL" - WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance" - fi - - if use cpu_flags_x86_ssse3 && use amd64; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3" - WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance" - WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance" - fi - - if use kernel_linux && kernel_is -ge 4 20; then - CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER" - fi - - check_extra_config -} - -src_unpack() { - if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack - EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack - else - default - fi -} - -src_prepare() { - default - if [[ ${PV} == *9999* ]] ; then - eautoreconf - fi - - sed -e "s:Exec=/bin/false:Exec=${EPREFIX}/usr/libexec/iwd:g" -i src/net.connman.iwd.service || die -} - -src_configure() { - append-cflags "-fsigned-char" - local myeconfargs=( - --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var - "$(use_enable client)" - "$(use_enable monitor)" - "$(use_enable ofono)" - "$(use_enable wired)" - --enable-systemd-service - --with-systemd-unitdir="$(systemd_get_systemunitdir)" - --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d" - --with-systemd-networkdir="$(systemd_get_utildir)/network" - ) - [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake "${MYRST2MAN}" -} - -src_install() { - emake DESTDIR="${D}" "${MYRST2MAN}" install - keepdir "/var/lib/${PN}" - - newinitd "${FILESDIR}/iwd.initd-r1" iwd - - if use wired;then - newinitd "${FILESDIR}/ead.initd" ead - fi - - if [[ ${PV} == *9999* ]] ; then - exeinto /usr/share/iwd/scripts/ - doexe test/* - fi - - if use standalone ; then - local iwdconf="${ED}/etc/iwd/main.conf" - dodir /etc/iwd - cat << EOF > "${iwdconf}" -[General] -EnableNetworkConfiguration=true - -[Network] -NameResolvingService=$(usex systemd systemd resolvconf) -EOF - dodir /etc/conf.d - echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd - fi -} diff --git a/net-wireless/iwd/iwd-2.20.ebuild b/net-wireless/iwd/iwd-2.22.ebuild index 8d2778bb52d8..184f2a89a85f 100644 --- a/net-wireless/iwd/iwd-2.20.ebuild +++ b/net-wireless/iwd/iwd-2.22.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit flag-o-matic linux-info systemd #Set this variable to the required external ell version -ELL_REQ="0.68" +ELL_REQ="0.69" if [[ ${PV} == *9999* ]]; then inherit autotools git-r3 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" MYRST2MAN="RST2MAN=:" fi diff --git a/net-wireless/iwd/iwd-2.19-r1.ebuild b/net-wireless/iwd/iwd-3.0.ebuild index e58ab2372cc2..95ad12b6ce87 100644 --- a/net-wireless/iwd/iwd-2.19-r1.ebuild +++ b/net-wireless/iwd/iwd-3.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit flag-o-matic linux-info systemd #Set this variable to the required external ell version -ELL_REQ="0.67" +ELL_REQ="0.69" if [[ ${PV} == *9999* ]]; then inherit autotools git-r3 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" MYRST2MAN="RST2MAN=:" fi diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild index 2088d90635e5..1d502d2e85ca 100644 --- a/net-wireless/iwd/iwd-9999.ebuild +++ b/net-wireless/iwd/iwd-9999.ebuild @@ -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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" MYRST2MAN="RST2MAN=:" fi diff --git a/net-wireless/iwgtk/Manifest b/net-wireless/iwgtk/Manifest index b1ea9e467344..37714c83d1e0 100644 --- a/net-wireless/iwgtk/Manifest +++ b/net-wireless/iwgtk/Manifest @@ -1,3 +1,3 @@ DIST iwgtk-0.9.tar.gz 120055 BLAKE2B 694592b354f529389c0d71f4b81ea7b65a305ac769157e48499414adc91e099ec66880956d80a039b7f68f0d44e0f40f4ac02db350020701471616794a5de399 SHA512 d755d72744051a39dda0b78dc0fb2cc57cbf44cd095ac595d4e83f22a70471a0d69a406636d0a4d5922b533d1c849578779fd7f4c41a0b0e1549dd4e9cc45c4d -EBUILD iwgtk-0.9.ebuild 614 BLAKE2B 0da3d80f6da8d1f0c94bcaedb7a528a5b467b48cc1b5ec4b1b45b411369ad332220eac21ac538cc225ab470920109c797c38381cc17389eb2120002c6655672a SHA512 e406f447b96fb0a153e1b37c38fba4bb778e20a7d0d2b0ae205d66d1f19744a709682d6195e190891a5db6a7a2bad182e9f74d22ce79963f3ce67c818a8e82e4 +EBUILD iwgtk-0.9.ebuild 671 BLAKE2B 3cff6ef6e213e0787ae3e41a5a70d1cf1edf217733cc92bb7edf6f6463c58d23aef21d853c7e96182a787e7302736d2534338beb03110a961b00d473219d87bd SHA512 ba23136a5f777423a5bab15bc63b26b083a7b805802f18eff2d7605f2fb8de0f8d2844e94f5c8118070f2ad73e23ace9a443ce0bae719bf7ccde36004b7bcb08 MISC metadata.xml 323 BLAKE2B 863acf05b117a3c8c37f3fd9ac0550ed96a50d8d79070489c34a3b112edcb6a4a183403c7e7d99fe2319ccb7c059f592e3a831739216d9caeb05216412fe1be3 SHA512 1c37e2b9288938913acd54a6f9f9a9ffdcd1db5578047874a36ba51f345a72b8fa9e069110d06a29e5417d0016611fb052dcdf0ab4877ee30498cee8db0f4791 diff --git a/net-wireless/iwgtk/iwgtk-0.9.ebuild b/net-wireless/iwgtk/iwgtk-0.9.ebuild index 866764df6280..37efcf48022e 100644 --- a/net-wireless/iwgtk/iwgtk-0.9.ebuild +++ b/net-wireless/iwgtk/iwgtk-0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,11 +11,8 @@ SRC_URI="https://github.com/J-Lentz/iwgtk/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" -IUSE="" -BDEPEND="app-text/scdoc" - -DEPEND=" +COMMON_DEPEND=" app-accessibility/at-spi2-core:2 dev-libs/glib:2 gui-libs/gtk:4 @@ -25,7 +22,14 @@ DEPEND=" x11-libs/pango:0 " +BDEPEND="app-text/scdoc" + +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" + RDEPEND=" - ${DEPEND} + ${COMMON_DEPEND} >=net-wireless/iwd-1.29 " diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest index c383cc2f80ce..bf6993c987fd 100644 --- a/net-wireless/qdmr/Manifest +++ b/net-wireless/qdmr/Manifest @@ -1,11 +1,6 @@ -AUX qdmr-0.10.2-musl.patch 1192 BLAKE2B 8426b283ca468f16af35a36efe9dd5a73fff1caa4d3fa14ebfbce03c611f9c02400eb3c00374ee358fc9892d5a907f1de3c8770736c2b7806c3c607b38457a3b SHA512 773f6788c570cf60eabcb1b04b69be71f9ad875a59baa05b06892b690d1b01ca0390fc4618a7fe534d186e676be54b50f3b86342f208f9b75fb285f47a1af0b0 -DIST qdmr-0.10.2.tar.gz 5903169 BLAKE2B 1ef4e9846dd4206d1eae3cfb5562fccec24b156bfd77a82e801e8d1194b969bbda0f14e99c1b6505d18abba4a79d87c5eee2232110969faf4c078c1fe781a8ee SHA512 96a3fd22be2b8f77a4925cfb426de12a55b29ee73eaf78869091fd0ecd36d2df51195f2ca70689857e190767c4651d3d4915a0b7aa9f5c6e429f46a53edb991c -DIST qdmr-0.10.4.tar.gz 6013877 BLAKE2B 32da2984620e162e049f4017e29bff7d500f293fa6125246fdd2e7640ed9dd1e0e066c03297c365b9b5dc2e76dee1e1511fed327690c9a611fd7aa1abc26f988 SHA512 4ba75274bcaa4a7b8887edf7a1725863ee4dc00730d9386673b5c149e7ac30a32f06b7341ebd327cae337eac7a445999a17606cbbb22734216df2c14cb03c322 -DIST qdmr-0.11.2.tar.gz 6391759 BLAKE2B d45c934a0bad8c92a10a1f183007310137c8ad04a95f5f1471bac2a54f7f33e3af44b386e4ff2803a42934b575ce2e414bb6090a7e474e7aa1ac82b1d722598e SHA512 cd8dfc9eb9d6efad08efcaaa7b6e2ae61823982bd2ffa7bc41826c9fea3c21bd63f5a2114dc63d88e01a0c56f2fb615cbe0ddef62b87deebb798beda937de5d0 DIST qdmr-0.11.3.tar.gz 6577404 BLAKE2B 7f9133e9620c5286492ee813907c47d550eba9368e801cd3939897381ed751788fa43337dbeb2cd1be5c4765c554ac5a031d9b4965c49dd1a521949d74b6f9f2 SHA512 4bb62cd84e8cce02f6582f854c4247c91f30271cc96856a4d1a55a4dbea5d2d9639e9db2df8b76f2ff196dddac1d7de3632627890617688037bd78085422e75e -EBUILD qdmr-0.10.2.ebuild 1410 BLAKE2B d7ea821a6b73d7b67d35fa73d3e25ac43d3e9501cd1deedf16544db9235d48f0ed98cd5af5e12866f2007445be504713d2d089fb6cd65217897525cc4ce8e353 SHA512 96dc6791dc21540ce432361a5b5f854c2d0f9339ea8c7eada3338e2e232ee6c741bbb221beddc4f7f4e0eae055b0303c42ecc83522fd6a12018c42f43be2cb24 -EBUILD qdmr-0.10.4.ebuild 1400 BLAKE2B 85bac426629654ef0498dc55a8ccc1ecd83ab62add86d8ba491cd9f3b1e5b00e6ab5b9b0312e3759100ddcf466ea0d261053c97ad8e7b90fd7342af774269729 SHA512 33b1b94975b754435485ec336eb66f55a9a85663645d9d476f26bdbb9057b72760419f9f772c2a8355d29201caf6133760709013e3baaab7651507e16bbcdc8c -EBUILD qdmr-0.11.2.ebuild 1490 BLAKE2B ed47bcbebe070e66e34fe07d73449f1244d437a73b49b0963a8a28ba8eefd704d1197a960641105ef62d086e0f4701b1801dbd9045828f2a4a24448caa9f3618 SHA512 dfaa8102e2d7e288d4d74f2ea2b63c2aab3f59bbd37d8f99549b3319a8ebeea0e358c862f734deeb07408302370f34e50df3357090f2fa0edbc71a140331d765 -EBUILD qdmr-0.11.3.ebuild 1490 BLAKE2B ed47bcbebe070e66e34fe07d73449f1244d437a73b49b0963a8a28ba8eefd704d1197a960641105ef62d086e0f4701b1801dbd9045828f2a4a24448caa9f3618 SHA512 dfaa8102e2d7e288d4d74f2ea2b63c2aab3f59bbd37d8f99549b3319a8ebeea0e358c862f734deeb07408302370f34e50df3357090f2fa0edbc71a140331d765 -EBUILD qdmr-9999.ebuild 1490 BLAKE2B ed47bcbebe070e66e34fe07d73449f1244d437a73b49b0963a8a28ba8eefd704d1197a960641105ef62d086e0f4701b1801dbd9045828f2a4a24448caa9f3618 SHA512 dfaa8102e2d7e288d4d74f2ea2b63c2aab3f59bbd37d8f99549b3319a8ebeea0e358c862f734deeb07408302370f34e50df3357090f2fa0edbc71a140331d765 +DIST qdmr-0.12.0.tar.gz 6905942 BLAKE2B 4452120860c8e4cc8e720161d90dd090affe43fa15965895e2e088f94856675811d3685933f25493b00eb2157ff58bef5481cb705cd92e7c9ef94a61fc877bdb SHA512 5cdb41c5d0234f8c1d4cfc4f75ea4e832c94f692320fe7714df1d0e893379b2c0939e004779a71cb601e696133d94d083d4e6062ab31916e9431bd14f6a60b6a +EBUILD qdmr-0.11.3.ebuild 1429 BLAKE2B 829f27a10ad9cdef0b696b3efcc7d51be8c2ed84d213ce2fe2eb1b18c986f177b1b5db5e2dd810eb3d574192d845bcf7222399eab777870d143da253db397e2a SHA512 7e1be7b45555491097ecd3f6a8320750c19d6fd826e0b2274273ec7cb1307f7d1bc6b3b4eebc8c904dad04b01b4bb8cd91d61dcb96561e35ad86fb85a156cec4 +EBUILD qdmr-0.12.0.ebuild 1431 BLAKE2B a455b937282c73266f6c1c4af2a9478d1a124d11ed747af5e0f3c6a5ac323178222e1ff2365f2b140f35f995f4718ed0f521cda58a37b434d928b5b1aa7eaef0 SHA512 5409506b2ed08ca47c53af72319eaf1b8ab5f78ac0e3e828911e49e85bf44c5697d6da04bee6c0ae18471ce5fdc9133da7b1a04db0685b41623f9e4d7ae38312 +EBUILD qdmr-9999.ebuild 1431 BLAKE2B a455b937282c73266f6c1c4af2a9478d1a124d11ed747af5e0f3c6a5ac323178222e1ff2365f2b140f35f995f4718ed0f521cda58a37b434d928b5b1aa7eaef0 SHA512 5409506b2ed08ca47c53af72319eaf1b8ab5f78ac0e3e828911e49e85bf44c5697d6da04bee6c0ae18471ce5fdc9133da7b1a04db0685b41623f9e4d7ae38312 MISC metadata.xml 427 BLAKE2B 0435094250074437ba1f88146a4a0b7d109b473311316840f498c5c7e0f7386b17e6f2bddcda187e586bb766b81374296d27c8cf273e3baeb7d2c1d65dfd359e SHA512 9a6aa1424549762fab24407eace1ebac36564e46dbcdf17dbe7ba3853a552763dbf765c67ce20e6a536ce1ee063ac1932bc1426a1061f697c6f0bc462a017125 diff --git a/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch b/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch deleted file mode 100644 index 21673cb4ebb2..000000000000 --- a/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From eca81fba54b156707545967b78c823cc38b1b53f Mon Sep 17 00:00:00 2001 -From: Hannes Matuschek <hmatuschek@gmail.com> -Date: Wed, 6 Apr 2022 15:29:02 +0200 -Subject: [PATCH] Fixed compilation issue under Genoo. Addresses #216. - ---- - lib/radiolimits.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/lib/radiolimits.cc b/lib/radiolimits.cc -index b883cc8..eb72166 100644 ---- a/lib/radiolimits.cc -+++ b/lib/radiolimits.cc -@@ -3,9 +3,10 @@ - #include "logger.hh" - #include "config.hh" - #include <QMetaProperty> -+#include <ctype.h> - - // Utility function to check string content for ASCII encoding --inline bool isascii(const QString &text) { -+inline bool qstring_is_ascii(const QString &text) { - foreach (QChar c, text) { - if ((c<0x1f) && (0x7f != c)) - return false; -@@ -205,7 +206,7 @@ RadioLimitString::verify(const ConfigItem *item, const QMetaProperty &prop, Radi - << ") is shorter than minimum size " << _minLen << "."; - } - -- if ((ASCII == _encoding) && (! isascii(value))) { -+ if ((ASCII == _encoding) && (! qstring_is_ascii(value))) { - auto &msg = context.newMessage(); - msg << "Cannot encode string '" << value << "' in ASCII."; - } diff --git a/net-wireless/qdmr/qdmr-0.10.2.ebuild b/net-wireless/qdmr/qdmr-0.10.2.ebuild deleted file mode 100644 index c57e656cbffa..000000000000 --- a/net-wireless/qdmr/qdmr-0.10.2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake udev linux-info - -DESCRIPTION="GUI application for configuring and programming cheap DMR radios" -HOMEPAGE="https://dm3mat.darc.de/qdmr/" -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git" -else - MY_PV="${PV/_/-}" - SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-3+" -SLOT="0" - -RDEPEND=" - dev-cpp/yaml-cpp:= - dev-qt/designer:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtpositioning:5 - dev-qt/qtserialport:5 - virtual/libusb:1 -" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( "${FILESDIR}/${P}-musl.patch" ) - -pkg_setup() { - CONFIG_CHECK="~USB_ACM" - WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio" - CONFIG_CHECK="~USB_SERIAL" - WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio" - check_extra_config -} - -src_prepare() { - #no devil perms - sed -i 's#666#660#' dist/99-qdmr.rules - sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt - cmake_src_prepare -} - -pkg_postinst() { - udev_reload -} diff --git a/net-wireless/qdmr/qdmr-0.10.4.ebuild b/net-wireless/qdmr/qdmr-0.10.4.ebuild deleted file mode 100644 index 2408bd6b897c..000000000000 --- a/net-wireless/qdmr/qdmr-0.10.4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake udev linux-info - -DESCRIPTION="GUI application for configuring and programming cheap DMR radios" -HOMEPAGE="https://dm3mat.darc.de/qdmr/" -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/hmatuschek/qdmr.git" -else - MY_PV="${PV/_/-}" - SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3+" -SLOT="0" - -RDEPEND=" - dev-cpp/yaml-cpp:= - dev-qt/designer:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtpositioning:5 - dev-qt/qtserialport:5 - virtual/libusb:1 -" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -pkg_setup() { - CONFIG_CHECK="~USB_ACM" - WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio" - CONFIG_CHECK="~USB_SERIAL" - WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio" - check_extra_config -} - -src_prepare() { - #no devil perms - sed -i 's#666#660#' dist/99-qdmr.rules - sed -i "s#/etc/udev/rules.d/#$(get_udevdir)/rules.d#" lib/CMakeLists.txt - cmake_src_prepare -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/net-wireless/qdmr/qdmr-0.11.3.ebuild b/net-wireless/qdmr/qdmr-0.11.3.ebuild index 1ba9c2ff8c36..564de8371aa1 100644 --- a/net-wireless/qdmr/qdmr-0.11.3.ebuild +++ b/net-wireless/qdmr/qdmr-0.11.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,13 +14,12 @@ else MY_PV="${PV/_/-}" SRC_URI="https://github.com/hmatuschek/qdmr/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${MY_PV}" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi -IUSE="test" -RESTRICT="!test? ( test )" - LICENSE="GPL-3+" SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" dev-cpp/yaml-cpp:= @@ -40,9 +39,9 @@ BDEPEND="dev-qt/linguist-tools:5" pkg_setup() { CONFIG_CHECK="~USB_ACM" - WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio" + WARNING_USB_ACM="You need to enable CONFIG_USB_ACM in your kernel to talk to some radios" CONFIG_CHECK="~USB_SERIAL" - WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio" + WARNING_USB_SERIAL="You need to enable CONFIG_USB_SERIAL in your kernel to talk to some radios" check_extra_config } diff --git a/net-wireless/qdmr/qdmr-0.11.2.ebuild b/net-wireless/qdmr/qdmr-0.12.0.ebuild index 1ba9c2ff8c36..f5fdcfa51e17 100644 --- a/net-wireless/qdmr/qdmr-0.11.2.ebuild +++ b/net-wireless/qdmr/qdmr-0.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,11 +16,10 @@ else S="${WORKDIR}/${PN}-${MY_PV}" KEYWORDS="~amd64 ~x86" fi -IUSE="test" -RESTRICT="!test? ( test )" - LICENSE="GPL-3+" SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" dev-cpp/yaml-cpp:= @@ -40,9 +39,9 @@ BDEPEND="dev-qt/linguist-tools:5" pkg_setup() { CONFIG_CHECK="~USB_ACM" - WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio" + WARNING_USB_ACM="You need to enable CONFIG_USB_ACM in your kernel to talk to some radios" CONFIG_CHECK="~USB_SERIAL" - WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio" + WARNING_USB_SERIAL="You need to enable CONFIG_USB_SERIAL in your kernel to talk to some radios" check_extra_config } diff --git a/net-wireless/qdmr/qdmr-9999.ebuild b/net-wireless/qdmr/qdmr-9999.ebuild index 1ba9c2ff8c36..f5fdcfa51e17 100644 --- a/net-wireless/qdmr/qdmr-9999.ebuild +++ b/net-wireless/qdmr/qdmr-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,11 +16,10 @@ else S="${WORKDIR}/${PN}-${MY_PV}" KEYWORDS="~amd64 ~x86" fi -IUSE="test" -RESTRICT="!test? ( test )" - LICENSE="GPL-3+" SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" dev-cpp/yaml-cpp:= @@ -40,9 +39,9 @@ BDEPEND="dev-qt/linguist-tools:5" pkg_setup() { CONFIG_CHECK="~USB_ACM" - WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio" + WARNING_USB_ACM="You need to enable CONFIG_USB_ACM in your kernel to talk to some radios" CONFIG_CHECK="~USB_SERIAL" - WARNING_USB_SERIAL="Some radios require CONFIG_USB_SERIAL to work, you may need to enable this driver to talk to your radio" + WARNING_USB_SERIAL="You need to enable CONFIG_USB_SERIAL in your kernel to talk to some radios" check_extra_config } diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest index 29f5f000945c..28eb1067e942 100644 --- a/net-wireless/unifi/Manifest +++ b/net-wireless/unifi/Manifest @@ -4,10 +4,6 @@ AUX unifi-mongodb.service 274 BLAKE2B 116b78df7e3e595ebef25af3c4be425b8706356d00 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6 AUX unifi.initd-r2 477 BLAKE2B 11dc44ebc7c9d9a670b6aecfd3a82265df60f21057ae459fafb4f5a5671edc522fb13872ec64c168173667cfc072cd0fde5fbaa236109a4c49947ddfd3fd429f SHA512 734aa8b93e057579470e59a287d68f219f510f73479add86d3bfc32d73ca495644d40d9323e2b00a448ee7b519f9a60d3150057c00398165108b572999e70b67 AUX unifi.service-r2 233 BLAKE2B 95d87f040be667c5d5817bc9b6eabfa3d2ef454cfcdd60badef834d6f9ec250612ea5b32724c9df28c735e22183180c9c646729e375d3e38f6a26371661af93b SHA512 cafa67126e7416c736e1ab59e8b31cd2f9ce3f8933b84985f4ba983898b664bb892255855c2fc6cbdb4519732f63e58207209d7701f908d48828dfdd399f1550 -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.3.32.zip 169676863 BLAKE2B 337d095e4ea434d22af78c93de1a14ac8ad6800286505242498ad513d424230208cf0e38c5df5185ad6480ff83d695837e8915067aa6026dc3faea49d245571e SHA512 f8ae2712c40957d308cc713b7f75cd9682da0b34f773293428ef6e8931629e5d365c8af4bc5503f96d0b751f4d996a1b8492cc443dc9a043c40105f38d9995c6 -EBUILD unifi-6.5.55-r2.ebuild 2535 BLAKE2B 2cfa249e33c6e13be327dd416862070f087e7998ef7219b2903a397c1419676b854576d059396276c03767b90a196fda451826df401525aba19014a54fa919df SHA512 2c15b0ff1eded12d1f2b99891f274d71d6dd9527d23440f8aacef8d76ccf66f6063b2ee136b503bd7b200258c812f648661fc40e54e958fe338ff0730cd2e0e3 -EBUILD unifi-7.5.187.ebuild 2673 BLAKE2B 4248580218eb10fc588ec60fea1c41344a84be3d9e464b9b85572afe9b3bc4326a9a13cded7fc20ae6043ab11d9d5b942226b39da9688898c84a323cc43a1a09 SHA512 445193da23f62a5420205c9988baca93ff3bb4e86b4b215b98fe911365fd6a602e606dab3ed1c1e5bffe3f1dde6b2442711b7ef1b5a0e62312ecefb0d90c7404 -EBUILD unifi-8.3.32.ebuild 2665 BLAKE2B 3b1815c1286abc5d874eeec60d586b56d574f090ae33f8c67ac03d14cb3c6c92a1fcdbee00e90b8883b6c9eaf816294f236a47d6c907923139b0c919f7538752 SHA512 8742007a954a4f531e3d01ce9a75c8b649547ad10430be416204185d7db24b59590299ae98f70765d85c3533ba1dee4b5d96a29d9c9bd75fdcc89800cc2d6e0d +DIST unifi-8.5.6.zip 169180361 BLAKE2B 945fb693d41301205647297f257dc7f8fb915421e0b40234d7e424993dfa58e50414d128cadb9792d824ca5e76716315a899331f33d6730957f25125806024ba SHA512 ff5f477be142fc9ea650cff4bf8eed3622bee60fa1513857000831eefd730bff9432aa218b3ae54ee1ac5ee592eb7ced4a4fc00347a353cb8529f2a9a8735e94 +EBUILD unifi-8.5.6.ebuild 2665 BLAKE2B 3b1815c1286abc5d874eeec60d586b56d574f090ae33f8c67ac03d14cb3c6c92a1fcdbee00e90b8883b6c9eaf816294f236a47d6c907923139b0c919f7538752 SHA512 8742007a954a4f531e3d01ce9a75c8b649547ad10430be416204185d7db24b59590299ae98f70765d85c3533ba1dee4b5d96a29d9c9bd75fdcc89800cc2d6e0d MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c diff --git a/net-wireless/unifi/unifi-6.5.55-r2.ebuild b/net-wireless/unifi/unifi-6.5.55-r2.ebuild deleted file mode 100644 index 30feb46a0502..000000000000 --- a/net-wireless/unifi/unifi-6.5.55-r2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Set this var for any releases except stable -RC_SUFFIX="-1d0581c00d" - -inherit java-pkg-2 systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" -S="${WORKDIR}/UniFi" - -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="-* amd64 ~arm64" -IUSE="systemd" -RESTRICT="bindist mirror" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:1.8 -" - -BDEPEND="app-arch/unzip" - -DOCS=( "readme.txt" ) - -QA_PREBUILT=" - usr/lib/unifi/lib/native/Linux/aarch64/*.so - usr/lib/unifi/lib/native/Linux/x86_64/*.so -" - -src_prepare() { - # Remove unneeded files Mac and Windows - rm -r lib/native/{Mac,Windows} || die - - if [[ ${CHOST} != aarch64* ]]; then - rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries" - fi - if [[ ${CHOST} != armv7* ]]; then - rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries" - fi - if [[ ${CHOST} != x86_64* ]]; then - rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries" - fi - - if [[ ${CHOST} == aarch64* ]]; then - if ! use systemd; then - rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die - fi - fi - if [[ ${CHOST} == armv7* ]]; then - if ! use systemd; then - rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die - fi - fi - if [[ ${CHOST} == x86_64* ]]; then - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - fi - - default -} - -src_compile() { - :; -} - -src_install() { - insinto /usr/lib/unifi - doins -r bin dl lib webapps - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar - java-pkg_dolauncher \ - unifi \ - --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' \ - --jar ace.jar \ - --pwd '/usr/lib/unifi' - - newinitd "${FILESDIR}"/unifi.initd-r2 unifi - systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs -} diff --git a/net-wireless/unifi/unifi-7.5.187.ebuild b/net-wireless/unifi/unifi-7.5.187.ebuild deleted file mode 100644 index 9eb90b0aa930..000000000000 --- a/net-wireless/unifi/unifi-7.5.187.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Set this var for any releases except stable -RC_SUFFIX="-f57f5bf7ab" - -inherit java-pkg-2 readme.gentoo-r1 systemd - -DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs" -HOMEPAGE="https://www.ubnt.com" -SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip" -S="${WORKDIR}/UniFi" - -LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="-* amd64 ~arm64" -IUSE="systemd system-mongodb" -RESTRICT="bindist mirror" - -RDEPEND=" - acct-group/unifi - acct-user/unifi - dev-db/mongodb - virtual/jre:17 -" - -BDEPEND="app-arch/unzip" - -DOCS=( "readme.txt" ) - -QA_PREBUILT=" - usr/lib/unifi/lib/native/Linux/aarch64/*.so - usr/lib/unifi/lib/native/Linux/x86_64/*.so -" - -src_prepare() { - if [[ ${CHOST} != aarch64* ]]; then - rm -r lib/native/Linux/aarch64 || die - fi - if [[ ${CHOST} != x86_64* ]]; then - rm -r lib/native/Linux/x86_64 || die - fi - - if [[ ${CHOST} == aarch64* ]]; then - if ! use systemd; then - rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die - fi - fi - if [[ ${CHOST} == x86_64* ]]; then - if ! use systemd; then - rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die - fi - fi - - default -} - -src_compile() { - :; -} - -src_install() { - insinto /usr/lib/unifi - doins -r dl lib webapps - ! use system-mongodb && doins -r bin - - diropts -o unifi -g unifi - keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi - - for symlink in conf data run tmp work; do - dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink} - done - dosym ../../../var/log/unifi /usr/lib/unifi/logs - - java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar - java-pkg_dolauncher \ - unifi \ - --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp \ - -Djava.library.path= \ - --add-opens java.base/java.lang=ALL-UNNAMED \ - --add-opens java.base/java.time=ALL-UNNAMED \ - --add-opens java.base/sun.security.util=ALL-UNNAMED \ - --add-opens java.base/java.io=ALL-UNNAMED \ - --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED' \ - --jar ace.jar \ - --pwd '/usr/lib/unifi' - - if use system-mongodb; then - systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service - newinitd "${FILESDIR}"/unifi-mongodb.initd unifi - else - systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service - newinitd "${FILESDIR}"/unifi.initd-r2 unifi - fi - - newconfd "${FILESDIR}"/unifi.confd unifi - - echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die - doenvd "${T}"/99unifi - - einstalldocs - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-wireless/unifi/unifi-8.3.32.ebuild b/net-wireless/unifi/unifi-8.5.6.ebuild index 2f1936dc19fa..2f1936dc19fa 100644 --- a/net-wireless/unifi/unifi-8.3.32.ebuild +++ b/net-wireless/unifi/unifi-8.5.6.ebuild diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest index 868782c61825..8c24505490ea 100644 --- a/net-wireless/wireless-regdb/Manifest +++ b/net-wireless/wireless-regdb/Manifest @@ -1,7 +1,3 @@ -DIST wireless-regdb-2022.06.06.tar.xz 26636 BLAKE2B e7695b1d4173ec239645a1f9c0bdd8f9cef92da86d918f3b2a7904487787b1a8b6fce5a75d0b7fad7d8a25f1419a4771e509977a5e3b13dff03bc53e976609f6 SHA512 ee6e79eeef3bf995120d31741bac9592771cbf918401f83d0ee059ba4119f7d9667607c5218bd9eeb0011dd7083264cf39a1a0ad3ebfd37dcfd957b01f248e0d -DIST wireless-regdb-2023.05.03.tar.xz 27260 BLAKE2B e880be3bacd7409719ede3e104ea6af870e0fb4edaefa6c61615ca74a8169a159348d631a4c296e273f6cc6e01ced2089e56c10080dd15a7439d8b4510eff7b8 SHA512 9de4852a1d351c11399ca55ea2ad61be23f488c61595b5c5afa3498d76488adc8120c6c77644275c460efcd1bb5bb68fa25597e73bec22ae847321bb55f7af27 DIST wireless-regdb-2024.05.08.tar.xz 27716 BLAKE2B 223268c6ba9e3f616b28a9317d62ac687cd09c9ff3cc8e0d0827b3a59efa7b3bc64c0c094b70aaceb87cffba7d36d36d550c001d0778238adcf2ac5cbe3f6b93 SHA512 edb562d708be7119e80bb48d7520c11e409b81178168f9c6873ea97a2e4d9277d02d3b72b1af9f0302ba2e252d94d14c4468ee4cc1a6bb186a17d74c57d7594d -EBUILD wireless-regdb-20220606.ebuild 1099 BLAKE2B 2a337f4aed15757ea01d52e31a1989f25ed11a3a1437c117a2dca17c9551c76459e027c295978aa0146be44e5c8d045212c4aa96dd0c9e7b4a72db2458a90861 SHA512 42ad07e183e9e039f5e1ca503fb8a4ef6e25d4ed5c9ba38effa7abff0dbfc9338417d5e1aca314e093752e5c41b7830ff0a1c3ac864db170895e143ef12bb2db -EBUILD wireless-regdb-20230503-r2.ebuild 2262 BLAKE2B f98b255eb344a2eceb630197f2d0ff2cb5283641ce5d69bbc16c04eb80965fd0edae9e88c0cec680e404b4d1bbc3ba824b90f2939644b684baa9e040115db681 SHA512 050f0509cf116119e00f2ba897ec1acb55e2ee9087291ab5dd4076e9424b7febe55581016a69bba109f2e9870c1d85b4cefaea405cf8b1cc0445052eddafd44c -EBUILD wireless-regdb-20240508.ebuild 2262 BLAKE2B f98b255eb344a2eceb630197f2d0ff2cb5283641ce5d69bbc16c04eb80965fd0edae9e88c0cec680e404b4d1bbc3ba824b90f2939644b684baa9e040115db681 SHA512 050f0509cf116119e00f2ba897ec1acb55e2ee9087291ab5dd4076e9424b7febe55581016a69bba109f2e9870c1d85b4cefaea405cf8b1cc0445052eddafd44c +EBUILD wireless-regdb-20240508.ebuild 2249 BLAKE2B 9a4b3f66d5e68a46193e16095cbf7c3e4efd6c2a53c8a4c803e9ed1117d7ba98fec09c5f8469b89c2434b81feb2a57e202135eeefd38816ca307be9db52fd1e0 SHA512 9ce0836e7175e2f542d1fd417d9c637feedf7362c1e72361e19dc1eeba8c2e33c621e9773458a7e73325ffb34224fe62dc8a05793c08753dbb5af04dc8f16e70 MISC metadata.xml 272 BLAKE2B 2a42142ca287ab19668cc11278dac4d0f16bf5b183646b0f06317a6e60568d9328d42baa986af6c692a256b28fdef32f24442faf69ae9b8305d625a3265df298 SHA512 4595277c33cd3d565c652cae1644c4ba131dea25899984629a48dc9a679441c95a7d26527c6fe4578a3e6f616e6f8c25580ee9f785fdcbd699bd43bacd846dd3 diff --git a/net-wireless/wireless-regdb/wireless-regdb-20220606.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20220606.ebuild deleted file mode 100644 index 3f15ef755143..000000000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20220606.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Binary regulatory database for CRDA" -HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" -SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" - -src_compile() { - einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version." -} - -src_install() { - # This file is not ABI-specific, and crda itself always hardcodes - # this path. So install into a common location for all ABIs to use. - insinto /usr/lib/crda - doins regulatory.bin - - insinto /etc/wireless-regdb/pubkeys - doins sforshee.key.pub.pem - - # Linux 4.15 now complains if the firmware loader - # can't find these files #643520 - insinto /lib/firmware - doins regulatory.db - doins regulatory.db.p7s - - doman regulatory.bin.5 - dodoc README db.txt -} diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild deleted file mode 100644 index 8860373ea93f..000000000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Wireless Regulatory database for Linux" -HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" -SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -REQUIRED_USE="kernel_linux" - -pkg_pretend() { - if kernel_is -ge 4 15; then - if linux_config_exists; then - if linux_chkconfig_builtin CFG80211 && - [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]; then - ewarn "REGULATORY DOMAIN PROBLEM:" - ewarn " With CONFIG_CFG80211=y (built-in), the driver(s) won't be able to load regulatory.db from" - ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m" - ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE." - fi - if ! linux_chkconfig_present CFG80211; then - ewarn "REGULARTORY DOMAIN PROBLEM:" - ewarn " With CONFIG_CFG80211 unset, the driver(s) won't be able to load the regulatory.db from" - ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m." - fi - if linux_chkconfig_present EXPERT && linux_chkconfig_present CFG80211_CRDA_SUPPORT; then - ewarn "You can safely disable CFG80211_CRDA_SUPPORT" - fi - fi - else - CONFIG_CHECK="~CFG80211_CRDA_SUPPORT" - WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: \ -please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support" - fi - - check_extra_config -} - -src_compile() { - einfo "Recompiling regulatory database(s) from db.txt would break signature verification." - einfo "Installing unmodified binary version." -} - -src_install() { - # install the files the kernel needs unconditionally, - # they are small and kernels get upgraded - insinto /lib/firmware - doins regulatory.db regulatory.db.p7s - - # regulatory.db.5 is a reference to regulatory.bin.5 so you need both unconditionally - doman -i18n= regulatory.db.5 regulatory.bin.5 - dodoc README db.txt -} diff --git a/net-wireless/wireless-regdb/wireless-regdb-20240508.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20240508.ebuild index 8860373ea93f..37e34dcb6d17 100644 --- a/net-wireless/wireless-regdb/wireless-regdb-20240508.ebuild +++ b/net-wireless/wireless-regdb/wireless-regdb-20240508.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" REQUIRED_USE="kernel_linux" pkg_pretend() { diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest index 2df174f9c4eb..4f2d851dad80 100644 --- a/net-wireless/wireless-tools/Manifest +++ b/net-wireless/wireless-tools/Manifest @@ -1,4 +1,4 @@ AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1 -EBUILD wireless-tools-30_pre9-r1.ebuild 1737 BLAKE2B 6d2d93b1f80c5b93474c22142a3663d244bd6959fcf881fce1045b539aca2e902c761f8774dd0d126957af95de39b08289a57bc3fb0a0d5e4bb232d53758f953 SHA512 f41fbdb73f9211c9bee043b07346691ad7670a38cb47beea7ca5034957236d441052614c695b84d0cba473cb7f2558fcfb71522021677c7d6ccfad64c17389fc +EBUILD wireless-tools-30_pre9-r1.ebuild 1731 BLAKE2B bfe109152588bf43b2466c2150c77d8962ea71042ba9bf51def9fd99836208f7b7d68f8108d73f83c5bbe3ef2516d82a282bae59267ddffee813dc6c8a5b373a SHA512 121be6b6930984e007ee0c77018f3bf857e1d3ec365ebff8f2ddc7025fbc516b5c137a82e60418ed10ecb0b3e711e965915913dba011865cba11e62cc1e42169 MISC metadata.xml 697 BLAKE2B 49b4a8fb43270acb9e9e935a31ba670c60cba6ade3cbe51de2ea1a7165e3886ea0c5666e1973868bb46b5aefef1d943c61eec679fc6144deabc6d50f6c0927e5 SHA512 1da3440c13f6bcf3553b24e5902eb763b0422fe94a8c7d1729708c49fda1fb765a2abca702a26896f66f80fd1b5072d61aefc6d4b9060d50e56c5d4209e80c8d diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild index 061033128513..04a68491ac18 100644 --- a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild +++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="multicall" PATCHES=("${FILESDIR}"/${PN}-29-asneeded.patch) diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index 08b56a58b69f..55d7a32f3545 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -7,7 +7,6 @@ AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f64 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-r4.ebuild 12403 BLAKE2B fcc0900e852f6fd1c2f1decaf83adca354195bba7a35b5f7895b3002f4cfc6d4fa9e635f81424a5ad9a376412c0f450be5ff03e4e4eb771b0abcc08f5e1987e5 SHA512 0f31a0cb9dae7e5eee3804e30472300969e480249fa38b6589c2f514110e9b317447f00b67bd93fbc1c8fca0db5b931f755baac525129504be727d8f0e11ea6d -EBUILD wpa_supplicant-2.10-r5.ebuild 12412 BLAKE2B c6192cc4601215dd4918eaf93ca6b8a3387ed021f8ba45807f2014b4759494bf9e1154c9f500b8c4f6cb1b7cd01dbe9614c8c285e94cecbadd6955f78481e459 SHA512 6084eef12f6dbc13f7c9e054f623e5b65d2798bd15aba5eb87d768be9135b512b83d5bebae0a7f70bf438e98c58e1e12d3c299ea7cd8ab491150dbd88807fa14 -EBUILD wpa_supplicant-9999.ebuild 12328 BLAKE2B 5d92927a2ed59856723d2d35efedc55eac87b4a9776ba49053f6ee1bc0b6be14da38e2f46adbe0fa4d92ba1161e4dbf3c8be2ff84f6f179327c5fbe69996b1c0 SHA512 77afc7659ddd7b2b784cfd12f1737dbef7063f965c9f3c49a826ef8ad7c8b068aee25b8bd299d2e56764214bf146eb95a021121985ec126415534112a88a6d18 +EBUILD wpa_supplicant-2.10-r5.ebuild 12400 BLAKE2B 5fa4998fde0c247f1995522f7545c8879fe4429ad99acca988cd4b53650661b8f6ae55c0bd203f50a8011800a46657ed265c85800f2979f565322692183a921a SHA512 d33d642b03b321aa4add11af6fc79a3f9db15768fbc8e3c00e34679706a4cdf540584cf8a06bb4cafec3e7b6a4fcef47e2e67eef1781bbdeb965ffd2a3f4b69b +EBUILD wpa_supplicant-9999.ebuild 12322 BLAKE2B 1fb2dfb1f74d602506cbc126d2175b6be0235026df8ece2173556141caf28d86a0ece3eb2a7a2fe87a94e5e52f82a69d2b96f621617fc40f75f1d20fe3388f48 SHA512 4564052c4593ed11fa737b943d5da29d118dc7fc8ecb81c5cf5f544b3efcf1273749cc39224e95dc93df22ef8d5b951ac55450ab668fb106532f59ffa7adcb22 MISC metadata.xml 1882 BLAKE2B fc23e2184bd2c01f590800a2087461ba6c5d9d5021f6300f1505671369694374a26d333556b467ca0f41fb90d676a5fcad5b87e80ab8f2b2b891255afa0bcd6b SHA512 05ca61dcaf7c3d7543085be7d375088e5372eb6e3dee0cd9920b763e34f528aa988a8ec484328e122812e0f3208aac308d6011995e5ab1c9599fc7d5b9dc6733 diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild deleted file mode 100644 index 266a66cac9f5..000000000000 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild +++ /dev/null @@ -1,477 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs - -DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" -HOMEPAGE="https://w1.fi/wpa_supplicant/" -LICENSE="|| ( GPL-2 BSD )" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://w1.fi/hostap.git" -else - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" - SRC_URI="https://w1.fi/releases/${P}.tar.gz" -fi - -SLOT="0" -IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps" - -# CONFIG_PRIVSEP=y does not have sufficient support for the new driver -# interface functions used for MACsec, so this combination cannot be used -# at least for now. bug #684442 -REQUIRED_USE=" - macsec? ( !privsep ) - privsep? ( !macsec ) - broadcom-sta? ( !fils !mesh !mbo ) -" - -DEPEND=" - >=dev-libs/openssl-1.0.2k:= - dbus? ( sys-apps/dbus ) - kernel_linux? ( - >=dev-libs/libnl-3.2:3 - eap-sim? ( sys-apps/pcsc-lite ) - ) - !kernel_linux? ( net-libs/libpcap ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) - readline? ( - sys-libs/ncurses:0= - sys-libs/readline:0= - ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-networkmanager ) - kernel_linux? ( - net-wireless/wireless-regdb - ) -" -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 (640492) - sed -i 's#-Werror ##' wpa_supplicant/Makefile || die -} - -src_configure() { - # Toolchain setup - tc-export CC PKG_CONFIG - - cp defconfig .config || die - - # Basic setup - Kconfig_style_config CTRL_IFACE - Kconfig_style_config MATCH_IFACE - Kconfig_style_config BACKEND file - Kconfig_style_config IBSS_RSN - Kconfig_style_config IEEE80211W - Kconfig_style_config IEEE80211R - Kconfig_style_config HT_OVERRIDES - Kconfig_style_config VHT_OVERRIDES - Kconfig_style_config OCV - Kconfig_style_config TLSV11 - Kconfig_style_config TLSV12 - Kconfig_style_config GETRANDOM - - # Basic authentication methods - # NOTE: we don't set GPSK or SAKE as they conflict - # with the below options - Kconfig_style_config EAP_GTC - Kconfig_style_config EAP_MD5 - Kconfig_style_config EAP_OTP - Kconfig_style_config EAP_PAX - Kconfig_style_config EAP_PSK - Kconfig_style_config EAP_TLV - Kconfig_style_config EAP_EXE - Kconfig_style_config IEEE8021X_EAPOL - Kconfig_style_config PKCS12 - Kconfig_style_config PEERKEY - Kconfig_style_config EAP_LEAP - Kconfig_style_config EAP_MSCHAPV2 - Kconfig_style_config EAP_PEAP - Kconfig_style_config EAP_TEAP - Kconfig_style_config EAP_TLS - Kconfig_style_config EAP_TTLS - - # Enabling background scanning. - Kconfig_style_config BGSCAN_SIMPLE - Kconfig_style_config BGSCAN_LEARN - - if use dbus ; then - Kconfig_style_config CTRL_IFACE_DBUS - Kconfig_style_config CTRL_IFACE_DBUS_NEW - Kconfig_style_config CTRL_IFACE_DBUS_INTRO - else - Kconfig_style_config CTRL_IFACE_DBUS n - Kconfig_style_config CTRL_IFACE_DBUS_NEW n - Kconfig_style_config CTRL_IFACE_DBUS_INTRO n - fi - - if use eapol-test ; then - Kconfig_style_config EAPOL_TEST - fi - - # Enable support for writing debug info to a log file and syslog. - Kconfig_style_config DEBUG_FILE - Kconfig_style_config DEBUG_SYSLOG - - if use hs2-0 ; then - Kconfig_style_config INTERWORKING - Kconfig_style_config HS20 - fi - - if use mbo ; then - Kconfig_style_config MBO - else - Kconfig_style_config MBO n - fi - - if use uncommon-eap-types; then - Kconfig_style_config EAP_GPSK - Kconfig_style_config EAP_SAKE - Kconfig_style_config EAP_GPSK_SHA256 - Kconfig_style_config EAP_IKEV2 - Kconfig_style_config EAP_EKE - fi - - if use eap-sim ; then - # Smart card authentication - Kconfig_style_config EAP_SIM - Kconfig_style_config EAP_AKA - Kconfig_style_config EAP_AKA_PRIME - Kconfig_style_config PCSC - fi - - if use fasteap ; then - Kconfig_style_config EAP_FAST - fi - - if use readline ; then - # readline/history support for wpa_cli - Kconfig_style_config READLINE - else - #internal line edit mode for wpa_cli - Kconfig_style_config WPA_CLI_EDIT - fi - - Kconfig_style_config TLS openssl - Kconfig_style_config FST - - Kconfig_style_config EAP_PWD - if use fils; then - Kconfig_style_config FILS - Kconfig_style_config FILS_SK_PFS - fi - if use mesh; then - Kconfig_style_config MESH - else - Kconfig_style_config MESH n - fi - # WPA3 - Kconfig_style_config OWE - Kconfig_style_config SAE - Kconfig_style_config DPP - Kconfig_style_config DPP2 - Kconfig_style_config SUITEB192 - Kconfig_style_config SUITEB - - if use wep ; then - Kconfig_style_config WEP - else - Kconfig_style_config WEP n - fi - - # Watch out, reversed logic - if use tkip ; then - Kconfig_style_config NO_TKIP n - else - Kconfig_style_config NO_TKIP - fi - - if use smartcard ; then - Kconfig_style_config SMARTCARD - else - Kconfig_style_config SMARTCARD n - fi - - if use tdls ; then - Kconfig_style_config TDLS - fi - - if use kernel_linux ; then - # Linux specific drivers - Kconfig_style_config DRIVER_ATMEL - Kconfig_style_config DRIVER_HOSTAP - Kconfig_style_config DRIVER_IPW - Kconfig_style_config DRIVER_NL80211 - Kconfig_style_config DRIVER_RALINK - Kconfig_style_config DRIVER_WEXT - Kconfig_style_config DRIVER_WIRED - - if use macsec ; then - #requires something, no idea what - #Kconfig_style_config DRIVER_MACSEC_QCA - Kconfig_style_config DRIVER_MACSEC_LINUX - Kconfig_style_config MACSEC - else - # bug #831369 and bug #684442 - Kconfig_style_config DRIVER_MACSEC_LINUX n - Kconfig_style_config MACSEC n - fi - - if use ps3 ; then - Kconfig_style_config DRIVER_PS3 - fi - fi - - # Wi-Fi Protected Setup (WPS) - if use wps ; then - Kconfig_style_config WPS - Kconfig_style_config WPS2 - # USB Flash Drive - Kconfig_style_config WPS_UFD - # External Registrar - Kconfig_style_config WPS_ER - # Universal Plug'n'Play - Kconfig_style_config WPS_UPNP - # Near Field Communication - Kconfig_style_config WPS_NFC - else - Kconfig_style_config WPS n - Kconfig_style_config WPS2 n - Kconfig_style_config WPS_UFD n - Kconfig_style_config WPS_ER n - Kconfig_style_config WPS_UPNP n - Kconfig_style_config WPS_NFC n - fi - - # Wi-Fi Direct (WiDi) - if use p2p ; then - Kconfig_style_config P2P - Kconfig_style_config WIFI_DISPLAY - else - Kconfig_style_config P2P n - Kconfig_style_config WIFI_DISPLAY n - fi - - # Access Point Mode - if use ap ; then - Kconfig_style_config AP - else - Kconfig_style_config AP n - fi - - # Enable essentials for AP/P2P - if use ap || use p2p ; then - # Enabling HT support (802.11n) - Kconfig_style_config IEEE80211N - - # Enabling VHT support (802.11ac) - Kconfig_style_config IEEE80211AC - fi - - # Enable mitigation against certain attacks against TKIP - Kconfig_style_config DELAYED_MIC_ERROR_REPORT - - if use privsep ; then - Kconfig_style_config PRIVSEP - fi - - if use kernel_linux ; then - Kconfig_style_config LIBNL32 - fi - - if use qt5 ; then - pushd "${S}"/wpa_gui-qt4 > /dev/null || die - eqmake5 wpa_gui.pro - popd > /dev/null || die - fi -} - -src_compile() { - einfo "Building wpa_supplicant" - emake V=1 BINDIR=/usr/sbin - - if use wimax; then - emake -C ../src/eap_peer clean - emake -C ../src/eap_peer - fi - - if use qt5; then - einfo "Building wpa_gui" - emake -C "${S}"/wpa_gui-qt4 - fi - - if use eapol-test ; then - emake eapol_test - fi -} - -src_install() { - dosbin wpa_supplicant - use privsep && dosbin wpa_priv - dobin wpa_cli wpa_passphrase - - newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant - newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant - - exeinto /etc/wpa_supplicant/ - newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh - - readme.gentoo_create_doc - dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ - wpa_supplicant.conf - - newdoc .config build-config - - if [ "${PV}" != "9999" ]; then - doman doc/docbook/*.{5,8} - fi - - if use qt5 ; then - into /usr - dobin wpa_gui-qt4/wpa_gui - doicon wpa_gui-qt4/icons/wpa_gui.svg - domenu wpa_gui-qt4/wpa_gui.desktop - else - rm "${ED}"/usr/share/man/man8/wpa_gui.8 - fi - - use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install - - if use dbus ; then - pushd "${S}"/dbus > /dev/null || die - insinto /etc/dbus-1/system.d - newins dbus-wpa_supplicant.conf wpa_supplicant.conf - insinto /usr/share/dbus-1/system-services - doins fi.w1.wpa_supplicant1.service - popd > /dev/null || die - - # This unit relies on dbus support, bug 538600. - systemd_dounit systemd/wpa_supplicant.service - fi - - if use eapol-test ; then - dobin eapol_test - fi - - systemd_dounit "systemd/wpa_supplicant@.service" - systemd_dounit "systemd/wpa_supplicant-nl80211@.service" - systemd_dounit "systemd/wpa_supplicant-wired@.service" -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -e "${EROOT}"/etc/wpa_supplicant.conf ]] ; then - echo - ewarn "WARNING: your old configuration file ${EROOT}/etc/wpa_supplicant.conf" - ewarn "needs to be moved to ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf" - fi - if ! use wep; then - einfo "WARNING: You are building with WEP support disabled, which is recommended since" - einfo "this protocol is deprecated and insecure. If you still need to connect to" - einfo "WEP-enabled networks, you may turn this flag back on. With this flag off," - einfo "WEP-enabled networks will not even show up as available." - einfo "If your network is missing you may wish to USE=wep" - fi - if ! use tkip; then - ewarn "WARNING: You are building with TKIP support disabled, which is recommended since" - ewarn "this protocol is deprecated and insecure. If you still need to connect to" - ewarn "TKIP-enabled networks, you may turn this flag back on. With this flag off," - ewarn "TKIP-enabled networks, including mixed mode TKIP/AES-CCMP will not even show up" - ewarn "as available. If your network is missing you may wish to USE=tkip" - fi - - # Mea culpa, feel free to remove that after some time --mgorny. - local fn - for fn in wpa_supplicant{,@wlan0}.service; do - if [[ -e "${EROOT}"/etc/systemd/system/network.target.wants/${fn} ]] - then - ebegin "Moving ${fn} to multi-user.target" - mv "${EROOT}"/etc/systemd/system/network.target.wants/${fn} \ - "${EROOT}"/etc/systemd/system/multi-user.target.wants/ || die - eend ${?} \ - "Please try to re-enable ${fn}" - fi - done - - systemd_reenable wpa_supplicant.service -} diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.ebuild index 962459094cc1..545e8edbdb19 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r5.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 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" SRC_URI="https://w1.fi/releases/${P}.tar.gz" fi diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild index b4936dfc9817..35d233fc079f 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" SRC_URI="https://w1.fi/releases/${P}.tar.gz" fi |