SOURCES: snort-libnet1.patch, snort-open.patch (NEW) - 2.8.2.2
areq
areq at pld-linux.org
Thu Sep 4 18:32:54 CEST 2008
Author: areq Date: Thu Sep 4 16:32:54 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- 2.8.2.2
---- Files affected:
SOURCES:
snort-libnet1.patch (1.6 -> 1.7) , snort-open.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/snort-libnet1.patch
diff -u SOURCES/snort-libnet1.patch:1.6 SOURCES/snort-libnet1.patch:1.7
--- SOURCES/snort-libnet1.patch:1.6 Fri Mar 9 15:28:20 2007
+++ SOURCES/snort-libnet1.patch Thu Sep 4 18:32:48 2008
@@ -1,185 +1,3 @@
-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 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
- 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 >/dev/null"; then
-- 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`"
- CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"
- AC_MSG_RESULT($i)
- else
-@@ -828,7 +828,7 @@ AC_ARG_ENABLE(inline-init-failopen,
-
- AC_ARG_ENABLE(flexresp,
- [ --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
- 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"
-@@ -852,7 +852,7 @@ if test "$enable_flexresp" != "no" -a "$
- 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"
-@@ -870,33 +870,33 @@ if test "$enable_flexresp" != "no" -a "$
- 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-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.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"
-@@ -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
@@ -216,3 +34,165 @@
#include "decode.h"
#include "inline.h"
+--- aaa/configure.in.orig 2008-07-18 20:42:29.000000000 +0000
++++ aaa/configure.in 2008-09-04 13:04:35.026969217 +0000
+@@ -1149,21 +1149,21 @@
+ 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 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
+ 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 >/dev/null"; then
+- 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`"
+ CPPFLAGS="${CPPFLAGS} -I${LIBNET_INC_DIR}"
+ AC_MSG_RESULT($i)
+ else
+@@ -1196,13 +1196,13 @@
+ 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"
+@@ -1210,7 +1210,7 @@
+ fi
+
+ LNET=""
+- AC_CHECK_HEADERS(libnet.h,, LNET="no")
++ AC_CHECK_HEADERS(libnet1.h,, LNET="no")
+ if test "x$LNET" = "xno"; then
+ echo
+ echo " ERROR! Libnet header not found, go get it from"
+@@ -1233,28 +1233,28 @@
+
+ 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 "x$LIBNET_INC_DIR" != "x"; 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-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.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 "x$LNET" = "xno"; then
+ echo
+ echo " ERROR! Libnet library not found, go get it from"
+@@ -1305,8 +1305,8 @@
+ [ --enable-react Intercept and terminate offending HTTP accesses],
+ enable_react="$enableval", enable_react="no")
+ if test "x$enable_react" = "xyes"; then
+- 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`"
+ fi
+
+ if test "x$enable_react" != "xno" -a "x$enable_react" = "xyes"; then
+@@ -1317,13 +1317,13 @@
+ 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"
+@@ -1331,7 +1331,7 @@
+ fi
+
+ LNET=""
+- AC_CHECK_HEADERS(libnet.h,, LNET="no")
++ AC_CHECK_HEADERS(libnet1.h,, LNET="no")
+ if test "x$LNET" = "xno"; then
+ echo
+ echo " ERROR! Libnet header not found, go get it from"
+@@ -1354,28 +1354,28 @@
+
+ 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 "x$LIBNET_INC_DIR" != "x"; 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 "x$LNET" = "xno"; then
+ echo
+ echo " ERROR! Libnet library not found, go get it from"
================================================================
Index: SOURCES/snort-open.patch
diff -u /dev/null SOURCES/snort-open.patch:1.1
--- /dev/null Thu Sep 4 18:32:55 2008
+++ SOURCES/snort-open.patch Thu Sep 4 18:32:48 2008
@@ -0,0 +1,11 @@
+--- snort-2.8.2.2/src/preprocessors/flow/portscan/server_stats.c.orginal 2008-09-04 13:32:27.613885983 +0000
++++ snort-2.8.2.2/src/preprocessors/flow/portscan/server_stats.c 2008-09-04 13:32:33.057009471 +0000
+@@ -346,7 +346,7 @@
+
+ /* open this description, create it if necessary, always wait on
+ * sync to disk w/ every write, only write */
+- fd = open(filename, O_CREAT|O_TRUNC|O_SYNC|O_WRONLY);
++ fd = open(filename, O_CREAT, S_IRUSR|S_IWUSR|O_TRUNC|O_SYNC|O_WRONLY);
+
+ if(fd < 0)
+ {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/snort-libnet1.patch?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list