Attachment #101951 for bug #155168

View | Details | Raw Unified | Return to bug 155168
Collapse All | Expand All

Lines 39-48 Link Here

(-)snort-2.6.0.2.orig/config.h.in (-2 / +2 lines)
39	/* Define to 1 if you have the `m' library (-lm). */	39	/* Define to 1 if you have the `m' library (-lm). */
40	#undef HAVE_LIBM	40	#undef HAVE_LIBM
41		41
42	/* Define to 1 if you have the `net' library (-lnet). */	42	/* Define to 1 if you have the `net' library (-lnet-1.0). */
43	#undef HAVE_LIBNET	43	#undef HAVE_LIBNET
44		44
45	/* Define to 1 if you have the <libnet.h> header file. */	45	/* Define to 1 if you have the <libnet-1.0.h> header file. */
46	#undef HAVE_LIBNET_H	46	#undef HAVE_LIBNET_H
47		47
48	/* Define to 1 if you have the `nsl' library (-lnsl). */	48	/* Define to 1 if you have the `nsl' library (-lnsl). */




         else
            libnet_dir="/usr/include /usr/local/include /sw/include"
        fi
        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-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-1.0.h | grep -v 1.0 >/dev/null"; then

   echo
   echo
   echo "**********************************************"
   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"

   exit 1

            fi
            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

# Check whether --enable-flexresp or --disable-flexresp was given.
if test "${enable_flexresp+set}" = set; then
  enableval="$enable_flexresp"
   CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"
fi;



    exit
  fi

  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-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-1.0"
  fi

  LNET=""

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

      libnet_dir="/usr/include /usr/local/include /sw/include"
    fi
  else
    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-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-1.0.h | grep -v 1.0.2a >/dev/null"; then
      echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
      echo

   echo
   echo
   echo "**********************************************"
   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"

   echo
   echo
   echo "**********************************************"
   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"


  LNET=""

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-1.0  $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF

#define HAVE_LIBNET 1
_ACEOF

  LIBS="-lnet-1.0 $LIBS"

else
  LNET="no"

# Check whether --enable-react or --disable-react was given.
if test "${enable_react+set}" = set; then
  enableval="$enable_react"
   CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"
fi;



    exit
  fi

  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-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-1.0"
  fi

  LNET=""

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

      libnet_dir="/usr/include /usr/local/include /sw/include"
    fi
  else
    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-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-1.0.h | grep -v 1.0.2a >/dev/null"; then
      echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
      echo

   echo
   echo
   echo "**********************************************"
   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"

   echo
   echo
   echo "**********************************************"
   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"


  LNET=""

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-1.0  $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF

#define HAVE_LIBNET 1
_ACEOF

  LIBS="-lnet-1.0 $LIBS"

else
  LNET="no"




         else
            libnet_dir="/usr/include /usr/local/include /sw/include"
        fi
        AC_MSG_CHECKING("for libnet-1.0.h version 1.0.x")
        for i in $libnet_dir; do
            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-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-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


