From d2d34cf8ef9adf4920d34feb052444ac157d1eb0 Mon Sep 17 00:00:00 2001 From: Rick Farina Date: Tue, 4 Dec 2018 11:41:44 -0500 Subject: net-wireless/kismet: correct fix for bug #662726 use newly added configure flags Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Rick Farina --- net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild | 128 --------------------- net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild | 126 ++++++++++++++++++++ net-wireless/kismet/kismet-9999.ebuild | 31 ++--- net-wireless/kismet/metadata.xml | 1 + 4 files changed, 137 insertions(+), 149 deletions(-) delete mode 100644 net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild create mode 100644 net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild (limited to 'net-wireless/kismet') diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild deleted file mode 100644 index 9f06e02bc4de..000000000000 --- a/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils multilib user python-single-r1 - -MY_P=${P/\./-} -MY_P=${MY_P/_beta/-BETA} -MY_P=${MY_P/./-R} -S=${WORKDIR}/${MY_P} - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git" - SRC_URI="" - inherit git-r3 - KEYWORDS="" - RESTRICT="strip" -else - SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" - 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 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 - ) - dev-libs/protobuf-c:= - dev-libs/protobuf:= - sys-libs/ncurses:= - lm_sensors? ( sys-apps/lm_sensors ) - pcre? ( dev-libs/libpcre ) - suid? ( sys-libs/libcap ) - " - -DEPEND="${CDEPEND} - virtual/pkgconfig -" - -RDEPEND="${CDEPEND} - 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 - - epatch "${FILESDIR}"/fix-setuptools.patch - eapply_user - - if [[ ${PV} == "9999" ]] ; then - eautoreconf - fi - - if ! use lm_sensors; then - sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure - fi - #fix for bug #662726 - sed -i "s#HAVE_SENSORS_SENSORS_H#HAVE_LMSENSORS_H#" system_monitor.cc || die - - if use networkmanager; then - sed -i "s#havelibnm\=no#havelibnm\=yes#" configure - else - sed -i "s#havelibnm\=yes#havelibnm\=no#" configure - fi - sed -i 's#-O3##' configure -} - -src_configure() { - econf \ - $(use_enable pcre) -} - -src_install() { - emake DESTDIR="${D}" commoninstall - emake DESTDIR="${D}" forceconfigs - - insinto /usr/share/${PN} - doins -r log_tools - - #dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore - dodoc CHANGELOG README* - newinitd "${FILESDIR}"/${PN}.initd kismet - newconfd "${FILESDIR}"/${PN}.confd 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 -} diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild new file mode 100644 index 000000000000..69055f3a8ae8 --- /dev/null +++ b/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils multilib user python-single-r1 + +MY_P=${P/\./-} +MY_P=${MY_P/_beta/-BETA} +MY_P=${MY_P/./-R} +S=${WORKDIR}/${MY_P} + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git" + SRC_URI="" + inherit git-r3 + KEYWORDS="" + RESTRICT="strip" +else + SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" + 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 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 + ) + dev-libs/protobuf-c:= + dev-libs/protobuf:= + sys-libs/ncurses:= + lm_sensors? ( sys-apps/lm_sensors ) + pcre? ( dev-libs/libpcre ) + suid? ( sys-libs/libcap ) + " + +DEPEND="${CDEPEND} + virtual/pkgconfig +" + +RDEPEND="${CDEPEND} + 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 + + epatch "${FILESDIR}"/fix-setuptools.patch + eapply_user + + if [[ ${PV} == "9999" ]] ; then + eautoreconf + fi + + if ! use lm_sensors; then + sed -i "s#sensors.h#totally-not-sensors.h#" configure + fi + + if use networkmanager; then + sed -i "s#havelibnm\=no#havelibnm\=yes#" configure + else + sed -i "s#havelibnm\=yes#havelibnm\=no#" configure + fi +} + +src_configure() { + econf \ + $(use_enable pcre) \ + --disable-optimization +} + +src_install() { + emake DESTDIR="${D}" commoninstall + emake DESTDIR="${D}" forceconfigs + + insinto /usr/share/${PN} + doins -r log_tools + + #dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore + dodoc CHANGELOG README* + newinitd "${FILESDIR}"/${PN}.initd kismet + newconfd "${FILESDIR}"/${PN}.confd 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 +} diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild index 9bd91454798a..9eecff37a2f8 100644 --- a/net-wireless/kismet/kismet-9999.ebuild +++ b/net-wireless/kismet/kismet-9999.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://www.kismetwireless.net" LICENSE="GPL-2" SLOT="0/${PV}" -IUSE="lm_sensors networkmanager +pcre selinux +suid" +IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid" CDEPEND=" ${PYTHON_DEPS} @@ -42,7 +42,7 @@ CDEPEND=" dev-libs/libnl:3 net-libs/libpcap ) - dev-libs/libusb:= + mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= sys-libs/ncurses:= @@ -67,32 +67,21 @@ src_prepare() { sed -i -e 's| -s||g' \ -e 's|@mangrp@|root|g' Makefile.in - epatch "${FILESDIR}"/fix-setuptools3.patch + eapply "${FILESDIR}"/fix-setuptools3.patch eapply_user - if use lm_sensors; then - sed -i "s#HAVE_LMSENSORS_H=0#HAVE_LMSENSORS_H=1#" configure.ac || die - sed -i "s#HAVE_LIBLMSENSORS=0#HAVE_LMSENSORS=1#" configure.ac || die - else - sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure.ac || die - sed -i "s#HAVE_LIBLMSENSORS=1#HAVE_LMSENSORS=0#" configure.ac || die + if [ "${PV}" = "9999" ]; then + eautoreconf fi - #fix for bug #662726 - sed -i "s#HAVE_SENSORS_SENSORS_H#HAVE_LMSENSORS_H#" system_monitor.cc || die - - if use networkmanager; then - sed -i "s#havelibnm\=no#havelibnm\=yes#" configure.ac || die - else - sed -i "s#havelibnm\=yes#havelibnm\=no#" configure.ac || die - fi - sed -i 's#-O3##' configure.ac || die - - eautoreconf } src_configure() { econf \ - $(use_enable pcre) + $(use_enable pcre) \ + $(use_enable lm_sensors lmsensors) \ + $(use_enable mousejack libusb) \ + $(use_enable networkmanager libnm) \ + --disable-optimization } src_install() { diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml index 3e3c9a3551a7..e5158f5c107b 100644 --- a/net-wireless/kismet/metadata.xml +++ b/net-wireless/kismet/metadata.xml @@ -12,6 +12,7 @@ this allows running kismet as a normal user, significantly reducing security risks + Add support for mousejack hardware using dev-libs/libusb Build with pcre support Audio support using app-accessibility/flite Build the autowep plugin -- cgit v1.2.3-65-gdbad