fix some allmodconfig issues for mips target

5 files changed, 19 insertions, 191 deletions

diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index cfcf5d908..7ec5e7d0a 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		kismet
-PKG_VERSION:=		2010-01-R1
+PKG_VERSION:=		2011-01-R1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a6d6edcf65d5bb2cb5de6472bcc16f19
+PKG_MD5SUM:=		1fb1f024a7ca52814b255e2f2faccf3b
 PKG_DESCR:=		Kismet
 PKG_SECTION:=		wifi
 PKG_DEPENDS:=		libpcap libncurses
@@ -26,8 +26,7 @@ $(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELE
 $(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_DRONE},${PKG_SECTION}))
 $(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--sysconfdir=/etc/kismet \
-			--disable-linuxwext
+CONFIGURE_ARGS+=	--sysconfdir=/etc/kismet
 
 pre-build:
 	(cd ${WRKBUILD} && ${MAKE} dep);
diff --git a/package/kismet/patches/patch-Makefile_in b/package/kismet/patches/patch-Makefile_in
index 8b00a86ec..97a3cad75 100644
--- a/package/kismet/patches/patch-Makefile_in
+++ b/package/kismet/patches/patch-Makefile_in
@@ -1,17 +1,18 @@
---- kismet-2010-01-R1.orig/Makefile.in	Mon Dec 14 20:04:11 2009
-+++ kismet-2010-01-R1/Makefile.in	Wed Feb 17 22:09:41 2010
-@@ -100,25 +100,25 @@ commoninstall:
- 	mkdir -p $(ETC)
- 	mkdir -p $(BIN)
+--- kismet-2011-01-R1.orig/Makefile.in	2010-12-19 15:20:16.000000000 +0100
++++ kismet-2011-01-R1/Makefile.in	2011-02-04 23:14:39.000000000 +0100
+@@ -112,26 +112,26 @@ commoninstall:
  
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet
--	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC)
+ 	if test -e $(NC); then \
+ 		echo "Installing client"; \
+-		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet; \
+-		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC); \
++		$(INSTALL) -m 555 scripts/kismet $(BIN)/kismet; \
++		$(INSTALL) -m 555 $(NC) $(BIN)/$(NC); \
+ 	fi;
 -	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(PS) $(BIN)/$(PS); 
 -	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(DRONE) $(BIN)/$(DRONE);
-+	$(INSTALL) -m 755 scripts/kismet $(BIN)/kismet
-+	$(INSTALL) -m 755 $(NC) $(BIN)/$(NC)
-+	$(INSTALL) -m 755 $(PS) $(BIN)/$(PS); 
-+	$(INSTALL) -m 755 $(DRONE) $(BIN)/$(DRONE);
++	$(INSTALL) -m 555 $(PS) $(BIN)/$(PS); 
++	$(INSTALL) -m 555 $(DRONE) $(BIN)/$(DRONE);
  
  	mkdir -p $(MAN)/man1
 -	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
@@ -39,47 +40,21 @@
  
  suidinstall: $(CS)
  	-groupadd -f $(SUIDGROUP)
-@@ -129,8 +129,8 @@ suidinstall: $(CS)
+@@ -174,7 +174,7 @@ install: $(INSTBINS)
  		echo "if there have been any changes to the base config you will need"; \
  		echo "to add them to your config file."; \
      else \
 -		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
 +		$(INSTALL) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+		echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
+ 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
  		echo "Installed config into $(ETC)/kismet.conf."; \
  	fi
- 	@if test -f $(ETC)/kismet_drone.conf; then \
-@@ -138,8 +138,8 @@ suidinstall: $(CS)
+@@ -183,7 +183,7 @@ install: $(INSTBINS)
  		echo "if there have been any changes to the base config you will need"; \
  		echo "to add them to your config file."; \
      else \
 -		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
 +		$(INSTALL) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+		echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
+ 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
  		echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
  	fi
