From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CF381382C5 for ; Fri, 4 Dec 2020 16:01:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FE43E0980; Fri, 4 Dec 2020 16:01:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5459EE0980 for ; Fri, 4 Dec 2020 16:01:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC603335D98 for ; Fri, 4 Dec 2020 16:01:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DA7045B for ; Fri, 4 Dec 2020 16:01:26 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1607097686.cc8948afb4dd61faca7c79dac953d25ef415af40.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/kismet/Manifest net-wireless/kismet/kismet-2020.04.3.ebuild net-wireless/kismet/kismet-2020.09.4.ebuild net-wireless/kismet/kismet-2020.12.1.ebuild X-VCS-Directories: net-wireless/kismet/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: cc8948afb4dd61faca7c79dac953d25ef415af40 X-VCS-Branch: master Date: Fri, 4 Dec 2020 16:01:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2d32e11e-b636-4cfe-af4d-a60aaa0651ae X-Archives-Hash: 698a9a1bc2ff39e7c5deb8782567bc16 commit: cc8948afb4dd61faca7c79dac953d25ef415af40 Author: Rick Farina gentoo org> AuthorDate: Fri Dec 4 16:01:13 2020 +0000 Commit: Rick Farina gentoo 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 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