]> git.pld-linux.org Git - packages/snort.git/commitdiff
- updated to 2.9.8.2
authorJan Rękorajski <baggins@pld-linux.org>
Sun, 10 Apr 2016 01:15:24 +0000 (10:15 +0900)
committerJan Rękorajski <baggins@pld-linux.org>
Sun, 10 Apr 2016 01:15:24 +0000 (10:15 +0900)
snort-lib64.patch [deleted file]
snort-libnet1.patch [deleted file]
snort-link.patch
snort.spec

diff --git a/snort-lib64.patch b/snort-lib64.patch
deleted file mode 100644 (file)
index b1111fb..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
---- snort-2.8.4.1/configure.in.orig    2009-04-21 20:42:53.000000000 +0200
-+++ snort-2.8.4.1/configure.in 2009-05-03 12:05:54.000000000 +0200
-@@ -678,10 +678,10 @@
-         done
-       fi
-       if test -z "$MYSQL_LIB_DIR"; then
--        str="$i/lib/libmysqlclient.*"
-+        str="$i/lib64/libmysqlclient.*"
-         for j in `echo $str`; do
-           if test -r "$j"; then
--            MYSQL_LIB_DIR="$i/lib"
-+            MYSQL_LIB_DIR="$i/lib64"
-             break 2
-           fi
-         done
-@@ -731,7 +731,7 @@
-       if test "x$mysql_fail" != "xno"; then
-         tmp=""
-         for i in $mysql_lib_directory; do
--          tmp="$tmp $i $i/lib $i/mysql $i/mysql/lib $i/lib/mysql"
-+          tmp="$tmp $i $i/lib64 $i/mysql $i/mysql/lib64 $i/lib64/mysql"
-         done
-         FAIL_MESSAGE("mysqlclient library (libmysqlclient.*)", $tmp)
-       else
-@@ -845,10 +845,10 @@
-     fi
-   else
--    str="$ODBC_DIR/lib/libodbc.*"
-+    str="$ODBC_DIR/lib64/libodbc.*"
-     for j in `echo $str`; do
-       if test -r "$j"; then 
--        ODBC_LIB_DIR="$ODBC_DIR/lib"
-+        ODBC_LIB_DIR="$ODBC_DIR/lib64"
-         ODBC_LIB="odbc"
-       fi
-     done
-@@ -865,7 +865,7 @@
-     if test -z "$ODBC_LIB_DIR"; then
-       if test "x$odbc_fail" != "xno"; then
--        FAIL_MESSAGE("odbc library (libodbc)", "$ODBC_DIR/lib")
-+        FAIL_MESSAGE("odbc library (libodbc)", "$ODBC_DIR/lib64")
-       else
-         AC_MSG_RESULT(no)
-       fi
-@@ -948,7 +948,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
-@@ -959,13 +959,13 @@
-        done
-    done
-   else
--   POSTGRESQL_LIB_DIR="$POSTGRESQL_DIR/lib"
-+   POSTGRESQL_LIB_DIR="$POSTGRESQL_DIR/lib64"
-   fi
-   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
-@@ -1024,7 +1024,7 @@
-     for i in "rdbms/demo" "rdbms/public" "network/public"; do
-       ORACLE_CPP_FLAGS="$ORACLE_CPP_FLAGS -I$ORACLE_DIR/$i"
-     done
--    ORACLE_LIB_DIR="$ORACLE_DIR/lib"
-+    ORACLE_LIB_DIR="$ORACLE_DIR/lib64"
-     AC_MSG_RESULT(yes)
-     LDFLAGS="${LDFLAGS} -L${ORACLE_LIB_DIR}"
-diff -Nur snort-2.8.4.1-orig/src/dynamic-examples/dynamic-preprocessor/Makefile.am snort-2.8.4.1/src/dynamic-examples/dynamic-preprocessor/Makefile.am
---- snort-2.8.4.1-orig/src/dynamic-examples/dynamic-preprocessor/Makefile.am   2007-10-11 18:07:25.000000000 +0200
-+++ snort-2.8.4.1/src/dynamic-examples/dynamic-preprocessor/Makefile.am        2009-05-03 20:26:49.000000000 +0200
-@@ -3,7 +3,7 @@
- INCLUDES = -I../include
--noinst_libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
-+noinst_libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor
- noinst_lib_LTLIBRARIES = lib_sfdynamic_preprocessor_example.la
-diff -Nur snort-2.8.4.1-orig/src/dynamic-examples/dynamic-rule/Makefile.am snort-2.8.4.1/src/dynamic-examples/dynamic-rule/Makefile.am
---- snort-2.8.4.1-orig/src/dynamic-examples/dynamic-rule/Makefile.am   2007-10-11 18:07:25.000000000 +0200
-+++ snort-2.8.4.1/src/dynamic-examples/dynamic-rule/Makefile.am        2009-05-03 20:26:42.000000000 +0200
-@@ -3,7 +3,7 @@
- INCLUDES = -I../include
--noinst_libdir = ${exec_prefix}/lib/snort_dynamicrules
-+noinst_libdir = ${exec_prefix}/lib64/snort_dynamicrules
- noinst_lib_LTLIBRARIES = lib_sfdynamic_example_rule.la
-diff -Nur snort-2.8.4.1-orig/src/dynamic-plugins/sf_engine/Makefile.am snort-2.8.4.1/src/dynamic-plugins/sf_engine/Makefile.am
---- snort-2.8.4.1-orig/src/dynamic-plugins/sf_engine/Makefile.am       2008-10-06 18:33:00.000000000 +0200
-+++ snort-2.8.4.1/src/dynamic-plugins/sf_engine/Makefile.am    2009-05-03 20:26:56.000000000 +0200
-@@ -5,7 +5,7 @@
- lib_LTLIBRARIES = libsf_engine.la
--libdir = ${exec_prefix}/lib/snort_dynamicengine
-+libdir = ${exec_prefix}/lib64/snort_dynamicengine
- libsf_engine_la_LDFLAGS = -export-dynamic
-diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/dcerpc/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/dcerpc/Makefile.am
---- snort-2.8.4.1-orig/src/dynamic-preprocessors/dcerpc/Makefile.am    2009-01-26 22:50:11.000000000 +0100
-+++ snort-2.8.4.1/src/dynamic-preprocessors/dcerpc/Makefile.am 2009-05-03 20:24:21.000000000 +0200
-@@ -3,7 +3,7 @@
- INCLUDES = -I../include
--libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
-+libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor
- lib_LTLIBRARIES = libsf_dcerpc_preproc.la
-diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/dcerpc2/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/dcerpc2/Makefile.am
---- snort-2.8.4.1-orig/src/dynamic-preprocessors/dcerpc2/Makefile.am   2009-01-26 22:50:13.000000000 +0100
-+++ snort-2.8.4.1/src/dynamic-preprocessors/dcerpc2/Makefile.am        2009-05-03 20:24:36.000000000 +0200
-@@ -3,7 +3,7 @@
- INCLUDES = -I../include -I$(srcdir)/includes
--libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
-+libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor
- lib_LTLIBRARIES = libsf_dce2_preproc.la
-diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/dns/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/dns/Makefile.am
---- snort-2.8.4.1-orig/src/dynamic-preprocessors/dns/Makefile.am       2009-01-26 22:50:17.000000000 +0100
-+++ snort-2.8.4.1/src/dynamic-preprocessors/dns/Makefile.am    2009-05-03 20:24:46.000000000 +0200
-@@ -3,7 +3,7 @@
- INCLUDES = -I../include
--libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
-+libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor
- lib_LTLIBRARIES = libsf_dns_preproc.la
-diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/ftptelnet/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/ftptelnet/Makefile.am
---- snort-2.8.4.1-orig/src/dynamic-preprocessors/ftptelnet/Makefile.am 2009-01-26 22:50:18.000000000 +0100
-+++ snort-2.8.4.1/src/dynamic-preprocessors/ftptelnet/Makefile.am      2009-05-03 20:25:13.000000000 +0200
-@@ -3,7 +3,7 @@
- INCLUDES = -I../include -I./includes
--libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
-+libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor
- lib_LTLIBRARIES = libsf_ftptelnet_preproc.la
-diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/smtp/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/smtp/Makefile.am
---- snort-2.8.4.1-orig/src/dynamic-preprocessors/smtp/Makefile.am      2009-01-26 22:50:22.000000000 +0100
-+++ snort-2.8.4.1/src/dynamic-preprocessors/smtp/Makefile.am   2009-05-03 20:25:35.000000000 +0200
-@@ -3,7 +3,7 @@
- INCLUDES = -I../include -I${top_srcdir}/src/dynamic-preprocessors/libs
--libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
-+libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor
- lib_LTLIBRARIES = libsf_smtp_preproc.la
-diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/ssh/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/ssh/Makefile.am
---- snort-2.8.4.1-orig/src/dynamic-preprocessors/ssh/Makefile.am       2009-01-26 22:50:24.000000000 +0100
-+++ snort-2.8.4.1/src/dynamic-preprocessors/ssh/Makefile.am    2009-05-03 20:25:43.000000000 +0200
-@@ -3,7 +3,7 @@
- INCLUDES = -I../include
--libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
-+libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor
- lib_LTLIBRARIES = libsf_ssh_preproc.la
-diff -Nur snort-2.8.4.1-orig/src/dynamic-preprocessors/ssl/Makefile.am snort-2.8.4.1/src/dynamic-preprocessors/ssl/Makefile.am
---- snort-2.8.4.1-orig/src/dynamic-preprocessors/ssl/Makefile.am       2009-01-26 22:50:24.000000000 +0100
-+++ snort-2.8.4.1/src/dynamic-preprocessors/ssl/Makefile.am    2009-05-03 20:25:57.000000000 +0200
-@@ -3,7 +3,7 @@
- INCLUDES = -I../include -I${top_srcdir}/src/dynamic-preprocessors/libs
--libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
-+libdir = ${exec_prefix}/lib64/snort_dynamicpreprocessor
- lib_LTLIBRARIES = libsf_ssl_preproc.la
diff --git a/snort-libnet1.patch b/snort-libnet1.patch
deleted file mode 100644 (file)
index 63d6449..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-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>
- #include <ctype.h>
--#include <libnet.h>
-+#include <libnet1.h>
- #include "rules.h"
- #include "decode.h"
-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 @@
- #if defined(ENABLE_RESPONSE) && !defined(ENABLE_RESPONSE2)
--#include <libnet.h>
-+#include <libnet1.h>
- #include "decode.h"
- #include "rules.h"
-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>
--#include <libnet.h>
-+#include <libnet1.h>
- #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 61128c060e90f11ea5638941b78922b60ca59c4c..fca7e180dc36b8aa2b7eea60fa1e9cf22e37b8ef 100644 (file)
@@ -1,11 +1,11 @@
---- snort-2.8.4.1/src/dynamic-examples/dynamic-rule/Makefile.am~       2007-10-11 18:07:25.000000000 +0200
-+++ snort-2.8.4.1/src/dynamic-examples/dynamic-rule/Makefile.am        2011-05-17 16:24:59.800000206 +0200
+--- snort-2.9.8.2/src/dynamic-examples/dynamic-rule/Makefile.am~       2011-06-08 09:33:10.000000000 +0900
++++ snort-2.9.8.2/src/dynamic-examples/dynamic-rule/Makefile.am        2016-04-10 10:02:21.076065236 +0900
 @@ -7,7 +7,7 @@
  
  noinst_lib_LTLIBRARIES = lib_sfdynamic_example_rule.la
  
