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

[Michał Górny]

commit:     086e07d51be38a0a4f663b326c15396d02465196
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  7 07:26:22 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 07:27:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086e07d5

net-wireless/kismet: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-wireless/kismet/Manifest                       |   1 -
 .../kismet/files/kismet-2016.07.1-ruby-fixes.patch |  78 ----------
 net-wireless/kismet/files/kismet.confd             |  12 --
 net-wireless/kismet/files/kismet.initd             |  26 ----
 net-wireless/kismet/kismet-2016.07.1-r2.ebuild     | 164 ---------------------
 profiles/package.mask                              |   7 -
 6 files changed, 288 deletions(-)

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 776ee7ac916..871d6a5dcea 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,3 +1,2 @@
-DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2020-04-R3.tar.xz 3159552 BLAKE2B 458c40dea530008295d46aadaf15699a0fd9025bb572cb23e94f059f31bba2835dedd9c39725d0183e84d31c326c2769450ce0b8bee7e7ca3bb7ac9dd82f4cc6 SHA512 585def7f19f479c6049cbc24e3886276d816f584fcb2070009cd90e35b33630d3e544145abf5f8b1eae87ec571a213ed9cb9f6b81345257c9bf1332d5bb319c2
 DIST kismet-2020-09-R4.tar.xz 8692520 BLAKE2B 68098080cfca6968538ecf4840a3ab06f95bfe9b72829dc7ea551b1a5f15d5b65fbfaa8cecfef19a537abf081d0c4e2b2ffdedc0e34023a3393013227c898d97 SHA512 4f2dd641999dd2675d2c4dfbe28caf5a8476d5d7bd9dedeefb7b1420b48b9155a4d576123832974586d51c61ca4d77d8572ab7038da3ec6fa2a7791f3e1a1479

diff --git a/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch b/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch
deleted file mode 100644
index bdfde9fbc7c..00000000000
--- a/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/ruby/kismet.rb b/ruby/kismet.rb
-index 5b18b23..7eab708 100755
---- a/ruby/kismet.rb
-+++ b/ruby/kismet.rb
-@@ -61,8 +61,6 @@ class Kismet
- 		rescue Exception => e
- 			pp e
- 
--			break if @die
--
- 			puts "write error: #{$!}"
- 		end
- 	end
-diff --git a/ruby/kismet_addsource.rb b/ruby/kismet_addsource.rb
-index 057a514..d3ae968 100755
---- a/ruby/kismet_addsource.rb
-+++ b/ruby/kismet_addsource.rb
-@@ -20,7 +20,7 @@
- 
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require 'optparse'
- 
-diff --git a/ruby/kismet_alert_syslog.rb b/ruby/kismet_alert_syslog.rb
-index 6969247..27373a9 100755
---- a/ruby/kismet_alert_syslog.rb
-+++ b/ruby/kismet_alert_syslog.rb
-@@ -20,7 +20,7 @@
- 
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require "getopt/long"
- require 'syslog'
-diff --git a/ruby/kismet_list.rb b/ruby/kismet_list.rb
-index ec8f0f9..7adffe6 100755
---- a/ruby/kismet_list.rb
-+++ b/ruby/kismet_list.rb
-@@ -20,7 +20,7 @@
- 
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- 
- def bssidcb(proto, fields)
- 	puts "Kismet saw network #{fields['bssid']} manuf #{fields['manuf']} on channel #{fields['channel']}"
-diff --git a/ruby/kismet_shootout.rb b/ruby/kismet_shootout.rb
-index 25021b9..61f70b0 100755
---- a/ruby/kismet_shootout.rb
-+++ b/ruby/kismet_shootout.rb
-@@ -21,7 +21,7 @@
- 
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require 'optparse'
- 
-diff --git a/ruby/kismet_sql.rb b/ruby/kismet_sql.rb
-index 9fe581d..b878979 100755
---- a/ruby/kismet_sql.rb
-+++ b/ruby/kismet_sql.rb
-@@ -22,7 +22,7 @@
- 
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require "getopt/long"
- require "sqlite3"

diff --git a/net-wireless/kismet/files/kismet.confd b/net-wireless/kismet/files/kismet.confd
deleted file mode 100644
index d203513c714..00000000000
--- a/net-wireless/kismet/files/kismet.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
-
-# Kismet configuration is done in /etc/kismet.conf
-
-# To use the kismet init script, you must have "logtemplate" set to a location
-# that is writable by the user assigned by "suiduser".
-# e.g.
-# suiduser=foo
-# logtemplate=%h/kismet_log/%n-%d-%i.%l
-
-# Options to pass to kismet_server, see `kismet_server --help`
-KISMET_SERVER_OPTIONS=""

diff --git a/net-wireless/kismet/files/kismet.initd b/net-wireless/kismet/files/kismet.initd
deleted file mode 100644
index 000e6ea03cd..00000000000
--- a/net-wireless/kismet/files/kismet.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-checkconfig() {
-	if [ ! -e /etc/kismet.conf ]; then
-		eerror "Configuration file /etc/kismet.conf not found"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting kismet server"
-	start-stop-daemon --start --quiet --pidfile /var/run/kismet_server.pid \
-		--background --make-pidfile --exec /usr/bin/kismet_server \
-		-- ${KISMET_SERVER_OPTIONS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping kismet server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/kismet_server.pid
-	eend ${?}
-}

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 17f5963fa10..00000000000
--- a/net-wireless/kismet/kismet-2016.07.1-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2020 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/profiles/package.mask b/profiles/package.mask
index 76b37fd6450..7a961fc09eb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -561,13 +561,6 @@ dev-python/mini-amf
 # previously removed dev-python/flask-bootstrap
 dev-python/flask-appconfig
 
-# Rick Farina <zerochaos@g.o> (2020-09-02)
-# Masked for removal in 30 days. Obsolete versions
-# of kismet and tools which use it are no longer maintained.
-# Users should upgrade to a newer version of kismet which
-# is supported.
-<net-wireless/kismet-2017
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com> (2020-09-01)
 # Mismatched version (bug #695022). Masked to force upgrade to 2.0.4_pre20200306162733.
 # (Mask should remain after ebuilds are deleted, until 2021-03-01 or