Fixed bug #94205 (init script fails to stop), bug #94387 (Add curses interface support in kismet) and bug #95539 (bad default configuration). Also updated the Ethereal version, fixed econf parameters and removed call to ifconfig from within the init script.

(Portage version: 2.0.51.22-r1)

6 files changed, 114 insertions, 47 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 528ebb6d0b08..8f1688e289d3 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.61 2005/05/09 11:17:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.62 2005/06/13 10:38:41 brix Exp $
+
+*kismet-2005.04.1-r1 (13 Jun 2005)
+
+  13 Jun 2005; <brix@gentoo.org> files/kismet-2005.04.1-conf.d,
+  files/kismet-2005.04.1-init.d, +kismet-2005.04.1-r1.ebuild:
+  Fixed bug #94205 (init script fails to stop), bug #94387 (Add curses
+  interface support in kismet) and bug #95539 (bad default configuration).
+  Also updated the Ethereal version, fixed econf parameters and removed call
+  to ifconfig from within the init script.
 
   09 May 2005; <brix@gentoo.org> -files/kismet-2004.10.1-conf.d,
   -files/kismet-2004.10.1-init.d, -files/kismet-2005.01.1-conf.d,
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 63fb3163b351..4144ad2d8005 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,6 +1,8 @@
 MD5 09e59b9e7dabbe17bb86bdcffb37fc4c kismet-2005.04.1.ebuild 1820
-MD5 fed72112173e9423325300b3d8511408 ChangeLog 9228
+MD5 bef262d63535cb1ca59428fc85cc3f96 kismet-2005.04.1-r1.ebuild 1957
+MD5 7393fa55b8e9201b22ca8c2ca56bfde2 ChangeLog 9657
 MD5 ffabe8240a5956794f085602c98e8598 metadata.xml 348
+MD5 b9db2fb07ec892c2d70eaa84614e4a32 files/digest-kismet-2005.04.1-r1 139
 MD5 1d4ef399dadbbdaefd1dd27172065ff7 files/digest-kismet-2005.04.1 139
-MD5 be902397f2912ffa9a6bafee907deeec files/kismet-2005.04.1-conf.d 805
-MD5 b33caaa184989acf81826026e95bd5d3 files/kismet-2005.04.1-init.d 1131
+MD5 4c7f3762c0aa9bd093029fdc17680e9e files/kismet-2005.04.1-conf.d 458
+MD5 7f41d9c37da0c9331527aa020e5cb46a files/kismet-2005.04.1-init.d 641
diff --git a/net-wireless/kismet/files/digest-kismet-2005.04.1-r1 b/net-wireless/kismet/files/digest-kismet-2005.04.1-r1
new file mode 100644
index 000000000000..37b24c7f2eb3
--- /dev/null
+++ b/net-wireless/kismet/files/digest-kismet-2005.04.1-r1
@@ -0,0 +1,2 @@
+MD5 19b4f192eb11a418ed3f6bf65c1226af kismet-2005-04-R1.tar.gz 871165
+MD5 03aa7fe2cbef9aa0654637cdc60e0458 ethereal-0.10.11.tar.bz2 5964016
diff --git a/net-wireless/kismet/files/kismet-2005.04.1-conf.d b/net-wireless/kismet/files/kismet-2005.04.1-conf.d
index eeef971eb716..26b4403999d7 100644
--- a/net-wireless/kismet/files/kismet-2005.04.1-conf.d
+++ b/net-wireless/kismet/files/kismet-2005.04.1-conf.d
@@ -1,27 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/kismet-2005.04.1-conf.d,v 1.1 2005/04/03 11:06:39 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/kismet-2005.04.1-conf.d,v 1.2 2005/06/13 10:38:41 brix Exp $
 
-# Config file for kismet server
+# Kismet configuration is done in /etc/kismet.conf
 
-# ATTENTION: most of the kismet configuration is still 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
 
