kismet, updates to fix ruby issues, and repoman issues

(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key DD11F94A)

6 files changed, 210 insertions, 176 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 0674ffccb530..d930fe94bf36 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/kismet
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.143 2014/11/02 09:38:04 swift Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.144 2015/03/17 18:31:45 zerochaos Exp $
+
+*kismet-2013.03.1-r2 (17 Mar 2015)
+
+  17 Mar 2015; Rick Farina <zerochaos@gentoo.org> +files/ruby19_fixes.patch,
+  +files/update-kismet_shootout.patch, +kismet-2013.03.1-r2.ebuild,
+  -kismet-2011.03.2-r3.ebuild, -kismet-2013.03.1-r1.ebuild, kismet-9999.ebuild:
+  kismet, updates to fix ruby issues, and repoman issues
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> kismet-2013.03.1-r1.ebuild,
   kismet-9999.ebuild:
diff --git a/net-wireless/kismet/files/ruby19_fixes.patch b/net-wireless/kismet/files/ruby19_fixes.patch
new file mode 100644
index 000000000000..28b704d03c66
--- /dev/null
+++ b/net-wireless/kismet/files/ruby19_fixes.patch
@@ -0,0 +1,85 @@
+commit 09b5076e4cd8338d3b45a760662fc7347f8d93bf
+Author: Mike Kershaw / Dragorn <dragorn@kismetwireless.net>
+Date:   Tue Apr 23 10:33:07 2013 -0400
+
+    Ruby 1.9 removed '.' from search path, use require_relative; also remove
+     spurious 'break' in tx code
+
+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 accda7e..931360f 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/update-kismet_shootout.patch b/net-wireless/kismet/files/update-kismet_shootout.patch
new file mode 100644
index 000000000000..57ff69f7bec2
--- /dev/null
+++ b/net-wireless/kismet/files/update-kismet_shootout.patch
@@ -0,0 +1,103 @@
+From 0ee73bd14c71e44ce53bc1016b871dcb6965e443 Mon Sep 17 00:00:00 2001
+From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
+Date: Tue, 17 Mar 2015 12:57:16 -0400
+Subject: [PATCH] update kismet_shootout
+
+make a little more detailed, 100.00 instead of 100.
+also extend space for name now that wlan0mon is a common interface name
+---
+ ruby/kismet_shootout.rb | 30 +++++++++++++++++++++++-------
+ 1 file changed, 23 insertions(+), 7 deletions(-)
+
+diff --git a/ruby/kismet_shootout.rb b/ruby/kismet_shootout.rb
+index 931360f..61f70b0 100755
+--- a/ruby/kismet_shootout.rb
++++ b/ruby/kismet_shootout.rb
+@@ -48,7 +48,7 @@ $lines_per_header = 10
+ $num_printed = 10
+ 
+ # output type (std, pretty, csv)
+-$output_type = "std"
++$output_type = "pretty"
+ 
+ def sourcecb(proto, fields)
+ 	if fields["error"] != "0"
+@@ -102,11 +102,11 @@ def sourcecb(proto, fields)
+ 						hstr = ""
+ 
+ 						if $output_type == "pretty"
+-							hstr = sprintf("%s  %6.6s %5.5s %8.8s %4.4s", hstr, "", "PPS", "Packets", "Pcnt")
++							hstr = sprintf("%s  %8.8s %5.5s %8.8s %7.7s", hstr, "Name", "PPS", "Packets", "Percent")
+ 
+ 						else
+ 							$cards.each { |c|
+-								hstr = sprintf("%s  %6.6s %5.5s %8.8s %4.4s", hstr, c, "PPS", "Total", "Pcnt")
++								hstr = sprintf("%s  %8.8s %5.5s %8.8s %7.7s", hstr, c, "PPS", "Total", "Percent")
+ 							}
+ 						end
+ 
+@@ -141,7 +141,7 @@ def sourcecb(proto, fields)
+ 						$card_records.each { |cr|
+ 							cr[1]["printed"] = 1
+ 
+-							printf("  %6.6s %5.5s %8.8s %3d%%\n", cr[1]["interface"], cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100)
++							printf("  %8.8s %5.5s %8.8s %6.2f%%\n", cr[1]["interface"], cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100)
+ 						}
+ 
+ 						t = Time.now.to_i - $start_time
+@@ -163,7 +163,7 @@ def sourcecb(proto, fields)
+ 							tu += "#{t}s"
+ 						end
+ 
+-						printf("  %6.6s %5.5s %8.8s %4.4s %6.6s %6.6s\n", "", "", "", "", total - lasttotal, tu)
++						printf("  %8.8s %5.5s %8.8s %7.7s %6.6s %6.6s\n", "", "", "", "", total - lasttotal, tu)
+ 					else
+ 						$card_records.each { |cr|
+ 							cr[1]["printed"] = 1
+@@ -171,7 +171,7 @@ def sourcecb(proto, fields)
+ 							cname = ""
+ 							cname = cr[1]["interface"] if $output_type == "pretty"
+ 
+-							str = sprintf("%s  %6.6s %5.5s %8.8s %3d%%", str, cname, cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100)
++							str = sprintf("%s  %8.8s %5.5s %8.8s %6.2f%%", str, cname, cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100)
+ 						}
+ 
+ 						t = Time.now.to_i - $start_time
+@@ -282,10 +282,18 @@ OptionParser.new do |opts|
+ 		options[:channel] = c
+ 	end
+ 
+-	opts.on("--pretty", "Format output with pretty ANSI codes") do 
++	opts.on("--pretty", "Format output with pretty ANSI codes (default)") do
+ 		options[:pretty] = true
+ 	end
+ 
++	opts.on("--std", "Do not format output with pretty ANSI codes") do
++		options[:std] = true
++	end
++
++	#opts.on("--csv", "Format output as comma separated values") do
++	#	options[:csv] = true
++	#end
++
+ end.parse!
+ 
+ if options[:host]
+@@ -315,6 +323,14 @@ if options[:pretty]
+ 	$output_type = "pretty"
+ end
+ 
++if options[:std]
++	$output_type = "std"
++end
++
++if options[:csv]
++	$output_type = "csv"
++end
++
+ $cards = ARGV
+ 
+ puts "INFO: Kismet NIC Shootout"
+-- 
+2.0.5
+
diff --git a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild b/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
deleted file mode 100644
index 3f6a5164a1d8..000000000000
--- a/net-wireless/kismet/kismet-2011.03.2-r3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2011.03.2-r3.ebuild,v 1.10 2013/12/06 17:55:58 swift Exp $
-
-EAPI=4
-
-inherit eutils multilib user
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/trunk"
-	inherit subversion
-	KEYWORDS=""
-else
-	SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ppc x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +pcre speech +plugin-autowep +plugin-btscan +plugin-dot15d4 +plugin-ptw +plugin-spectools +ruby selinux +suid"
-
-# Bluez 4.98 breaks c++ building, so we choose to use -r2 which has the patch
-# or 4.96 which still builds properly.
-RDEPEND="net-wireless/wireless-tools
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap[-netlink] )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	client? ( sys-libs/ncurses )
-	!arm? ( speech? ( app-accessibility/flite ) )
-	ruby? ( dev-lang/ruby )
-	plugin-btscan? ( || (
-			>=net-wireless/bluez-4.98-r2
-			=net-wireless/bluez-4.96
-			) )
-	plugin-dot15d4? ( virtual/libusb:0 )
-	plugin-spectools? ( net-wireless/spectools )
-	selinux? ( sec-policy/selinux-kismet )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-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}"/makefile.patch
-	epatch "${FILESDIR}"/plugins-ldflags.patch
-	epatch "${FILESDIR}"/bluechanfix_r3184.patch
-	epatch "${FILESDIR}"/kismet-console-scrolling-backport.patch
-	epatch "${FILESDIR}"/header_alignment_r3326.patch
-	epatch "${FILESDIR}"/use-hostname-by-default.patch
-	epatch "${FILESDIR}"/${P}-cflags-backport.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable client) \
-		$(use_enable pcre)
-}
-
-src_compile() {
-	emake
-
-	if use plugin-autowep; then
-		cd "${S}"/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}"/plugin-ptw
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake
-	fi
-}
-
-src_install() {
-	if use plugin-autowep; then
-		cd "${S}"/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}"/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 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 || die "Header installation failed"
-	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 || die
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-
-	insinto /etc
-	doins conf/kismet{,_drone}.conf || die
-
-	if use suid; then
-	dobin kismet_capture || die
-	fi
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_capture || die
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_capture || die
-		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
-}
diff --git a/net-wireless/kismet/kismet-2013.03.1-r1.ebuild b/net-wireless/kismet/kismet-2013.03.1-r2.ebuild
index b77c236c283d..4edefc01aa30 100644
--- a/net-wireless/kismet/kismet-2013.03.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2013.03.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2013.03.1-r1.ebuild,v 1.9 2014/11/02 09:38:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2013.03.1-r2.ebuild,v 1.1 2015/03/17 18:31:45 zerochaos Exp $
 
 EAPI=5
 
