|
@@ -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)/."
|