AC_ARG_ENABLE(flexresp,
[  --enable-flexresp        Flexible Responses on hostile connection attempts],
[ 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

    exit
  fi

  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-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-1.0"
  fi

  LNET=""
  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"

      libnet_dir="/usr/include /usr/local/include /sw/include"
    fi
  else
    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-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-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-1.0.h)", $LIBNET_INC_DIR)
    fi
    AC_MSG_RESULT(yes)
  else
    AC_MSG_RESULT(no)
    FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
  fi

  LNET=""
  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"


AC_ARG_ENABLE(react,
[  --enable-react           Intercept and terminate offending HTTP accesses],
[ 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

    exit
  fi

  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-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-1.0"
  fi

  LNET=""
  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"

      libnet_dir="/usr/include /usr/local/include /sw/include"
    fi
  else
    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-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-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-1.0.h)", $LIBNET_INC_DIR)
    fi
    AC_MSG_RESULT(yes)
  else
    AC_MSG_RESULT(no)
    FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
  fi

  LNET=""
  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"

Lines 57-63 Link Here

(-)snort-2.6.0.2.orig/src/detection-plugins/sp_react.c (-1 / +1 lines)
57	#include <stdlib.h>	57	#include <stdlib.h>
58	#include <string.h>	58	#include <string.h>
59	#include <ctype.h>	59	#include <ctype.h>
60	#include <libnet.h>	60	#include <libnet-1.0.h>
61		61
62	#include "rules.h"	62	#include "rules.h"
63	#include "decode.h"	63	#include "decode.h"

Lines 34-40 Link Here

(-)snort-2.6.0.2.orig/src/detection-plugins/sp_respond.c (-1 / +1 lines)
34		34
35		35
36	#if defined(ENABLE_RESPONSE) && !defined(ENABLE_RESPONSE2)	36	#if defined(ENABLE_RESPONSE) && !defined(ENABLE_RESPONSE2)
37	#include <libnet.h>	37	#include <libnet-1.0.h>
38		38
39	#include "decode.h"	39	#include "decode.h"
40	#include "rules.h"	40	#include "rules.h"

Lines 20-26 Link Here

(-)snort-2.6.0.2.orig/src/inline.c (-1 / +1 lines)
20	#include <stdlib.h>	20	#include <stdlib.h>
21	#include <string.h>	21	#include <string.h>
22	#include <pcap.h>	22	#include <pcap.h>
23	#include <libnet.h>	23	#include <libnet-1.0.h>
24		24
25	#include "decode.h"	25	#include "decode.h"
26	#include "inline.h"	26	#include "inline.h"

Return to bug 155168

Lines 799-817 Link Here

(-)snort-2.6.0.2.orig/configure.in (-30 / +30 lines)
799	else	799	else
800	libnet_dir="/usr/include /usr/local/include /sw/include"	800	libnet_dir="/usr/include /usr/local/include /sw/include"
801	fi	801	fi
802	AC_MSG_CHECKING("for libnet.h version 1.0.x")	802	AC_MSG_CHECKING("for libnet-1.0.h version 1.0.x")
803	for i in $libnet_dir; do	803	for i in $libnet_dir; do
804	if test -r $i/libnet.h; then	804	if test -r $i/libnet-1.0.h; then
805	LIBNET_INC_DIR=$i	805	LIBNET_INC_DIR=$i
806	fi	806	fi
807	done	807	done
808		808
809	if test "$LIBNET_INC_DIR" != ""; then	809	if test "$LIBNET_INC_DIR" != ""; then
810	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h \| grep -v 1.0 >/dev/null"; then	810	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h \| grep -v 1.0 >/dev/null"; then
811	FAIL_MESSAGE("libnet 1.0.x (libnet.h)", $LIBNET_INC_DIR)	811	FAIL_MESSAGE("libnet 1.0.x (libnet-1.0.h)", $LIBNET_INC_DIR)
812	fi	812	fi
813	CFLAGS="${CFLAGS} `libnet-config --defines` `libnet-config --cflags`"	813	CFLAGS="${CFLAGS} `libnet-1.0-config --defines` `libnet-1.0-config --cflags`"
814	LIBS="${LIBS} `libnet-config --libs`"	814	LIBS="${LIBS} `libnet-1.0-config --libs`"
815	CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"	815	CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"
816	AC_MSG_RESULT($i)	816	AC_MSG_RESULT($i)
817	else	817	else
Lines 823-829 Link Here
823		823
824	AC_ARG_ENABLE(flexresp,	824	AC_ARG_ENABLE(flexresp,
825	[ --enable-flexresp Flexible Responses on hostile connection attempts],	825	[ --enable-flexresp Flexible Responses on hostile connection attempts],
826	[ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"],)	826	[ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"],)
827		827
828		828
829	if test "$enable_flexresp" != "no" -a "$enable_flexresp" = "yes"; then	829	if test "$enable_flexresp" != "no" -a "$enable_flexresp" = "yes"; then
Lines 833-853 Link Here
833	exit	833	exit
834	fi	834	fi
835		835
836	if test `libnet-config --cflags \| wc -c` = "1"; then	836	if test `libnet-1.0-config --cflags \| wc -c` = "1"; then
837	CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"	837	CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
838	LIBNET_CONFIG_BROKEN_CFLAGS=yes	838	LIBNET_CONFIG_BROKEN_CFLAGS=yes
839	fi	839	fi
840		840
841	if test `libnet-config --libs \| wc -c` = "1"; then	841	if test `libnet-1.0-config --libs \| wc -c` = "1"; then
842	AC_MSG_WARN(libnet-config --libs is broken on your system. If you)	842	AC_MSG_WARN(libnet-1.0-config --libs is broken on your system. If you)
843	AC_MSG_WARN(are using a precompiled package please notify the)	843	AC_MSG_WARN(are using a precompiled package please notify the)
844	AC_MSG_WARN(maintainer.)	844	AC_MSG_WARN(maintainer.)
845	LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"	845	LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
846	LIBS="${LIBS} -lnet"	846	LIBS="${LIBS} -lnet-1.0"
847	fi	847	fi
848		848
849	LNET=""	849	LNET=""
850	AC_CHECK_HEADERS(libnet.h,, LNET="no")	850	AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no")
851	if test "$LNET" = "no"; then	851	if test "$LNET" = "no"; then
852	echo	852	echo
853	echo " ERROR! Libnet header not found, go get it from"	853	echo " ERROR! Libnet header not found, go get it from"
Lines 865-897 Link Here
865	libnet_dir="/usr/include /usr/local/include /sw/include"	865	libnet_dir="/usr/include /usr/local/include /sw/include"
866	fi	866	fi
867	else	867	else
868	libnet_dir=`libnet-config --cflags \| cut -dI -f2`	868	libnet_dir=`libnet-1.0-config --cflags \| cut -dI -f2`
869	fi	869	fi
870		870
871	LIBNET_INC_DIR=""	871	LIBNET_INC_DIR=""
872	for i in $libnet_dir; do	872	for i in $libnet_dir; do
873	if test -r $i/libnet.h; then	873	if test -r $i/libnet-1.0.h; then
874	LIBNET_INC_DIR=$i	874	LIBNET_INC_DIR=$i
875	fi	875	fi
876	done	876	done
877		877
878	if test "$LIBNET_INC_DIR" != ""; then	878	if test "$LIBNET_INC_DIR" != ""; then
879	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h \| grep -v 1.0.2a >/dev/null"; then	879	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h \| grep -v 1.0.2a >/dev/null"; then
880	AC_MSG_RESULT(no)	880	AC_MSG_RESULT(no)
881	echo	881	echo
882	echo " ERROR! Snort with --enable-flexresp will only work with"	882	echo " ERROR! Snort with --enable-flexresp will only work with"
883	echo " libnet version 1.0.2a, go get it from"	883	echo " libnet version 1.0.2a, go get it from"
884	echo " http://www.packetfactory.net/projects/libnet/"	884	echo " http://www.packetfactory.net/projects/libnet/"
885	FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)	885	FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR)
886	fi	886	fi
887	AC_MSG_RESULT(yes)	887	AC_MSG_RESULT(yes)
888	else	888	else
889	AC_MSG_RESULT(no)	889	AC_MSG_RESULT(no)
890	FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)	890	FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
891	fi	891	fi
892		892
893	LNET=""	893	LNET=""
894	AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")	894	AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no")
895	if test "$LNET" = "no"; then	895	if test "$LNET" = "no"; then
896	echo	896	echo
897	echo " ERROR! Libnet library not found, go get it from"	897	echo " ERROR! Libnet library not found, go get it from"
Lines 937-943 Link Here
937		937
938	AC_ARG_ENABLE(react,	938	AC_ARG_ENABLE(react,
939	[ --enable-react Intercept and terminate offending HTTP accesses],	939	[ --enable-react Intercept and terminate offending HTTP accesses],
940	[ CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"],)	940	[ CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"],)
941		941
942		942
943	if test "$enable_react" != "no" -a "$enable_react" = "yes"; then	943	if test "$enable_react" != "no" -a "$enable_react" = "yes"; then
Lines 948-968 Link Here
948	exit	948	exit
949	fi	949	fi
950		950
951	if test `libnet-config --cflags \| wc -c` = "1"; then	951	if test `libnet-1.0-config --cflags \| wc -c` = "1"; then
952	CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"	952	CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
953	LIBNET_CONFIG_BROKEN_CFLAGS=yes	953	LIBNET_CONFIG_BROKEN_CFLAGS=yes
954	fi	954	fi
955		955
956	if test `libnet-config --libs \| wc -c` = "1"; then	956	if test `libnet-1.0-config --libs \| wc -c` = "1"; then
957	AC_MSG_WARN(libnet-config --libs is broken on your system. If you)	957	AC_MSG_WARN(libnet-1.0-config --libs is broken on your system. If you)
958	AC_MSG_WARN(are using a precompiled package please notify the)	958	AC_MSG_WARN(are using a precompiled package please notify the)
959	AC_MSG_WARN(maintainer.)	959	AC_MSG_WARN(maintainer.)
960	LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"	960	LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
961	LIBS="${LIBS} -lnet"	961	LIBS="${LIBS} -lnet-1.0"
962	fi	962	fi
963		963
964	LNET=""	964	LNET=""
965	AC_CHECK_HEADERS(libnet.h,, LNET="no")	965	AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no")
966	if test "$LNET" = "no"; then	966	if test "$LNET" = "no"; then
967	echo	967	echo
968	echo " ERROR! Libnet header not found, go get it from"	968	echo " ERROR! Libnet header not found, go get it from"
Lines 980-1012 Link Here
980	libnet_dir="/usr/include /usr/local/include /sw/include"	980	libnet_dir="/usr/include /usr/local/include /sw/include"
981	fi	981	fi
982	else	982	else
983	libnet_dir=`libnet-config --cflags \| cut -dI -f2`	983	libnet_dir=`libnet-1.0-config --cflags \| cut -dI -f2`
984	fi	984	fi
985		985
986	LIBNET_INC_DIR=""	986	LIBNET_INC_DIR=""
987	for i in $libnet_dir; do	987	for i in $libnet_dir; do
988	if test -r $i/libnet.h; then	988	if test -r $i/libnet-1.0.h; then
989	LIBNET_INC_DIR=$i	989	LIBNET_INC_DIR=$i
990	fi	990	fi
991	done	991	done
992		992
993	if test "$LIBNET_INC_DIR" != ""; then	993	if test "$LIBNET_INC_DIR" != ""; then
994	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h \| grep -v 1.0.2a >/dev/null"; then	994	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h \| grep -v 1.0.2a >/dev/null"; then
995	AC_MSG_RESULT(no)	995	AC_MSG_RESULT(no)
996	echo	996	echo
997	echo " ERROR! Snort with --enable-react will only work with"	997	echo " ERROR! Snort with --enable-react will only work with"
998	echo " libnet version 1.0.2a, go get it from"	998	echo " libnet version 1.0.2a, go get it from"
999	echo " http://www.packetfactory.net/projects/libnet/"	999	echo " http://www.packetfactory.net/projects/libnet/"
1000	FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)	1000	FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR)
1001	fi	1001	fi
1002	AC_MSG_RESULT(yes)	1002	AC_MSG_RESULT(yes)
1003	else	1003	else
1004	AC_MSG_RESULT(no)	1004	AC_MSG_RESULT(no)
1005	FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)	1005	FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
1006	fi	1006	fi
1007		1007
1008	LNET=""	1008	LNET=""
1009	AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")	1009	AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no")
1010	if test "$LNET" = "no"; then	1010	if test "$LNET" = "no"; then
1011	echo	1011	echo
1012	echo " ERROR! Libnet library not found, go get it from"	1012	echo " ERROR! Libnet library not found, go get it from"