-
-# Set WIFI_DEV to the device to be used by the kismet server.
-# This device must have the ability to do monitor mode
-
-
-WIFI_DEV=""
-
-# WIFI_DEV="wlan0"
-# WIFI_DEV="eth1"
-
-# Options to pass to the hopper/monitor/server
-KISMET_MONITOR_OPTS=""
-KISMET_SERVER_OPTS=""
+# Options to pass to kismet_server, see `kismet_server --help`
+KISMET_SERVER_OPTIONS=""
diff --git a/net-wireless/kismet/files/kismet-2005.04.1-init.d b/net-wireless/kismet/files/kismet-2005.04.1-init.d
index 0d2b7152f1e4..3f3d34b9e016 100644
--- a/net-wireless/kismet/files/kismet-2005.04.1-init.d
+++ b/net-wireless/kismet/files/kismet-2005.04.1-init.d
@@ -1,41 +1,27 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/kismet-2005.04.1-init.d,v 1.1 2005/04/03 11:06:39 brix Exp $
-
-# If you use this init script, you only need to run `kismet_client` to connect
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/kismet-2005.04.1-init.d,v 1.2 2005/06/13 10:38:41 brix Exp $
 
 checkconfig() {
-	if [ ! -e /etc/kismet.conf ] ; then
-		eerror "You need an /etc/kismet.conf to run kismet_server."
-		return 1
-	elif [ -z "${WIFI_DEV}" ]; then
-		eerror "You must define WIFI_DEV in /etc/conf.d/kismet."
-		return 1
-	fi
-
-}
-checkcard() {
-	if [ -z "`cat /proc/net/dev | grep ${WIFI_DEV}`" ]; then
-		eerror "${WIFI_DEV} not found."
+	if [ ! -e /etc/kismet.conf ]; then
+		eerror "Configuration file /etc/kismet.conf not found"
 		return 1
 	fi
 }
 
 start() {
 	checkconfig || return 1
-	checkcard || return 1
-	ifconfig ${WIFI_DEV} up
-	ebegin "Starting kismet_server"
+
+	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_OPTS}
-	eend $?
+		--background --make-pidfile --exec /usr/bin/kismet_server \
+		-- ${KISMET_SERVER_OPTIONS}
+	eend ${?}
 }
 
 stop() {
-	ebegin "Stopping kismet_server"
+	ebegin "Stopping kismet server"
 	start-stop-daemon --stop --quiet --pidfile /var/run/kismet_server.pid
-	kismet_unmonitor &> /dev/null
-	eend $?
+	eend ${?}
 }
-
diff --git a/net-wireless/kismet/kismet-2005.04.1-r1.ebuild b/net-wireless/kismet/kismet-2005.04.1-r1.ebuild
new file mode 100644
index 000000000000..6da329d6430a
--- /dev/null
+++ b/net-wireless/kismet/kismet-2005.04.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2005.04.1-r1.ebuild,v 1.1 2005/06/13 10:38:41 brix Exp $
+
+inherit linux-info
+
+MY_P=${P/\./-}
+MY_P=${MY_P/./-R}
+S=${WORKDIR}/${MY_P}
+
+ETHEREAL_VERSION="0.10.11"
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="http://www.kismetwireless.net"
+SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz
+		ethereal? ( http://www.ethereal.com/distribution/ethereal-${ETHEREAL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="ethereal gps ncurses"
+
+DEPEND=">=sys-devel/autoconf-2.58
+		sys-apps/sed"
+RDEPEND="net-wireless/wireless-tools
+		sys-libs/ncurses
+		ethereal? ( =dev-libs/glib-1.2*
+				>=net-analyzer/ethereal-${ETHEREAL_VERSION}
+				sys-libs/zlib )
+		gps? ( app-misc/gpsdrive
+				>=dev-libs/expat-1.95.4
+				dev-libs/gmp
+				>=media-gfx/imagemagick-6.0
+				dev-perl/libwww-perl )"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		${S}/conf/kismet.conf.in
+}
+
+src_compile() {
+	# the configure script only honors '--disable-foo'
+	local config=""
+
+	if ! use ncurses; then
+		config="${config} --disable-curses --disable-panel"
+	fi
+
+	if ! use gps; then
+		# Note: gps support is automatically enabled based on the
+		# libs in RDEPEND - 2005-04-R1 doesn't honor the --disable-gps flag
+		config="${config} --disable-gps"
+	fi
+
+	if use ethereal; then
+		cd ${WORKDIR}/ethereal-${ETHEREAL_VERSION}/wiretap
+		econf || die "wiretap econf failed"
+		emake || die "wiretap emake failed"
+		config="${config} --with-ethereal=${WORKDIR}/ethereal-${ETHEREAL_VERSION}"
+		cd ${S}
+	fi
+
+	econf \
+		${config} \
+		--with-linuxheaders=${KV_DIR}/include \
+		|| die "econf failed"
+
+	emake dep || die "emake dep failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR=${D} install || die "emake install failed"
+
+	dodoc CHANGELOG README TODO docs/*
+
+	newinitd ${FILESDIR}/${P}-init.d kismet
+	newconfd ${FILESDIR}/${P}-conf.d kismet
+}