]>
Commit | Line | Data |
---|---|---|
bcb05dcf | 1 | diff -Nur snort-2.0.0.org/src/detection-plugins/sp_react.c snort-2.0.0/src/detection-plugins/sp_react.c |
2 | --- snort-2.0.0.org/src/detection-plugins/sp_react.c 2003-04-03 21:10:52.000000000 +0000 | |
3 | +++ snort-2.0.0/src/detection-plugins/sp_react.c 2003-07-03 22:31:13.000000000 +0000 | |
4 | @@ -53,7 +53,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 -Nur snort-2.0.0.org/src/detection-plugins/sp_respond.c snort-2.0.0/src/detection-plugins/sp_respond.c | |
14 | --- snort-2.0.0.org/src/detection-plugins/sp_respond.c 2003-04-03 21:10:52.000000000 +0000 | |
15 | +++ snort-2.0.0/src/detection-plugins/sp_respond.c 2003-07-03 22:30:57.000000000 +0000 | |
16 | @@ -30,7 +30,7 @@ | |
17 | ||
18 | ||
19 | #ifdef ENABLE_RESPONSE | |
20 | -#include <libnet.h> | |
21 | +#include <libnet1.h> | |
22 | ||
23 | #include "decode.h" | |
24 | #include "rules.h" | |
25 | --- snort-2.0.1/configure.in.orig 2003-08-07 12:28:49.000000000 +0200 | |
57710997 | 26 | +++ snort-2.0.1/configure.in 2003-08-10 21:25:51.000000000 +0200 |
bcb05dcf | 27 | @@ -598,26 +598,25 @@ |
bba82098 | 28 | |
29 | AC_ARG_ENABLE(flexresp, | |
30 | [ --enable-flexresp Flexible Responses on hostile connection attempts], | |
31 | -[ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet-config --libs`"],) | |
bcb05dcf | 32 | - |
bba82098 | 33 | +[ CPPFLAGS="${CPPFLAGS} -DENABLE_RESPONSE `libnet1-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet1-config --libs`"],) |
bba82098 | 34 | |
35 | if test "$enable_flexresp" != "no" -a "$enable_flexresp" = "yes"; then | |
36 | ||
37 | - if test `libnet-config --cflags | wc -c` = "1"; then | |
38 | + if test `libnet1-config --cflags | wc -c` = "1"; then | |
bcb05dcf | 39 | CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include" |
bba82098 | 40 | LIBNET_CONFIG_BROKEN_CFLAGS=yes |
41 | fi | |
42 | ||
43 | - if test `libnet-config --libs | wc -c` = "1"; then | |
44 | - AC_MSG_WARN(libnet-config --libs is broken on your system. If you) | |
45 | + if test `libnet1-config --libs | wc -c` = "1"; then | |
46 | + AC_MSG_WARN(libnet1-config --libs is broken on your system. If you) | |
47 | AC_MSG_WARN(are using a precompiled package please notify the) | |
48 | AC_MSG_WARN(maintainer.) | |
bcb05dcf | 49 | LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib" |
50 | LIBS="${LIBS} -lnet" | |
bba82098 | 51 | fi |
52 | ||
bcb05dcf | 53 | - LNET="" |
bba82098 | 54 | - AC_CHECK_HEADERS(libnet.h,, LNET="no") |
bcb05dcf | 55 | + LNET="yes" |
bba82098 | 56 | + AC_CHECK_HEADERS(libnet1.h,, LNET="no") |
57 | if test "$LNET" = "no"; then | |
58 | echo | |
59 | echo " ERROR! Libnet header not found, go get it from" | |
bcb05dcf | 60 | @@ -630,38 +629,38 @@ |
61 | AC_MSG_CHECKING(for libnet version 1.0.2a) | |
62 | if test "${LIBNET_CONFIG_BROKEN_CFLAGS}" = "yes"; then | |
63 | if test -n "$with_libnet_includes" -a "$with_libnet_includes" != "no"; then | |
64 | - libnet_dir="${with_libnet_includes}" | |
65 | + libnet_dir="${with_libnet1_includes}" | |
66 | else | |
67 | libnet_dir="/usr/include /usr/local/include /sw/include" | |
bba82098 | 68 | fi |
69 | else | |
70 | - libnet_dir=`libnet-config --cflags | cut -dI -f2` | |
71 | + libnet_dir=`libnet1-config --cflags | cut -dI -f2` | |
72 | fi | |
73 | ||
57710997 | 74 | - LIBNET_INC_DIR="" |
75 | + LIBNET_INC_DIR="/usr/include/libnet1" | |
bba82098 | 76 | for i in $libnet_dir; do |
77 | - if test -r $i/libnet.h; then | |
78 | + if test -r $i/libnet1.h; then | |
79 | LIBNET_INC_DIR=$i | |
80 | fi | |
81 | done | |
82 | ||
83 | if test "$LIBNET_INC_DIR" != ""; then | |
84 | - if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then | |
85 | + if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet1.h | grep -v 1.0.2a >/dev/null"; then | |
86 | AC_MSG_RESULT(no) | |
87 | echo | |
88 | echo " ERROR! Snort with --enable-flexresp will *only* work with" | |
89 | echo " libnet version 1.0.2a, go get it from" | |
90 | echo " http://www.packetfactory.net/projects/libnet/" | |
91 | - FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR) | |
92 | + FAIL_MESSAGE("libnet 1.0.2a (libnet1.h)", $LIBNET_INC_DIR) | |
93 | fi | |
94 | AC_MSG_RESULT(yes) | |
95 | else | |
96 | AC_MSG_RESULT(no) | |
97 | - FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir) | |
98 | + FAIL_MESSAGE("libnet 1.0.2a (libnet1.h)", $libnet_dir) | |
99 | fi | |
100 | ||
101 | LNET="" | |
bcb05dcf | 102 | - AC_CHECK_LIB(net, libnet_build_ip,, LNET="no") |
57710997 | 103 | + AC_CHECK_LIB(net1, libnet_build_ip,, LNET="no") |
bcb05dcf | 104 | if test "$LNET" = "no"; then |
105 | echo | |
106 | echo " ERROR! Libnet library not found, go get it from" |