net-wireless/kismet: bump and fixes
authorRick Farina <zerochaos@gentoo.org>
Mon, 22 Jul 2019 01:22:48 +0000 (21:22 -0400)
committerRick Farina <zerochaos@gentoo.org>
Mon, 22 Jul 2019 01:23:53 +0000 (21:23 -0400)
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Rick Farina <zerochaos@gentoo.org>
net-wireless/kismet/Manifest
net-wireless/kismet/files/kismet.initd-r2 [moved from net-wireless/kismet/files/kismet.initd-r1 with 58% similarity]
net-wireless/kismet/kismet-2019.07.2.ebuild [new file with mode: 0644]
net-wireless/kismet/kismet-9999.ebuild

index ead4cd763dc294a2b631af2b78a824a76ec81810..2ad9f0bf6e78542d8cdc3c632dfa61a764f9f39e 100644 (file)
@@ -1,2 +1,3 @@
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2019-05-R1.tar.xz 3025984 BLAKE2B dbb286a2bd53e78be2fd6ecc8d7046b65b88f11c34b82787c9a3a0198549317c254fd32d9097492bef60fb5e074b7d9c964da5993881305e0dd135b15a77f39d SHA512 1be981020aff723b52e887d3db40c7842b6639a83c524fadd468094a1aef7ca80540db1691984958ec9f8a4e31d2486557aeef5bf1769d410416638cb783b7cd
+DIST kismet-2019-07-R2.tar.xz 3022928 BLAKE2B 8f7e26ea9374dfd7689b9e03603432b0aaf9e9b0c82ce848220a1c249e67f08afc07595e86d232e1b99e84ea5cd4fec328118d1e84a917363a60879f4abf5349 SHA512 442becf849cad06447023f9cff7a5547c681a36a34a125e617651a3ffe38b4da9fdf04b9a9d9d1ff045f43ea18324a328cee7515d7508f40ab2119d3f8adeee9
similarity index 58%
rename from net-wireless/kismet/files/kismet.initd-r1
rename to net-wireless/kismet/files/kismet.initd-r2
index 4c1891611967b520ff99e17c3562a1d8c2360242..bc4374e6801660021fd4e3bed2669bb96b140b46 100644 (file)
@@ -2,25 +2,17 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-checkconfig() {
-       if [ ! -e /etc/kismet.conf ]; then
-               eerror "Configuration file /etc/kismet.conf not found"
-               return 1
-       fi
-}
-
 start() {
-       checkconfig || return 1
-
-       ebegin "Starting kismet server"
+       ebegin "Starting kismet"
        start-stop-daemon --start --quiet --pidfile /run/kismet.pid \
                --background --make-pidfile --exec /usr/bin/kismet \
-               -- ${KISMET_SERVER_OPTIONS}
+    -1 /var/log/kismet.log -2 /var/log/kismet.log \
+               -- --no-ncurses ${KISMET_SERVER_OPTIONS}
        eend ${?}
 }
 
 stop() {
-       ebegin "Stopping kismet server"
+       ebegin "Stopping kismet"
        start-stop-daemon --stop --quiet --pidfile /run/kismet.pid
        eend ${?}
 }
diff --git a/net-wireless/kismet/kismet-2019.07.2.ebuild b/net-wireless/kismet/kismet-2019.07.2.ebuild
new file mode 100644 (file)
index 0000000..67e7039
--- /dev/null
@@ -0,0 +1,161 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib user python-single-r1
+
+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="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
+       #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="lm_sensors mousejack networkmanager +pcre selinux +suid"
+
+CDEPEND="
+       ${PYTHON_DEPS}
+       networkmanager? ( net-misc/networkmanager:= )
+       dev-libs/glib:=
+       dev-libs/elfutils:=
+       sys-libs/zlib:=
+       dev-db/sqlite:=
+       net-libs/libmicrohttpd
+       kernel_linux? ( sys-libs/libcap
+                       dev-libs/libnl:3
+                       net-libs/libpcap
+                       )
+       mousejack? ( dev-libs/libusb:= )
+       dev-libs/protobuf-c:=
+       dev-libs/protobuf:=
+       dev-python/protobuf-python[${PYTHON_USEDEP}]
+       sys-libs/ncurses:=
+       lm_sensors? ( sys-apps/lm_sensors )
+       pcre? ( dev-libs/libpcre )
+       suid? ( sys-libs/libcap )
+       "
+
+DEPEND="${CDEPEND}
+       virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+       dev-python/pyserial[${PYTHON_USEDEP}]
+       selinux? ( sec-policy/selinux-kismet )
+"
+
+src_prepare() {
+       sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+               conf/kismet_logging.conf || die
+
+       # Don't strip and set correct mangrp
+       sed -i -e 's| -s||g' \
+               -e 's|@mangrp@|root|g' Makefile.in
+
+       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 pcre) \
+               $(use_enable lm_sensors lmsensors) \
+               $(use_enable mousejack libusb) \
+               $(use_enable networkmanager libnm) \
+               --sysconfdir=/etc/kismet \
+               --disable-optimization
+}
+
+src_install() {
+       emake DESTDIR="${D}" commoninstall
+       emake DESTDIR="${D}" forceconfigs
+
+       insinto /usr/share/${PN}
+       doins Makefile.inc
+
+       #dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
+       dodoc CHANGELOG README*
+       newinitd "${FILESDIR}"/${PN}.initd-r2 kismet
+       newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
+}
+
+pkg_preinst() {
+       if use suid; then
+               enewgroup kismet
+               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/"
+       if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+               ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+               ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+       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
+}
index 9361c44b1797c6152feb9514af0705104ea72186..c436f6bff4070901e45dde5ed11162ca12969648 100644 (file)
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools eutils multilib user python-single-r1
 
@@ -25,7 +25,7 @@ else
        #SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
        #S="${WORKDIR}/${PN}-${COMMIT}"
 
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+       KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
@@ -91,6 +91,7 @@ src_configure() {
                $(use_enable lm_sensors lmsensors) \
                $(use_enable mousejack libusb) \
                $(use_enable networkmanager libnm) \
+               --sysconfdir=/etc/kismet \
                --disable-optimization
 }
 
@@ -103,7 +104,7 @@ src_install() {
 
        #dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
        dodoc CHANGELOG README*
-       newinitd "${FILESDIR}"/${PN}.initd-r1 kismet
+       newinitd "${FILESDIR}"/${PN}.initd-r2 kismet
        newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
 }
 
@@ -128,3 +129,33 @@ pkg_preinst() {
                ewarn "your user to the kismet group."
        fi
 }
+
+migrate_config() {
+       einfo "Kismet Configuration files are now read from /etc/kismet/"
+       if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+               ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+               ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+       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
+}