From d630bf6330993ada782a1bd856da22c78516a1d5 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 26 May 2009 19:16:12 +0000
Subject: kismet: Update to version 2008-05-R1.

---
 recipes/kismet/files/fix_strip.patch               | 47 ++++++++++++++++++++++
 recipes/kismet/kismet-2007-10-R1/fix_strip.patch   | 47 ----------------------
 .../kismet-2008-05-R1/kismet-2008-05-R1-crash.diff | 20 +++++++++
 .../kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff   | 11 +++++
 .../kismet-2008-05-R1-infinite-loop.diff           | 20 +++++++++
 .../kismet-2008-05-R1-nonvoid.diff                 | 10 +++++
 recipes/kismet/kismet_2008-05-R1.bb                | 10 +++++
 7 files changed, 118 insertions(+), 47 deletions(-)
 create mode 100644 recipes/kismet/files/fix_strip.patch
 delete mode 100644 recipes/kismet/kismet-2007-10-R1/fix_strip.patch
 create mode 100644 recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff
 create mode 100644 recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff
 create mode 100644 recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff
 create mode 100644 recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff
 create mode 100644 recipes/kismet/kismet_2008-05-R1.bb

(limited to 'recipes/kismet')

diff --git a/recipes/kismet/files/fix_strip.patch b/recipes/kismet/files/fix_strip.patch
new file mode 100644
index 0000000000..54e7a9b1b7
--- /dev/null
+++ b/recipes/kismet/files/fix_strip.patch
@@ -0,0 +1,47 @@
+Index: kismet-2007-10-R1/Makefile.in
+===================================================================
+--- kismet-2007-10-R1.orig/Makefile.in	2008-03-06 15:20:37.000000000 +0000
++++ kismet-2007-10-R1/Makefile.in	2008-03-06 15:21:07.000000000 +0000
+@@ -138,23 +138,23 @@
+ 	fi
+ 
+ binuserinstall:
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); 
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE);
++	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); 
++	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE);
+ 
+ binsuidinstall:
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); 
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE);
++	install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(PS) $(BIN)/$(PS); 
++	install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(DRONE) $(BIN)/$(DRONE);
+ 	
+ commoninstall:
+ 	mkdir -p $(ETC)
+ 	mkdir -p $(BIN)
+ 
+ 	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(WRAP) $(BIN)/kismet
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC)
+-	# install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER)
++	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC)
++	# install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(HOPPER) $(BIN)/$(HOPPER)
+ 	@if test "$(ZAURUS)" = "yes"; then \
+-		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
++		install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
++		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
+ 	fi
+ #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor
+ #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor
+@@ -169,8 +169,8 @@
+ 	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
+ 
+ 	@if test "$(GPSLBUILD)" = "$(GPSL)"; then \
+-		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
++		install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
++		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
+ 		install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
+ 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
+ 		install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
diff --git a/recipes/kismet/kismet-2007-10-R1/fix_strip.patch b/recipes/kismet/kismet-2007-10-R1/fix_strip.patch
deleted file mode 100644
index 54e7a9b1b7..0000000000
--- a/recipes/kismet/kismet-2007-10-R1/fix_strip.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: kismet-2007-10-R1/Makefile.in
-===================================================================
---- kismet-2007-10-R1.orig/Makefile.in	2008-03-06 15:20:37.000000000 +0000
-+++ kismet-2007-10-R1/Makefile.in	2008-03-06 15:21:07.000000000 +0000
-@@ -138,23 +138,23 @@
- 	fi
- 
- binuserinstall:
--	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); 
--	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE);
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); 
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE);
- 
- binsuidinstall:
--	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); 
--	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE);
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(PS) $(BIN)/$(PS); 
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(DRONE) $(BIN)/$(DRONE);
- 	
- commoninstall:
- 	mkdir -p $(ETC)
- 	mkdir -p $(BIN)
- 
- 	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(WRAP) $(BIN)/kismet
--	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC)
--	# install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER)
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC)
-+	# install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(HOPPER) $(BIN)/$(HOPPER)
- 	@if test "$(ZAURUS)" = "yes"; then \
--		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
-+		install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
-+		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
- 	fi
- #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor
- #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor
-@@ -169,8 +169,8 @@
- 	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
- 
- 	@if test "$(GPSLBUILD)" = "$(GPSL)"; then \
--		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
-+		install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
-+		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
- 		install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
- 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
- 		install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff
new file mode 100644
index 0000000000..4c1d3a2360
--- /dev/null
+++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff
@@ -0,0 +1,20 @@
+--- kismet_wrapper.cc
++++ kismet_wrapper.cc
+@@ -79,7 +79,7 @@ void reap(int sig) {
+ 		if (FD_ISSET(epipe[0], &rset)) {
+ 			if (fgets(ret, 2048, err) == NULL ||
+ 				feof(err)) {
+-				if (feof(out))
++				if (!check_out || feof(out))
+ 					break;
+ 
+ 				fclose(err);
+@@ -98,7 +98,7 @@ void reap(int sig) {
+ 		if (FD_ISSET(rpipe[0], &rset)) {
+ 			if (fgets(ret, 2048, out) == NULL ||
+ 				feof(out)) {
+-				if (feof(err))
++				if (!check_err || feof(err))
+ 					break;
+ 
+ 				fclose(out);
diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff
new file mode 100644
index 0000000000..032f92ba22
--- /dev/null
+++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff
@@ -0,0 +1,11 @@
+--- gpsmap.cc
++++ gpsmap.cc
+@@ -3825,7 +3825,7 @@
+                 else if (tok == "location")
+                     network_labels.push_back(NETLABEL_LOCATION);
+                 else {
+-                    fprintf(stderr, "Invalid label '%s'\n", tok.c_str());
++                    fprintf(stderr, "Invalid label '%zs'\n", tok.c_str());
+                     exit(1);
+                 }
+             }
diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff
new file mode 100644
index 0000000000..f8417943e8
--- /dev/null
+++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff
@@ -0,0 +1,20 @@
+--- gpsmap.cc
++++ gpsmap.cc
+@@ -874,7 +874,7 @@
+ 
+                 // Break up the path to the gpsxml file and form a path based on that
+                 unsigned int lastslash = 0;
+-                for (unsigned int x = origxmlfile.find('/'); x != string::npos;
++                for (string::size_type x = origxmlfile.find('/'); x != string::npos;
+                      lastslash = x, x = origxmlfile.find('/', lastslash+1)) {
+                     // We don't actually need to do anything...
+                 }
+@@ -882,7 +882,7 @@
+                 comp = origxmlfile.substr(0, lastslash);
+ 
+                 lastslash = 0;
+-                for (unsigned int x = orignetfile.find('/'); x != string::npos;
++                for (string::size_type x = orignetfile.find('/'); x != string::npos;
+                      lastslash = x, x = orignetfile.find('/', lastslash+1)) {
+                     // We don't actually need to do anything...
+                 }
diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff
new file mode 100644
index 0000000000..e068f8dac5
--- /dev/null
+++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff
@@ -0,0 +1,10 @@
+--- pcapsource.cc
++++ pcapsource.cc
+@@ -2914,6 +2914,7 @@
+ 			return -1;
+ 
+ 	}
++	return -1;
+ }
+ #endif
+ 
diff --git a/recipes/kismet/kismet_2008-05-R1.bb b/recipes/kismet/kismet_2008-05-R1.bb
new file mode 100644
index 0000000000..c413ed508a
--- /dev/null
+++ b/recipes/kismet/kismet_2008-05-R1.bb
@@ -0,0 +1,10 @@
+require kismet.inc
+
+# patches *.diff are from openSUSE
+SRC_URI += "file://kismet-2008-05-R1-crash.diff;patch=1;pnum=0 \
+            file://kismet-2008-05-R1-fmt.diff;patch=1;pnum=0 \
+            file://kismet-2008-05-R1-infinite-loop.diff;patch=1;pnum=0 \
+            file://kismet-2008-05-R1-nonvoid.diff;patch=1;pnum=0 \
+            file://fix_strip.patch;patch=1"
+
+PR = "r0"
-- 
cgit 1.2.3-korg