Prunded old version.

8 files changed, 11 insertions, 341 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 2045a599c990..471a0946554a 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.49 2004/12/18 11:30:28 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.50 2004/12/18 11:36:19 brix Exp $
+
+  18 Dec 2004; Henrik Brix Andersen <brix@gentoo.org>
+  -files/kismet_amd64.patch, -files/kismet_gcc34.gz, -files/rc-conf-3,
+  -files/rc-script-3, -kismet-2004.04.1.ebuild:
+  Prunded old version.
 
   18 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
   kismet-2004.10.1-r1.ebuild:
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index ac405dc21c63..d009ff71b5de 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,14 +1,8 @@
-MD5 04e0debcef2c8a2696717cd35ac9822d kismet-2004.04.1.ebuild 2430
-MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
-MD5 bf4fb7ebb8fdff39b79ce2f2f092de95 ChangeLog 7322
 MD5 051f6a5bc088b872cb3960c1380b5b16 kismet-2.8.1-r1.ebuild 2123
 MD5 af69f82ac9e9fc54665a764c5e8800f0 kismet-2004.10.1-r1.ebuild 2261
-MD5 c63dd4e1f9460ee0e5f5a2d0d884a6ea files/kismet_amd64.patch 6545
-MD5 7519d0a6f8fee0e7ad5ca5cbe1abda00 files/rc-conf-3 805
-MD5 2b5522ad006abb94c870187b1d687109 files/digest-kismet-2004.10.1-r1 138
-MD5 d823fe5de2466ad5a6acf8e3337eae31 files/rc-script-3 1133
-MD5 6c6ba4e2b2af51630273719aa775a393 files/kismet_gcc34.gz 607
-MD5 0d620d9840f740fd0914006eaf1a636d files/kismet-2004.10.1-init.d 1131
-MD5 752e77b324cb8708cb1c39301b1a552f files/digest-kismet-2004.04.1 138
-MD5 51ee9832a194be859c3e76f998c75f2d files/digest-kismet-2.8.1-r1 200
+MD5 409e7f331a10f6d7855d97ce9b411ae7 ChangeLog 7517
+MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
 MD5 ac3f64df09253e57accaee015fdd60bb files/kismet-2004.10.1-conf.d 805
