Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

1 files changed, 84 insertions, 11 deletions

diff --git a/package/kismet/patches/patch-Makefile_in b/package/kismet/patches/patch-Makefile_in
index e58e3399a..8b00a86ec 100644
--- a/package/kismet/patches/patch-Makefile_in
+++ b/package/kismet/patches/patch-Makefile_in
@@ -1,12 +1,85 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- kismet-2008-05-R1.orig/Makefile.in	2008-05-29 21:18:26.000000000 +0200
-+++ kismet-2008-05-R1/Makefile.in	2009-05-10 01:19:47.000000000 +0200
-@@ -22,7 +22,7 @@ LDFLAGS	= @LDFLAGS@
- LIBS	= @LIBS@
- CLIBS   = @CLIBS@
- CFLAGS	= @CFLAGS@
--CXXFLAGS = -O2 -Wall -DVERSION_MAJOR=\"$(VERSION_MAJOR)\" -DVERSION_MINOR=\"$(VERSION_MINOR)\" -DVERSION_TINY=\"$(VERSION_TINY)\" -DTIMESTAMP=\"`cat TIMESTAMP`\" @CXXFLAGS@
-+CXXFLAGS = -Wall -DVERSION_MAJOR=\"$(VERSION_MAJOR)\" -DVERSION_MINOR=\"$(VERSION_MINOR)\" -DVERSION_TINY=\"$(VERSION_TINY)\" -DTIMESTAMP=\"`cat TIMESTAMP`\" @CXXFLAGS@
- CPPFLAGS = @CPPFLAGS@
- SUID	= @suid@
+--- 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)
  
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC)
+-	$(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);
+ 
+ 	mkdir -p $(MAN)/man1
+-	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
+-	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
++	$(INSTALL) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
++	$(INSTALL) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
+ 
+ 	mkdir -p $(MAN)/man5
+-	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
+-	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
++	$(INSTALL) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
++	$(INSTALL) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
+ 
+ 	mkdir -p $(WAV)
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/new.wav $(WAV)/new.wav
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/packet.wav $(WAV)/packet.wav
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/alert.wav $(WAV)/alert.wav
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/gpslost.wav $(WAV)/gpslost.wav
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/gpslock.wav $(WAV)/gpslock.wav
++	$(INSTALL) -m 644 wav/new.wav $(WAV)/new.wav
++	$(INSTALL) -m 644 wav/packet.wav $(WAV)/packet.wav
++	$(INSTALL) -m 644 wav/alert.wav $(WAV)/alert.wav
++	$(INSTALL) -m 644 wav/gpslost.wav $(WAV)/gpslost.wav
++	$(INSTALL) -m 644 wav/gpslock.wav $(WAV)/gpslock.wav
+ 
+ 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)/."