--lib_sfdynamic_example_rule_la_LDFLAGS = -export-dynamic
-+lib_sfdynamic_example_rule_la_LDFLAGS = -export-dynamic -L../../dynamic-plugins/sf_engine/.libs -lsf_engine
+-lib_sfdynamic_example_rule_la_LDFLAGS = -export-dynamic @XCCFLAGS@
++lib_sfdynamic_example_rule_la_LDFLAGS = -export-dynamic @XCCFLAGS@ -L../../dynamic-plugins/sf_engine/.libs -lsf_engine
  
  BUILT_SOURCES = \
  sfsnort_dynamic_detection_lib.c \
index bea1def422d666bc46fd9b218cdbcac1f17587f9..8daaf7e77315e9f0a64d8bbd007bb6b20e12d79c 100644 (file)
@@ -1,17 +1,9 @@
 #
 # TODO: - snort rules - fix description
-#      - clamav support - cleanup, add some docs
 #      - snort_inline - prepare separate sets of config-files, rules
 #        and startup script, adds some docs
-#      - snort 2.6
 #
 # Conditional build:
-%bcond_without pgsql   # build without PostgreSQL storage support
-%bcond_without mysql   # build without MySQL storage support
-%bcond_without snmp    # build without SNMP support
-%bcond_without inline  # build without inline support
-%bcond_without prelude # build without prelude support
-%bcond_without clamav  # build w/o  ClamAV preprocessor support (anti-vir)
 %bcond_with    registered      # build with rules available for registered users
 #
 Summary:       Network intrusion detection system (IDS/IPS)
