aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2015-08-03 13:43:00 +0200
committerSteven Barth <steven@midlink.org>2015-08-03 13:43:00 +0200
commit80bdd250b26385f1397cac879401982935ec5d7a (patch)
tree13e7bf091d40c192704ccb45f85b41c04909f620
parentefe138e4ba7013a7befba4c7d584e56e094946bc (diff)
parentac1ad5c387e10ad22cf8ef4f9546b2051864ff26 (diff)
Merge pull request #1564 from hauke/kismet
kismet: fix build with musl
-rw-r--r--net/kismet/patches/010-dont-add-host-include-paths.patch6
-rw-r--r--net/kismet/patches/020-musl-include-fixes.patch22
2 files changed, 24 insertions, 4 deletions
diff --git a/net/kismet/patches/010-dont-add-host-include-paths.patch b/net/kismet/patches/010-dont-add-host-include-paths.patch
index 23a87bdcf..3b1858afb 100644
--- a/net/kismet/patches/010-dont-add-host-include-paths.patch
+++ b/net/kismet/patches/010-dont-add-host-include-paths.patch
@@ -1,9 +1,7 @@
-diff --git a/configure b/configure
-index 6936a47..9a85269 100755
--- a/configure
+++ b/configure
-@@ -6980,9 +6980,6 @@ else
- fi
+@@ -5456,9 +5456,6 @@ fi
+
-# Add additional cflags since some distros bury panel.h
diff --git a/net/kismet/patches/020-musl-include-fixes.patch b/net/kismet/patches/020-musl-include-fixes.patch
new file mode 100644
index 000000000..7f2d52cb9
--- /dev/null
+++ b/net/kismet/patches/020-musl-include-fixes.patch
@@ -0,0 +1,22 @@
+--- a/configfile.cc
++++ b/configfile.cc
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
++#include <time.h>
+ #include "configfile.h"
+ #include "util.h"
+
+--- a/dumpfile_tuntap.cc
++++ b/dumpfile_tuntap.cc
+@@ -20,8 +20,8 @@
+
+ #include <errno.h>
+
+-#include "dumpfile_tuntap.h"
+ #include "ifcontrol.h"
++#include "dumpfile_tuntap.h"
+ #include "ipc_remote.h"
+
+ #ifndef SYS_CYGWIN