gentoo auto-resync : 21:07:2022 - 20:44:55

4 files changed, 13 insertions, 219 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index da349a9aa6a4..7e5cbea365f7 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index f3b821db71ed..68aed0b13214 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -5,10 +5,8 @@ AUX kismet-gdb 53 BLAKE2B 8409c5f55c0b35dd13ab122d60baa2e164e158bfaa3579f1da6505
 AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
 DIST kismet-2021-08-R1.tar.xz 10621004 BLAKE2B 236a43d2073e380c60dadfc4f611465ffa5c7de2a282fa3f45252368cbc65aaa21ad6d33c504685e39ec7913a36364283f6706d6ad8fcecf2f7922c23a4aa792 SHA512 91e86dc1d3b69aa8cb6dff4c4b8bb959dca128f06d1298effe1b23ed24158ce4285abdf2af838f48588b9e71c69f82538d1a002838c4bc1d053868118e394b7a
-DIST kismet-2022-01-R3.tar.xz 10694148 BLAKE2B dee1c71922909990cc847cd8253cefdb303d383e2521ed91a3b7144f7004373c1aae8d5673f919caf046ad20a6d2b5d1d8b6c5344fdd5c30bd81787cf3ae7404 SHA512 2f41da4ff835c6d560f2f1f901844a8b88d3e34aec789ebb281ebdcb2e76c589d77394e2eb3b33a5a8bdb28e6e7f68ccd28cc9d68d273e3de0c345d57094f692
 DIST kismet-2022-02-R1.tar.xz 10693024 BLAKE2B 30ce64856733991edbe436c4eac96364dc205a60accc68f18c20cd48e2cb193a1b1baa6998f1c81d270ce082da331ee46ac5b0e0eb834e940eb2378ed4e6d22f SHA512 09292096614b9ca3569430ef196cd7cf6fbd2ab7212bdfc653cf5433bdc727ea48c63638220804799f9756a92108a85e8abf0f4e8e0383dbcbe0028bf91a6aee
 EBUILD kismet-2021.08.1-r1.ebuild 5957 BLAKE2B e0aa26ddd1cee3bef68e3f4943e35f5f04762590f68aa5bb2798fa342d5be4ad1df13e75d74950bbd1911e76916605d059c99d081f60314dd85c80745845b208 SHA512 63bfbb54b03f9ce71a146cd9a171803e474e6b0e13bf73e3f7be4f905985ec9426aa7bc2cd1d4a1c110be00f9fa3253daae42922660041e0daf079ebf915be0b
-EBUILD kismet-2022.01.3.ebuild 5989 BLAKE2B 9ba9596040d36af5a84be92dcb9e0e583d2a86356f3cbacce19b9578a2abd3cc982ff0783c8f0eba818ac1fd90a536f0fd24214243eda8eb89b4e6bb256a0c20 SHA512 e0daecf5c119c011c9adba5ec9058bbef0e4a4aa5f42f6ed09903586283eaa7fe30b3afb277ce2d4c4877a9aee95aadb07e590f0261ba836e371514b7075e558
 EBUILD kismet-2022.02.1.ebuild 5907 BLAKE2B 890bbb80e6cb39fb04bb630abbf4c7f65fa105844666abfb2dfd339ad076fb61133606f5eeb363a080f927b4a125f5caccf48f0ee8a1f9fb2b682a8c3f17132d SHA512 06265c5f9ff0d4d71d38e4bf227f69c2919a869105e1d15c50cfd26212751c7e01f8a0ce731589ee5bd85c74db6fc4d9f802f736d31b66ac2410aa465b560b93
-EBUILD kismet-9999.ebuild 5907 BLAKE2B 890bbb80e6cb39fb04bb630abbf4c7f65fa105844666abfb2dfd339ad076fb61133606f5eeb363a080f927b4a125f5caccf48f0ee8a1f9fb2b682a8c3f17132d SHA512 06265c5f9ff0d4d71d38e4bf227f69c2919a869105e1d15c50cfd26212751c7e01f8a0ce731589ee5bd85c74db6fc4d9f802f736d31b66ac2410aa465b560b93
+EBUILD kismet-9999.ebuild 5946 BLAKE2B 065f0ed5f00ccf166bb145230bca3a9e0dbb0dbbd2290cd2b22078bc6e2cbf40ddc8aae49807532edf40e888c38d08fe7214946650e5e9e465012731032435fc SHA512 1b08b89033e4898c48173860aedda93629016d234f926802066e42e9409aa31cbe004223c2451ddce989e46ffc9ebac434ecca58c4b42a13675f845c3809c590
 MISC metadata.xml 787 BLAKE2B c7000a14fe4a29247dbb68f535ad8e5b9daffc6cda71176db88f5d55811601a1b3113ad5029fc2cb46f777a16e7c5859de0798fb1a83a03beead91ebf66160a1 SHA512 449e7457a35f11b3c09c917134df48af7896ac9d34892f80102cbd2b2510f78d95331582cbde0be7d24ffe004c58a95fdebc6590ce90522a9f15212d5e70c58b
diff --git a/net-wireless/kismet/kismet-2022.01.3.ebuild b/net-wireless/kismet/kismet-2022.01.3.ebuild
deleted file mode 100644
index 57d82e0c98d1..000000000000
--- a/net-wireless/kismet/kismet-2022.01.3.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-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:=
-	dev-libs/elfutils:=
-	sys-libs/zlib:=
-	dev-db/sqlite:=
-	net-libs/libmicrohttpd:=
-	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}]
-	')
-	sys-libs/ncurses:=
-	lm-sensors? ( sys-apps/lm-sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	ubertooth? ( net-wireless/ubertooth:= )
-	"
-
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	dev-libs/libfmt
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_USEDEP}]
-	')
-	selinux? ( sec-policy/selinux-kismet )
-"
-PDEPEND="
-	rtlsdr? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-		net-wireless/rtl-sdr
-	)"
-
-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
-
-	#dev-libs/jsoncpp
-	#rm -r json || die
-	#sed -i 's#"json/json.h"#<json/json.h>#' 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
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in || die
-
-	#remove this patch on bump
-	eapply "${FILESDIR}/kismet-2022-01-3-wardrive.patch"
-	eapply_user
-
-	#just use set to fix setup.py
-	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-
-	if [ "${PV}" = "9999" ]; then
-		eautoreconf
-	fi
-}
-
-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 CHANGELOG 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
-}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index e82c719234ad..22b7c2b6b129 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -64,26 +64,23 @@ CDEPEND="
 	suid? ( sys-libs/libcap )
 	ubertooth? ( net-wireless/ubertooth:= )
 	"
-
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	dev-libs/libfmt
-	virtual/pkgconfig
-"
-
 RDEPEND="${CDEPEND}
 	$(python_gen_cond_dep '
 		dev-python/pyserial[${PYTHON_USEDEP}]
 	')
-	selinux? ( sec-policy/selinux-kismet )
-"
-PDEPEND="
 	rtlsdr? (
 		$(python_gen_cond_dep '
 			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 		net-wireless/rtl-sdr
-	)"
+	)
+	selinux? ( sec-policy/selinux-kismet )
+"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	dev-libs/libfmt
+"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
@@ -200,4 +197,8 @@ pkg_postinst() {
 			fi
 		done
 	fi
+	udev_reload
+}
+pkg_postrm() {
+	udev_reload
 }