From b04ab98040a7e7e15bd0297cd06218ce9108f153 Mon Sep 17 00:00:00 2001 From: Rick Farina Date: Thu, 20 Jan 2022 10:06:39 -0500 Subject: net-wireless/kismet: fix missing use dep Signed-off-by: Rick Farina Closes: https://bugs.gentoo.org/828011 Bump python support to 10 Bump eapi 7->8 remove unused eclass --- net-wireless/kismet/kismet-2021.08.1-r1.ebuild | 203 +++++++++++++++++++++++++ net-wireless/kismet/kismet-2021.08.1.ebuild | 203 ------------------------- net-wireless/kismet/kismet-9999.ebuild | 12 +- 3 files changed, 209 insertions(+), 209 deletions(-) create mode 100644 net-wireless/kismet/kismet-2021.08.1-r1.ebuild delete mode 100644 net-wireless/kismet/kismet-2021.08.1.ebuild diff --git a/net-wireless/kismet/kismet-2021.08.1-r1.ebuild b/net-wireless/kismet/kismet-2021.08.1-r1.ebuild new file mode 100644 index 000000000000..e82c719234ad --- /dev/null +++ b/net-wireless/kismet/kismet-2021.08.1-r1.ebuild @@ -0,0 +1,203 @@ +# 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"##' 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 + + 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-2021.08.1.ebuild b/net-wireless/kismet/kismet-2021.08.1.ebuild deleted file mode 100644 index 45462e528503..000000000000 --- a/net-wireless/kismet/kismet-2021.08.1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -inherit autotools 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}" - - 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_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"##' 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 - - 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 45462e528503..e82c719234ad 100644 --- a/net-wireless/kismet/kismet-9999.ebuild +++ b/net-wireless/kismet/kismet-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) -inherit autotools multilib python-single-r1 udev systemd +inherit autotools python-single-r1 udev systemd if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" @@ -46,7 +46,7 @@ CDEPEND=" sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd:= - net-libs/libwebsockets:=[client] + net-libs/libwebsockets:=[client,lejp] kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap @@ -175,7 +175,7 @@ pkg_preinst() { 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 + 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 -- cgit v1.2.3-65-gdbad