diff -urN snort-2.6.0.2.orig/config.h.in snort-2.6.0.2/config.h.in --- snort-2.6.0.2.orig/config.h.in 2006-11-14 12:42:15.000000000 -0500 +++ snort-2.6.0.2/config.h.in 2006-11-14 13:08:27.000000000 -0500 @@ -39,10 +39,10 @@ /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM -/* Define to 1 if you have the `net' library (-lnet). */ +/* Define to 1 if you have the `net' library (-lnet-1.0). */ #undef HAVE_LIBNET -/* Define to 1 if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_LIBNET_H /* Define to 1 if you have the `nsl' library (-lnsl). */ diff -urN snort-2.6.0.2.orig/configure snort-2.6.0.2/configure --- snort-2.6.0.2.orig/configure 2006-11-14 12:42:15.000000000 -0500 +++ snort-2.6.0.2/configure 2006-11-14 13:08:27.000000000 -0500 @@ -24397,21 +24397,21 @@ else libnet_dir="/usr/include /usr/local/include /sw/include" fi - echo "$as_me:$LINENO: checking \"for libnet.h version 1.0.x\"" >&5 -echo $ECHO_N "checking \"for libnet.h version 1.0.x\"... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking \"for libnet-1.0.h version 1.0.x\"" >&5 +echo $ECHO_N "checking \"for libnet-1.0.h version 1.0.x\"... $ECHO_C" >&6 for i in $libnet_dir; do - if test -r $i/libnet.h; then + if test -r $i/libnet-1.0.h; then LIBNET_INC_DIR=$i fi done if test "$LIBNET_INC_DIR" != ""; then - if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0 >/dev/null"; then + if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0 >/dev/null"; then echo echo echo "**********************************************" - echo " ERROR: unable to find" "libnet 1.0.x (libnet.h)" + echo " ERROR: unable to find" "libnet 1.0.x (libnet-1.0.h)" echo " checked in the following places" for i in `echo $LIBNET_INC_DIR`; do echo " $i" @@ -24421,8 +24421,8 @@ exit 1 fi - CFLAGS="${CFLAGS} `libnet-config --defines` `libnet-config --cflags`" - LIBS="${LIBS} `libnet-config --libs`" + CFLAGS="${CFLAGS} `libnet-1.0-config --defines` `libnet-1.0-config --cflags`" + LIBS="${LIBS} `libnet-1.0-config --libs`" CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}" echo "$as_me:$LINENO: result: $i" >&5 echo "${ECHO_T}$i" >&6 @@ -24439,7 +24439,7 @@ # Check whether --enable-flexresp or --disable-flexresp was given. if test "${enable_flexresp+set}" = set; then enableval="$enable_flexresp" - CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`" + CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`" fi; @@ -24450,25 +24450,25 @@ exit fi - if test `libnet-config --cflags | wc -c` = "1"; then + if test `libnet-1.0-config --cflags | wc -c` = "1"; then CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include" LIBNET_CONFIG_BROKEN_CFLAGS=yes fi - if test `libnet-config --libs | wc -c` = "1"; then - { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system. If you" >&5 -echo "$as_me: WARNING: libnet-config --libs is broken on your system. If you" >&2;} + if test `libnet-1.0-config --libs | wc -c` = "1"; then + { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&5 +echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&2;} { echo "$as_me:$LINENO: WARNING: are using a precompiled package please notify the" >&5 echo "$as_me: WARNING: are using a precompiled package please notify the" >&2;} { echo "$as_me:$LINENO: WARNING: maintainer." >&5 echo "$as_me: WARNING: maintainer." >&2;} LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib" - LIBS="${LIBS} -lnet" + LIBS="${LIBS} -lnet-1.0" fi LNET="" -for ac_header in libnet.h +for ac_header in libnet-1.0.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -24637,18 +24637,18 @@ libnet_dir="/usr/include /usr/local/include /sw/include" fi else - libnet_dir=`libnet-config --cflags | cut -dI -f2` + libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2` fi LIBNET_INC_DIR="" for i in $libnet_dir; do - if test -r $i/libnet.h; then + if test -r $i/libnet-1.0.h; then LIBNET_INC_DIR=$i fi done if test "$LIBNET_INC_DIR" != ""; then - if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then + if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 echo @@ -24659,7 +24659,7 @@ echo echo echo "**********************************************" - echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)" + echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)" echo " checked in the following places" for i in `echo $LIBNET_INC_DIR`; do echo " $i" @@ -24678,7 +24678,7 @@ echo echo echo "**********************************************" - echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)" + echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)" echo " checked in the following places" for i in `echo $libnet_dir`; do echo " $i" @@ -24691,13 +24691,13 @@ LNET="" -echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5 -echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5 +echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6 if test "${ac_cv_lib_net_libnet_build_ip+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lnet $LIBS" +LIBS="-lnet-1.0 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24760,7 +24760,7 @@ #define HAVE_LIBNET 1 _ACEOF - LIBS="-lnet $LIBS" + LIBS="-lnet-1.0 $LIBS" else LNET="no" @@ -25041,7 +25041,7 @@ # Check whether --enable-react or --disable-react was given. if test "${enable_react+set}" = set; then enableval="$enable_react" - CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`" + CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`" fi; @@ -25053,25 +25053,25 @@ exit fi - if test `libnet-config --cflags | wc -c` = "1"; then + if test `libnet-1.0-config --cflags | wc -c` = "1"; then CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include" LIBNET_CONFIG_BROKEN_CFLAGS=yes fi - if test `libnet-config --libs | wc -c` = "1"; then - { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system. If you" >&5 -echo "$as_me: WARNING: libnet-config --libs is broken on your system. If you" >&2;} + if test `libnet-1.0-config --libs | wc -c` = "1"; then + { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&5 +echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&2;} { echo "$as_me:$LINENO: WARNING: are using a precompiled package please notify the" >&5 echo "$as_me: WARNING: are using a precompiled package please notify the" >&2;} { echo "$as_me:$LINENO: WARNING: maintainer." >&5 echo "$as_me: WARNING: maintainer." >&2;} LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib" - LIBS="${LIBS} -lnet" + LIBS="${LIBS} -lnet-1.0" fi LNET="" -for ac_header in libnet.h +for ac_header in libnet-1.0.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -25240,18 +25240,18 @@ libnet_dir="/usr/include /usr/local/include /sw/include" fi else - libnet_dir=`libnet-config --cflags | cut -dI -f2` + libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2` fi LIBNET_INC_DIR="" for i in $libnet_dir; do - if test -r $i/libnet.h; then + if test -r $i/libnet-1.0.h; then LIBNET_INC_DIR=$i fi done if test "$LIBNET_INC_DIR" != ""; then - if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then + if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 echo @@ -25262,7 +25262,7 @@ echo echo echo "**********************************************" - echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)" + echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)" echo " checked in the following places" for i in `echo $LIBNET_INC_DIR`; do echo " $i" @@ -25281,7 +25281,7 @@ echo echo echo "**********************************************" - echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)" + echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)" echo " checked in the following places" for i in `echo $libnet_dir`; do echo " $i" @@ -25294,13 +25294,13 @@ LNET="" -echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5 -echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5 +echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6 if test "${ac_cv_lib_net_libnet_build_ip+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lnet $LIBS" +LIBS="-lnet-1.0 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25363,7 +25363,7 @@ #define HAVE_LIBNET 1 _ACEOF - LIBS="-lnet $LIBS" + LIBS="-lnet-1.0 $LIBS" else LNET="no" diff -urN snort-2.6.0.2.orig/configure.in snort-2.6.0.2/configure.in --- snort-2.6.0.2.orig/configure.in 2006-11-14 12:42:15.000000000 -0500 +++ snort-2.6.0.2/configure.in 2006-11-14 13:13:05.000000000 -0500 @@ -799,19 +799,19 @@ else libnet_dir="/usr/include /usr/local/include /sw/include" fi - AC_MSG_CHECKING("for libnet.h version 1.0.x") + AC_MSG_CHECKING("for libnet-1.0.h version 1.0.x") for i in $libnet_dir; do - if test -r $i/libnet.h; then + if test -r $i/libnet-1.0.h; then LIBNET_INC_DIR=$i fi done if test "$LIBNET_INC_DIR" != ""; then - if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0 >/dev/null"; then - FAIL_MESSAGE("libnet 1.0.x (libnet.h)", $LIBNET_INC_DIR) + if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0 >/dev/null"; then + FAIL_MESSAGE("libnet 1.0.x (libnet-1.0.h)", $LIBNET_INC_DIR) fi - CFLAGS="${CFLAGS} `libnet-config --defines` `libnet-config --cflags`" - LIBS="${LIBS} `libnet-config --libs`" + CFLAGS="${CFLAGS} `libnet-1.0-config --defines` `libnet-1.0-config --cflags`" + LIBS="${LIBS} `libnet-1.0-config --libs`" CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}" AC_MSG_RESULT($i) else @@ -823,7 +823,7 @@ AC_ARG_ENABLE(flexresp, [ --enable-flexresp Flexible Responses on hostile connection attempts], -[ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"],) +[ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"],) if test "$enable_flexresp" != "no" -a "$enable_flexresp" = "yes"; then @@ -833,21 +833,21 @@ exit fi - if test `libnet-config --cflags | wc -c` = "1"; then + if test `libnet-1.0-config --cflags | wc -c` = "1"; then CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include" LIBNET_CONFIG_BROKEN_CFLAGS=yes fi - if test `libnet-config --libs | wc -c` = "1"; then - AC_MSG_WARN(libnet-config --libs is broken on your system. If you) + if test `libnet-1.0-config --libs | wc -c` = "1"; then + AC_MSG_WARN(libnet-1.0-config --libs is broken on your system. If you) AC_MSG_WARN(are using a precompiled package please notify the) AC_MSG_WARN(maintainer.) LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib" - LIBS="${LIBS} -lnet" + LIBS="${LIBS} -lnet-1.0" fi LNET="" - AC_CHECK_HEADERS(libnet.h,, LNET="no") + AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no") if test "$LNET" = "no"; then echo echo " ERROR! Libnet header not found, go get it from" @@ -865,33 +865,33 @@ libnet_dir="/usr/include /usr/local/include /sw/include" fi else - libnet_dir=`libnet-config --cflags | cut -dI -f2` + libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2` fi LIBNET_INC_DIR="" for i in $libnet_dir; do - if test -r $i/libnet.h; then + if test -r $i/libnet-1.0.h; then LIBNET_INC_DIR=$i fi done if test "$LIBNET_INC_DIR" != ""; then - if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then + if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then AC_MSG_RESULT(no) echo echo " ERROR! Snort with --enable-flexresp will *only* work with" echo " libnet version 1.0.2a, go get it from" echo " http://www.packetfactory.net/projects/libnet/" - FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR) + FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR) fi AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) - FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir) + FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir) fi LNET="" - AC_CHECK_LIB(net, libnet_build_ip,, LNET="no") + AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no") if test "$LNET" = "no"; then echo echo " ERROR! Libnet library not found, go get it from" @@ -937,7 +937,7 @@ AC_ARG_ENABLE(react, [ --enable-react Intercept and terminate offending HTTP accesses], -[ CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"],) +[ CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"],) if test "$enable_react" != "no" -a "$enable_react" = "yes"; then @@ -948,21 +948,21 @@ exit fi - if test `libnet-config --cflags | wc -c` = "1"; then + if test `libnet-1.0-config --cflags | wc -c` = "1"; then CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include" LIBNET_CONFIG_BROKEN_CFLAGS=yes fi - if test `libnet-config --libs | wc -c` = "1"; then - AC_MSG_WARN(libnet-config --libs is broken on your system. If you) + if test `libnet-1.0-config --libs | wc -c` = "1"; then + AC_MSG_WARN(libnet-1.0-config --libs is broken on your system. If you) AC_MSG_WARN(are using a precompiled package please notify the) AC_MSG_WARN(maintainer.) LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib" - LIBS="${LIBS} -lnet" + LIBS="${LIBS} -lnet-1.0" fi LNET="" - AC_CHECK_HEADERS(libnet.h,, LNET="no") + AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no") if test "$LNET" = "no"; then echo echo " ERROR! Libnet header not found, go get it from" @@ -980,33 +980,33 @@ libnet_dir="/usr/include /usr/local/include /sw/include" fi else - libnet_dir=`libnet-config --cflags | cut -dI -f2` + libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2` fi LIBNET_INC_DIR="" for i in $libnet_dir; do - if test -r $i/libnet.h; then + if test -r $i/libnet-1.0.h; then LIBNET_INC_DIR=$i fi done if test "$LIBNET_INC_DIR" != ""; then - if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then + if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then AC_MSG_RESULT(no) echo echo " ERROR! Snort with --enable-react will *only* work with" echo " libnet version 1.0.2a, go get it from" echo " http://www.packetfactory.net/projects/libnet/" - FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR) + FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR) fi AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) - FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir) + FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir) fi LNET="" - AC_CHECK_LIB(net, libnet_build_ip,, LNET="no") + AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no") if test "$LNET" = "no"; then echo echo " ERROR! Libnet library not found, go get it from" diff -urN snort-2.6.0.2.orig/src/detection-plugins/sp_react.c snort-2.6.0.2/src/detection-plugins/sp_react.c --- snort-2.6.0.2.orig/src/detection-plugins/sp_react.c 2006-11-14 12:42:15.000000000 -0500 +++ snort-2.6.0.2/src/detection-plugins/sp_react.c 2006-11-14 12:52:15.000000000 -0500 @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include "rules.h" #include "decode.h" diff -urN snort-2.6.0.2.orig/src/detection-plugins/sp_respond.c snort-2.6.0.2/src/detection-plugins/sp_respond.c --- snort-2.6.0.2.orig/src/detection-plugins/sp_respond.c 2006-11-14 12:42:15.000000000 -0500 +++ snort-2.6.0.2/src/detection-plugins/sp_respond.c 2006-11-14 12:52:15.000000000 -0500 @@ -34,7 +34,7 @@ #if defined(ENABLE_RESPONSE) && !defined(ENABLE_RESPONSE2) -#include +#include #include "decode.h" #include "rules.h" diff -urN snort-2.6.0.2.orig/src/inline.c snort-2.6.0.2/src/inline.c --- snort-2.6.0.2.orig/src/inline.c 2006-11-14 12:42:15.000000000 -0500 +++ snort-2.6.0.2/src/inline.c 2006-11-14 12:52:15.000000000 -0500 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "decode.h" #include "inline.h"