From f96441b9faf769c9ecdd4d338b605ea3d0cc4010 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 9 Nov 2004 00:36:47 +0000 Subject: Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches. BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA --- .../kismet-2004-04-R1/glibc3.3.2-getopt-throw.diff | 36 +++++ kismet/kismet-2004-04-R1/no-chmod.diff | 173 +++++++++++++++++++++ .../no-lib-modules-uname-include.diff | 15 ++ kismet/kismet-2004-04-R1/no-strip.diff | 45 ++++++ 4 files changed, 269 insertions(+) (limited to 'kismet') diff --git a/kismet/kismet-2004-04-R1/glibc3.3.2-getopt-throw.diff b/kismet/kismet-2004-04-R1/glibc3.3.2-getopt-throw.diff index e69de29bb2..7032e3d736 100644 --- a/kismet/kismet-2004-04-R1/glibc3.3.2-getopt-throw.diff +++ b/kismet/kismet-2004-04-R1/glibc3.3.2-getopt-throw.diff @@ -0,0 +1,36 @@ +--- getopt.h.o 2004-10-10 19:48:48.409249432 +0200 ++++ getopt.h 2004-10-10 19:51:42.610766776 +0200 +@@ -20,6 +20,14 @@ + + #include "config.h" + ++#ifndef __THROW ++# if defined __cplusplus && __GNUC_PREREQ (2,8) ++# define __THROW throw () ++# else ++# define __THROW ++# endif ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -103,15 +111,15 @@ + /* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ +-extern int getopt (int argc, char *const *argv, const char *shortopts); ++extern int getopt (int argc, char *const *argv, const char *shortopts) __THROW; + #else /* not __GNU_LIBRARY__ */ + /* extern int getopt (); */ + #endif /* not __GNU_LIBRARY__ */ + extern int getopt_long (int argc, char *const *argv, const char *shortopts, +- const struct option *longopts, int *longind); ++ const struct option *longopts, int *longind) __THROW; + extern int getopt_long_only (int argc, char *const *argv, + const char *shortopts, +- const struct option *longopts, int *longind); ++ const struct option *longopts, int *longind) __THROW; + + /* Internal only. Users should not call this directly. */ + extern int _getopt_internal (int argc, char *const *argv, diff --git a/kismet/kismet-2004-04-R1/no-chmod.diff b/kismet/kismet-2004-04-R1/no-chmod.diff index e69de29bb2..9520d1df5b 100644 --- a/kismet/kismet-2004-04-R1/no-chmod.diff +++ b/kismet/kismet-2004-04-R1/no-chmod.diff @@ -0,0 +1,173 @@ +--- Makefile.in.o 2004-10-16 15:55:52.836093688 +0200 ++++ Makefile.in 2004-10-16 16:06:38.966866880 +0200 +@@ -130,52 +130,52 @@ + fi + + binuserinstall: +- install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); +- install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE); ++ install -m 755 $(PS) $(BIN)/$(PS); ++ install -m 755 $(DRONE) $(BIN)/$(DRONE); + + binsuidinstall: +- install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(PS) $(BIN)/$(PS); +- install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(DRONE) $(BIN)/$(DRONE); ++ install -m 4755 $(PS) $(BIN)/$(PS); ++ install -m 4755 $(DRONE) $(BIN)/$(DRONE); + + commoninstall: + mkdir -p $(ETC) + mkdir -p $(BIN) + +- install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet $(BIN)/kismet +- install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC) +- # install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(HOPPER) $(BIN)/$(HOPPER) ++ install -m 755 scripts/kismet $(BIN)/kismet ++ install -m 755 $(NC) $(BIN)/$(NC) ++ # install -m 755 $(HOPPER) $(BIN)/$(HOPPER) + @if test "$(ZAURUS)" = "yes"; then \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \ ++ install -m 755 $(BUZZER) $(BIN)/buzzme; \ ++ echo install -m 755 $(BUZZER) $(BIN)/buzzme; \ + fi +-#install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor +-#install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor ++#install -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor ++#install -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor + 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_monitor.1 $(MAN)/man1/kismet_monitor.1 +- # install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_hopper.1 $(MAN)/man1/kismet_hopper.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_monitor.1 $(MAN)/man1/kismet_monitor.1 ++ # install -m 644 man/kismet_hopper.1 $(MAN)/man1/kismet_hopper.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_ui.conf.5 $(MAN)/man5/kismet_ui.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_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5 ++ install -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5 + + @if test "$(GPSLBUILD)" = "$(GPSL)"; then \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ +- install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ +- echo install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ ++ install -m 755 $(GPSL) $(BIN)/$(GPSL); \ ++ echo install -m 755 $(GPSL) $(BIN)/$(GPSL); \ ++ install -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ ++ echo install -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ ++ install -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ ++ echo install -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ + fi + + mkdir -p $(WAV) +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/new_network.wav $(WAV)/new_network.wav +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/traffic.wav $(WAV)/traffic.wav +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/junk_traffic.wav $(WAV)/junk_traffic.wav +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/alert.wav $(WAV)/alert.wav +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/ap_manuf $(ETC)/ap_manuf; +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/client_manuf $(ETC)/client_manuf; ++ install -m 644 wav/new_network.wav $(WAV)/new_network.wav ++ install -m 644 wav/traffic.wav $(WAV)/traffic.wav ++ install -m 644 wav/junk_traffic.wav $(WAV)/junk_traffic.wav ++ install -m 644 wav/alert.wav $(WAV)/alert.wav ++ install -m 644 conf/ap_manuf $(ETC)/ap_manuf; ++ install -m 644 conf/client_manuf $(ETC)/client_manuf; + + @if test -f $(BIN)/kismet_curses; then \ + echo "Removing old kismet_curses binary. The panels frontend is now kismet_client."; \ +@@ -188,22 +188,22 @@ + @if test -f $(ETC)/kismet.conf; then \ + $(MAKE) -e checkconfig; \ + 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 \ + $(MAKE) -e checkdroneconfig; \ + 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 + @if test -f $(ETC)/kismet_ui.conf; then \ + $(MAKE) -e checkuiconfig; \ + else \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ echo install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ + echo "Installed UI config into $(ETC)/kismet_ui.conf."; \ + fi + @echo "Installed kismet into $(BIN)/." +@@ -221,22 +221,22 @@ + @if test -f $(ETC)/kismet.conf; then \ + $(MAKE) -e checkconfig; \ + 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 \ + $(MAKE) -e checkdroneconfig; \ + 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 + @if test -f $(ETC)/kismet_ui.conf; then \ + $(MAKE) -e checkuiconfig; \ + else \ +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ echo install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ + echo "Installed UI config into $(ETC)/kismet_ui.conf."; \ + fi + @echo "Installed kismet into $(BIN)/." +@@ -252,11 +252,11 @@ + forceinstall: $(PS) + $(MAKE) -e commoninstall + $(MAKE) -e binuserinstall +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ ++ install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ + echo "Installed config into $(ETC)/kismet.conf."; +- 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 "Installed drone config into $(ETC)/kismet_drone.conf."; +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ + echo "Installed UI config into $(ETC)/kismet_ui.conf."; + @echo "Installed kismet into $(BIN)/." + @echo "If you have not done so already, read the README file and the FAQ file. Additional" +@@ -271,11 +271,11 @@ + suidforceinstall: $(PS) + $(MAKE) -e commoninstall + $(MAKE) -e binsuidinstall +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ ++ install -m 644 conf/kismet.conf $(ETC)/kismet.conf; \ + echo "Installed config into $(ETC)/kismet.conf."; +- 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 "Installed drone config into $(ETC)/kismet_drone.conf."; +- install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ ++ install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf; \ + echo "Installed UI config into $(ETC)/kismet_ui.conf."; + @echo "Installed kismet into $(BIN)/." + @echo "If you have not done so already, read the README file and the FAQ file. Additional" diff --git a/kismet/kismet-2004-04-R1/no-lib-modules-uname-include.diff b/kismet/kismet-2004-04-R1/no-lib-modules-uname-include.diff index e69de29bb2..6b2b5f74a6 100644 --- a/kismet/kismet-2004-04-R1/no-lib-modules-uname-include.diff +++ b/kismet/kismet-2004-04-R1/no-lib-modules-uname-include.diff @@ -0,0 +1,15 @@ +--- configure.o 2004-10-18 13:37:48.208863080 +0200 ++++ configure 2004-10-18 13:39:16.298471424 +0200 +@@ -5805,9 +5805,9 @@ + if test "$wireless" = "yes"; then + # If we're compiling under linux and we need the wireless extentions, + # then we should try to look in the current kernel module build dir, too. +- if test "$linux" = "yes"; then +- CPPFLAGS="$CPPFLAGS -I/lib/modules/\`uname -r\`/build/include/" +- fi ++ #if test "$linux" = "yes"; then ++ # CPPFLAGS="$CPPFLAGS -I/lib/modules/\`uname -r\`/build/include/" ++ #fi + + echo "$as_me:$LINENO: checking that linux/wireless.h is what we expect" >&5 + echo $ECHO_N "checking that linux/wireless.h is what we expect... $ECHO_C" >&6 diff --git a/kismet/kismet-2004-04-R1/no-strip.diff b/kismet/kismet-2004-04-R1/no-strip.diff index e69de29bb2..a4a8f85344 100644 --- a/kismet/kismet-2004-04-R1/no-strip.diff +++ b/kismet/kismet-2004-04-R1/no-strip.diff @@ -0,0 +1,45 @@ +--- Makefile.in.o 2004-10-08 18:59:21.294566720 +0200 ++++ Makefile.in 2004-10-08 18:59:40.034717784 +0200 +@@ -130,23 +130,23 @@ + fi + + binuserinstall: +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE); ++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); ++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE); + + binsuidinstall: +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE); ++ install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(PS) $(BIN)/$(PS); ++ install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(DRONE) $(BIN)/$(DRONE); + + commoninstall: + mkdir -p $(ETC) + mkdir -p $(BIN) + + install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet $(BIN)/kismet +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC) +- # install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER) ++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC) ++ # install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(HOPPER) $(BIN)/$(HOPPER) + @if test "$(ZAURUS)" = "yes"; then \ +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \ ++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \ ++ echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \ + fi + #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor + #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor +@@ -161,8 +161,8 @@ + install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5 + + @if test "$(GPSLBUILD)" = "$(GPSL)"; then \ +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \ ++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \ ++ echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \ + install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ + echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ + install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ -- cgit v1.2.3