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 04E19138359 for ; Wed, 2 Sep 2020 03:35:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A5C5E0835; Wed, 2 Sep 2020 03:35:55 +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 0479AE07A7 for ; Wed, 2 Sep 2020 03:35:54 +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 E1F9B335DBF for ; Wed, 2 Sep 2020 03:35:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 598A6335 for ; Wed, 2 Sep 2020 03:35:51 +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: <1599017749.76c2feda4dfd518a10d53944c6a82102461587a8.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-2016.07.1-r2.ebuild net-wireless/kismet/kismet-2019.09.1-r2.ebuild net-wireless/kismet/kismet-2019.12.2-r1.ebuild net-wireless/kismet/kismet-2020.09.1.ebuild net-wireless/kismet/metadata.xml X-VCS-Directories: net-wireless/kismet/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 76c2feda4dfd518a10d53944c6a82102461587a8 X-VCS-Branch: master Date: Wed, 2 Sep 2020 03:35:51 +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: 0b34092c-85ca-404e-a364-8f4ef8ae9b00 X-Archives-Hash: 994665133f7e26a04d9350c9eb5d0e7a commit: 76c2feda4dfd518a10d53944c6a82102461587a8 Author: Rick Farina gentoo org> AuthorDate: Wed Sep 2 02:03:37 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Wed Sep 2 03:35:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c2feda net-wireless/kismet: bump remove old Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Rick Farina gentoo.org> net-wireless/kismet/Manifest | 4 +- net-wireless/kismet/kismet-2016.07.1-r2.ebuild | 164 -------------------- net-wireless/kismet/kismet-2019.09.1-r2.ebuild | 166 --------------------- ...2019.12.2-r1.ebuild => kismet-2020.09.1.ebuild} | 9 +- net-wireless/kismet/metadata.xml | 10 -- 5 files changed, 6 insertions(+), 347 deletions(-) diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest index e567b17fec6..c44b6a5b8c6 100644 --- a/net-wireless/kismet/Manifest +++ b/net-wireless/kismet/Manifest @@ -1,4 +1,2 @@ -DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416 -DIST kismet-2019-09-R1.tar.xz 3034832 BLAKE2B 9f7818549e5260dc081ac39ea8323c70f2e4d0b959bc42dacc253c9d72bf72c2547f7c6d65d84ee7d0ca4a41068f5973028e48f6f9f3c5a7cd50c35246570814 SHA512 eeaf069718206f2b6d292c41792217afc9c72c10ffa014c8c670de64195bd28d44f33364dba7d338610f17a5af2be3c125ccd1297cce362159a4968c9ddabb88 -DIST kismet-2019-12-R2.tar.xz 3127064 BLAKE2B b7ffac6a6a4d7d7893d3564f9471080e055798c325b102f98fa0e86db37bcbab33422afae9c2694b747ae0c369259b62c218a77c673d0e0c05969a56e42311c2 SHA512 b1e3de74a6d314150d849ac3d95c8b99324bba14522dc4f00244d1c09acb690cce40d35dbe33845ffb1060a69cd38f036d59a0283ed9b1a70b022e3d57cde5a0 DIST kismet-2020-04-R3.tar.xz 3159552 BLAKE2B 458c40dea530008295d46aadaf15699a0fd9025bb572cb23e94f059f31bba2835dedd9c39725d0183e84d31c326c2769450ce0b8bee7e7ca3bb7ac9dd82f4cc6 SHA512 585def7f19f479c6049cbc24e3886276d816f584fcb2070009cd90e35b33630d3e544145abf5f8b1eae87ec571a213ed9cb9f6b81345257c9bf1332d5bb319c2 +DIST kismet-2020-09-R1.tar.xz 8694804 BLAKE2B 1389486809024179c3be71a8b26cdb460f483e1af0dd7cda9d36450d10e4df16536f23db3b5ca3fd6b65b0c48514c96e5cb37ec71425a8f087d58e7a89bed137 SHA512 e687c76b9e94d973245f61d6fc59a1a05a06ba9c765f7661a183d14d0228676359a7d7798bac9f3b493a5c311e53785c54fd9f0d12bf6cdc4d43919bad167327 diff --git a/net-wireless/kismet/kismet-2016.07.1-r2.ebuild b/net-wireless/kismet/kismet-2016.07.1-r2.ebuild deleted file mode 100644 index f80d0523017..00000000000 --- a/net-wireless/kismet/kismet-2016.07.1-r2.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils multilib user - -MY_P=${P/\./-} -MY_P=${MY_P/./-R} -S=${WORKDIR}/${MY_P} - -SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" -KEYWORDS="amd64 arm ~arm64 ~ppc x86" - -DESCRIPTION="IEEE 802.11 wireless LAN sniffer" -HOMEPAGE="https://www.kismetwireless.net" - -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby selinux +suid" - -CDEPEND="net-wireless/wireless-tools - kernel_linux? ( sys-libs/libcap - dev-libs/libnl:3 - net-libs/libpcap - ) - pcre? ( dev-libs/libpcre ) - suid? ( sys-libs/libcap ) - client? ( sys-libs/ncurses:0= ) - !arm? ( speech? ( app-accessibility/flite ) ) - plugin-btscan? ( net-wireless/bluez ) - plugin-dot15d4? ( virtual/libusb:0 ) - plugin-spectools? ( net-wireless/spectools ) - plugin-ptw? ( dev-libs/openssl:= ) -" - -DEPEND="${CDEPEND} - virtual/pkgconfig -" - -RDEPEND="${CDEPEND} - ruby? ( dev-lang/ruby:* ) - selinux? ( sec-policy/selinux-kismet ) -" - -src_prepare() { - sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \ - conf/kismet.conf.in - - # Don't strip and set correct mangrp - sed -i -e 's| -s||g' \ - -e 's|@mangrp@|root|g' Makefile.in - - epatch "${FILESDIR}/${P}-ruby-fixes.patch" - eapply_user - eautoreconf -} - -src_configure() { - econf \ - $(use_enable client) \ - $(use_enable pcre) -} - -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 - - ##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 - newinitd "${FILESDIR}"/${PN}.initd kismet - newconfd "${FILESDIR}"/${PN}.confd kismet - - insinto /etc - doins conf/kismet{,_drone}.conf - - if use suid; then - dobin kismet_capture - fi -} - -pkg_preinst() { - if use suid; then - enewgroup kismet - fowners root:kismet /usr/bin/kismet_capture - # Need to set the permissions after chowning. - # See chown(2) - fperms 4550 /usr/bin/kismet_capture - 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.09.1-r2.ebuild b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild deleted file mode 100644 index 178c532ebfb..00000000000 --- a/net-wireless/kismet/kismet-2019.09.1-r2.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) - -inherit autotools eutils multilib user python-single-r1 - -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} - - #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 - -DESCRIPTION="IEEE 802.11 wireless LAN sniffer" -HOMEPAGE="https://www.kismetwireless.net" - -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="lm-sensors mousejack networkmanager +pcre selinux +suid" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -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 - ) - mousejack? ( virtual/libusb:1 ) - dev-libs/protobuf-c:= - dev-libs/protobuf:= - $(python_gen_cond_dep ' - dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] - ') - sys-libs/ncurses:= - lm-sensors? ( sys-apps/lm-sensors ) - pcre? ( dev-libs/libpcre ) - suid? ( sys-libs/libcap ) - " - -DEPEND="${CDEPEND} - virtual/pkgconfig -" - -RDEPEND="${CDEPEND} - $(python_gen_cond_dep ' - dev-python/pyserial[${PYTHON_MULTI_USEDEP}] - ') - 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 - - 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 pcre) \ - $(use_enable lm-sensors lmsensors) \ - $(use_enable mousejack libusb) \ - $(use_enable networkmanager libnm) \ - --sysconfdir=/etc/kismet \ - --disable-optimization -} - -src_install() { - emake DESTDIR="${D}" commoninstall - python_optimize - emake DESTDIR="${D}" forceconfigs - - insinto /usr/share/${PN} - doins Makefile.inc - - dodoc CHANGELOG README* - newinitd "${FILESDIR}"/${PN}.initd-r3 kismet - newconfd "${FILESDIR}"/${PN}.confd-r2 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 -} - -migrate_config() { - einfo "Kismet Configuration files are now read from /etc/kismet/" - if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then - ewarn "Files at /etc/kismet_*.conf will not be read and should be removed" - ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf" - 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-2019.12.2-r1.ebuild b/net-wireless/kismet/kismet-2020.09.1.ebuild similarity index 95% rename from net-wireless/kismet/kismet-2019.12.2-r1.ebuild rename to net-wireless/kismet/kismet-2020.09.1.ebuild index 73b8a86810b..f55bc6dc159 100644 --- a/net-wireless/kismet/kismet-2019.12.2-r1.ebuild +++ b/net-wireless/kismet/kismet-2020.09.1.ebuild @@ -3,9 +3,9 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) -inherit autotools eutils multilib user python-single-r1 +inherit autotools eutils multilib user python-single-r1 udev if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git" @@ -21,7 +21,7 @@ else SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz" #but sometimes we want a git commit - #COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a" + #COMMIT="9ca7e469cf115469f392db7436816151867e1654" #SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" #S="${WORKDIR}/${PN}-${COMMIT}" @@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net" LICENSE="GPL-2" SLOT="0/${PV}" -IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth" +IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev" REQUIRED_USE="${PYTHON_REQUIRED_USE}" CDEPEND=" @@ -113,6 +113,7 @@ 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 diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml index db93b745df7..c596280be24 100644 --- a/net-wireless/kismet/metadata.xml +++ b/net-wireless/kismet/metadata.xml @@ -6,24 +6,14 @@ Rick Farina - Build the ncurses-based user interface Support libusb based capture sources such as mousejack, cc2540(ble), and nrf51822(ble) Install a setuid root helper binary with limited functionality; this allows running kismet as a normal user, significantly reducing security risks - Add support for mousejack hardware using dev-libs/libusb Build with pcre support - Audio support using app-accessibility/flite - Build the autowep plugin - Build the btscan plugin - Build the dot15d4 plugin - Build the ptw plugin - Build the spectools plugin. This uses net-wireless/spectools - Build the syslog plugin. Enable rtlsdr based kismet capture sources - Build extras which are written in ruby, example plugins and the like. Enable capture source for ubertooth to sniff bluetooth low energy