From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/
Date: Wed, 22 Feb 2023 20:44:56 +0000 (UTC) [thread overview]
Message-ID: <1677098676.eac4803723e269b65bed0847b3e57924d347d340.zerochaos@gentoo> (raw)
commit: eac4803723e269b65bed0847b3e57924d347d340
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 20:42:30 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 20:44:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac48037
net-wireless/kismet: fixup deps
Adjust deps per qa tools
Remove do nothing sed lines
Use bundled libfmt
Closes: https://bugs.gentoo.org/872608
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
.../files/kismet-2022.08.1-sandbox-fix.patch | 147 +++++++++++++++++++++
...smet-9999.ebuild => kismet-2022.08.1-r2.ebuild} | 35 ++---
net-wireless/kismet/kismet-9999.ebuild | 32 ++---
3 files changed, 180 insertions(+), 34 deletions(-)
diff --git a/net-wireless/kismet/files/kismet-2022.08.1-sandbox-fix.patch b/net-wireless/kismet/files/kismet-2022.08.1-sandbox-fix.patch
new file mode 100644
index 000000000000..358475cbc194
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2022.08.1-sandbox-fix.patch
@@ -0,0 +1,147 @@
+From 8264835a935de9c754c0ff28c632695103b2dc2f Mon Sep 17 00:00:00 2001
+From: Mike Kershaw / Dragorn <dragorn@kismetwireless.net>
+Date: Fri, 6 Jan 2023 15:22:52 -0500
+Subject: [PATCH] python: Merge patch from Rick Farina / Zero_Chaos to make
+ gentoo not complain about python build parameters
+
+---
+ capture_bt_geiger/Makefile.in | 4 +++-
+ capture_freaklabs_zigbee/Makefile.in | 4 +++-
+ capture_proxy_adsb/Makefile.in | 4 +++-
+ capture_sdr_rtl433/Makefile.in | 4 +++-
+ capture_sdr_rtladsb/Makefile.in | 4 +++-
+ capture_sdr_rtlamr/Makefile.in | 4 +++-
+ 6 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/capture_bt_geiger/Makefile.in b/capture_bt_geiger/Makefile.in
+index 646069fed..4f644535b 100644
+--- a/capture_bt_geiger/Makefile.in
++++ b/capture_bt_geiger/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
+diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
+index 646069fed..4f644535b 100644
+--- a/capture_freaklabs_zigbee/Makefile.in
++++ b/capture_freaklabs_zigbee/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
+diff --git a/capture_proxy_adsb/Makefile.in b/capture_proxy_adsb/Makefile.in
+index d16ba601f..96ba6ceca 100644
+--- a/capture_proxy_adsb/Makefile.in
++++ b/capture_proxy_adsb/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -22,7 +24,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
+diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
+index 646069fed..4f644535b 100644
+--- a/capture_sdr_rtl433/Makefile.in
++++ b/capture_sdr_rtl433/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
+diff --git a/capture_sdr_rtladsb/Makefile.in b/capture_sdr_rtladsb/Makefile.in
+index d16ba601f..96ba6ceca 100644
+--- a/capture_sdr_rtladsb/Makefile.in
++++ b/capture_sdr_rtladsb/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -22,7 +24,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
+diff --git a/capture_sdr_rtlamr/Makefile.in b/capture_sdr_rtlamr/Makefile.in
+index 646069fed..4f644535b 100644
+--- a/capture_sdr_rtlamr/Makefile.in
++++ b/capture_sdr_rtlamr/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
similarity index 91%
copy from net-wireless/kismet/kismet-9999.ebuild
copy to net-wireless/kismet/kismet-2022.08.1-r2.ebuild
index c9e0a62e9649..fe8f8bc10d3c 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit autotools python-single-r1 udev systemd
@@ -40,13 +40,11 @@ CDEPEND="
${PYTHON_DEPS}
acct-user/kismet
acct-group/kismet
- networkmanager? ( net-misc/networkmanager:= )
- dev-libs/glib:=
- dev-libs/elfutils:=
- dev-libs/openssl:=
+ networkmanager? ( net-misc/networkmanager )
+ dev-libs/glib:2
+ dev-libs/elfutils
sys-libs/zlib:=
- dev-db/sqlite:=
- net-libs/libmicrohttpd:=
+ dev-db/sqlite:3
net-libs/libwebsockets:=[client,lejp]
kernel_linux? ( sys-libs/libcap
dev-libs/libnl:3
@@ -59,7 +57,6 @@ CDEPEND="
dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/websockets[${PYTHON_USEDEP}]
')
- sys-libs/ncurses:=
lm-sensors? ( sys-apps/lm-sensors:= )
pcre? ( dev-libs/libpcre )
suid? ( sys-libs/libcap )
@@ -77,15 +74,22 @@ RDEPEND="${CDEPEND}
)
selinux? ( sec-policy/selinux-kismet )
"
+#switched back to bundled libfmt-8
+#https://bugs.gentoo.org/895252
+#<dev-libs/libfmt-9
DEPEND="${CDEPEND}
dev-libs/boost
- <dev-libs/libfmt-9
+ sys-libs/libcap
"
BDEPEND="virtual/pkgconfig"
+# https://bugs.gentoo.org/872608
+# drop after 2022.08*
+PATCHES=( "${FILESDIR}/${P}-sandbox-fix.patch" )
+
src_prepare() {
- sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
- conf/kismet_logging.conf || die
+ #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
@@ -93,7 +97,9 @@ src_prepare() {
#sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
rm -r boost || die
- rm -r fmt || die
+ #switched back to bundled libfmt-8
+ #https://bugs.gentoo.org/895252
+ #rm -r fmt || die
#dev-libs/jsoncpp
#rm -r json || die
@@ -107,11 +113,9 @@ src_prepare() {
eapply_user
if [ "${PV}" = "9999" ]; then
- sed -i -e 's|@mangrp@|root|g' Makefile.inc.in || die
eautoreconf
- else
- sed -i -e 's|@mangrp@|root|g' Makefile.inc || die
fi
+ # drop after 2022.08*
# VERSION was incorrectly removed in 4e490cf0b49a287e964df9c5e5c4067f6918909e upstream
# https://github.com/kismetwireless/kismet/issues/427
# https://bugs.gentoo.org/864298
@@ -121,7 +125,6 @@ src_prepare() {
src_configure() {
econf \
$(use_enable libusb libusb) \
- $(use_enable libusb wifi-coconut) \
$(use_enable pcre) \
$(use_enable lm-sensors lmsensors) \
$(use_enable networkmanager libnm) \
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index c9e0a62e9649..913097640161 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit autotools python-single-r1 udev systemd
@@ -40,13 +40,12 @@ CDEPEND="
${PYTHON_DEPS}
acct-user/kismet
acct-group/kismet
- networkmanager? ( net-misc/networkmanager:= )
- dev-libs/glib:=
- dev-libs/elfutils:=
+ networkmanager? ( net-misc/networkmanager )
+ dev-libs/glib:2
+ dev-libs/elfutils
dev-libs/openssl:=
sys-libs/zlib:=
- dev-db/sqlite:=
- net-libs/libmicrohttpd:=
+ dev-db/sqlite:3
net-libs/libwebsockets:=[client,lejp]
kernel_linux? ( sys-libs/libcap
dev-libs/libnl:3
@@ -59,7 +58,6 @@ CDEPEND="
dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/websockets[${PYTHON_USEDEP}]
')
- sys-libs/ncurses:=
lm-sensors? ( sys-apps/lm-sensors:= )
pcre? ( dev-libs/libpcre )
suid? ( sys-libs/libcap )
@@ -77,15 +75,18 @@ RDEPEND="${CDEPEND}
)
selinux? ( sec-policy/selinux-kismet )
"
+#switched back to bundled libfmt-8
+#https://bugs.gentoo.org/895252
+#<dev-libs/libfmt-9
DEPEND="${CDEPEND}
dev-libs/boost
- <dev-libs/libfmt-9
+ sys-libs/libcap
"
BDEPEND="virtual/pkgconfig"
src_prepare() {
- sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
- conf/kismet_logging.conf || die
+ #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
@@ -93,7 +94,9 @@ src_prepare() {
#sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
rm -r boost || die
- rm -r fmt || die
+ #switched back to bundled libfmt-8
+ #https://bugs.gentoo.org/895252
+ #rm -r fmt || die
#dev-libs/jsoncpp
#rm -r json || die
@@ -107,15 +110,8 @@ src_prepare() {
eapply_user
if [ "${PV}" = "9999" ]; then
- sed -i -e 's|@mangrp@|root|g' Makefile.inc.in || die
eautoreconf
- else
- sed -i -e 's|@mangrp@|root|g' Makefile.inc || die
fi
- # VERSION was incorrectly removed in 4e490cf0b49a287e964df9c5e5c4067f6918909e upstream
- # https://github.com/kismetwireless/kismet/issues/427
- # https://bugs.gentoo.org/864298
- echo "${PV}" > VERSION
}
src_configure() {
next reply other threads:[~2023-02-22 20:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-22 20:44 Rick Farina [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-07 6:17 [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/ Sam James
2019-07-25 18:21 Rick Farina
2019-07-22 1:23 Rick Farina
2019-01-07 19:45 Rick Farina
2018-05-29 19:14 Richard Farina
2018-04-26 14:29 Richard Farina
2017-10-06 2:09 Richard Farina
2016-03-20 9:54 David Seifert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1677098676.eac4803723e269b65bed0847b3e57924d347d340.zerochaos@gentoo \
--to=zerochaos@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox