snort-libnet1.patch

   1 diff -NurpP --minimal snort-2.6.1.3.a/src/detection-plugins/sp_react.c snort-2.6.1.3.b/src/detection-plugins/sp_react.c
   2 --- snort-2.6.1.3.a/src/detection-plugins/sp_react.c    2007-03-09 10:08:23.000000000 +0100
   3 +++ snort-2.6.1.3.b/src/detection-plugins/sp_react.c    2007-03-09 10:40:03.000000000 +0100
   4 @@ -57,7 +57,7 @@
   5  #include <stdlib.h>
   6  #include <string.h>
   7  #include <ctype.h>
   8 -#include <libnet.h>
   9 +#include <libnet1.h>
  10
  11  #include "rules.h"
  12  #include "decode.h"
  13 diff -NurpP --minimal snort-2.6.1.3.a/src/detection-plugins/sp_respond.c snort-2.6.1.3.b/src/detection-plugins/sp_respond.c
  14 --- snort-2.6.1.3.a/src/detection-plugins/sp_respond.c  2007-03-09 10:08:23.000000000 +0100
  15 +++ snort-2.6.1.3.b/src/detection-plugins/sp_respond.c  2007-03-09 10:40:37.000000000 +0100
  16 @@ -34,7 +34,7 @@
  17
  18
  19  #if defined(ENABLE_RESPONSE) && !defined(ENABLE_RESPONSE2)
  20 -#include <libnet.h>
  21 +#include <libnet1.h>
  22
  23  #include "decode.h"
  24  #include "rules.h"
  25 diff -NurpP --minimal snort-2.6.1.3.a/src/inline.c snort-2.6.1.3.b/src/inline.c
  26 --- snort-2.6.1.3.a/src/inline.c        2007-03-09 10:08:23.000000000 +0100
  27 +++ snort-2.6.1.3.b/src/inline.c        2007-03-09 10:41:19.000000000 +0100
  28 @@ -20,7 +20,7 @@
  29  #include <stdlib.h>
  30  #include <string.h>
  31  #include <pcap.h>
  32 -#include <libnet.h>
  33 +#include <libnet1.h>
  34
  35  #include "decode.h"
  36  #include "inline.h"
  37 --- aaa/configure.in.orig       2008-07-18 20:42:29.000000000 +0000
  38 +++ aaa/configure.in    2008-09-04 13:04:35.026969217 +0000
  39 @@ -1149,21 +1149,21 @@
  40          if test -n "$with_libnet_includes" -a "$with_libnet_includes" != "no"; then
  41              libnet_dir="${with_libnet_includes}"
  42           else
  43 -            libnet_dir="/usr/include /usr/local/include /sw/include"
  44 +            libnet_dir="/usr/include /usr/local/include /sw/include /usr/include/libnet1"
  45          fi
  46 -        AC_MSG_CHECKING("for libnet.h version 1.0.x")
  47 +        AC_MSG_CHECKING("for libnet1.h version 1.0.x")
  48          for i in $libnet_dir; do
  49 -            if test -r "$i/libnet.h"; then
  50 +            if test -r "$i/libnet1.h"; then
  51                  LIBNET_INC_DIR="$i"
  52              fi
  53          done
  54
  55          if test "$LIBNET_INC_DIR" != ""; then
  56 -            if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0 >/dev/null"; then
  57 -                FAIL_MESSAGE("libnet 1.0.x (libnet.h)", $LIBNET_INC_DIR)
  58 +            if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet1.h | grep -v 1.0 >/dev/null"; then
  59 +                FAIL_MESSAGE("libnet 1.0.x (libnet1.h)", $LIBNET_INC_DIR)
  60              fi
  61 -            CFLAGS="${CFLAGS} `libnet-config --defines` `libnet-config --cflags`"
  62 -            LIBS="${LIBS} `libnet-config --libs`"
  63 +            CFLAGS="${CFLAGS} `libnet1-config --defines` `libnet1-config --cflags`"
  64 +            LIBS="${LIBS} `libnet1-config --libs`"
  65              CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"
  66              AC_MSG_RESULT($i)
  67          else
  68 @@ -1196,13 +1196,13 @@
  69          exit
  70      fi
  71
  72 -    if test `libnet-config --cflags | wc -c` = "1"; then
  73 +    if test `libnet1-config --cflags | wc -c` = "1"; then
  74          CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
  75          LIBNET_CONFIG_BROKEN_CFLAGS="yes"
  76      fi
  77
  78 -    if test `libnet-config --libs | wc -c` = "1"; then
  79 -        AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
  80 +    if test `libnet1-config --libs | wc -c` = "1"; then
  81 +        AC_MSG_WARN(libnet1-config --libs is broken on your system.  If you)
  82          AC_MSG_WARN(are using a precompiled package please notify the)
  83          AC_MSG_WARN(maintainer.)
  84          LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
  85 @@ -1210,7 +1210,7 @@
  86      fi
  87
  88      LNET=""
  89 -    AC_CHECK_HEADERS(libnet.h,, LNET="no")
  90 +    AC_CHECK_HEADERS(libnet1.h,, LNET="no")
  91      if test "x$LNET" = "xno"; then
  92          echo
  93          echo "   ERROR!  Libnet header not found, go get it from"
  94 @@ -1233,28 +1233,28 @@
  95
  96      LIBNET_INC_DIR=""
  97      for i in $libnet_dir; do
  98 -        if test -r "$i/libnet.h"; then
  99 +        if test -r "$i/libnet1.h"; then
 100              LIBNET_INC_DIR="$i"
 101          fi
 102      done
 103
 104      if test "x$LIBNET_INC_DIR" != "x"; then
 105 -        if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
 106 +        if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet1.h | grep -v 1.0.2a >/dev/null"; then
 107              AC_MSG_RESULT(no)
 108              echo
 109              echo "   ERROR!  Snort with --enable-flexresp will *only* work with"
 110              echo "   libnet version 1.0.2a, go get it from"
 111              echo "   http://www.packetfactory.net/projects/libnet/"
 112 -            FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
 113 +            FAIL_MESSAGE("libnet 1.0.2a (libnet1.h)", $LIBNET_INC_DIR)
 114          fi
 115          AC_MSG_RESULT(yes)
 116      else
 117          AC_MSG_RESULT(no)
 118 -        FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
 119 +        FAIL_MESSAGE("libnet 1.0.2a (libnet1.h)", $libnet_dir)
 120      fi
 121
 122      LNET=""
 123 -    AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
 124 +    AC_CHECK_LIB(net1, libnet_build_ip,, LNET="no")
 125      if test "x$LNET" = "xno"; then
 126          echo
 127          echo "   ERROR!  Libnet library not found, go get it from"
 128 @@ -1305,8 +1305,8 @@
 129  [  --enable-react           Intercept and terminate offending HTTP accesses],
 130         enable_react="$enableval", enable_react="no")
 131  if test "x$enable_react" = "xyes"; then
 132 -    CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet-config --defines --cflags`"
 133 -    LDFLAGS="${LDFLAGS} `libnet-config --libs`"
 134 +    CPPFLAGS="${CPPFLAGS} -DENABLE_REACT `libnet1-config --defines --cflags`"
 135 +    LDFLAGS="${LDFLAGS} `libnet1-config --libs`"
 136  fi
 137
 138  if test "x$enable_react" != "xno" -a "x$enable_react" = "xyes"; then
 139 @@ -1317,13 +1317,13 @@
 140          exit
 141      fi
 142
 143 -    if test `libnet-config --cflags | wc -c` = "1"; then
 144 +    if test `libnet1-config --cflags | wc -c` = "1"; then
 145          CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
 146          LIBNET_CONFIG_BROKEN_CFLAGS="yes"
 147      fi
 148
 149 -    if test `libnet-config --libs | wc -c` = "1"; then
 150 -        AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
 151 +    if test `libnet1-config --libs | wc -c` = "1"; then
 152 +        AC_MSG_WARN(libnet1-config --libs is broken on your system.  If you)
 153          AC_MSG_WARN(are using a precompiled package please notify the)
 154          AC_MSG_WARN(maintainer.)
 155          LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
 156 @@ -1331,7 +1331,7 @@
 157      fi
 158
 159      LNET=""
 160 -    AC_CHECK_HEADERS(libnet.h,, LNET="no")
 161 +    AC_CHECK_HEADERS(libnet1.h,, LNET="no")
 162      if test "x$LNET" = "xno"; then
 163          echo
 164          echo "   ERROR!  Libnet header not found, go get it from"
 165 @@ -1354,28 +1354,28 @@
 166
 167      LIBNET_INC_DIR=""
 168      for i in $libnet_dir; do
 169 -        if test -r "$i/libnet.h"; then
 170 +        if test -r "$i/libnet1.h"; then
 171              LIBNET_INC_DIR="$i"
 172          fi
 173      done
 174
 175      if test "x$LIBNET_INC_DIR" != "x"; then
 176 -        if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
 177 +        if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet1.h | grep -v 1.0.2a >/dev/null"; then
 178              AC_MSG_RESULT(no)
 179              echo
 180              echo "   ERROR!  Snort with --enable-react will *only* work with"
 181              echo "   libnet version 1.0.2a, go get it from"
 182              echo "   http://www.packetfactory.net/projects/libnet/"
 183 -            FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
 184 +            FAIL_MESSAGE("libnet 1.0.2a (libnet1.h)", $LIBNET_INC_DIR)
 185          fi
 186          AC_MSG_RESULT(yes)
 187      else
 188          AC_MSG_RESULT(no)
 189 -        FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
 190 +        FAIL_MESSAGE("libnet 1.0.2a (libnet1.h)", $libnet_dir)
 191      fi
 192
 193      LNET=""
 194 -    AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
 195 +    AC_CHECK_LIB(net1, libnet_build_ip,, LNET="no")
 196      if test "x$LNET" = "xno"; then
 197          echo
 198          echo "   ERROR!  Libnet library not found, go get it from"