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.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 18 insertions, 43 deletions

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 ${?}
 }
-