- 
-@@ -161,8 +161,8 @@ install: $(PS) $(CS) $(DRONE) $(NC)
- 		echo "if there have been any changes to the base config you will need"; \
- 		echo "to add them to your config file."; \
-     else \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+		$(INSTALL) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
-+		echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
- 		echo "Installed config into $(ETC)/kismet.conf."; \
- 	fi
- 	@if test -f $(ETC)/kismet_drone.conf; then \
-@@ -170,8 +170,8 @@ install: $(PS) $(CS) $(DRONE) $(NC)
- 		echo "if there have been any changes to the base config you will need"; \
- 		echo "to add them to your config file."; \
-     else \
--		$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
--		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+		$(INSTALL) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
-+		echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
- 		echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
- 	fi
- 	@echo "Installed kismet into $(BIN)/."
diff --git a/package/kismet/patches/patch-configure b/package/kismet/patches/patch-configure
deleted file mode 100644
index ce10b60f3..000000000
--- a/package/kismet/patches/patch-configure
+++ /dev/null
@@ -1,98 +0,0 @@
---- kismet-2010-01-R1.orig/configure	Fri Jan  8 00:33:30 2010
-+++ kismet-2010-01-R1/configure	Wed Feb 17 21:59:01 2010
-@@ -26,9 +26,10 @@ esac
- 
- fi
- 
-+oCC="$CC"
-+CC="$CXX"
- 
- 
--
- # PATH needs CR
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-@@ -6836,74 +6837,7 @@ else
- $as_echo "yes" >&6; }
- fi
- 
--# Do we use libstdc++?
--# We need to swap to the g++ compiler here
--oCC="$CC"
--CC="$CXX"
--{ $as_echo "$as_me:$LINENO: checking for main in -luClibc++" >&5
--$as_echo_n "checking for main in -luClibc++... " >&6; }
--if test "${ac_cv_lib_uClibcpp_main+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-luClibc++  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--
--int
--main ()
--{
--return main ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_lib_uClibcpp_main=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_uClibcpp_main=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_uClibcpp_main" >&5
--$as_echo "$ac_cv_lib_uClibcpp_main" >&6; }
--if test "x$ac_cv_lib_uClibcpp_main" = x""yes; then
--  foundcxxl="uclibc" CXXLIBS="$CXXLIBS -luClibc++"
--fi
--
--
- # Do we use uclibc++?
- if test "$foundcxxl"x == "x"; then
- 	{ $as_echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
-@@ -7017,7 +6951,7 @@ fi
- 
- 
- # Add additional cflags since some distros bury panel.h
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
-+#CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
- 
- termcontrol="none";
- 
diff --git a/package/kismet/patches/patch-ifcontrol_cc b/package/kismet/patches/patch-ifcontrol_cc
deleted file mode 100644
index a7028eb32..000000000
--- a/package/kismet/patches/patch-ifcontrol_cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- kismet-2010-01-R1.orig/ifcontrol.cc	Mon Aug 31 01:36:19 2009
-+++ kismet-2010-01-R1/ifcontrol.cc	Wed Feb 17 21:59:02 2010
-@@ -149,7 +149,7 @@ string Linux_GetSysDrv(const char *in_dev) {
- 	devlinklen = readlink(devlink.c_str(), devlinktarget, 511);
- 	if (devlinklen > 0) {
- 		devlinktarget[devlinklen] = '\0';
--		rind = rindex(devlinktarget, '/');
-+		rind = strchr(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 --git a/package/kismet/patches/patch-iwcontrol_cc b/package/kismet/patches/patch-iwcontrol_cc
deleted file mode 100644
index f6e8aac25..000000000
--- a/package/kismet/patches/patch-iwcontrol_cc
+++ /dev/null
@@ -1,37 +0,0 @@
---- kismet-2010-01-R1.orig/iwcontrol.cc	Mon Aug 17 21:51:36 2009
-+++ kismet-2010-01-R1/iwcontrol.cc	Wed Feb 17 21:59:02 2010
-@@ -32,7 +32,6 @@
- #include <linux/if.h>
- #include <linux/wireless.h>
- 
--#endif // wireless
- 
- #ifndef rintf
- #define rintf(x) (float) rint((double) (x))
-@@ -697,7 +696,7 @@ int Iwconfig_Get_Chanlist(const char *interface, char 
- 		return -1;
- 	}
- 
--	bzero(buffer, sizeof(buffer));
-+	memset(buffer, 0, sizeof(buffer));
- 
- 	memset(&wrq, 0, sizeof(struct iwreq));
- 
-@@ -732,7 +731,7 @@ int Iwconfig_Get_Chanlist(const char *interface, char 
- 		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));
-@@ -797,6 +796,8 @@ int Iwconfig_Get_Chanlist(const char *interface, char 
- 	close(skfd);
- 	return chan_list->size();
- }
-+
-+#endif // wireless
- 
- #endif
-