SOURCES: snort-lib64.patch, snort-libnet1.patch - updated
arekm
arekm at pld-linux.org
Mon Oct 31 00:52:21 CET 2005
Author: arekm Date: Sun Oct 30 23:52:21 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
snort-lib64.patch (1.1 -> 1.2) , snort-libnet1.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/snort-lib64.patch
diff -u SOURCES/snort-lib64.patch:1.1 SOURCES/snort-lib64.patch:1.2
--- SOURCES/snort-lib64.patch:1.1 Mon Jan 26 16:47:08 2004
+++ SOURCES/snort-lib64.patch Mon Oct 31 00:52:16 2005
@@ -1,6 +1,7 @@
---- configure.in~ 2004-01-26 16:25:45.706051805 +0100
-+++ configure.in 2004-01-26 16:30:27.632921786 +0100
-@@ -382,7 +382,7 @@
+diff -urBbN 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:49:42.581788000 +0100
+@@ -408,7 +408,7 @@
fi
else
@@ -9,7 +10,7 @@
str="$MYSQL_DIR/$i/libmysqlclient.*"
for j in `echo $str`; do
if test -r $j; then
-@@ -395,7 +395,7 @@
+@@ -421,7 +421,7 @@
if test -z "$MYSQL_LIB_DIR"; then
if test "$mysql_fail" != "no"; then
FAIL_MESSAGE("mysqlclient library",
@@ -18,7 +19,7 @@
else
AC_MSG_RESULT(no)
fi
-@@ -449,10 +449,10 @@
+@@ -475,10 +475,10 @@
fi
else
@@ -31,7 +32,7 @@
ODBC_LIB="odbc"
fi
done
-@@ -469,7 +469,7 @@
+@@ -495,7 +495,7 @@
if test -z "$ODBC_LIB_DIR"; then
if test "$odbc_fail" != "no"; then
@@ -40,25 +41,32 @@
else
AC_MSG_RESULT(no)
fi
-@@ -526,7 +526,7 @@
- fi
+@@ -578,7 +578,7 @@
+
+ if test -z "$POSTGRESQL_DIR"; then
+ for dir in $postgresql_directory; do
+- for i in lib lib/pgsql; do
++ for i in lib64 lib64/pgsql; do
+ str="$dir/$i/libpq.*"
+ for j in `echo $str`; do
+ if test -r $j; then
+@@ -589,13 +589,13 @@
+ done
+ done
else
+- POSTGRESQL_LIB_DIR="$POSTGRESQL_LIB_DIR/lib"
++ POSTGRESQL_LIB_DIR="$POSTGRESQL_LIB_DIR/lib64"
+ fi
-- for i in lib lib/pgsql; do
-+ for i in lib64 lib64/pgsql; do
- str="$POSTGRESQL_DIR/$i/libpq.*"
- for j in `echo $str`; do
- if test -r $j; then
-@@ -539,7 +539,7 @@
- if test -z "$POSTGRESQL_LIB_DIR"; then
- if test "$postgresql_fail" != "no"; then
- FAIL_MESSAGE("postgresql library libpq",
-- "$POSTGRESQL_DIR/lib $POSTGRESQL_DIR/lib/pgsql")
-+ "$POSTGRESQL_DIR/lib64 $POSTGRESQL_DIR/lib64/pgsql")
- else
- AC_MSG_RESULT(no);
- fi
-@@ -592,7 +592,7 @@
+ if test -z "$POSTGRESQL_LIB_DIR"; then
+ if test "$postgresql_fail" != "no"; then
+ FAIL_MESSAGE("postgresql library libpq",
+- "$POSTGRESQL_DIR/lib $POSTGRESQL_DIR/lib/pgsql")
++ "$POSTGRESQL_DIR/lib $POSTGRESQL_DIR/lib64/pgsql")
+ else
+ AC_MSG_RESULT(no);
+ fi
+@@ -647,7 +647,7 @@
for i in rdbms/demo rdbms/public network/public; do
ORACLE_CPP_FLAGS="$ORACLE_CPP_FLAGS -I$ORACLE_DIR/$i"
done
@@ -67,12 +75,3 @@
AC_MSG_RESULT(yes)
LDFLAGS="${LDFLAGS} -L${ORACLE_LIB_DIR}"
-@@ -635,7 +635,7 @@
- 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"
-+ LDFLAGS="${LDFLAGS} -L/usr/local/lib64 -L/sw/lib64"
- LIBS="${LIBS} -lnet"
- fi
-
================================================================
Index: SOURCES/snort-libnet1.patch
diff -u SOURCES/snort-libnet1.patch:1.4 SOURCES/snort-libnet1.patch:1.5
--- SOURCES/snort-libnet1.patch:1.4 Fri Nov 19 10:25:34 2004
+++ SOURCES/snort-libnet1.patch Mon Oct 31 00:52:16 2005
@@ -1,11 +1,14 @@
---- snort-2.3.0RC1/configure.in.orig 2004-11-18 17:13:42.000000000 +0000
-+++ snort-2.3.0RC1/configure.in 2004-11-19 10:10:22.398942856 +0000
-@@ -687,19 +687,19 @@
-
- LIBNET_INC_DIR=""
+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 @@
+ 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")
-- libnet_dir="/usr/include /usr/local/include"
-+ libnet_dir="/usr/include /usr/local/include /usr/include/libnet1"
for i in $libnet_dir; do
- if test -r $i/libnet.h; then
+ if test -r $i/libnet1.h; then
@@ -16,17 +19,17 @@
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)
++ 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)
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
-@@ -711,26 +711,25 @@
+@@ -769,26 +769,25 @@
AC_ARG_ENABLE(flexresp,
[ --enable-flexresp Flexible Responses on hostile connection attempts],
@@ -59,7 +62,7 @@
if test "$LNET" = "no"; then
echo
echo " ERROR! Libnet header not found, go get it from"
-@@ -743,38 +742,38 @@
+@@ -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
@@ -106,8 +109,9 @@
if test "$LNET" = "no"; then
echo
echo " ERROR! Libnet library not found, go get it from"
---- snort-2.3.0RC1/src/detection-plugins/sp_react.c.orig 2004-03-23 15:34:46.000000000 +0000
-+++ snort-2.3.0RC1/src/detection-plugins/sp_react.c 2004-11-19 10:14:10.595251744 +0000
+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
@@ -57,7 +57,7 @@
#include <stdlib.h>
#include <string.h>
@@ -117,8 +121,9 @@
#include "rules.h"
#include "decode.h"
---- snort-2.3.0RC1/src/detection-plugins/sp_respond.c.orig 2004-11-19 10:17:02.159170064 +0000
-+++ snort-2.3.0RC1/src/detection-plugins/sp_respond.c 2004-11-19 10:17:10.138956952 +0000
+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
@@ -34,7 +34,7 @@
@@ -128,8 +133,9 @@
#include "decode.h"
#include "rules.h"
---- snort-2.3.0RC1/src/inline.c~ 2004-09-13 17:44:49.000000000 +0000
-+++ snort-2.3.0RC1/src/inline.c 2004-11-19 10:22:41.224624280 +0000
+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 @@
#include <stdlib.h>
#include <string.h>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/snort-lib64.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/snort-libnet1.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list