commit: 3d60d8eac4e4381053f701b6aea46caf2cd9570b
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 28 22:06:07 2025 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 22:09:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d60d8ea
net-wireless/kismet: update live ebuild
Enable python 3.13
Make protobuf optional, default to off, matching upstream
Relax libfmt dep, it works will all versions in tree
Add note about new bundled dep
Remove some unneeded cflags forced by upstream
Remove -fno-strict-aliasin and filter-lto, bug fixed upstream
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/kismet/kismet-9999.ebuild | 35 +++++++++++++++++-----------------
net-wireless/kismet/metadata.xml | 1 +
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/net-wireless/kismet/kismet-9999.ebuild
b/net-wireless/kismet/kismet-9999.ebuild
index d60d149d1f88..6cbdac3f288a 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
-inherit autotools eapi9-ver flag-o-matic python-single-r1 udev systemd
+inherit autotools eapi9-ver python-single-r1 udev systemd
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git";
@@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net";
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="libusb lm-sensors mqtt networkmanager +pcre rtlsdr selinux +suid
ubertooth udev +wext"
+IUSE="libusb lm-sensors mqtt networkmanager +pcre protobuf rtlsdr selinux
+suid ubertooth udev +wext"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# upstream said protobuf-26.1 breaks everything
@@ -53,10 +53,10 @@ CDEPEND="
net-libs/libpcap
)
libusb? ( virtual/libusb:1 )
- dev-libs/protobuf-c:=
- <dev-libs/protobuf-26:=
+ protobuf? ( dev-libs/protobuf-c:=
+ <dev-libs/protobuf-26:= )
$(python_gen_cond_dep '
- dev-python/protobuf[${PYTHON_USEDEP}]
+ protobuf? ( dev-python/protobuf[${PYTHON_USEDEP}] )
dev-python/websockets[${PYTHON_USEDEP}]
')
lm-sensors? ( sys-apps/lm-sensors:= )
@@ -80,7 +80,7 @@ RDEPEND="${CDEPEND}
"
DEPEND="${CDEPEND}
dev-libs/boost
- =dev-libs/libfmt-9*
+ dev-libs/libfmt
sys-libs/libcap
"
BDEPEND="virtual/pkgconfig"
@@ -89,14 +89,14 @@ src_prepare() {
#sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
# conf/kismet_logging.conf || die
- #this was added to quiet macosx builds but it makes gcc builds noisier
- sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die
-
#sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
rm -r boost || die
rm -r fmt || die
+ # bundles mpack but I failed to successfully unbundle
+ # rm -r mpack || die
+
#dev-libs/jsoncpp
#rm -r json || die
#sed -i 's#"json/json.h"#<json/json.h>#' jsoncpp.cc
kis_net_beast_httpd.h \
@@ -109,19 +109,18 @@ src_prepare() {
default
if [ "${PV}" = "9999" ]; then
+ sed -i -e 's#-Wno-dangling-reference##g' configure.ac || die
eautoreconf
+ # Untested by should fix same in non-live
+ #else
+ # sed -i -e 's#-Wno-unknown-warning-option ##g' configure || die
fi
+
+ #this was added to quiet macosx builds but it makes gcc builds noisier
+ sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die
}
src_configure() {
- # -Werror=strict-aliasing
- # https://bugs.gentoo.org/877761
- # https://github.com/kismetwireless/kismet/issues/518
- #
- # Do not trust with LTO either.
- append-flags -fno-strict-aliasing
- filter-lto
-
econf \
$(use_enable libusb libusb) \
$(use_enable libusb wifi-coconut) \
diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml
index 9a0418aaa270..9c4f78353488 100644
--- a/net-wireless/kismet/metadata.xml
+++ b/net-wireless/kismet/metadata.xml
@@ -9,6 +9,7 @@
<flag name="libusb">Support libusb based capture sources such
as mousejack, cc2540(ble), and nrf51822(ble)</flag>
<flag name="mqtt">Enable MQTT support</flag>
<flag name="pcre">Build with pcre support</flag>
+ <flag name="protobuf">Support old protobuf message passing in
case of remote capture sources which are not up to date.</flag>
<flag name="rtlsdr">Enable rtlsdr based kismet capture
sources</flag>
<flag name="suid">
Install a setuid root helper binary with limited
functionality;