@@ -20,12 +12,12 @@ Summary(pt_BR.UTF-8):       Ferramenta de detecção de intrusos
 Summary(ru.UTF-8):     Snort - система обнаружения попыток вторжения в сеть
 Summary(uk.UTF-8):     Snort - система виявлення спроб вторгнення в мережу
 Name:          snort
-Version:       2.8.4.1
-Release:       9
+Version:       2.9.8.2
+Release:       1
 License:       GPL v2 (vrt rules on VRT-License)
 Group:         Networking
-Source0:       http://www.snort.org/dl/%{name}-%{version}.tar.gz
-# Source0-md5: 63f4e76ae96a2d133f4c7b741bad5458
+Source0:       http://www.snort.org/downloads/snort/%{name}-%{version}.tar.gz
+# Source0-md5: b5005f88a01b42ff7ee0defb94161ffc
 Source1:       http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_pr/%{name}rules-pr-2.4.tar.gz
 # Source1-md5: 35d9a2486f8c0280bb493aa03c011927
 %if %{with registered}
@@ -37,24 +29,18 @@ Source3:    http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Communit
 # Source3-md5: f236b8a4ac12e99d3e7bd81bf3b5a482
 Source4:       %{name}.init
 Source5:       %{name}.logrotate
-Patch0:                %{name}-libnet1.patch
-Patch1:                %{name}-lib64.patch
-Patch2:                %{name}-link.patch
+Patch0:                %{name}-link.patch
 URL:           http://www.snort.org/
 BuildRequires: autoconf
 BuildRequires: automake
