[gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/

[Rick Farina]

commit:     e24ed4bb3a335285635d50c48483936cd978b124
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 18:36:18 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 18:36:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24ed4bb

net-wireless/kismet: add snapshot for wpa3

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-wireless/kismet/Manifest                       |   3 +-
 net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild | 126 ---------------------
 ...a2.ebuild => kismet-2019.04.1_p20190416.ebuild} |  14 ++-
 3 files changed, 12 insertions(+), 131 deletions(-)

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 2fdf6654580..8f656632486 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,4 +1,3 @@
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
-DIST kismet-2018-08-BETA1.tar.xz 2043136 BLAKE2B f24af4250bb0238073380514413d9501e449cf40507d7a96ac868d76acb34af81b9bf4a49c9b6197b6b903ab33e2318bb5efa22876cc2070e3878ebf030d592c SHA512 09eab9d648f011c95b8632c666990d79f9998465b051a65357f53af19a135a5d58df3025ec60f9ef9a7b7d9b5622d2332bb2defbffd21ca0e25e2e4090ceae2f
-DIST kismet-2019-01-BETA2.tar.xz 3096084 BLAKE2B 77f0497721bb1a6c2af2dd91b5d2a895fae0012ccb7a9cf03a700c96562a5ae62530b1138f509df5f0af91362a9658eae7916a9c643cef6e1630fe616d949017 SHA512 1384630ea0ba12c157928696aab502406c5e521765e420459ab049e3205e7d7bfb472c6a1a88c1268fd8235b24b615a03ce4b91f0974adc24f47d00709ef9d4b
 DIST kismet-2019-04-R1.tar.xz 3038632 BLAKE2B e304085806d5e0b77c8421969b1c3dea608b70124559dcd5f133c1823f0228e6caeddf3cf775a6ccea7604265b2227df045cefcfdf803a4f69bf682b9b531f9d SHA512 26f3ab038e76ab06d461dc73e44cde6944f6f550a615081588a238154c95ab4684adec5436c31761a716e081f994435840b7f4e7e95b75d83c9da89114b33ab4
+DIST kismet-2019.04.1_p20190416.tar.gz 4154154 BLAKE2B 86ce5057f62004269ab00a5a1619a1961d79fee506fa67aa065c18c7ce75d8fbe85a64e5b3861754acb802e03a599efb516f947b9e9192030ecbff0d779efb54 SHA512 fded3cf80bdd1eac2b57e8dc37e4995500ea8b1e6b32e665356b6172f2cd1986efd043ada8e04e62393943c815a3197e72408308c7294f6f26aa495ca8d9f9d3

diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild
deleted file mode 100644
index 69055f3a8ae..00000000000
--- a/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild
+++ /dev/null
@@ -1,126 +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#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-2019.01_beta2.ebuild b/net-wireless/kismet/kismet-2019.04.1_p20190416.ebuild
similarity index 82%
rename from net-wireless/kismet/kismet-2019.01_beta2.ebuild
rename to net-wireless/kismet/kismet-2019.04.1_p20190416.ebuild
index 2e5fd9c3d05..871bee91427 100644
--- a/net-wireless/kismet/kismet-2019.01_beta2.ebuild
+++ b/net-wireless/kismet/kismet-2019.04.1_p20190416.ebuild
@@ -16,7 +16,12 @@ else
 	MY_P=${MY_P/_beta/-BETA}
 	MY_P=${MY_P/./-R}
 	S=${WORKDIR}/${MY_P/BETA/beta}
-	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+	#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
 
@@ -64,9 +69,12 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
-	eapply "${FILESDIR}"/fix-setuptools4.patch
 	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
@@ -86,7 +94,7 @@ src_install() {
 	emake DESTDIR="${D}" forceconfigs
 
 	insinto /usr/share/${PN}
-	doins -r log_tools
+	doins Makefile.inc
 
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
 	dodoc CHANGELOG README*