From 8d15cb8238a384acdb70250a0cd213f2ab5f0ab6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 23 Feb 2023 09:44:00 +0000 Subject: gentoo auto-resync : 23:02:2023 - 09:44:00 --- net-wireless/kismet/Manifest | 4 +- .../files/kismet-2022.08.1-sandbox-fix.patch | 147 +++++++++++++++ net-wireless/kismet/kismet-2022.08.1-r2.ebuild | 208 +++++++++++++++++++++ net-wireless/kismet/kismet-9999.ebuild | 32 ++-- 4 files changed, 372 insertions(+), 19 deletions(-) create mode 100644 net-wireless/kismet/files/kismet-2022.08.1-sandbox-fix.patch create mode 100644 net-wireless/kismet/kismet-2022.08.1-r2.ebuild (limited to 'net-wireless/kismet') diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest index 9d84c34343d9..b3b474e51d68 100644 --- a/net-wireless/kismet/Manifest +++ b/net-wireless/kismet/Manifest @@ -1,8 +1,10 @@ AUX gdb 232 BLAKE2B dc970ec4b6a5c82198d949d6a9a0e763bf63b62c4dceaf27a045ddc50226f3230108b981e6a3383f3098401f42334ce167eaa62a7e1b163f59d1d26fcbea6110 SHA512 232ebc8d3cfc9855f196e49533159638a54f03337c5734d768d3aa4a92c3ffb859eb04db35074aa2362f3074c8c153d2cad7f1fbec403894315eea0b595e740f +AUX kismet-2022.08.1-sandbox-fix.patch 4981 BLAKE2B 8bc7010844020b5b0928fe9729155f31a4f0075150a6b4500051f7346b91941e8e540a009ee0cb8643347a484028ea0bad3239b7bd1c6f5a1cf5aefe154b9b1f SHA512 f79132cd54930f58e399018f4cf66de1210d23299f755417e16559828aa19e8d312fb927802485c7748d8365d0f52608416cd52c131a9dce03da6cf44ab2a837 AUX kismet-gdb 53 BLAKE2B 8409c5f55c0b35dd13ab122d60baa2e164e158bfaa3579f1da6505a46908b4227f3973b2ac175c91090a07b6e66059349d3ffd132e15a162befc03b3d0758708 SHA512 d31173eb60a4240fb6cb6c649866d78dcfc779eea952985292711fea7f8c973b052f6d3676e9cfd8fc495336ea03710f99754669de1278f4694d25f709b15385 AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231 DIST kismet-2022-08-R1.tar.xz 10700692 BLAKE2B 9f6b3a651eca34b90e34b8a8357be493a8966cdd5c54f5f1c38383cc3ad74f2c78ab265df882b0a5b985bed98ad61f4741ead7b443d9b79f2769ca7edc72427f SHA512 befca2dcd7016d96a17e97babbd6d88195fa61750ed616d104d10a85828ec160672c33bd2a1eae554d375feb55ea45a040a3e53c4410a3ff8c9bfa4b5c8bcdb1 EBUILD kismet-2022.08.1-r1.ebuild 5886 BLAKE2B e057c33c4653a2ced2d33b9371e5a33f79ac356139988b72687657431d467042615b31bf7586798e4c048b5cece0dd5cf80fbe51afe91e66074f8d94e6e54508 SHA512 625c2aebf4179f37d5f053ccd153b11bdcfcb0cd8fdeab92506b695c3cda503e6683a5937a2e4d4f689a2a257fd023b24726f2f1dcd425d6d8563f53a35f7e84 -EBUILD kismet-9999.ebuild 5956 BLAKE2B 4780175bc7f33ea5e775cad8a685ee2a0815312a6fd66abe56eea5ee7010db2c545367dbb2bccc06fa5453fba4b4177fef97b2f003bf5ed09b65b45220203ea4 SHA512 dd4e415cdebff2defd4a301588c45e52b459efe66cccb5219441ca826bc24147181a277a8c64a61716f29799e4d6a8c97b1e81284dc0d7afe1e8f29949fa8cc8 +EBUILD kismet-2022.08.1-r2.ebuild 6017 BLAKE2B 0ac8e1b51ab4e5653cc3387ff145b92cde32dabd1f4f0a5c718b6da2fa7fc802969c4e4c9ebba49c02b565f2ce4bdf8ff09b5636fbefe27428ea221eb15ffd95 SHA512 b2416de82b6cbf4ef913ed64629500f483f26ea66520db9b5a89f842bda75311b471761275ebc927b9c308bca29fdb9065e242743d7a803a227befb3844242ef +EBUILD kismet-9999.ebuild 5746 BLAKE2B 0c63cade94abe5f3dad7aae2d88d29fd3e82098c8e04355fb303dd060bb6ee6f7037f037cbafa488e6e286b63d324911b8b115858fbba8782b1746109379a942 SHA512 010c6470cf8aead53cd46a47d22691eee0c9197c4b26827873c2ca58b2ff033d1ccd50f0a10160e50f467f9a584b09a66d028bf71fb4256b997d08db62813c84 MISC metadata.xml 873 BLAKE2B f4dea6914ce2380db76b7f66d3028dbc22a5785e41814b71f3876716148e71e82f9a62035d27abeba1567222b16da560e7e74a6ca2379433bf68b5a842fa618d SHA512 a82c3f86ab863646e6d7c8a91b033c851413487652621e576c7baf9b956ff39b8b4c4d8616478eb62752766aa8b10039d1c881cf29c99ea44eb98174c3cf4f67 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 +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-2022.08.1-r2.ebuild b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild new file mode 100644 index 000000000000..fe8f8bc10d3c --- /dev/null +++ b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild @@ -0,0 +1,208 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools python-single-r1 udev systemd + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" + inherit git-r3 + RESTRICT="strip" +else + MY_P=${P/\./-} + MY_P=${MY_P/_beta/-BETA} + MY_P=${MY_P/./-R} + S=${WORKDIR}/${MY_P/BETA/beta} + + #normally we want an official release + SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" + + #but sometimes we want a git commit + #COMMIT="9ca7e469cf115469f392db7436816151867e1654" + #SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + #S="${WORKDIR}/${PN}-${COMMIT}" + + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +fi + +DESCRIPTION="IEEE 802.11 wireless LAN sniffer" +HOMEPAGE="https://www.kismetwireless.net" + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +CDEPEND=" + ${PYTHON_DEPS} + acct-user/kismet + acct-group/kismet + networkmanager? ( net-misc/networkmanager ) + dev-libs/glib:2 + dev-libs/elfutils + sys-libs/zlib:= + dev-db/sqlite:3 + net-libs/libwebsockets:=[client,lejp] + kernel_linux? ( sys-libs/libcap + dev-libs/libnl:3 + net-libs/libpcap + ) + libusb? ( virtual/libusb:1 ) + dev-libs/protobuf-c:= + dev-libs/protobuf:= + $(python_gen_cond_dep ' + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/websockets[${PYTHON_USEDEP}] + ') + lm-sensors? ( sys-apps/lm-sensors:= ) + pcre? ( dev-libs/libpcre ) + suid? ( sys-libs/libcap ) + ubertooth? ( net-wireless/ubertooth ) + " +RDEPEND="${CDEPEND} + $(python_gen_cond_dep ' + dev-python/pyserial[${PYTHON_USEDEP}] + ') + rtlsdr? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + net-wireless/rtl-sdr + ) + selinux? ( sec-policy/selinux-kismet ) +" +#switched back to bundled libfmt-8 +#https://bugs.gentoo.org/895252 +##' jsoncpp.cc kis_net_beast_httpd.h \ + # log_tools/kismetdb_clean.cc log_tools/kismetdb_dump_devices.cc \ + # log_tools/kismetdb_statistics.cc log_tools/kismetdb_to_gpx.cc \ + # log_tools/kismetdb_to_kml.cc log_tools/kismetdb_to_pcap.cc \ + # log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \ + # trackedelement.h trackedelement_workers.h + + eapply_user + + if [ "${PV}" = "9999" ]; then + eautoreconf + fi + # drop after 2022.08* + # VERSION was incorrectly removed in 4e490cf0b49a287e964df9c5e5c4067f6918909e upstream + # https://github.com/kismetwireless/kismet/issues/427 + # https://bugs.gentoo.org/864298 + echo "${PV}" > VERSION +} + +src_configure() { + econf \ + $(use_enable libusb libusb) \ + $(use_enable pcre) \ + $(use_enable lm-sensors lmsensors) \ + $(use_enable networkmanager libnm) \ + $(use_enable ubertooth) \ + --sysconfdir=/etc/kismet \ + --disable-optimization +} + +src_install() { + emake DESTDIR="${D}" commoninstall + python_optimize + emake DESTDIR="${D}" forceconfigs + use udev && udev_dorules packaging/udev/*.rules + + insinto /usr/share/${PN} + doins Makefile.inc + if [ "${PV}" = "9999" ];then + doins "${FILESDIR}"/gdb + dobin "${FILESDIR}"/kismet-gdb + fi + + dodoc README* + newinitd "${FILESDIR}"/${PN}.initd-r3 kismet + newconfd "${FILESDIR}"/${PN}.confd-r2 kismet + systemd_dounit packaging/systemd/kismet.service +} + +pkg_preinst() { + if use suid; then + fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth + fowners root:kismet /usr/bin/kismet_cap_linux_wifi + fowners root:kismet /usr/bin/kismet_cap_pcapfile + # Need to set the permissions after chowning. + # See chown(2) + fperms 4550 /usr/bin/kismet_cap_linux_bluetooth + fperms 4550 /usr/bin/kismet_cap_linux_wifi + fperms 4550 /usr/bin/kismet_cap_pcapfile + elog "Kismet has been installed with a setuid-root helper binary" + elog "to enable minimal-root operation. Users need to be part of" + elog "the 'kismet' group to perform captures from physical devices." + fi + if ! use suid; then + ewarn "It is highly discouraged to run a sniffer as root," + ewarn "Please consider enabling the suid use flag and adding" + ewarn "your user to the kismet group." + fi +} + +migrate_config() { + einfo "Kismet Configuration files are now read from /etc/kismet/" + ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf" + if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then + ewarn "Files at /etc/kismet_*.conf will not be read and should be removed" + fi + if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then + mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location" + ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf" + elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then + ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits" + ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf" + fi +} + +pkg_postinst() { + if [ -n "${REPLACING_VERSIONS}" ]; then + for v in ${REPLACING_VERSIONS}; do + if ver_test ${v} -lt 2019.07.2 ; then + migrate_config + break + fi + if ver_test ${v} -eq 9999 ; then + migrate_config + break + fi + done + fi + udev_reload +} +pkg_postrm() { + udev_reload +} 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 +# VERSION } src_configure() { -- cgit v1.2.3