6 files changed, 71 insertions, 0 deletions
diff --git a/recipes/kismet/kismet-2007-10-R1/fix_strip.patch b/recipes/kismet/files/fix_strip.patch
index 54e7a9b1b7..54e7a9b1b7 100644
--- a/recipes/kismet/kismet-2007-10-R1/fix_strip.patch
+++ b/recipes/kismet/files/fix_strip.patch
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"