From 49fa307d479376ce8404d24c6d6d7142dcd941fb Mon Sep 17 00:00:00 2001 From: Zhiquan Li Date: Mon, 16 Nov 2015 10:23:00 +0800 Subject: snort: 2.9.6.0 -> 2.9.7.5 Upgrade snort from 2.9.6.0 to 2.9.7.5, as its dependency upgrade daq from 2.0.2 to 2.0.6, and accordingly update the patches: * Add 2 new patches for snort to solve the cross compile issues * Discard 2 snort patches since it is not needed * Refresh the patch for daq new version * Remove redundant '/' to getting round the rpm debugedit bug: canonicalization unexpectedly shrank character Signed-off-by: Zhiquan Li Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- ...isable-run-test-program-while-cross-compiling.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch') diff --git a/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch b/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch index 12a6cba600..a100b7cb83 100644 --- a/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch +++ b/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch @@ -5,12 +5,13 @@ configure: error: cannot run test program while cross compiling Signed-off-by: Chunrong Guo ---- a/m4/sf.m4old 2013-08-30 04:08:18.768409680 -0500 -+++ b/m4/sf.m4 2013-08-30 04:09:24.591367890 -0500 -@@ -135,19 +135,6 @@ +--- a/m4/sf.m4old 2015-10-28 10:21:20.270557986 +0800 ++++ a/m4/sf.m4 2015-10-28 10:23:22.726551974 +0800 +@@ -135,20 +135,7 @@ + echo exit 1 fi - AC_MSG_CHECKING([for libpcap version >= $1]) +- AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x], [ - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[ @@ -22,8 +23,9 @@ Signed-off-by: Chunrong Guo - if (strcmp(pcap_version, $1) < 0) - return 1; - ]])], -- [libpcap_version_1x="yes"], -- [libpcap_version_1x="no"]) - if test "x$libpcap_version_1x" = "xno"; then - AC_MSG_RESULT(no) +- [daq_cv_libpcap_version_1x="yes"], +- [daq_cv_libpcap_version_1x="no"])]) ++ AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x]) + if test "x$daq_cv_libpcap_version_1x" = "xno"; then echo + echo " ERROR! Libpcap library version >= $1 not found." -- cgit v1.2.3-54-g00ecf