-%{?with_clamav:BuildRequires:  clamav-devel}
-%{?with_inline:BuildRequires:  iptables-devel}
+BuildRequires: daq-static
+BuildRequires: libdnet-devel
 BuildRequires: libnet-devel
 BuildRequires: libnet1-devel = 1.0.2a
 BuildRequires: libpcap-devel
-%{?with_prelude:BuildRequires: libprelude-devel}
 BuildRequires: libtool
-%{?with_mysql:BuildRequires:   mysql-devel}
-%{?with_snmp:BuildRequires:    net-snmp-devel >= 5.0.7}
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pcre-devel
-%{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: rpmbuild(macros) >= 1.202
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: zlib-devel
@@ -68,8 +54,6 @@ Requires(pre):        /usr/sbin/useradd
 Requires:      libnet1 = 1.0.2a
 Requires:      rc-scripts >= 0.2.0
 Provides:      group(snort)
-%{?with_mysql:Provides:        snort(mysql) = %{version}}
-%{?with_pgsql:Provides:        snort(pgsql) = %{version}}
 Provides:      user(snort)
 Obsoletes:     snort-rules
 Conflicts:     logrotate < 3.7-4
@@ -145,10 +129,6 @@ Snort - це сніфер пакетів, що може використовув
 %prep
 %setup -q %{!?with_registered:-a1} %{?with_registered:-a2} -a3
 %patch0 -p1
-%if "%{_lib}" == "lib64"
-%patch1 -p1
-%endif
-%patch2 -p1
 
 sed -i "s#var\ RULE_PATH.*#var RULE_PATH /etc/snort/rules#g" rules/snort.conf
 _DIR=$(pwd)
@@ -166,19 +146,11 @@ cd $_DIR
 # we don't need libnsl, so don't use it
 %configure \
        no_libnsl=yes \
-       --enable-smbalerts \
-       --enable-flexresp \
-       %{?with_inline:--enable-inline } \
-       %{?with_inline:--with-libipq-includes=%{_includedir}/libipq }  \
-       --with-libnet-includes=%{_includedir} \
-       --with%{!?with_snmp:out}-snmp \
-       --without-odbc \
-       --enable-perfmonitor \
-       --with%{!?with_pgsql:out}-postgresql \
-       --with%{!?with_mysql:out}-mysql \
-       %{?with_prelude:--enable-prelude } \
-       %{?with_clamav:--enable-clamav --with-clamav-defdir=/var/lib/clamav} \
-       --enable-pthread
+       --enable-pthread \
+       --enable-so-with-static-lib \
+       --enable-control-socket \
+       --enable-side-channel \
+       --enable-build-dynamic-examples
 
 %{__make} -j1
 
@@ -200,9 +172,6 @@ install %{SOURCE4}  $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install %{SOURCE5}     $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 install rules/snort.conf       $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
-mv schemas/create_mysql schemas/create_mysql.sql
-mv schemas/create_postgresql schemas/create_postgresql.sql
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -229,7 +198,6 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc doc/{AUTHORS,BUGS,CREDITS,INSTALL,NEWS,PROBLEMS,README*,TODO,USAGE,WISHLIST,generators,*.pdf}
-%doc schemas/create_{mysql,postgresql}.sql
 %attr(755,root,root) %{_sbindir}/*
 %attr(770,root,snort) %dir %{_var}/log/%{name}
 %attr(770,root,snort) %dir %{_var}/log/archive/%{name}
@@ -244,7 +212,5 @@ fi
 %{_mandir}/man?/*
 %dir %{_libdir}/snort_dynamicengine
 %dir %{_libdir}/snort_dynamicpreprocessor
-%dir %{_libdir}/snort_dynamicrules
 %attr(755,root,root) %{_libdir}/snort_dynamicengine/libsf_engine.so*
 %attr(755,root,root) %{_libdir}/snort_dynamicpreprocessor/*.so*
-%attr(755,root,root) %{_libdir}/snort_dynamicrules/lib_sfdynamic_example_rule.so*
This page took 0.133654 seconds and 4 git commands to generate.