From 2d668ca9977ed60e1de98134aaa9ef6458761de5 Mon Sep 17 00:00:00 2001 From: Rick Farina Date: Sun, 21 Jul 2019 21:46:31 -0400 Subject: net-wireless/kismet: fix confd file Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Rick Farina --- net-wireless/kismet/files/kismet.confd-r1 | 14 --- net-wireless/kismet/files/kismet.confd-r2 | 11 ++ net-wireless/kismet/kismet-2019.07.2-r1.ebuild | 161 +++++++++++++++++++++++++ net-wireless/kismet/kismet-2019.07.2.ebuild | 161 ------------------------- net-wireless/kismet/kismet-9999.ebuild | 2 +- 5 files changed, 173 insertions(+), 176 deletions(-) delete mode 100644 net-wireless/kismet/files/kismet.confd-r1 create mode 100644 net-wireless/kismet/files/kismet.confd-r2 create mode 100644 net-wireless/kismet/kismet-2019.07.2-r1.ebuild delete mode 100644 net-wireless/kismet/kismet-2019.07.2.ebuild (limited to 'net-wireless/kismet') diff --git a/net-wireless/kismet/files/kismet.confd-r1 b/net-wireless/kismet/files/kismet.confd-r1 deleted file mode 100644 index 42f617372ff5..000000000000 --- a/net-wireless/kismet/files/kismet.confd-r1 +++ /dev/null @@ -1,14 +0,0 @@ -# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet - -# Kismet configuration is done in /etc/kismet*.conf -# It is recommended to put user config in /etc/kismet_site.conf -# where kismet updates won't try to overwrite it. - -# To use the kismet init script, you must have "logtemplate" set to a location -# that is writable by the user assigned by "suiduser". -# e.g. -# suiduser=foo -# logtemplate=%h/kismet_log/%n-%d-%i.%l - -# Options to pass to kismet, see `kismet --help` -KISMET_SERVER_OPTIONS="--no-ncurses" diff --git a/net-wireless/kismet/files/kismet.confd-r2 b/net-wireless/kismet/files/kismet.confd-r2 new file mode 100644 index 000000000000..40da851cbf00 --- /dev/null +++ b/net-wireless/kismet/files/kismet.confd-r2 @@ -0,0 +1,11 @@ +# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet + +# Kismet configuration is done in /etc/kismet/kismet_site.conf + +# To use the kismet init script, you must have "logtemplate" set to a location +# e.g. +# log_template=%h/kismet_log/%n-%d-%i.%l + +# Options to pass to kismet_server, see `kismet --help` +# --no-ncurses is passed unconditionally +KISMET_SERVER_OPTIONS="" diff --git a/net-wireless/kismet/kismet-2019.07.2-r1.ebuild b/net-wireless/kismet/kismet-2019.07.2-r1.ebuild new file mode 100644 index 000000000000..2b3fa83481e3 --- /dev/null +++ b/net-wireless/kismet/kismet-2019.07.2-r1.ebuild @@ -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-r2 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 +} diff --git a/net-wireless/kismet/kismet-2019.07.2.ebuild b/net-wireless/kismet/kismet-2019.07.2.ebuild deleted file mode 100644 index 67e7039b5619..000000000000 --- a/net-wireless/kismet/kismet-2019.07.2.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# 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 -} diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild index c436f6bff407..77ae6098f3e1 100644 --- a/net-wireless/kismet/kismet-9999.ebuild +++ b/net-wireless/kismet/kismet-9999.ebuild @@ -105,7 +105,7 @@ src_install() { #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 + newconfd "${FILESDIR}"/${PN}.confd-r2 kismet } pkg_preinst() { -- cgit v1.2.3-65-gdbad