From d92e2d01cb8207ea3c388df103b288886a9626c7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 18 Feb 2010 19:06:45 +0100 Subject: Avoid/Fix build on OpenBSD host system --- package/kismet/patches/patch-Makefile_in | 48 +++++++++++++++++++++++++++++-- package/kismet/patches/patch-configure | 17 ++++++----- package/kismet/patches/patch-ifcontrol_cc | 6 ++-- package/kismet/patches/patch-iwcontrol_cc | 15 +++++----- 4 files changed, 67 insertions(+), 19 deletions(-) (limited to 'package/kismet/patches') diff --git a/package/kismet/patches/patch-Makefile_in b/package/kismet/patches/patch-Makefile_in index 68c43e813..8b00a86ec 100644 --- a/package/kismet/patches/patch-Makefile_in +++ b/package/kismet/patches/patch-Makefile_in @@ -1,5 +1,5 @@ ---- kismet-2010-01-R1.orig/Makefile.in 2009-12-14 20:04:11.000000000 +0100 -+++ kismet-2010-01-R1/Makefile.in 2010-02-14 20:19:50.000000000 +0100 +--- 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) @@ -39,3 +39,47 @@ suidinstall: $(CS) -groupadd -f $(SUIDGROUP) +@@ -129,8 +129,8 @@ suidinstall: $(CS) + 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 \ +@@ -138,8 +138,8 @@ suidinstall: $(CS) + 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 + +@@ -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 index 054622165..ce10b60f3 100644 --- a/package/kismet/patches/patch-configure +++ b/package/kismet/patches/patch-configure @@ -1,16 +1,18 @@ ---- kismet-2010-01-R1.orig/configure 2010-01-08 00:33:30.000000000 +0100 -+++ kismet-2010-01-R1/configure 2010-02-14 20:32:44.000000000 +0100 -@@ -26,7 +26,8 @@ esac +--- 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 -@@ -6836,73 +6837,6 @@ else + # Avoid depending upon Character Ranges. + as_cr_letters='abcdefghijklmnopqrstuvwxyz' +@@ -6836,74 +6837,7 @@ else $as_echo "yes" >&6; } fi @@ -31,7 +33,7 @@ -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -- + - -int -main () @@ -81,9 +83,10 @@ - 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 diff --git a/package/kismet/patches/patch-ifcontrol_cc b/package/kismet/patches/patch-ifcontrol_cc index c1606f9d2..a7028eb32 100644 --- a/package/kismet/patches/patch-ifcontrol_cc +++ b/package/kismet/patches/patch-ifcontrol_cc @@ -1,6 +1,6 @@ ---- kismet-2010-01-R1.orig/ifcontrol.cc 2009-08-31 01:36:19.000000000 +0200 -+++ kismet-2010-01-R1/ifcontrol.cc 2010-02-14 19:59:51.000000000 +0100 -@@ -149,7 +149,7 @@ string Linux_GetSysDrv(const char *in_de +--- 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'; diff --git a/package/kismet/patches/patch-iwcontrol_cc b/package/kismet/patches/patch-iwcontrol_cc index 01ca44d53..f6e8aac25 100644 --- a/package/kismet/patches/patch-iwcontrol_cc +++ b/package/kismet/patches/patch-iwcontrol_cc @@ -1,5 +1,5 @@ ---- kismet-2010-01-R1.orig/iwcontrol.cc 2009-08-17 21:51:36.000000000 +0200 -+++ kismet-2010-01-R1/iwcontrol.cc 2010-02-14 22:27:00.000000000 +0100 +--- 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 #include @@ -8,7 +8,7 @@ #ifndef rintf #define rintf(x) (float) rint((double) (x)) -@@ -697,7 +696,7 @@ int Iwconfig_Get_Chanlist(const char *in +@@ -697,7 +696,7 @@ int Iwconfig_Get_Chanlist(const char *interface, char return -1; } @@ -17,7 +17,7 @@ memset(&wrq, 0, sizeof(struct iwreq)); -@@ -732,7 +731,7 @@ int Iwconfig_Get_Chanlist(const char *in +@@ -732,7 +731,7 @@ int Iwconfig_Get_Chanlist(const char *interface, char memcpy((char *) &range, buffer, sizeof(iw_range)); } else { /* Zero unknown fields */ @@ -26,11 +26,12 @@ /* Initial part unmoved */ memcpy((char *) &range, buffer, iwr15_off(num_channels)); -@@ -798,5 +797,7 @@ int Iwconfig_Get_Chanlist(const char *in +@@ -797,6 +796,8 @@ int Iwconfig_Get_Chanlist(const char *interface, char + close(skfd); return chan_list->size(); } - -+#endif // wireless + ++#endif // wireless + #endif -- cgit v1.2.3