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 779551586A6 for ; Tue, 17 Aug 2021 16:37:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D844E07A7; Tue, 17 Aug 2021 16:37:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 07F88E07A7 for ; Tue, 17 Aug 2021 16:37:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8B58F335CDF for ; Tue, 17 Aug 2021 16:37:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 051407BD for ; Tue, 17 Aug 2021 16:36:59 +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: <1629218210.5e3a6ecaeb72948baabfadb2d4665c2fc7cadb65.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.12.3.ebuild net-wireless/kismet/kismet-2021.06.1.ebuild net-wireless/kismet/kismet-2021.08.1.ebuild X-VCS-Directories: net-wireless/kismet/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 5e3a6ecaeb72948baabfadb2d4665c2fc7cadb65 X-VCS-Branch: master Date: Tue, 17 Aug 2021 16:36:59 +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: be053878-364d-403d-b308-0da1fe24317a X-Archives-Hash: 7836609d63045316f0b2bf43585999fe commit: 5e3a6ecaeb72948baabfadb2d4665c2fc7cadb65 Author: Rick Farina gentoo org> AuthorDate: Tue Aug 17 16:36:50 2021 +0000 Commit: Rick Farina gentoo org> CommitDate: Tue Aug 17 16:36:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e3a6eca net-wireless/kismet: stabilize 2021.06.1 drop old bump new Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Rick Farina gentoo.org> net-wireless/kismet/Manifest | 2 +- net-wireless/kismet/kismet-2020.12.3.ebuild | 179 --------------------- net-wireless/kismet/kismet-2021.06.1.ebuild | 2 +- ...et-2021.06.1.ebuild => kismet-2021.08.1.ebuild} | 0 4 files changed, 2 insertions(+), 181 deletions(-) diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest index bb967d1ec3c..5f77c23f1ae 100644 --- a/net-wireless/kismet/Manifest +++ b/net-wireless/kismet/Manifest @@ -1,3 +1,3 @@ -DIST kismet-2020-12-R3.tar.xz 9887764 BLAKE2B 4d011a13888f6a60d34ddcbc47d83c01debf73307da7d26c28034b15ad6dde2d8ae7741b4104d250ff112be242af0cbbcff612fc172d67d404d14b3d0ef688f3 SHA512 6c4c95a9963977d5a383e34f662f814a803d0d36d7dbc35d3d0a42d3e67c20e8d46357df0ee544b8dd3c7f527bd43ef9c0d913577d4979f261764fc9761cd6d1 DIST kismet-2021-05-R1.tar.xz 10611692 BLAKE2B fc0a145005440c8af5320488e1a4bfe808ad8aeba614c9294b511a8da70ec2d51dbfd2ecc840c9af84e0222967200bb82856b2e008e39f015b455be131f89484 SHA512 edca956c9c04f99e06a09dc23216a908fbac68637246d73430b2d9d3a3ba1c2e8099d263819073d24494dce17bd36c83a2f51c648430a6eea3db7332b07e2fba DIST kismet-2021-06-R1.tar.xz 10616368 BLAKE2B 22c216355b31224f41991f6caa6ad86cd2549982196cf0dd6f89ef88f92d85f57bd12100a74ebbe3e0cee0140da4bd545b548382d55a4c3ac1403504680c9ca3 SHA512 88d92e2ef3f0513a3a00b573012edbd115f92e5f28f884aead5ab049fad97b328222c2f3cbb49d80c5fcfdab2212934532cf41c100c4d0a5e94c932e1c5e8352 +DIST kismet-2021-08-R1.tar.xz 10621004 BLAKE2B 236a43d2073e380c60dadfc4f611465ffa5c7de2a282fa3f45252368cbc65aaa21ad6d33c504685e39ec7913a36364283f6706d6ad8fcecf2f7922c23a4aa792 SHA512 91e86dc1d3b69aa8cb6dff4c4b8bb959dca128f06d1298effe1b23ed24158ce4285abdf2af838f48588b9e71c69f82538d1a002838c4bc1d053868118e394b7a diff --git a/net-wireless/kismet/kismet-2020.12.3.ebuild b/net-wireless/kismet/kismet-2020.12.3.ebuild deleted file mode 100644 index 3984c8e938e..00000000000 --- a/net-wireless/kismet/kismet-2020.12.3.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -inherit autotools multilib python-single-r1 udev systemd - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" - inherit git-r3 - RESTRICT="strip" -else - MY_P=${P/\./-} - 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" - - 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="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev" -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/libwebsockets:=[client] - kernel_linux? ( sys-libs/libcap - dev-libs/libnl:3 - net-libs/libpcap - ) - libusb? ( virtual/libusb:1 ) - dev-libs/protobuf-c:= - dev-libs/protobuf:= - $(python_gen_cond_dep ' - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/websockets[${PYTHON_USEDEP}] - ') - sys-libs/ncurses:= - lm-sensors? ( sys-apps/lm-sensors ) - pcre? ( dev-libs/libpcre ) - suid? ( sys-libs/libcap ) - ubertooth? ( net-wireless/ubertooth:= ) - " - -DEPEND="${CDEPEND} - virtual/pkgconfig -" - -RDEPEND="${CDEPEND} - $(python_gen_cond_dep ' - dev-python/pyserial[${PYTHON_USEDEP}] - ') - selinux? ( sec-policy/selinux-kismet ) -" -PDEPEND=" - rtlsdr? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') - net-wireless/rtl-sdr - )" - -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 || die - - 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 -} - -src_configure() { - econf \ - $(use_enable libusb libusb) \ - $(use_enable pcre) \ - $(use_enable lm-sensors lmsensors) \ - $(use_enable networkmanager libnm) \ - $(use_enable ubertooth) \ - --sysconfdir=/etc/kismet \ - --disable-optimization -} - -src_install() { - emake DESTDIR="${D}" commoninstall - python_optimize - emake DESTDIR="${D}" forceconfigs - use udev && udev_dorules packaging/udev/*.rules - - insinto /usr/share/${PN} - doins Makefile.inc - - 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 - 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 -} - -migrate_config() { - einfo "Kismet Configuration files are now read from /etc/kismet/" - ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf" - if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then - ewarn "Files at /etc/kismet_*.conf will not be read and should be removed" - fi - if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then - mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location" - ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf" - elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then - ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits" - ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf" - fi -} - -pkg_postinst() { - if [ -n "${REPLACING_VERSIONS}" ]; then - for v in ${REPLACING_VERSIONS}; do - if ver_test ${v} -lt 2019.07.2 ; then - migrate_config - break - fi - if ver_test ${v} -eq 9999 ; then - migrate_config - break - fi - done - fi -} diff --git a/net-wireless/kismet/kismet-2021.06.1.ebuild b/net-wireless/kismet/kismet-2021.06.1.ebuild index 45462e52850..4d086c30ee7 100644 --- a/net-wireless/kismet/kismet-2021.06.1.ebuild +++ b/net-wireless/kismet/kismet-2021.06.1.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-2021.06.1.ebuild b/net-wireless/kismet/kismet-2021.08.1.ebuild similarity index 100% copy from net-wireless/kismet/kismet-2021.06.1.ebuild copy to net-wireless/kismet/kismet-2021.08.1.ebuild