update snort to latest upstream, add daq package

1 files changed, 105 insertions, 60 deletions

diff --git a/package/snort/patches/patch-configure b/package/snort/patches/patch-configure
index 2f5bfde4e..3b197b010 100644
--- a/package/snort/patches/patch-configure
+++ b/package/snort/patches/patch-configure
@@ -1,25 +1,20 @@
---- snort-2.8.5.2.orig/configure	2009-10-19 23:18:06.000000000 +0200
-+++ snort-2.8.5.2/configure	2010-01-14 20:16:49.000000000 +0100
-@@ -25882,81 +25882,7 @@ _ACEOF
+--- snort-2.9.5.orig/configure	2013-06-04 23:21:55.000000000 +0200
++++ snort-2.9.5/configure	2013-07-17 11:07:20.000000000 +0200
+@@ -14205,50 +14205,6 @@ _ACEOF
  fi
  
  
 -# In case INADDR_NONE is not defined (like on Solaris)
 -have_inaddr_none="no"
--{ echo "$as_me:$LINENO: checking for INADDR_NONE" >&5
--echo $ECHO_N "checking for INADDR_NONE... $ECHO_C" >&6; }
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INADDR_NONE" >&5
+-$as_echo_n "checking for INADDR_NONE... " >&6; }
+-if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
 -else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -#include <sys/types.h>
@@ -37,58 +32,108 @@
 -  return 0;
 -}
 -_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-if ac_fn_c_try_run "$LINENO"; then :
 -  have_inaddr_none="yes"
 -else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--have_inaddr_none="no"
+-  have_inaddr_none="no"
 -fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 -fi
 -
--
--{ echo "$as_me:$LINENO: result: $have_inaddr_none" >&5
--echo "${ECHO_T}$have_inaddr_none" >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_inaddr_none" >&5
+-$as_echo "$have_inaddr_none" >&6; }
 -if test "x$have_inaddr_none" = "xno"; then
 -
--cat >>confdefs.h <<\_ACEOF
--#define INADDR_NONE -1
+-$as_echo "#define INADDR_NONE -1" >>confdefs.h
+-
+-fi
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -14578,45 +14534,6 @@ if test "x$LPCAP" = "xno"; then
+   fi
+ fi
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_lex_destroy" >&5
+-$as_echo_n "checking for pcap_lex_destroy... " >&6; }
+-if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <pcap.h>
+-
+-int
+-main ()
+-{
+-
+-   pcap_lex_destroy();
+-
+-  ;
+-  return 0;
+-}
 -_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  have_pcap_lex_destroy="yes"
+-else
+-  have_pcap_lex_destroy="no"
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pcap_lex_destroy" >&5
+-$as_echo "$have_pcap_lex_destroy" >&6; }
+-if test "x$have_pcap_lex_destroy" = "xyes"; then
+-
+-$as_echo "#define HAVE_PCAP_LEX_DESTROY 1" >>confdefs.h
+-
+-fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_lib_version" >&5
+ $as_echo_n "checking for pcap_lib_version... " >&6; }
+@@ -15432,38 +15349,7 @@ fi
+ done
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for daq address space ID" >&5
+-$as_echo_n "checking for daq address space ID... " >&6; }
+-if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include <daq.h>
 -
+-int
+-main ()
+-{
+-
+-   DAQ_PktHdr_t hdr;
+-   hdr.address_space_id = 0;
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  have_daq_address_space_id="yes"
+-else
+-  have_daq_address_space_id="no"
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 -fi
-+have_inaddr_none="yes"
++have_daq_address_space_id="yes"
  
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -26580,7 +26506,7 @@ fi
- # that versions < 0.9 do not accumulate packet statistics whereas >= 0.9 do accumulate.
- # This is Linux only.  The check is done after pcre because the code below uses pcre.
- # It seems Phil Wood's pcap does not accumulate - 0.9x
--pcap_version_check="yes"
-+pcap_version_check="no"
- if test "x$linux" = "xyes"; then
-     if test "x$pcap_version_check" = "xyes"; then
-         { echo "$as_me:$LINENO: checking for libpcap version >= 0.9" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_daq_address_space_id" >&5
+ $as_echo "$have_daq_address_space_id" >&6; }