gentoo auto-resync : 22:07:2023 - 02:49:03

4 files changed, 203 insertions, 7 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 2068ab36ba04..5529894b457f 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 8bfd0c8dd1b2..44e1f0f8df06 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -4,6 +4,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-2022-08-R1.tar.xz 10700692 BLAKE2B 9f6b3a651eca34b90e34b8a8357be493a8966cdd5c54f5f1c38383cc3ad74f2c78ab265df882b0a5b985bed98ad61f4741ead7b443d9b79f2769ca7edc72427f SHA512 befca2dcd7016d96a17e97babbd6d88195fa61750ed616d104d10a85828ec160672c33bd2a1eae554d375feb55ea45a040a3e53c4410a3ff8c9bfa4b5c8bcdb1
+DIST kismet-2023-07-R1.tar.xz 11144120 BLAKE2B c43f0665c784ff9245289e624e23cb3eb4ffcb79f050deede50129cf6b07662e817f9c9aaf6cc608395045b5b449b87d22ff314d7dbc8f04b29db2df86dc5f84 SHA512 b8b320b8e09be5be582848ce8a1a66f71a96eccc3c78f52d3f1f18122abbe614ff3b5a55b5fcedf3e6a1fc959a72838adc0d7278ffd6c25a1c179a1caf5584ce
 EBUILD kismet-2022.08.1-r2.ebuild 6014 BLAKE2B f46ea8ed5c5e6761cde9a469ce8a0c94f1dadd1dd1b8cca8702ef31a2b77edaf0f18a40a3aba16fb0ed45c2d25df4e7c53e86caf202d00e16cc3b112543dc028 SHA512 2cdd1766022a2b4f8809ac1bd8622927d2188503dfaf1955d68eaa1e167ffe5a0905774f57f08836a82f63850fd5196a2e9701c406e93dd58908549fe8cfa9e8
-EBUILD kismet-9999.ebuild 5786 BLAKE2B fbfce7146a90c6a85972641d21a0abe369215e2f9195e80014fcac5f2e976651130eb73c0c8e7f213187ff5cd96895eea14afb1d5b8edc4c594d195edf44371a SHA512 164d694a7205d0c89899f50f27e176e5ec582d251c5dee2c32398c92af36a1f661fea20dd91ae9e8ddaec3f062b91dc9dc45e53dcfded3133546e3959982cb34
+EBUILD kismet-2023.07.1.ebuild 5650 BLAKE2B bdfc1eaea9225a5534fd43318d769b84e1b12717303bef33814666bac2167d8f9f74b31556c360e62289a46d3edf48cd83a699792080172f7ed6214dd4bd08e9 SHA512 711fdac2f959822776123bc178ae92e1b7c7e63713360cefe8ebf9ba2cbfa26d0cd516ad2a94c96c5ad2f76d3b6c537b3cc0245278bdb58e30827b4f42a4421d
+EBUILD kismet-9999.ebuild 5650 BLAKE2B bdfc1eaea9225a5534fd43318d769b84e1b12717303bef33814666bac2167d8f9f74b31556c360e62289a46d3edf48cd83a699792080172f7ed6214dd4bd08e9 SHA512 711fdac2f959822776123bc178ae92e1b7c7e63713360cefe8ebf9ba2cbfa26d0cd516ad2a94c96c5ad2f76d3b6c537b3cc0245278bdb58e30827b4f42a4421d
 MISC metadata.xml 873 BLAKE2B f4dea6914ce2380db76b7f66d3028dbc22a5785e41814b71f3876716148e71e82f9a62035d27abeba1567222b16da560e7e74a6ca2379433bf68b5a842fa618d SHA512 a82c3f86ab863646e6d7c8a91b033c851413487652621e576c7baf9b956ff39b8b4c4d8616478eb62752766aa8b10039d1c881cf29c99ea44eb98174c3cf4f67
diff --git a/net-wireless/kismet/kismet-2023.07.1.ebuild b/net-wireless/kismet/kismet-2023.07.1.ebuild
new file mode 100644
index 000000000000..12ccc414e920
--- /dev/null
+++ b/net-wireless/kismet/kismet-2023.07.1.ebuild
@@ -0,0 +1,198 @@
+# 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
+	dev-libs/openssl:=
+	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/libpcre2:= )
+	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 )
+"
+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
+
+	#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
+
+	eapply_user
+
+	if [ "${PV}" = "9999" ]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable libusb libusb) \
+		$(use_enable libusb wifi-coconut) \
+		$(use_enable pcre) \
+		$(use_enable pcre require-pcre2) \
+		$(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 12f25b0e7fc0..12ccc414e920 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -75,11 +75,9 @@ 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"
@@ -94,9 +92,7 @@ src_prepare() {
 	#sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
 
 	rm -r boost || die
-	#switched back to bundled libfmt-8
-	#https://bugs.gentoo.org/895252
-	#rm -r fmt || die
+	rm -r fmt || die
 
 	#dev-libs/jsoncpp
 	#rm -r json || die