gentoo resync : 04.08.2018

3 files changed, 141 insertions, 80 deletions

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 51e7312afc88..eeb86fc84697 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -3,6 +3,8 @@ AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27e
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
+DIST kismet-2018-08-BETA1.tar.xz 2043136 BLAKE2B f24af4250bb0238073380514413d9501e449cf40507d7a96ac868d76acb34af81b9bf4a49c9b6197b6b903ab33e2318bb5efa22876cc2070e3878ebf030d592c SHA512 09eab9d648f011c95b8632c666990d79f9998465b051a65357f53af19a135a5d58df3025ec60f9ef9a7b7d9b5622d2332bb2defbffd21ca0e25e2e4090ceae2f
 EBUILD kismet-2016.07.1-r1.ebuild 4191 BLAKE2B 121e49130ad54fc963b011b005fa33ea6d01e71cf699232c744f7a497076b489e8913da9a0341becb21657de947204cd260e95ef46fe111716de1b1b6781b521 SHA512 ceefe51d38f6375629708be15a23a9e382578a8b4474503e2ff61bb912ab3ae313b37f417880f180094439505ea36fdbd9aeab95cbd426cc3f744985615080fc
-EBUILD kismet-9999.ebuild 4691 BLAKE2B acc21dc3fc02efd61f4073c37902bcf45b7f264296b71c6315ff800e7c44879a4d565e7286c4667e794e2a997b73c4dc5a110790715c2a7ecd82d0c759e3106a SHA512 2f50cdca13c5626c4bd2353a47c9d4009af440f7376883d42427ea3fdcb891e208aebf43aef5d5d2b1039b50f950c194816272fa9bbf0e729f6eef52c1fe5901
+EBUILD kismet-2018.08_beta1-r1.ebuild 2928 BLAKE2B 9be0cfefabe0b0b69674610a05639360aa50918abd8c3076c215ebb0b85e19e9455bde50c8c881fee2abf824cdc5a4cbc26f1edcd7d651c277e919501d1a875c SHA512 f39423e4130c78335ce6f361315a322fbb5a5c23dcbdcf96055183a995f8a0f255ded74a8fd2cb50f86ce9f8df0694fbe4f91029d7f53000ee703e55e3e42b5f
+EBUILD kismet-9999.ebuild 2928 BLAKE2B 9be0cfefabe0b0b69674610a05639360aa50918abd8c3076c215ebb0b85e19e9455bde50c8c881fee2abf824cdc5a4cbc26f1edcd7d651c277e919501d1a875c SHA512 f39423e4130c78335ce6f361315a322fbb5a5c23dcbdcf96055183a995f8a0f255ded74a8fd2cb50f86ce9f8df0694fbe4f91029d7f53000ee703e55e3e42b5f
 MISC metadata.xml 1159 BLAKE2B 2e72c1c62f31b52445c83b6b0d7695c7f1231de69fbe865e123a18dc0030a0f57586b058a7e738d561f48413e8a6ff0e8ac73428de2c41688e5baa1e4c255af1 SHA512 cf7c0f4c38f0a5e7b9c51c9fc98f5dd49e51159986443687a81d486c8805aea069168832f406a16b36dc6342be063fdbcade74685273fcdd2111ea9a616437d7
diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r1.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r1.ebuild
new file mode 100644
index 000000000000..ddf8e2e5e783
--- /dev/null
+++ b/net-wireless/kismet/kismet-2018.08_beta1-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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}
+	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:=
+	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
+	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
+
+	#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 2a6321ed5126..ddf8e2e5e783 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -8,6 +8,7 @@ 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}
 
@@ -27,7 +28,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="+pcre speech selinux +suid"
+IUSE="lm_sensors networkmanager +pcre selinux +suid"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -43,13 +44,10 @@ CDEPEND="
 			)
 	dev-libs/protobuf-c:=
 	sys-libs/ncurses:=
+	lm_sensors? ( sys-apps/lm_sensors )
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
-	!arm? ( speech? ( app-accessibility/flite ) )
 	"
-	#plugin-btscan? ( net-wireless/bluez )
-	#plugin-dot15d4? ( virtual/libusb:0 )
-	#plugin-spectools? ( net-wireless/spectools )
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
@@ -69,95 +67,35 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/fix-setuptools.patch
 	eapply_user
-	eautoreconf
+
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+
+	if ! use lm_sensors; then
+		sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure
+	fi
+	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)
-		#--disable-python-tools
-}
-
-src_compile() {
-	emake
-
-	#if use plugin-autowep; then
-	#	cd "${S}"/restricted-plugin-autowep
-	#	KIS_SRC_DIR="${S}" emake
-	#fi
-	#if use plugin-btscan; then
-	#	cd "${S}"/plugin-btscan
-	#	KIS_SRC_DIR="${S}" emake
-	#fi
-	#if use plugin-dot15d4; then
-	#	cd "${S}"/plugin-dot15d4
-	#	KIS_SRC_DIR="${S}" emake
-	#fi
-	#if use plugin-ptw; then
-	#	cd "${S}"/restricted-plugin-ptw
-	#	KIS_SRC_DIR="${S}" emake
-	#fi
-	#if use plugin-spectools; then
-	#	cd "${S}"/plugin-spectools
-	#	KIS_SRC_DIR="${S}" emake
-	#fi
-	#if use plugin-syslog; then
-	#	cd "${S}"/plugin-syslog
-	#	KIS_SRC_DIR="${S}" emake
-	#fi
 }
 
 src_install() {
-	#if use plugin-autowep; then
-	#	cd "${S}"/restricted-plugin-autowep
-	#	KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	#fi
-	#if use plugin-btscan; then
-	#	cd "${S}"/plugin-btscan
-	#	KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	#fi
-	#if use plugin-dot15d4; then
-	#	cd "${S}"/plugin-dot15d4
-	#	KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	#fi
-	#if use plugin-ptw; then
-	#	cd "${S}"/restricted-plugin-ptw
-	#	KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	#fi
-	#if use plugin-spectools; then
-	#	cd "${S}"/plugin-spectools
-	#	KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	#fi
-	#if use plugin-syslog; then
-	#	cd "${S}"/plugin-syslog
-	#	KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	#fi
-	#if use ruby; then
-	#	cd "${S}"/ruby
-	#	dobin *.rb
-	#fi
-
-	#cd "${S}"
 	emake DESTDIR="${D}" commoninstall
 	emake DESTDIR="${D}" forceconfigs
 
-	##dragorn would prefer I set fire to my head than do this, but it works
-	##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
-	##is there an automatic way to force this?
-	# install headers for external plugins
-	insinto /usr/include/kismet
-	doins *.h
-	doins Makefile.inc
-	#todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
-
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
 	dodoc CHANGELOG README*
 	newinitd "${FILESDIR}"/${PN}.initd kismet
 	newconfd "${FILESDIR}"/${PN}.confd kismet
-
-	#if use suid; then
-	#	dobin kismet_capture
-	#fi
 }
 
 pkg_preinst() {