snort-libnet1.patch

   1 --- snort-2.3.0RC1/configure.in.orig    2004-11-18 17:13:42.000000000 +0000
   2 +++ snort-2.3.0RC1/configure.in 2004-11-19 10:10:22.398942856 +0000
   3 @@ -687,19 +687,19 @@
   4
   5          LIBNET_INC_DIR=""
   6          AC_MSG_CHECKING("for libnet.h version 1.0.x")
   7 -        libnet_dir="/usr/include /usr/local/include"
   8 +        libnet_dir="/usr/include /usr/local/include /usr/include/libnet1"
   9          for i in $libnet_dir; do
  10 -            if test -r $i/libnet.h; then
  11 +            if test -r $i/libnet1.h; then
  12                  LIBNET_INC_DIR=$i
  13              fi
  14          done
  15
  16          if test "$LIBNET_INC_DIR" != ""; then
  17 -            if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0 >/dev/null"; then
  18 -                FAIL_MESSAGE("libnet 1.0.x (libnet.h)", $tmp)
  19 +            if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet1.h | grep -v 1.0.2a >/dev/null"; then
  20 +                FAIL_MESSAGE("libnet 1.0.x (libnet1.h)", $tmp)
  21              fi
  22 -            CFLAGS="${CFLAGS} `libnet-config --defines` `libnet-config --cflags`"
  23 -            LIBS="${LIBS} `libnet-config --libs`"
  24 +            CFLAGS="${CFLAGS} `libnet1-config --defines` `libnet1-config --cflags`"
  25 +            LIBS="${LIBS} `libnet1-config --libs`"
  26              CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"
  27              AC_MSG_RESULT($i)
  28          else
  29 @@ -711,26 +711,25 @@
  30
  31  AC_ARG_ENABLE(flexresp,
  32  [  --enable-flexresp       Flexible Responses on hostile connection attempts],
  33 -[ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"],)
  34 -
  35 +[ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet1-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet1-config --libs`"],)
  36
  37  if test "$enable_flexresp" != "no" -a "$enable_flexresp" = "yes"; then
  38
  39 -  if test `libnet-config --cflags | wc -c` = "1"; then
  40 +  if test `libnet1-config --cflags | wc -c` = "1"; then
  41      CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
  42      LIBNET_CONFIG_BROKEN_CFLAGS=yes
  43    fi
  44
  45 -  if test `libnet-config --libs | wc -c` = "1"; then
  46 -    AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
  47 +  if test `libnet1-config --libs | wc -c` = "1"; then
  48 +    AC_MSG_WARN(libnet1-config --libs is broken on your system.  If you)
  49      AC_MSG_WARN(are using a precompiled package please notify the)
  50      AC_MSG_WARN(maintainer.)
  51      LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
  52      LIBS="${LIBS} -lnet"
  53    fi
  54
  55 -  LNET=""
  56 -  AC_CHECK_HEADERS(libnet.h,, LNET="no")
  57 +  LNET="yes"
  58 +  AC_CHECK_HEADERS(libnet1.h,, LNET="no")
  59    if test "$LNET" = "no"; then
  60      echo
  61      echo "   ERROR!  Libnet header not found, go get it from"
  62 @@ -743,38 +742,38 @@
  63    AC_MSG_CHECKING(for libnet version 1.0.2a)
  64    if test "${LIBNET_CONFIG_BROKEN_CFLAGS}" = "yes"; then
  65      if test -n "$with_libnet_includes" -a "$with_libnet_includes" != "no"; then
  66 -      libnet_dir="${with_libnet_includes}"
  67 +      libnet_dir="${with_libnet1_includes}"
  68      else
  69        libnet_dir="/usr/include /usr/local/include /sw/include"
  70      fi
  71    else
  72 -    libnet_dir=`libnet-config --cflags | cut -dI -f2`
  73 +    libnet_dir=`libnet1-config --cflags | cut -dI -f2`
  74    fi
  75
  76 -  LIBNET_INC_DIR=""
  77 +  LIBNET_INC_DIR="/usr/include/libnet1"
  78    for i in $libnet_dir; do
  79 -    if test -r $i/libnet.h; then
  80 +    if test -r $i/libnet1.h; then
  81        LIBNET_INC_DIR=$i
  82      fi
  83    done
  84
  85    if test "$LIBNET_INC_DIR" != ""; then
  86 -    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
  87 +    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet1.h | grep -v 1.0.2a >/dev/null"; then
  88        AC_MSG_RESULT(no)
  89        echo
  90        echo "   ERROR!  Snort with --enable-flexresp will *only* work with"
  91        echo "   libnet version 1.0.2a, go get it from"
  92        echo "   http://www.packetfactory.net/projects/libnet/"
  93 -      FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
  94 +      FAIL_MESSAGE("libnet 1.0.2a (libnet1.h)", $LIBNET_INC_DIR)
  95      fi
  96      AC_MSG_RESULT(yes)
  97    else
  98      AC_MSG_RESULT(no)
  99 -    FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
 100 +    FAIL_MESSAGE("libnet 1.0.2a (libnet1.h)", $libnet_dir)
 101    fi
 102
 103    LNET=""
 104 -  AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
 105 +  AC_CHECK_LIB(net1, libnet_build_ip,, LNET="no")
 106    if test "$LNET" = "no"; then
 107      echo
 108      echo "   ERROR!  Libnet library not found, go get it from"
 109 --- snort-2.3.0RC1/src/detection-plugins/sp_react.c.orig        2004-03-23 15:34:46.000000000 +0000
 110 +++ snort-2.3.0RC1/src/detection-plugins/sp_react.c     2004-11-19 10:14:10.595251744 +0000
 111 @@ -57,7 +57,7 @@
 112  #include <stdlib.h>
 113  #include <string.h>
 114  #include <ctype.h>
 115 -#include <libnet.h>
 116 +#include <libnet1.h>
 117
 118  #include "rules.h"
 119  #include "decode.h"
 120 --- snort-2.3.0RC1/src/detection-plugins/sp_respond.c.orig      2004-11-19 10:17:02.159170064 +0000
 121 +++ snort-2.3.0RC1/src/detection-plugins/sp_respond.c   2004-11-19 10:17:10.138956952 +0000
 122 @@ -34,7 +34,7 @@
 123
 124
 125  #ifdef ENABLE_RESPONSE
 126 -#include <libnet.h>
 127 +#include <libnet1.h>
 128
 129  #include "decode.h"
 130  #include "rules.h"
 131 --- snort-2.3.0RC1/src/inline.c~        2004-09-13 17:44:49.000000000 +0000
 132 +++ snort-2.3.0RC1/src/inline.c 2004-11-19 10:22:41.224624280 +0000
 133 @@ -3,7 +3,7 @@
 134  #include <stdlib.h>
 135  #include <string.h>
 136  #include <pcap.h>
 137 -#include <libnet.h>
 138 +#include <libnet1.h>
 139
 140  #include "decode.h"
 141  #include "inline.h"