commit: db0a0a0f6487318a6df2e777d7fd7d4c7efa0ea7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Feb 18 12:48:22 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Feb 18 13:11:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db0a0a0f
net-wireless/kismet: drop 2021.08.1-r1 Broken by current stable dev-libs/libfmt version. Bug: https://bugs.gentoo.org/887031 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-wireless/kismet/Manifest | 1 - .../kismet/files/kismet-2021.08.1-nopcre.patch | 24 --- net-wireless/kismet/kismet-2021.08.1-r1.ebuild | 205 --------------------- 3 files changed, 230 deletions(-) diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest index bd206161efff..9c4df342cb7b 100644 --- a/net-wireless/kismet/Manifest +++ b/net-wireless/kismet/Manifest @@ -1,2 +1 @@ -DIST kismet-2021-08-R1.tar.xz 10621004 BLAKE2B 236a43d2073e380c60dadfc4f611465ffa5c7de2a282fa3f45252368cbc65aaa21ad6d33c504685e39ec7913a36364283f6706d6ad8fcecf2f7922c23a4aa792 SHA512 91e86dc1d3b69aa8cb6dff4c4b8bb959dca128f06d1298effe1b23ed24158ce4285abdf2af838f48588b9e71c69f82538d1a002838c4bc1d053868118e394b7a DIST kismet-2022-08-R1.tar.xz 10700692 BLAKE2B 9f6b3a651eca34b90e34b8a8357be493a8966cdd5c54f5f1c38383cc3ad74f2c78ab265df882b0a5b985bed98ad61f4741ead7b443d9b79f2769ca7edc72427f SHA512 befca2dcd7016d96a17e97babbd6d88195fa61750ed616d104d10a85828ec160672c33bd2a1eae554d375feb55ea45a040a3e53c4410a3ff8c9bfa4b5c8bcdb1 diff --git a/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch b/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch deleted file mode 100644 index c3b648464ff5..000000000000 --- a/net-wireless/kismet/files/kismet-2021.08.1-nopcre.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e28c407f612877e750e6e5e1b92a8949275b7df0 Mon Sep 17 00:00:00 2001 -From: Mike Kershaw / Dragorn <[email protected]> -Date: Thu, 16 Dec 2021 20:35:43 -0500 -Subject: [PATCH] Fix compiling when pcre is not available - -Fix compiling when pcre is not available ---- - log_tools/kismetdb_to_wiglecsv.cc | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/log_tools/kismetdb_to_wiglecsv.cc b/log_tools/kismetdb_to_wiglecsv.cc -index 8d4a8db68..5c79680c7 100644 ---- a/log_tools/kismetdb_to_wiglecsv.cc -+++ b/log_tools/kismetdb_to_wiglecsv.cc -@@ -239,6 +239,9 @@ int main(int argc, char *argv[]) { - - pcre *re; - pcre_extra *study; -+#else -+ pcre_filter(const std::string& in_regex) {} -+ bool match(const std::string& target) {return false;} - #endif - }; - diff --git a/net-wireless/kismet/kismet-2021.08.1-r1.ebuild b/net-wireless/kismet/kismet-2021.08.1-r1.ebuild deleted file mode 100644 index b7ec430af772..000000000000 --- a/net-wireless/kismet/kismet-2021.08.1-r1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{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 - )" - -PATCHES=( "${FILESDIR}"/kismet-2021.08.1-nopcre.patch ) - -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 - - default - - #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 -}
