aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-06-08 20:21:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-06-08 20:21:36 +0000
commitdd481519b9a5eb154576c067f15591a6ffb3ff21 (patch)
treedb0aa8da025b204ec9fe3b82ebfa618b64cd4137
parent16a3d7a1d32d9848d4ebef2878561da34648fa0d (diff)
downloadupstream-dd481519b9a5eb154576c067f15591a6ffb3ff21.tar.gz
upstream-dd481519b9a5eb154576c067f15591a6ffb3ff21.tar.bz2
upstream-dd481519b9a5eb154576c067f15591a6ffb3ff21.zip
fix kismet-server and add mostlyclean target
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1177 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kismet/Makefile3
-rw-r--r--package/kismet/patches/110-uclibc++_fixes.patch12
2 files changed, 15 insertions, 0 deletions
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index 0ae6b5e24e..971c40e73f 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -88,3 +88,6 @@ $(IPKG_KISMET_SERVER):
$(RSTRIP) $(IDIR_KISMET_SERVER)
$(IPKG_BUILD) $(IDIR_KISMET_SERVER) $(PACKAGE_DIR)
+mostlyclean:
+ $(MAKE) -C $(PKG_BUILD_DIR) clean
+ rm -f $(PKG_BUILD_DIR)/.built
diff --git a/package/kismet/patches/110-uclibc++_fixes.patch b/package/kismet/patches/110-uclibc++_fixes.patch
index 4cf5a7b5b5..66fc77e077 100644
--- a/package/kismet/patches/110-uclibc++_fixes.patch
+++ b/package/kismet/patches/110-uclibc++_fixes.patch
@@ -27,3 +27,15 @@ diff -urN kismet-2005-04-R1.old/macaddr.h kismet-2005-04-R1.dev/macaddr.h
return (singleton_itr != op.singleton_itr) || (vector_itr != op.vector_itr);
}
+diff -urN kismet-2005-04-R1.old/tcpserver.cc kismet-2005-04-R1.dev/tcpserver.cc
+--- kismet-2005-04-R1.old/tcpserver.cc 2005-04-03 07:33:42.000000000 +0200
++++ kismet-2005-04-R1.dev/tcpserver.cc 2005-06-08 23:17:34.000000000 +0200
+@@ -373,7 +373,7 @@
+ return 0;
+ }
+ } else {
+- copt->wrbuf.erase(0, res);
++ copt->wrbuf = "";
+ }
+ }
+