commit: 6bece96d957ca624343c5c582b40647341d099f0
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 8 23:50:05 2017 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 23:50:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bece96d
net-wireless/kismet: backport the ruby fixes from master that were not put in
the release branch
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-wireless/kismet/Manifest | 1 -
.../kismet/files/kismet-2016.07.1-ruby-fixes.patch | 78 ++++++++++
...2016.01.1.ebuild => kismet-2016.07.1-r1.ebuild} | 5 +-
net-wireless/kismet/kismet-2016.07.1.ebuild | 170 ---------------------
4 files changed, 80 insertions(+), 174 deletions(-)
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 1a66178..713fb4a 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,3 +1,2 @@
DIST kismet-2013-03-R1.tar.gz 899372 SHA256
1c1e9f6b550de1f248363d4c9ce1d24fdc20d041ead5a53cec88eb1b07353082 SHA512
7e992f5ef3db4c5fa298bd4aabfe216668baade948b83996850c010c6c92bfa2fea37d7006a532eb6bace015624f536cc45ed8b3b3ed4a6a1cac7a137ac86d36
WHIRLPOOL
694796f7dd0f4ffd70e64d67eba30bf7b206189dadb8e773a302af9f417a8219b45e547bfcaf59db3f502e0f5ab18af6d642e66dbe8277d8af48daeb35b40843
-DIST kismet-2016-01-R1.tar.xz 703308 SHA256
162f1796996836b2d44126ccbe877a88a7f4a0e50f6729da897fc5a8ec4776b9 SHA512
cfbfb2cefd8df4a4fd09333eb6b0becd56cd7c3a1804d555d28b1d55379186e51804334560531d05e760d31e446c4b89d32ce2bd2c0705473f67f04611c0434e
WHIRLPOOL
7ba136a9a138a43768c07668f92b6836d4345bb382935527e0576d5d4aedceb6135bc5b2a38fdfe5b7c488fadc17d759b0960c8cc8a461338adb3417024cb491
DIST kismet-2016-07-R1.tar.xz 709364 SHA256
bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 SHA512
88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
WHIRLPOOL
33bbe6e3353c87907e2a58326ccd84ff973e474a884c29f01c29439de673d2050c50348bf001799da25f0b156c3527d3c5f93cdcdccfd830c9e2eb40cce9aa8b
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
new file mode 100644
index 00000000..bdfde9f
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch
@@ -0,0 +1,78 @@
+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/kismet-2016.01.1.ebuild
b/net-wireless/kismet/kismet-2016.07.1-r1.ebuild
similarity index 98%
rename from net-wireless/kismet/kismet-2016.01.1.ebuild
rename to net-wireless/kismet/kismet-2016.07.1-r1.ebuild
index 01dd3f3..fc5aa42 100644
--- a/net-wireless/kismet/kismet-2016.01.1.ebuild
+++ b/net-wireless/kismet/kismet-2016.07.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -51,8 +51,6 @@ RDEPEND="${CDEPEND}
"
src_prepare() {
- epatch -p1 "${FILESDIR}"/${P}-tinfo.patch
-
sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
conf/kismet.conf.in
@@ -60,6 +58,7 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in
+ epatch "${FILESDIR}/${P}-ruby-fixes.patch"
epatch_user
eautoreconf
}
diff --git a/net-wireless/kismet/kismet-2016.07.1.ebuild
b/net-wireless/kismet/kismet-2016.07.1.ebuild
deleted file mode 100644
index 18490cf..00000000
--- a/net-wireless/kismet/kismet-2016.07.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils multilib user
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git";
- SRC_URI=""
- inherit git-2
- KEYWORDS=""
-else
- SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://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 )
-"
-
-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_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
-}
