From ccc509d7a301d6305899a5f99a7fed77b0befdfe Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 26 Mar 2000 00:29:22 +0000 Subject: [PATCH] unified diffs --- net/sniffit/patches/patch-aa | 73 ++++++---------- net/sniffit/patches/patch-af | 157 ++++++++++++++--------------------- net/sniffit/patches/patch-ag | 30 +++---- 3 files changed, 100 insertions(+), 160 deletions(-) diff --git a/net/sniffit/patches/patch-aa b/net/sniffit/patches/patch-aa index cb92bec841e..fa960b21ef3 100644 --- a/net/sniffit/patches/patch-aa +++ b/net/sniffit/patches/patch-aa @@ -1,46 +1,27 @@ -*** Makefile.in.orig Fri Apr 18 05:33:57 1997 ---- Makefile.in Thu Jun 18 15:55:25 1998 -*************** -*** 8,19 **** - SNIFFIT = sniffit.0.3.5.c - CC = @CC@ - LIBS = @LIBS@ -! DEFS = @DEFS@ - OS_OPT = @OS_OPT@ - OBJ_FLAG = -w -O2 -c -! OBJ_OPT = -I./libpcap-0.3 -L./libpcap-0.3 - EXE_FLAG = -w -O2 -o sniffit -! EXE_OPT = -I./libpcap-0.3 -L./libpcap-0.3 -lpcap - EXE_OBJ = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \ - sn_logfile.o - DEP_FILES = sn_config.h pcap.h sn_data.h sn_defines.h sn_plugins.h \ ---- 8,19 ---- - SNIFFIT = sniffit.0.3.5.c - CC = @CC@ - LIBS = @LIBS@ -! DEFS = @DEFS@ -DHAVE_LIBNCURSES - OS_OPT = @OS_OPT@ - OBJ_FLAG = -w -O2 -c -! #OBJ_OPT = -I./libpcap-0.3 -L./libpcap-0.3 - EXE_FLAG = -w -O2 -o sniffit -! EXE_OPT = -lpcap - EXE_OBJ = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \ - sn_logfile.o - DEP_FILES = sn_config.h pcap.h sn_data.h sn_defines.h sn_plugins.h \ -*************** -*** 21,27 **** - sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o - - sniffit: $(SNIFFIT) $(DEP_FILES) -! cd libpcap-0.3; make; cd .. - $(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) - strip sniffit - ---- 21,27 ---- - sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o - - sniffit: $(SNIFFIT) $(DEP_FILES) -! #cd libpcap-0.3; make; cd .. - $(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) - strip sniffit - +--- Makefile.in.orig Fri Apr 18 05:33:57 1997 ++++ Makefile.in Sat Mar 25 18:28:00 2000 +@@ -8,12 +8,12 @@ + SNIFFIT = sniffit.0.3.5.c + CC = @CC@ + LIBS = @LIBS@ +-DEFS = @DEFS@ ++DEFS = @DEFS@ -DHAVE_LIBNCURSES + OS_OPT = @OS_OPT@ + OBJ_FLAG = -w -O2 -c +-OBJ_OPT = -I./libpcap-0.3 -L./libpcap-0.3 ++#OBJ_OPT = -I./libpcap-0.3 -L./libpcap-0.3 + EXE_FLAG = -w -O2 -o sniffit +-EXE_OPT = -I./libpcap-0.3 -L./libpcap-0.3 -lpcap ++EXE_OPT = -lpcap + EXE_OBJ = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \ + sn_logfile.o + DEP_FILES = sn_config.h pcap.h sn_data.h sn_defines.h sn_plugins.h \ +@@ -21,7 +21,7 @@ + sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o + + sniffit: $(SNIFFIT) $(DEP_FILES) +- cd libpcap-0.3; make; cd .. ++ #cd libpcap-0.3; make; cd .. + $(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) + strip sniffit + diff --git a/net/sniffit/patches/patch-af b/net/sniffit/patches/patch-af index d7cae6194f1..6c35a894090 100644 --- a/net/sniffit/patches/patch-af +++ b/net/sniffit/patches/patch-af @@ -1,95 +1,62 @@ -*** configure.orig Fri Apr 18 16:33:57 1997 ---- configure Thu May 7 15:18:45 1998 -*************** -*** 712,726 **** - fi - - -! NCURSES_PATH=/usr/include:/usr/include/ncurses:/usr/include/curses:/usr/local/include:/usr/local/include/ncurses:/usr/local/include/curses -! echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 -! echo "configure:718: checking for main in -lncurses" >&5 -! ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lncurses $LIBS" - cat > conftest.$ac_ext <&6 -! echo "configure:718: checking for main in -lcurses" >&5 -! ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lcurses $LIBS" - cat > conftest.$ac_ext <&6 -! ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 - fi - - -! for ac_prog in ncurses.h - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 ---- 744,763 ---- - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -! ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 - fi - - -! for ac_prog in curses.h - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -*************** -*** 1299,1304 **** ---- 1299,1312 ---- - freebsd*) - cat >> confdefs.h <<\EOF - #define FREEBSD 1 -+ EOF -+ -+ OS_OPT= -+ -+ ;; -+ openbsd*) -+ cat >> confdefs.h <<\EOF -+ #define OPENBSD 1 - EOF - - OS_OPT= +--- configure.orig Fri Apr 18 05:33:57 1997 ++++ configure Sat Mar 25 18:28:00 2000 +@@ -712,15 +712,15 @@ + fi + + +-NCURSES_PATH=/usr/include:/usr/include/ncurses:/usr/include/curses:/usr/local/include:/usr/local/include/ncurses:/usr/local/include/curses +-echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 +-echo "configure:718: checking for main in -lncurses" >&5 +-ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'` ++NCURSES_PATH=/usr/include:/usr/include/curses:/usr/include/curses:/usr/local/include:/usr/local/include/curses:/usr/local/include/curses ++echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 ++echo "configure:718: checking for main in -lcurses" >&5 ++ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lncurses $LIBS" ++LIBS="-lcurses $LIBS" + cat > conftest.$ac_ext <&6 +- ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 + fi + + +-for ac_prog in ncurses.h ++for ac_prog in curses.h + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -1299,6 +1299,14 @@ + freebsd*) + cat >> confdefs.h <<\EOF + #define FREEBSD 1 ++EOF ++ ++ OS_OPT= ++ ++ ;; ++openbsd*) ++ cat >> confdefs.h <<\EOF ++#define OPENBSD 1 + EOF + + OS_OPT= diff --git a/net/sniffit/patches/patch-ag b/net/sniffit/patches/patch-ag index 5d58ac1f40e..65287578a20 100644 --- a/net/sniffit/patches/patch-ag +++ b/net/sniffit/patches/patch-ag @@ -1,19 +1,11 @@ -*** sn_data.h.orig Thu May 7 15:04:04 1998 ---- sn_data.h Thu May 7 15:04:38 1998 -*************** -*** 20,26 **** - char *ETH_DEV[]={"et"}; - #endif - -! #ifdef FREEBSD - #define ETH_DEV_NR 1 - char *ETH_DEV[]={"ed"}; - #endif ---- 20,26 ---- - char *ETH_DEV[]={"et"}; - #endif - -! #if defined(FREEBSD) || defined(OPENBSD) - #define ETH_DEV_NR 1 - char *ETH_DEV[]={"ed"}; - #endif +--- sn_data.h.orig Fri Apr 18 05:33:58 1997 ++++ sn_data.h Sat Mar 25 18:28:00 2000 +@@ -20,7 +20,7 @@ + char *ETH_DEV[]={"et"}; + #endif + +-#ifdef FREEBSD ++#if defined(FREEBSD) || defined(OPENBSD) + #define ETH_DEV_NR 1 + char *ETH_DEV[]={"ed"}; + #endif