Lines 24397-24417 Link Here

(-)snort-2.6.0.2.orig/configure (-39 / +39 lines)
24397	else	24397	else
24398	libnet_dir="/usr/include /usr/local/include /sw/include"	24398	libnet_dir="/usr/include /usr/local/include /sw/include"
24399	fi	24399	fi
24400	echo "$as_me:$LINENO: checking \"for libnet.h version 1.0.x\"" >&5	24400	echo "$as_me:$LINENO: checking \"for libnet-1.0.h version 1.0.x\"" >&5
24401	echo $ECHO_N "checking \"for libnet.h version 1.0.x\"... $ECHO_C" >&6	24401	echo $ECHO_N "checking \"for libnet-1.0.h version 1.0.x\"... $ECHO_C" >&6
24402	for i in $libnet_dir; do	24402	for i in $libnet_dir; do
24403	if test -r $i/libnet.h; then	24403	if test -r $i/libnet-1.0.h; then
24404	LIBNET_INC_DIR=$i	24404	LIBNET_INC_DIR=$i
24405	fi	24405	fi
24406	done	24406	done
24407		24407
24408	if test "$LIBNET_INC_DIR" != ""; then	24408	if test "$LIBNET_INC_DIR" != ""; then
24409	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h \| grep -v 1.0 >/dev/null"; then	24409	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h \| grep -v 1.0 >/dev/null"; then
24410		24410
24411	echo	24411	echo
24412	echo	24412	echo
24413	echo "**********************************************"	24413	echo "**********************************************"
24414	echo " ERROR: unable to find" "libnet 1.0.x (libnet.h)"	24414	echo " ERROR: unable to find" "libnet 1.0.x (libnet-1.0.h)"
24415	echo " checked in the following places"	24415	echo " checked in the following places"
24416	for i in `echo $LIBNET_INC_DIR`; do	24416	for i in `echo $LIBNET_INC_DIR`; do
24417	echo " $i"	24417	echo " $i"
Lines 24421-24428 Link Here
24421	exit 1	24421	exit 1
24422		24422
24423	fi	24423	fi
24424	CFLAGS="${CFLAGS} `libnet-config --defines` `libnet-config --cflags`"	24424	CFLAGS="${CFLAGS} `libnet-1.0-config --defines` `libnet-1.0-config --cflags`"
24425	LIBS="${LIBS} `libnet-config --libs`"	24425	LIBS="${LIBS} `libnet-1.0-config --libs`"
24426	CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"	24426	CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"
24427	echo "$as_me:$LINENO: result: $i" >&5	24427	echo "$as_me:$LINENO: result: $i" >&5
24428	echo "${ECHO_T}$i" >&6	24428	echo "${ECHO_T}$i" >&6
Lines 24439-24445 Link Here
24439	# Check whether --enable-flexresp or --disable-flexresp was given.	24439	# Check whether --enable-flexresp or --disable-flexresp was given.
24440	if test "${enable_flexresp+set}" = set; then	24440	if test "${enable_flexresp+set}" = set; then
24441	enableval="$enable_flexresp"	24441	enableval="$enable_flexresp"
24442	CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"	24442	CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"
24443	fi;	24443	fi;
24444		24444
24445		24445
Lines 24450-24474 Link Here
24450	exit	24450	exit
24451	fi	24451	fi
24452		24452
24453	if test `libnet-config --cflags \| wc -c` = "1"; then	24453	if test `libnet-1.0-config --cflags \| wc -c` = "1"; then
24454	CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"	24454	CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
24455	LIBNET_CONFIG_BROKEN_CFLAGS=yes	24455	LIBNET_CONFIG_BROKEN_CFLAGS=yes
24456	fi	24456	fi
24457		24457
24458	if test `libnet-config --libs \| wc -c` = "1"; then	24458	if test `libnet-1.0-config --libs \| wc -c` = "1"; then
24459	{ echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system. If you" >&5	24459	{ echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&5
24460	echo "$as_me: WARNING: libnet-config --libs is broken on your system. If you" >&2;}	24460	echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&2;}
24461	{ echo "$as_me:$LINENO: WARNING: are using a precompiled package please notify the" >&5	24461	{ echo "$as_me:$LINENO: WARNING: are using a precompiled package please notify the" >&5
24462	echo "$as_me: WARNING: are using a precompiled package please notify the" >&2;}	24462	echo "$as_me: WARNING: are using a precompiled package please notify the" >&2;}
24463	{ echo "$as_me:$LINENO: WARNING: maintainer." >&5	24463	{ echo "$as_me:$LINENO: WARNING: maintainer." >&5
24464	echo "$as_me: WARNING: maintainer." >&2;}	24464	echo "$as_me: WARNING: maintainer." >&2;}
24465	LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"	24465	LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
24466	LIBS="${LIBS} -lnet"	24466	LIBS="${LIBS} -lnet-1.0"
24467	fi	24467	fi
24468		24468
24469	LNET=""	24469	LNET=""
24470		24470
24471	for ac_header in libnet.h	24471	for ac_header in libnet-1.0.h
24472	do	24472	do
24473	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`	24473	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
24474	if eval "test \"\${$as_ac_Header+set}\" = set"; then	24474	if eval "test \"\${$as_ac_Header+set}\" = set"; then
Lines 24637-24654 Link Here
24637	libnet_dir="/usr/include /usr/local/include /sw/include"	24637	libnet_dir="/usr/include /usr/local/include /sw/include"
24638	fi	24638	fi
24639	else	24639	else
24640	libnet_dir=`libnet-config --cflags \| cut -dI -f2`	24640	libnet_dir=`libnet-1.0-config --cflags \| cut -dI -f2`
24641	fi	24641	fi
24642		24642
24643	LIBNET_INC_DIR=""	24643	LIBNET_INC_DIR=""
24644	for i in $libnet_dir; do	24644	for i in $libnet_dir; do
24645	if test -r $i/libnet.h; then	24645	if test -r $i/libnet-1.0.h; then
24646	LIBNET_INC_DIR=$i	24646	LIBNET_INC_DIR=$i
24647	fi	24647	fi
24648	done	24648	done
24649		24649
24650	if test "$LIBNET_INC_DIR" != ""; then	24650	if test "$LIBNET_INC_DIR" != ""; then
24651	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h \| grep -v 1.0.2a >/dev/null"; then	24651	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h \| grep -v 1.0.2a >/dev/null"; then
24652	echo "$as_me:$LINENO: result: no" >&5	24652	echo "$as_me:$LINENO: result: no" >&5
24653	echo "${ECHO_T}no" >&6	24653	echo "${ECHO_T}no" >&6
24654	echo	24654	echo
Lines 24659-24665 Link Here
24659	echo	24659	echo
24660	echo	24660	echo
24661	echo "**********************************************"	24661	echo "**********************************************"
24662	echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)"	24662	echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
24663	echo " checked in the following places"	24663	echo " checked in the following places"
24664	for i in `echo $LIBNET_INC_DIR`; do	24664	for i in `echo $LIBNET_INC_DIR`; do
24665	echo " $i"	24665	echo " $i"
Lines 24678-24684 Link Here
24678	echo	24678	echo
24679	echo	24679	echo
24680	echo "**********************************************"	24680	echo "**********************************************"
24681	echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)"	24681	echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
24682	echo " checked in the following places"	24682	echo " checked in the following places"
24683	for i in `echo $libnet_dir`; do	24683	for i in `echo $libnet_dir`; do
24684	echo " $i"	24684	echo " $i"
Lines 24691-24703 Link Here
24691		24691
24692	LNET=""	24692	LNET=""
24693		24693
24694	echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5	24694	echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5
24695	echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6	24695	echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6
24696	if test "${ac_cv_lib_net_libnet_build_ip+set}" = set; then	24696	if test "${ac_cv_lib_net_libnet_build_ip+set}" = set; then
24697	echo $ECHO_N "(cached) $ECHO_C" >&6	24697	echo $ECHO_N "(cached) $ECHO_C" >&6
24698	else	24698	else
24699	ac_check_lib_save_LIBS=$LIBS	24699	ac_check_lib_save_LIBS=$LIBS
24700	LIBS="-lnet $LIBS"	24700	LIBS="-lnet-1.0 $LIBS"
24701	cat >conftest.$ac_ext <<_ACEOF	24701	cat >conftest.$ac_ext <<_ACEOF
24702	/* confdefs.h. */	24702	/* confdefs.h. */
24703	_ACEOF	24703	_ACEOF
Lines 24760-24766 Link Here
24760	#define HAVE_LIBNET 1	24760	#define HAVE_LIBNET 1
24761	_ACEOF	24761	_ACEOF
24762		24762
24763	LIBS="-lnet $LIBS"	24763	LIBS="-lnet-1.0 $LIBS"
24764		24764
24765	else	24765	else
24766	LNET="no"	24766	LNET="no"
Lines 25041-25047 Link Here
25041	# Check whether --enable-react or --disable-react was given.	25041	# Check whether --enable-react or --disable-react was given.
25042	if test "${enable_react+set}" = set; then	25042	if test "${enable_react+set}" = set; then
25043	enableval="$enable_react"	25043	enableval="$enable_react"
25044	CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"	25044	CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-1.0-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-1.0-config --libs`"
25045	fi;	25045	fi;
25046		25046
25047		25047
Lines 25053-25077 Link Here
25053	exit	25053	exit
25054	fi	25054	fi
25055		25055
25056	if test `libnet-config --cflags \| wc -c` = "1"; then	25056	if test `libnet-1.0-config --cflags \| wc -c` = "1"; then
25057	CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"	25057	CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
25058	LIBNET_CONFIG_BROKEN_CFLAGS=yes	25058	LIBNET_CONFIG_BROKEN_CFLAGS=yes
25059	fi	25059	fi
25060		25060
25061	if test `libnet-config --libs \| wc -c` = "1"; then	25061	if test `libnet-1.0-config --libs \| wc -c` = "1"; then
25062	{ echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system. If you" >&5	25062	{ echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&5
25063	echo "$as_me: WARNING: libnet-config --libs is broken on your system. If you" >&2;}	25063	echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&2;}
25064	{ echo "$as_me:$LINENO: WARNING: are using a precompiled package please notify the" >&5	25064	{ echo "$as_me:$LINENO: WARNING: are using a precompiled package please notify the" >&5
25065	echo "$as_me: WARNING: are using a precompiled package please notify the" >&2;}	25065	echo "$as_me: WARNING: are using a precompiled package please notify the" >&2;}
25066	{ echo "$as_me:$LINENO: WARNING: maintainer." >&5	25066	{ echo "$as_me:$LINENO: WARNING: maintainer." >&5
25067	echo "$as_me: WARNING: maintainer." >&2;}	25067	echo "$as_me: WARNING: maintainer." >&2;}
25068	LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"	25068	LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
25069	LIBS="${LIBS} -lnet"	25069	LIBS="${LIBS} -lnet-1.0"
25070	fi	25070	fi
25071		25071
25072	LNET=""	25072	LNET=""
25073		25073
25074	for ac_header in libnet.h	25074	for ac_header in libnet-1.0.h
25075	do	25075	do
25076	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`	25076	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
25077	if eval "test \"\${$as_ac_Header+set}\" = set"; then	25077	if eval "test \"\${$as_ac_Header+set}\" = set"; then
Lines 25240-25257 Link Here
25240	libnet_dir="/usr/include /usr/local/include /sw/include"	25240	libnet_dir="/usr/include /usr/local/include /sw/include"
25241	fi	25241	fi
25242	else	25242	else
25243	libnet_dir=`libnet-config --cflags \| cut -dI -f2`	25243	libnet_dir=`libnet-1.0-config --cflags \| cut -dI -f2`
25244	fi	25244	fi
25245		25245
25246	LIBNET_INC_DIR=""	25246	LIBNET_INC_DIR=""
25247	for i in $libnet_dir; do	25247	for i in $libnet_dir; do
25248	if test -r $i/libnet.h; then	25248	if test -r $i/libnet-1.0.h; then
25249	LIBNET_INC_DIR=$i	25249	LIBNET_INC_DIR=$i
25250	fi	25250	fi
25251	done	25251	done
25252		25252
25253	if test "$LIBNET_INC_DIR" != ""; then	25253	if test "$LIBNET_INC_DIR" != ""; then
25254	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h \| grep -v 1.0.2a >/dev/null"; then	25254	if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h \| grep -v 1.0.2a >/dev/null"; then
25255	echo "$as_me:$LINENO: result: no" >&5	25255	echo "$as_me:$LINENO: result: no" >&5
25256	echo "${ECHO_T}no" >&6	25256	echo "${ECHO_T}no" >&6
25257	echo	25257	echo
Lines 25262-25268 Link Here
25262	echo	25262	echo
25263	echo	25263	echo
25264	echo "**********************************************"	25264	echo "**********************************************"
25265	echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)"	25265	echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
25266	echo " checked in the following places"	25266	echo " checked in the following places"
25267	for i in `echo $LIBNET_INC_DIR`; do	25267	for i in `echo $LIBNET_INC_DIR`; do
25268	echo " $i"	25268	echo " $i"
Lines 25281-25287 Link Here
25281	echo	25281	echo
25282	echo	25282	echo
25283	echo "**********************************************"	25283	echo "**********************************************"
25284	echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)"	25284	echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
25285	echo " checked in the following places"	25285	echo " checked in the following places"
25286	for i in `echo $libnet_dir`; do	25286	for i in `echo $libnet_dir`; do
25287	echo " $i"	25287	echo " $i"
Lines 25294-25306 Link Here
25294		25294
25295	LNET=""	25295	LNET=""
25296		25296
25297	echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5	25297	echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5
25298	echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6	25298	echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6
25299	if test "${ac_cv_lib_net_libnet_build_ip+set}" = set; then	25299	if test "${ac_cv_lib_net_libnet_build_ip+set}" = set; then
25300	echo $ECHO_N "(cached) $ECHO_C" >&6	25300	echo $ECHO_N "(cached) $ECHO_C" >&6
25301	else	25301	else
25302	ac_check_lib_save_LIBS=$LIBS	25302	ac_check_lib_save_LIBS=$LIBS
25303	LIBS="-lnet $LIBS"	25303	LIBS="-lnet-1.0 $LIBS"
25304	cat >conftest.$ac_ext <<_ACEOF	25304	cat >conftest.$ac_ext <<_ACEOF
25305	/* confdefs.h. */	25305	/* confdefs.h. */
25306	_ACEOF	25306	_ACEOF
Lines 25363-25369 Link Here
25363	#define HAVE_LIBNET 1	25363	#define HAVE_LIBNET 1
25364	_ACEOF	25364	_ACEOF
25365		25365
25366	LIBS="-lnet $LIBS"	25366	LIBS="-lnet-1.0 $LIBS"
25367		25367
25368	else	25368	else
25369	LNET="no"	25369	LNET="no"