gentoo resync : 03.03.2021

3 files changed, 7 insertions, 200 deletions

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index e058210a5d46..87332bdf37ea 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,8 +1,6 @@
 AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
-DIST kismet-2020-09-R4.tar.xz 8692520 BLAKE2B 68098080cfca6968538ecf4840a3ab06f95bfe9b72829dc7ea551b1a5f15d5b65fbfaa8cecfef19a537abf081d0c4e2b2ffdedc0e34023a3393013227c898d97 SHA512 4f2dd641999dd2675d2c4dfbe28caf5a8476d5d7bd9dedeefb7b1420b48b9155a4d576123832974586d51c61ca4d77d8572ab7038da3ec6fa2a7791f3e1a1479
-DIST kismet-2020-12-R2.tar.xz 9888412 BLAKE2B 6228c7c760d4e35cfbedcbd93e5b461bf81821832ea1bdcc3645a5770ddbbd83dbe9d69d6c7b88e3e279fbd1d52306217283e4307b71d8cdb7679506bf2f4c69 SHA512 c31fa1e603a3c6f533b2df13b9b676c82ab48e933078649840e7a0fdaa79227f05dd5b69c1381761a57f81293780b94ded1a69859173972815c30f004086fb58
-EBUILD kismet-2020.09.4.ebuild 5266 BLAKE2B 8e20c76a0728cbc21293935acb9bdd3b499604a9e779e62b9a6d8fb4b74a91b19592acbf1560dbac447a78f6b3e48595f1710bb5020d7ee404c1fec35d778722 SHA512 fa3ad141df73ab3ecad921bccfaeb47066877e43740f26139ea391e2436b3d829cca11348abdde7c4eb4952b105dff9d97a0ebf2873a2b64f58552ff8ac1a78f
-EBUILD kismet-2020.12.2.ebuild 5426 BLAKE2B 1dec6a2511c8e68a7e3c2a20d946f688f3f33ae7ef076a286ed3bcf58f85dcfcf6615704cd89248b41b95839e00c5833c3a02550ecbc5c662feb34de0b0e7266 SHA512 3671a3057cda46d9478e8aa8e6f8d70ece49855ef956b7316661c362c7d22741253262aff19b431a2c34d73dd2c4c5c69041e2dd70818def6042c3b75cf48dda
+DIST kismet-2020-12-R3.tar.xz 9887764 BLAKE2B 4d011a13888f6a60d34ddcbc47d83c01debf73307da7d26c28034b15ad6dde2d8ae7741b4104d250ff112be242af0cbbcff612fc172d67d404d14b3d0ef688f3 SHA512 6c4c95a9963977d5a383e34f662f814a803d0d36d7dbc35d3d0a42d3e67c20e8d46357df0ee544b8dd3c7f527bd43ef9c0d913577d4979f261764fc9761cd6d1
+EBUILD kismet-2020.12.3.ebuild 5097 BLAKE2B 7a5a3939be0bc5e004500324f3804eac1742939cb212e6a6f1deb6aa70590139e2b0f7431cb8ba12c749b31c5e26ff687fed4d7e48be720f97cae868f481de1b SHA512 37295c7b656f9de82beeed6a6378181c3349cfdb56d05f88d1b04bc6bb5c8c63b378b406f5e014bed5b58d9a0493913f03560d2e258785337e8b97336fc85a6d
 EBUILD kismet-9999.ebuild 5355 BLAKE2B b483c152788f21ca19bdf2a41ef189143ad3755aa3b17da05d2ccea72a37cc053d6d07a39a9ed9abe652697f7de97cefe6f3188ce1140be7543684fb40e01946 SHA512 2c6939da6128cfd6d94d212f10b14ef1a61318ca09eddc9d9530b7c890c095fa91a7915c15e39dd26e9a8e61a765145f2b451e8e842ef033bebb896f4ed2d87d
 MISC metadata.xml 786 BLAKE2B 86f38600535248d3b03f57ea796b57d7cc5ea04c2e35095702b586574740105efdd3710ab05e15c2faef640c7a5ddeb835cd4055e3426591129ab5802a2708b2 SHA512 a6ff91e31ed15b2e6fb381210b654c1a1195699c466d36af838c9ec4d560d632a194ff7597f167cd8281ad9908d75eb39aef5a73d7dc59fdf2020aaf5359a0f8
diff --git a/net-wireless/kismet/kismet-2020.12.2.ebuild b/net-wireless/kismet/kismet-2020.12.2.ebuild
deleted file mode 100644
index e0314856ae97..000000000000
--- a/net-wireless/kismet/kismet-2020.12.2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools eutils multilib 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}"
-
-	#Desired (minimum) keywords
-	#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-	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]
-	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_MULTI_USEDEP}]
-		dev-python/websockets[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-libs/ncurses:=
-	lm-sensors? ( sys-apps/lm-sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	ubertooth? ( net-wireless/ubertooth:= )
-	"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
-	')
-	selinux? ( sec-policy/selinux-kismet )
-"
-PDEPEND="
-	rtlsdr? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_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
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in || die
-
-	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
-
-	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-2020.09.4.ebuild b/net-wireless/kismet/kismet-2020.12.3.ebuild
index dc057a4411a4..3930832e1ffb 100644
--- a/net-wireless/kismet/kismet-2020.09.4.ebuild
+++ b/net-wireless/kismet/kismet-2020.12.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools eutils multilib python-single-r1 udev systemd
 
@@ -17,14 +17,8 @@ else
 	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
 
@@ -45,7 +39,8 @@ CDEPEND="
 	dev-libs/elfutils:=
 	sys-libs/zlib:=
 	dev-db/sqlite:=
-	net-libs/libmicrohttpd
+	net-libs/libmicrohttpd:=
+	net-libs/libwebsockets:=[client]
 	kernel_linux? ( sys-libs/libcap
 			dev-libs/libnl:3
 			net-libs/libpcap
@@ -55,6 +50,7 @@ CDEPEND="
 	dev-libs/protobuf:=
 	$(python_gen_cond_dep '
 		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/websockets[${PYTHON_MULTI_USEDEP}]
 	')
 	sys-libs/ncurses:=
 	lm-sensors? ( sys-apps/lm-sensors )