+MD5 51ee9832a194be859c3e76f998c75f2d files/digest-kismet-2.8.1-r1 200
+MD5 0d620d9840f740fd0914006eaf1a636d files/kismet-2004.10.1-init.d 1131
+MD5 2b5522ad006abb94c870187b1d687109 files/digest-kismet-2004.10.1-r1 138
diff --git a/net-wireless/kismet/files/digest-kismet-2004.04.1 b/net-wireless/kismet/files/digest-kismet-2004.04.1
deleted file mode 100644
index ec574ae8bcd8..000000000000
--- a/net-wireless/kismet/files/digest-kismet-2004.04.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bd9fad469b3d9ca35c51734e58e406d0 kismet-2004-04-R1.tar.gz 757689
-MD5 6902272eb5304f57db76bf91abe453d1 ethereal-0.10.3.tar.bz2 4840005
diff --git a/net-wireless/kismet/files/kismet_amd64.patch b/net-wireless/kismet/files/kismet_amd64.patch
deleted file mode 100644
index 8371b0e74fff..000000000000
--- a/net-wireless/kismet/files/kismet_amd64.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-kismet amd64 amd 64 bit patch.
-
-Got amd64 laptop mitac8355. Kismet unfortunately hangs up on 64 bit. So did some fast fix. 
-
-And it could access 16G of RAM ;)
-
-$Id: kismet_amd64.patch,v 1.1 2004/09/02 23:49:24 malc Exp $ 
-email: k_w-at-bk-dot-ru
-
-diff -u ../kismet-2004-04-R1/configfile.cc ./configfile.cc
---- ../kismet-2004-04-R1/configfile.cc	2004-01-24 16:27:20.000000000 -0500
-+++ ./configfile.cc	2004-05-30 16:59:33.093508480 -0400
-@@ -251,12 +251,12 @@
-                                 macmap<int> *dest_map,
-                                 int *bssid_invert, int *source_invert, int *dest_invert) {
-     // Break it into filter terms
--    unsigned int parse_pos = 0;
--    unsigned int parse_error = 0;
-+    size_t parse_pos = 0;
-+    size_t parse_error = 0;
- 
-     while (parse_pos < filter_str.length()) {
--        unsigned int addr_term_end;
--        unsigned int address_target = 0; // 1=bssid 2=source 4=dest 7=any
-+        size_t addr_term_end;
-+        size_t address_target = 0; // 1=bssid 2=source 4=dest 7=any
- 
-         if (filter_str[parse_pos] == ',' || filter_str[parse_pos] == ' ') {
-             parse_pos++;
-@@ -310,10 +310,10 @@
-             break;
-         }
- 
--        unsigned int term_parse_pos = 0;
-+        size_t term_parse_pos = 0;
-         while (term_parse_pos < term_contents.length()) {
--            unsigned int term_end;
--            unsigned int invert = 0;
-+            size_t term_end;
-+            size_t invert = 0;
- 
-             if (term_contents[term_parse_pos] == ' ' || term_contents[term_parse_pos] == ',') {
-                 term_parse_pos++;
-diff -u ../kismet-2004-04-R1/kismet_drone.cc ./kismet_drone.cc
---- ../kismet-2004-04-R1/kismet_drone.cc	2004-04-04 21:20:57.000000000 -0400
-+++ ./kismet_drone.cc	2004-05-30 17:10:15.081911408 -0400
-@@ -571,8 +571,8 @@
-     }
- 
-     // Parse the allowed hosts into the vector
--    unsigned int ahstart = 0;
--    unsigned int ahend = allowed_hosts.find(",");
-+    size_t ahstart = 0;
-+    size_t ahend = allowed_hosts.find(",");
- 
-     int ahdone = 0;
-     while (ahdone == 0) {
-@@ -590,7 +590,7 @@
-         client_ipblock *ipb = new client_ipblock;
- 
-         // Find the netmask divider, if one exists
--        unsigned int masksplit = hoststr.find("/");
-+        size_t masksplit = hoststr.find("/");
-         if (masksplit == string::npos) {
-             // Handle hosts with no netmask - they're treated as single hosts
-             inet_aton("255.255.255.255", &(ipb->mask));
-diff -u ../kismet-2004-04-R1/kismet_server.cc ./kismet_server.cc
---- ../kismet-2004-04-R1/kismet_server.cc	2004-04-04 21:20:57.000000000 -0400
-+++ ./kismet_server.cc	2004-05-30 17:09:19.615343608 -0400
-@@ -1178,10 +1178,10 @@
-     // Convert the WEP mappings to our real map
-     vector<string> raw_wepmap_vec;
-     raw_wepmap_vec = conf->FetchOptVec("wepkey");
--    for (unsigned int rwvi = 0; rwvi < raw_wepmap_vec.size(); rwvi++) {
-+    for (size_t rwvi = 0; rwvi < raw_wepmap_vec.size(); rwvi++) {
-         string wepline = raw_wepmap_vec[rwvi];
- 
--        unsigned int rwsplit = wepline.find(",");
-+        size_t rwsplit = wepline.find(",");
-         if (rwsplit == string::npos) {
-             fprintf(stderr, "FATAL:  Malformed 'wepkey' option in the config file.\n");
-             ErrorShutdown();
-@@ -1458,12 +1458,12 @@
- 
-     vector<string> hostsvec = StrTokenize(allowed_hosts, ",");
- 
--    for (unsigned int hostcomp = 0; hostcomp < hostsvec.size(); hostcomp++) {
-+    for (size_t hostcomp = 0; hostcomp < hostsvec.size(); hostcomp++) {
-         client_ipblock *ipb = new client_ipblock;
-         string hoststr = hostsvec[hostcomp];
- 
-         // Find the netmask divider, if one exists
--        unsigned int masksplit = hoststr.find("/");
-+        size_t masksplit = hoststr.find("/");
-         if (masksplit == string::npos) {
-             // Handle hosts with no netmask - they're treated as single hosts
-             inet_aton("255.255.255.255", &(ipb->mask));
-diff -u ../kismet-2004-04-R1/tcpserver.cc ./tcpserver.cc
---- ../kismet-2004-04-R1/tcpserver.cc	2003-03-20 16:02:53.000000000 -0500
-+++ ./tcpserver.cc	2004-05-30 17:05:17.872094168 -0400
-@@ -377,7 +377,7 @@
- 
-     /* See if the buffer contains a command. */
-     int killbits = 0;
--    unsigned int nl = copt->cmdbuf.find("\r\n");
-+    size_t nl = copt->cmdbuf.find("\r\n");
-     if (nl == string::npos) {
-         nl = copt->cmdbuf.find('\n');
-         if (nl == string::npos)
-@@ -422,8 +422,8 @@
- 
-     // Find the first space - this is the command.  If it doesn't look like something
-     // we can handle, pass it on.
--    unsigned int start = 0;
--    unsigned int space = in_command->cmd.find(" ");
-+    size_t start = 0;
-+    size_t space = in_command->cmd.find(" ");
-     if (space == string::npos)
-         return 1;
- 
-@@ -482,7 +482,7 @@
-         start = space + 1;
-         vector<int> field_vec;
- 
--        unsigned int end = in_command->cmd.find(",", start);
-+        size_t end = in_command->cmd.find(",", start);
- 
-         int done = 0;
-         int initial = 1;
-@@ -499,7 +499,7 @@
-             // Try once to match it to * - an int compare is cheaper than a string
-             if (initial) {
-                 if (com == "*") {
--                    for (unsigned int fld = 0; fld < sprot->field_map.size(); fld++)
-+                    for (size_t fld = 0; fld < sprot->field_map.size(); fld++)
-                         field_vec.push_back(fld);
-                     break;
-                 }
-diff -u ../kismet-2004-04-R1/util.cc ./util.cc
---- ../kismet-2004-04-R1/util.cc	2003-12-09 16:36:38.000000000 -0500
-+++ ./util.cc	2004-05-27 21:49:31.000000000 -0400
-@@ -138,8 +138,8 @@
- }
- 
- vector<string> StrTokenize(string in_str, string in_split) {
--    unsigned int begin = 0;
--    unsigned int end = in_str.find(in_split);
-+    size_t begin = 0;
-+    size_t end = in_str.find(in_split);
-     vector<string> ret;
- 
-     if (in_str.length() == 0)
-@@ -159,7 +159,7 @@
- vector<string> LineWrap(string in_txt, unsigned int in_hdr_len, unsigned int in_maxlen) {
- 	vector<string> ret;
- 
--	unsigned int pos, prev_pos, start, hdroffset;
-+	size_t pos, prev_pos, start, hdroffset;
- 	start = hdroffset = 0;
- 
- 	for (pos = prev_pos = in_txt.find(' ', in_hdr_len); pos != string::npos; pos = in_txt.find(' ', pos + 1)) {
-@@ -359,7 +359,7 @@
-     vector<int> ret;
-     int ch;
- 
--    for (unsigned int x = 0; x < optlist.size(); x++) {
-+    for (size_t x = 0; x < optlist.size(); x++) {
-         if (sscanf(optlist[x].c_str(), "%d", &ch) != 1) {
-             ret.clear();
-             break;
diff --git a/net-wireless/kismet/files/kismet_gcc34.gz b/net-wireless/kismet/files/kismet_gcc34.gz
deleted file mode 100644
index 686af1828a33..000000000000
--- a/net-wireless/kismet/files/kismet_gcc34.gz
+++ /dev/null
diff --git a/net-wireless/kismet/files/rc-conf-3 b/net-wireless/kismet/files/rc-conf-3
deleted file mode 100644
index 53b225e43090..000000000000
--- a/net-wireless/kismet/files/rc-conf-3
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/rc-conf-3,v 1.4 2004/10/26 09:49:12 brix Exp $
-
-# Config file for kismet server
-
-# ATTENTION: most of the kismet configuration is still done in
-# /etc/kismet/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=/home/foo/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/rc-script-3 b/net-wireless/kismet/files/rc-script-3
deleted file mode 100644
index ce6ff5b6f738..000000000000
--- a/net-wireless/kismet/files/rc-script-3
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/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/rc-script-3,v 1.4 2004/10/26 09:49:12 brix Exp $
-
-# If you use this init script, you only need to run `kismet_client` to connect
-
-checkconfig() {
-	if [ ! -e /etc/kismet/kismet.conf ] ; then
-		eerror "You need an /etc/kismet/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.04.1.ebuild b/net-wireless/kismet/kismet-2004.04.1.ebuild
deleted file mode 100644
index d98a3767ea6b..000000000000
--- a/net-wireless/kismet/kismet-2004.04.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.04.1.ebuild,v 1.7 2004/09/22 22:08:39 pvdabeel Exp $
-
-inherit gnuconfig eutils
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-ETHEREAL_VERSION="0.10.3"
-DESCRIPTION="Kismet is a 802.11b wireless network 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="acpi gps ethereal"
-
-DEPEND="gps? ( >=dev-libs/expat-1.95.4 dev-libs/gmp media-gfx/imagemagick )
-	>=sys-devel/autoconf-2.58"
-RDEPEND="net-wireless/wireless-tools"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/kismet_gcc34.gz
-	epatch ${FILESDIR}/kismet_amd64.patch
-	gnuconfig_update ${S}
-}
-
-src_compile() {
-	local myconf
-
-	# To have kismet build acpi support, you need to be running a kernel
-	# with acpi enabled at the time of compiling
-
-	myconf="`use_enable acpi`"
-	use gps || myconf="${myconf} --disable-gps"
-
-	if use ethereal; then
-		myconf="${myconf} --with-ethereal=${WORKDIR}/ethereal-${ETHEREAL_VERSION}"
-
-		cd ${WORKDIR}/ethereal-${ETHEREAL_VERSION}/wiretap
-		econf || die
-		emake || die
-	fi
-
-	cd ${S}
-	./configure \
-	    --prefix=/usr \
-		--host=${CHOST} \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc/kismet \
-		--localstatedir=/var/lib \
-		${myconf} || die "./configure failed"
-
-	cd ${S}/conf
-	cp -f kismet.conf kismet.conf.orig
-	cp -f kismet_ui.conf kismet_ui.conf.orig
-	sed -e "s:/usr/local:/usr:g; \
-			s:=ap_manuf:=/etc/kismet/ap_manuf:g; \
-			s:=client_manuf:=/etc/kismet/client_manuf:g" \
-			kismet.conf.orig > kismet.conf
-	sed -e "s:/usr/local:/usr:g" kismet_ui.conf.orig > kismet_ui.conf
-	rm -f kismet.conf.orig kismet_ui.conf.orig
-
-	cd ${S}
-	make dep || die "make dep for kismet failed"
-	emake || die "compile of kismet failed"
-}
-
-src_install () {
-	dodir /etc/kismet
-	dodir /usr/bin
-	make prefix=${D}/usr \
-		ETC=${D}/etc/kismet MAN=${D}/usr/share/man \
-		SHARE=${D}/usr/share/${PN} install || die
-	 use gps && cp ${S}/scripts/gpsmap* ${D}/usr/bin/
-	 dodoc CHANGELOG FAQ README docs/*
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/rc-script-3 kismet
-	insinto /etc/conf.d
-	newins ${FILESDIR}/rc-conf-3 kismet
-}