SOURCES: snort-libnet1.patch - up to 2.6.1.3
mguevara
mguevara at pld-linux.org
Fri Mar 9 15:28:25 CET 2007
Author: mguevara Date: Fri Mar 9 14:28:25 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 2.6.1.3
---- Files affected:
SOURCES:
snort-libnet1.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/snort-libnet1.patch
diff -u SOURCES/snort-libnet1.patch:1.5 SOURCES/snort-libnet1.patch:1.6
--- SOURCES/snort-libnet1.patch:1.5 Mon Oct 31 00:52:16 2005
+++ SOURCES/snort-libnet1.patch Fri Mar 9 15:28:20 2007
@@ -1,14 +1,15 @@
-diff -urNbB snort-2.4.3.org/configure.in snort-2.4.3/configure.in
---- snort-2.4.3.org/configure.in 2005-10-17 00:21:08.000000000 +0200
-+++ snort-2.4.3/configure.in 2005-10-31 00:46:20.301146250 +0100
-@@ -743,21 +743,21 @@
+diff -NurpP --minimal snort-2.6.1.3.a/configure.in snort-2.6.1.3.b/configure.in
+--- snort-2.6.1.3.a/configure.in 2007-03-09 10:08:24.000000000 +0100
++++ snort-2.6.1.3.b/configure.in 2007-03-09 10:39:29.000000000 +0100
+@@ -797,21 +797,21 @@ if test "$enable_inline" != "no"; then
if test -n "$with_libnet_includes" -a "$with_libnet_includes" != "no"; then
libnet_dir="${with_libnet_includes}"
else
- libnet_dir="/usr/include /usr/local/include /sw/include"
+ libnet_dir="/usr/include /usr/local/include /sw/include /usr/include/libnet1"
fi
- AC_MSG_CHECKING("for libnet.h version 1.0.x")
+- AC_MSG_CHECKING("for libnet.h version 1.0.x")
++ AC_MSG_CHECKING("for libnet1.h version 1.0.x")
for i in $libnet_dir; do
- if test -r $i/libnet.h; then
+ if test -r $i/libnet1.h; then
@@ -18,26 +19,29 @@
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)", $tmp)
-+ if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet1.h | grep -v 1.0.2a >/dev/null"; then
-+ FAIL_MESSAGE("libnet 1.0.x (libnet1.h)", $tmp)
+- FAIL_MESSAGE("libnet 1.0.x (libnet.h)", $LIBNET_INC_DIR)
++ if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet1.h | grep -v 1.0 >/dev/null"; then
++ FAIL_MESSAGE("libnet 1.0.x (libnet1.h)", $LIBNET_INC_DIR)
fi
- CFLAGS="${CFLAGS} `libnet-config --defines` `libnet-config --cflags`"
- LIBS="${LIBS} `libnet-config --libs`"
-+ CFLAGS="${CFLAGS} `libnet1-config --defines` `libnet1-config --cflags`"
-+ LIBS="${LIBS} `libnet1-config --libs`"
++ CFLAGS="${CFLAGS} `libnet1-config --defines` `libnet1-config --cflags`"
++ LIBS="${LIBS} `libnet1-config --libs`"
CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"
AC_MSG_RESULT($i)
else
-@@ -769,26 +769,25 @@
+@@ -828,7 +828,7 @@ AC_ARG_ENABLE(inline-init-failopen,
AC_ARG_ENABLE(flexresp,
- [ --enable-flexresp Flexible Responses on hostile connection attempts],
+ [ --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 `libnet1-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet1-config --libs`"],)
+
if test "$enable_flexresp" != "no" -a "$enable_flexresp" = "yes"; then
+@@ -838,13 +838,13 @@ if test "$enable_flexresp" != "no" -a "$
+ exit
+ fi
- if test `libnet-config --cflags | wc -c` = "1"; then
+ if test `libnet1-config --cflags | wc -c` = "1"; then
@@ -52,23 +56,16 @@
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"
+@@ -852,7 +852,7 @@ if test "$enable_flexresp" != "no" -a "$
fi
-- LNET=""
+ LNET=""
- AC_CHECK_HEADERS(libnet.h,, LNET="no")
-+ LNET="yes"
+ AC_CHECK_HEADERS(libnet1.h,, LNET="no")
if test "$LNET" = "no"; then
echo
echo " ERROR! Libnet header not found, go get it from"
-@@ -801,38 +800,38 @@
- AC_MSG_CHECKING(for libnet version 1.0.2a)
- if test "${LIBNET_CONFIG_BROKEN_CFLAGS}" = "yes"; then
- if test -n "$with_libnet_includes" -a "$with_libnet_includes" != "no"; then
-- libnet_dir="${with_libnet_includes}"
-+ libnet_dir="${with_libnet1_includes}"
- else
+@@ -870,33 +870,33 @@ if test "$enable_flexresp" != "no" -a "$
libnet_dir="/usr/include /usr/local/include /sw/include"
fi
else
@@ -76,8 +73,7 @@
+ libnet_dir=`libnet1-config --cflags | cut -dI -f2`
fi
-- LIBNET_INC_DIR=""
-+ LIBNET_INC_DIR="/usr/include/libnet1"
+ LIBNET_INC_DIR=""
for i in $libnet_dir; do
- if test -r $i/libnet.h; then
+ if test -r $i/libnet1.h; then
@@ -109,9 +105,84 @@
if test "$LNET" = "no"; then
echo
echo " ERROR! Libnet library not found, go get it from"
-diff -urNbB snort-2.4.3.org/src/detection-plugins/sp_react.c snort-2.4.3/src/detection-plugins/sp_react.c
---- snort-2.4.3.org/src/detection-plugins/sp_react.c 2004-03-23 16:34:46.000000000 +0100
-+++ snort-2.4.3/src/detection-plugins/sp_react.c 2005-10-31 00:42:52.160138250 +0100
+@@ -942,7 +942,7 @@ fi
+
+ 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 `libnet1-config --defines --cflags`" LDFLAGS="${LDFLAGS} `libnet1-config --libs`"],)
+
+
+ if test "$enable_react" != "no" -a "$enable_react" = "yes"; then
+@@ -953,13 +953,13 @@ if test "$enable_react" != "no" -a "$ena
+ exit
+ fi
+
+- if test `libnet-config --cflags | wc -c` = "1"; then
++ if test `libnet1-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 `libnet1-config --libs | wc -c` = "1"; then
++ AC_MSG_WARN(libnet1-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"
+@@ -967,7 +967,7 @@ if test "$enable_react" != "no" -a "$ena
+ fi
+
+ LNET=""
+- AC_CHECK_HEADERS(libnet.h,, LNET="no")
++ AC_CHECK_HEADERS(libnet1.h,, LNET="no")
+ if test "$LNET" = "no"; then
+ echo
+ echo " ERROR! Libnet header not found, go get it from"
+@@ -985,33 +985,33 @@ if test "$enable_react" != "no" -a "$ena
+ libnet_dir="/usr/include /usr/local/include /sw/include"
+ fi
+ else
+- libnet_dir=`libnet-config --cflags | cut -dI -f2`
++ libnet_dir=`libnet1-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/libnet1.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/libnet1.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 (libnet1.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 (libnet1.h)", $libnet_dir)
+ fi
+
+ LNET=""
+- AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
++ AC_CHECK_LIB(net1, libnet_build_ip,, LNET="no")
+ if test "$LNET" = "no"; then
+ echo
+ echo " ERROR! Libnet library not found, go get it from"
+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
+--- snort-2.6.1.3.a/src/detection-plugins/sp_react.c 2007-03-09 10:08:23.000000000 +0100
++++ snort-2.6.1.3.b/src/detection-plugins/sp_react.c 2007-03-09 10:40:03.000000000 +0100
@@ -57,7 +57,7 @@
#include <stdlib.h>
#include <string.h>
@@ -121,22 +192,22 @@
#include "rules.h"
#include "decode.h"
-diff -urNbB snort-2.4.3.org/src/detection-plugins/sp_respond.c snort-2.4.3/src/detection-plugins/sp_respond.c
---- snort-2.4.3.org/src/detection-plugins/sp_respond.c 2004-03-23 16:34:46.000000000 +0100
-+++ snort-2.4.3/src/detection-plugins/sp_respond.c 2005-10-31 00:42:52.160138250 +0100
+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
+--- snort-2.6.1.3.a/src/detection-plugins/sp_respond.c 2007-03-09 10:08:23.000000000 +0100
++++ snort-2.6.1.3.b/src/detection-plugins/sp_respond.c 2007-03-09 10:40:37.000000000 +0100
@@ -34,7 +34,7 @@
- #ifdef ENABLE_RESPONSE
+ #if defined(ENABLE_RESPONSE) && !defined(ENABLE_RESPONSE2)
-#include <libnet.h>
+#include <libnet1.h>
#include "decode.h"
#include "rules.h"
-diff -urNbB snort-2.4.3.org/src/inline.c snort-2.4.3/src/inline.c
---- snort-2.4.3.org/src/inline.c 2005-05-05 22:00:35.000000000 +0200
-+++ snort-2.4.3/src/inline.c 2005-10-31 00:42:52.160138250 +0100
-@@ -3,7 +3,7 @@
+diff -NurpP --minimal snort-2.6.1.3.a/src/inline.c snort-2.6.1.3.b/src/inline.c
+--- snort-2.6.1.3.a/src/inline.c 2007-03-09 10:08:23.000000000 +0100
++++ snort-2.6.1.3.b/src/inline.c 2007-03-09 10:41:19.000000000 +0100
+@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
#include <pcap.h>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/snort-libnet1.patch?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list