Fix for new config file location.

5 files changed, 91 insertions, 6 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 0db9515e5b1b..f67b2a48aace 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.41 2004/10/26 09:52:44 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.42 2004/10/26 14:40:11 brix Exp $
+
+  26 Oct 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +files/kismet-2004.10.1-conf.d, +files/kismet-2004.10.1-init.d,
+  kismet-2004.10.1.ebuild:
+  Updated to reflect new config file location.
 
   26 Oct 2004; Henrik Brix Andersen <brix@gentoo.org>
   kismet-2004.04.1-r1.ebuild:
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 5b168f228926..ffa7c1aada1c 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,6 +1,6 @@
 MD5 21e7369e6da736ef68ce288791ef46c0 kismet-2.6.2-r1.ebuild 1884
 MD5 100be3f22acd516390a5b71e3121caf7 kismet-2004.04.1-r1.ebuild 2450
-MD5 b964bc06b84f64bf79a1fb684f50262b kismet-2004.10.1.ebuild 1958
+MD5 2ee03c14dea814f1c8897e50234a8371 kismet-2004.10.1.ebuild 2193
 MD5 87617e9aad3041909e1151fb6fcdf9cb kismet-2.8.1.ebuild 1977
 MD5 1ebdb6d82948a242cffd87a8822ed012 kismet-2004.02.01.ebuild 2205
 MD5 e5bcc0048c76e9118b91ab2bcaa72f4f kismet-2.8.0b-r1.ebuild 1981
@@ -9,7 +9,7 @@ MD5 04e0debcef2c8a2696717cd35ac9822d kismet-2004.04.1.ebuild 2430
 MD5 420236c784145e4cdea28efb45f5155a kismet-2.8.0a.ebuild 1779
 MD5 051f6a5bc088b872cb3960c1380b5b16 kismet-2.8.1-r1.ebuild 2123
 MD5 ec0e6b5e444bfae7cb0ed2591667bbbb kismet-2.8.0.ebuild 1777
-MD5 8e8f8c42ebe8287760135f68aa04e390 ChangeLog 5997
+MD5 062f6d94abf8ca05c7266ec220751fb8 ChangeLog 6192
 MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
 MD5 6701c84a371ed9c02a0832f5e7ae0ff1 kismet-3.0.1-r1.ebuild 2292
 MD5 ac454f5a5ad0a364c677157a511e534d files/digest-kismet-2.8.0a 133
@@ -17,8 +17,10 @@ MD5 a73efbda3289e9413549c220b046ef23 files/digest-kismet-2.8.0 131
 MD5 51ee9832a194be859c3e76f998c75f2d files/digest-kismet-2.8.1 200
 MD5 7571e627220475fa712fd8a43970db6c files/digest-kismet-3.0.1 64
 MD5 7519d0a6f8fee0e7ad5ca5cbe1abda00 files/rc-conf-3 805
+MD5 791323ea98047ef945e121bbc60930bf files/kismet-2004.10.1-conf.d 696
 MD5 8dfc64a8a4100cc38d8f00a3475bba9a files/digest-kismet-2.6.2-r1 131
 MD5 51ee9832a194be859c3e76f998c75f2d files/digest-kismet-2.8.1-r1 200
+MD5 1928c7686e5950c0194efdd536dec3fa files/kismet-2004.10.1-init.d 1022
 MD5 63dd3cb4247737ee77391240518ec850 files/digest-kismet-2.8.0b-r1 202
 MD5 d823fe5de2466ad5a6acf8e3337eae31 files/rc-script-3 1133
 MD5 a2a209af1409814bed3299f119d163a8 files/digest-kismet-2004.04.1-r1 138
diff --git a/net-wireless/kismet/files/kismet-2004.10.1-conf.d b/net-wireless/kismet/files/kismet-2004.10.1-conf.d
new file mode 100644
index 000000000000..b99ca93b524e
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2004.10.1-conf.d
@@ -0,0 +1,27 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/kismet-2004.10.1-conf.d,v 1.1 2004/10/26 14:40:11 brix Exp $
+
+# Config file for kismet server
+
+# 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=""
diff --git a/net-wireless/kismet/files/kismet-2004.10.1-init.d b/net-wireless/kismet/files/kismet-2004.10.1-init.d
new file mode 100644
index 000000000000..1705083a25fc
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2004.10.1-init.d
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/kismet-2004.10.1-init.d,v 1.1 2004/10/26 14:40:11 brix Exp $
+
+# If you use this init script, you only need to run `kismet_client` to connect
+
+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."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	checkcard || return 1
+	ifconfig ${WIFI_DEV} up
+	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 $?
+}
+
+stop() {
+	ebegin "Stopping kismet_server"
+	start-stop-daemon --stop --quiet --pidfile /var/run/kismet_server.pid
+	kismet_unmonitor &> /dev/null
+	eend $?
+}
+
diff --git a/net-wireless/kismet/kismet-2004.10.1.ebuild b/net-wireless/kismet/kismet-2004.10.1.ebuild
index d08492e22ea1..1ce2bf390090 100644
--- a/net-wireless/kismet/kismet-2004.10.1.ebuild
+++ b/net-wireless/kismet/kismet-2004.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2004.10.1.ebuild,v 1.1 2004/10/26 09:49:12 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2004.10.1.ebuild,v 1.2 2004/10/26 14:40:11 brix Exp $
 
 inherit gnuconfig
 
@@ -70,8 +70,18 @@ src_install () {
 	dodoc CHANGELOG README TODO docs/*
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/rc-script-3 kismet
+	newexe ${FILESDIR}/${P}-init.d kismet
 
 	insinto /etc/conf.d
-	newins ${FILESDIR}/rc-conf-3 kismet
+	newins ${FILESDIR}/${P}-conf.d kismet
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Please notice that the config file location has changed from"
+	einfo "/etc/kismet to /etc/"
+	einfo ""
+	einfo "For usage instructions please see"
+	einfo "/usr/share/doc/${PF}/README.gz"
+	einfo ""
 }