commit:     cc8948afb4dd61faca7c79dac953d25ef415af40
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 16:01:13 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 16:01:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8948af

net-wireless/kismet: stable new version

add newer version
cleanup old version

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

 net-wireless/kismet/Manifest                       |  2 +-
 net-wireless/kismet/kismet-2020.09.4.ebuild        |  2 +-
 ...et-2020.04.3.ebuild => kismet-2020.12.1.ebuild} | 25 ++++++++++++++++------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 871d6a5dcea..3f7641b343f 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,2 +1,2 @@
-DIST kismet-2020-04-R3.tar.xz 3159552 BLAKE2B 
458c40dea530008295d46aadaf15699a0fd9025bb572cb23e94f059f31bba2835dedd9c39725d0183e84d31c326c2769450ce0b8bee7e7ca3bb7ac9dd82f4cc6
 SHA512 
585def7f19f479c6049cbc24e3886276d816f584fcb2070009cd90e35b33630d3e544145abf5f8b1eae87ec571a213ed9cb9f6b81345257c9bf1332d5bb319c2
 DIST kismet-2020-09-R4.tar.xz 8692520 BLAKE2B 
68098080cfca6968538ecf4840a3ab06f95bfe9b72829dc7ea551b1a5f15d5b65fbfaa8cecfef19a537abf081d0c4e2b2ffdedc0e34023a3393013227c898d97
 SHA512 
4f2dd641999dd2675d2c4dfbe28caf5a8476d5d7bd9dedeefb7b1420b48b9155a4d576123832974586d51c61ca4d77d8572ab7038da3ec6fa2a7791f3e1a1479
+DIST kismet-2020-12-R1.tar.xz 9888492 BLAKE2B 
26dbc3ed63948b41554e809d271669b24af7412e9e96ea2e8d9fa54a7959878946243aca3448a744a07ec3f649006214e9fab3505a7480ee7c87a07eead63a3d
 SHA512 
277a437ee30c8974095ad7a4afabe321d45b9b97993b6156092eeb8884945d06af2f19abd7825b8dd80ae3e6d1d8b20435d83fc1f08bb3d8737e859c13842459

diff --git a/net-wireless/kismet/kismet-2020.09.4.ebuild 
b/net-wireless/kismet/kismet-2020.09.4.ebuild
index 06840c1eb32..1e4b03ce03c 100644
--- a/net-wireless/kismet/kismet-2020.09.4.ebuild
+++ b/net-wireless/kismet/kismet-2020.09.4.ebuild
@@ -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"

diff --git a/net-wireless/kismet/kismet-2020.04.3.ebuild 
b/net-wireless/kismet/kismet-2020.12.1.ebuild
similarity index 87%
rename from net-wireless/kismet/kismet-2020.04.3.ebuild
rename to net-wireless/kismet/kismet-2020.12.1.ebuild
index 3e9d0c602dc..35f0b45d87e 100644
--- a/net-wireless/kismet/kismet-2020.04.3.ebuild
+++ b/net-wireless/kismet/kismet-2020.12.1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
-inherit autotools eutils multilib user python-single-r1 udev
+inherit autotools eutils multilib python-single-r1 udev systemd
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git";
@@ -21,11 +21,13 @@ else
        SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz";
 
        #but sometimes we want a git commit
-       #COMMIT="ea3f9ffe84b86cfc5e01ce3fec5476d51d161b98"
+       #COMMIT="9ca7e469cf115469f392db7436816151867e1654"
        
#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
        #S="${WORKDIR}/${PN}-${COMMIT}"
 
-       KEYWORDS="amd64 arm ~arm64 ~ppc x86"
+       #Desired (minimum) keywords
+       #KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
@@ -38,12 +40,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="
        ${PYTHON_DEPS}
+       acct-user/kismet
+       acct-group/kismet
        networkmanager? ( net-misc/networkmanager:= )
        dev-libs/glib:=
        dev-libs/elfutils:=
        sys-libs/zlib:=
        dev-db/sqlite:=
-       net-libs/libmicrohttpd
+       net-libs/libmicrohttpd:=
+       net-libs/libwebsockets:=[client]
        kernel_linux? ( sys-libs/libcap
                        dev-libs/libnl:3
                        net-libs/libpcap
@@ -53,6 +58,7 @@ CDEPEND="
        dev-libs/protobuf:=
        $(python_gen_cond_dep '
                dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+               dev-python/websockets[${PYTHON_MULTI_USEDEP}]
        ')
        sys-libs/ncurses:=
        lm-sensors? ( sys-apps/lm-sensors )
@@ -83,9 +89,14 @@ src_prepare() {
        sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
                conf/kismet_logging.conf || die
 
+       #this was added to quiet macosx builds but it makes gcc builds noisier
+       sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die
+
+       #sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
+
        # Don't strip and set correct mangrp
        sed -i -e 's| -s||g' \
-               -e 's|@mangrp@|root|g' Makefile.in
+               -e 's|@mangrp@|root|g' Makefile.in || die
 
        eapply_user
 
@@ -121,11 +132,11 @@ src_install() {
        dodoc CHANGELOG README*
        newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
        newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
+       systemd_dounit packaging/systemd/kismet.service
 }
 
 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

Reply via email to