Commit 57f3b11d authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

kismet: bump version and convert to Makefile.autotools.in format 



Closes #487

* Bump kismet from 2007-10-R1 to 2009-06-R1 (newcore: nicer, more features)
* Migrate to Makefile.autotools.in
* Introduce new options to just install the server, client, drone or
  combination

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 8c118958

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


	Issues resolved (http://bugs.uclibc.org):



	#487: Make kismet package sexier

	#527: misc fixes for dnsmasq package



2009.08, Released August 31th, 2009:

package/kismet/Config.in

+20 −3
Original line number Diff line number Diff line 
comment "kismet has no inherent support for AVR32" 

comment "Kismet has no inherent support for AVR32"

	depends on BR2_avr32 && BR2_PACKAGE_KISMET



comment "Kismet requires a toolchain with C++ support enabled"

	depends on !BR2_INSTALL_LIBSTDCPP



config BR2_PACKAGE_KISMET

	bool "kismet"

	depends on BR2_INSTALL_LIBSTDCPP

	select BR2_PACKAGE_NCURSES

	select BR2_PACKAGE_NCURSES_TARGET_PANEL

	select BR2_PACKAGE_LIBPCAP

	select BR2_PACKAGE_DBUS

	select BR2_PACKAGE_DBUS_GLIB

	help

	  Kismet - 802.11 layer2 wireless network detector, sniffer,

	  and intrusion detection system.
@@ -21,3 +24,17 @@ config BR2_PACKAGE_KISMET 
	  of nonbeaconing networks via data traffic.



	  http://www.kismetwireless.net



config BR2_PACKAGE_KISMET_CLIENT

	bool "Install client"

	depends on BR2_PACKAGE_KISMET



config BR2_PACKAGE_KISMET_DRONE

	bool "Install drone"

	depends on BR2_PACKAGE_KISMET



config BR2_PACKAGE_KISMET_SERVER

	bool "Install server"

	default y

	depends on BR2_PACKAGE_KISMET

package/kismet/kismet-2007-10-R1-memset.patch

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
diff -urN kismet-2007-10-R1-0rig//kismet_wrapper.cc kismet-2007-10-R1/kismet_wrapper.cc

--- kismet-2007-10-R1-0rig//kismet_wrapper.cc	2007-10-06 23:50:03.000000000 +0200

+++ kismet-2007-10-R1/kismet_wrapper.cc	2009-01-21 01:12:42.000000000 +0100

@@ -27,6 +27,7 @@

 #include <unistd.h>

 

 #include "config.h"

+#include <string.h>

 

 /* Blob of globals since sighandler needs them */

 vector<string> postcli_err;

diff -urN kismet-2007-10-R1-0rig//ringbuf.cc kismet-2007-10-R1/ringbuf.cc

--- kismet-2007-10-R1-0rig//ringbuf.cc	2005-12-11 20:14:39.000000000 +0100

+++ kismet-2007-10-R1/ringbuf.cc	2009-01-21 01:12:26.000000000 +0100

@@ -17,6 +17,7 @@

 */

 

 #include "ringbuf.h"

+#include <string.h>

 

 RingBuffer::RingBuffer(int in_size) {

     ring_len = in_size;

diff -urN kismet-2007-10-R1-0rig//util.cc kismet-2007-10-R1/util.cc

--- kismet-2007-10-R1-0rig//util.cc	2006-08-28 22:37:29.000000000 +0200

+++ kismet-2007-10-R1/util.cc	2009-01-21 01:12:26.000000000 +0100

@@ -22,6 +22,7 @@

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <fcntl.h>

+#include <string.h>

 

 // We need this to make uclibc happy since they don't even have rintf...

 #ifndef rintf

diff -urN kismet-2007-10-R1-0rig//util.h kismet-2007-10-R1/util.h

--- kismet-2007-10-R1-0rig//util.h	2006-08-28 22:37:29.000000000 +0200

+++ kismet-2007-10-R1/util.h	2009-01-21 01:12:26.000000000 +0100

@@ -65,7 +65,7 @@

         end = op.end;

         return *this;

     }

-};

+} swt;

 vector<smart_word_token> SmartStrTokenize(string in_str, string in_split, int return_partial = 1);

 

 vector<string> LineWrap(string in_txt, unsigned int in_hdr_len, unsigned int in_maxlen);

package/kismet/kismet-ncurses.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- kismet-2009-06-R1/configure	2009-06-12 04:26:32.000000000 +0100

+++ kismet-2009-06-R1.mod/configure	2009-08-05 11:27:43.000000000 +0100

@@ -6981,7 +6981,7 @@

 

 

 # Add additional cflags since some distros bury panel.h

-CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"

+#CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"

 

 termcontrol="none";

package/kismet/kismet-nobsd.patch

0 → 100644
+44 −0
Original line number Diff line number Diff line 
diff -Nura kismet-2009-06-R1/ifcontrol.cc kismet-2009-06-R1-nobsd/ifcontrol.cc

--- kismet-2009-06-R1/ifcontrol.cc	2009-04-08 16:57:44.000000000 -0300

+++ kismet-2009-06-R1-nobsd/ifcontrol.cc	2009-09-01 12:54:44.000000000 -0300

@@ -148,7 +148,7 @@

 	devlinklen = readlink(devlink.c_str(), devlinktarget, 511);

 	if (devlinklen > 0) {

 		devlinktarget[devlinklen] = '\0';

-		rind = rindex(devlinktarget, '/');

+		rind = strrchr(devlinktarget, '/');

 		// If we found it and not at the end of the line

 		if (rind != NULL && (rind - devlinktarget) + 1 < devlinklen)

 			return string(rind + 1);

diff -Nura kismet-2009-06-R1/iwcontrol.cc kismet-2009-06-R1-nobsd/iwcontrol.cc

--- kismet-2009-06-R1/iwcontrol.cc	2009-04-20 00:22:55.000000000 -0300

+++ kismet-2009-06-R1-nobsd/iwcontrol.cc	2009-09-01 12:54:44.000000000 -0300

@@ -697,7 +697,7 @@

 		return -1;

 	}

 

-	bzero(buffer, sizeof(buffer));

+	memset(buffer, 0, sizeof(buffer));

 

 	memset(&wrq, 0, sizeof(struct iwreq));

 

@@ -732,7 +732,7 @@

 		memcpy((char *) &range, buffer, sizeof(iw_range));

 	} else {

 		/* Zero unknown fields */

-		bzero((char *) &range, sizeof(struct iw_range));

+		memset((char *) &range, 0, sizeof(struct iw_range));

 

 		/* Initial part unmoved */

 		memcpy((char *) &range, buffer, iwr15_off(num_channels));

diff -Nura kismet-2009-06-R1/madwifing_control.cc kismet-2009-06-R1-nobsd/madwifing_control.cc

--- kismet-2009-06-R1/madwifing_control.cc	2009-03-22 23:19:19.000000000 -0300

+++ kismet-2009-06-R1-nobsd/madwifing_control.cc	2009-09-01 12:54:42.000000000 -0300

@@ -34,7 +34,6 @@

 #include <stdint.h>

 #include <ctype.h>

 #include <getopt.h>

-#include <err.h>

 #include <dirent.h>

 #include <fcntl.h>

 #include <errno.h>