@@ -30,15 +30,13 @@ IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin
 CDEPEND="net-wireless/wireless-tools
 	kernel_linux? ( sys-libs/libcap
 			dev-libs/libnl:3
-			|| (
-				<net-libs/libpcap-1.4.0[-netlink]
-				>=net-libs/libpcap-1.4.0
-			) )
+			net-libs/libpcap
+			)
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
 	client? ( sys-libs/ncurses )
 	!arm? ( speech? ( app-accessibility/flite ) )
-	ruby? ( dev-lang/ruby )
+	ruby? ( dev-lang/ruby:* )
 	plugin-btscan? ( net-wireless/bluez )
 	plugin-dot15d4? ( virtual/libusb:0 )
 	plugin-spectools? ( net-wireless/spectools )
@@ -54,6 +52,9 @@ RDEPEND="${CDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-tinfo.patch
+	epatch "${FILESDIR}"/ruby19_fixes.patch
+	epatch "${FILESDIR}"/update-kismet_shootout.patch
+	mv configure.in configure.ac
 
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
 		conf/kismet.conf.in || die
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index f36413114c94..b79f63d110c5 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-9999.ebuild,v 1.12 2014/11/02 09:38:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-9999.ebuild,v 1.13 2015/03/17 18:31:45 zerochaos Exp $
 
 EAPI=5
 
@@ -30,15 +30,13 @@ IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin
 CDEPEND="net-wireless/wireless-tools
 	kernel_linux? ( sys-libs/libcap
 			dev-libs/libnl:3
-			|| (
-				<net-libs/libpcap-1.4.0[-netlink]
-				>=net-libs/libpcap-1.4.0
-			) )
+			net-libs/libpcap
+			)
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
 	client? ( sys-libs/ncurses )
 	!arm? ( speech? ( app-accessibility/flite ) )
-	ruby? ( dev-lang/ruby )
+	ruby? ( dev-lang/ruby:* )
 	plugin-btscan? ( net-wireless/bluez )
 	plugin-dot15d4? ( virtual/libusb:0 )
 	plugin-spectools? ( net-wireless/spectools )