diff options
| author |   Zhiquan Li <zhiquan.li@windriver.com> | 2015-11-16 10:23:00 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2015-11-30 13:00:15 -0500 |
| commit | 49fa307d479376ce8404d24c6d6d7142dcd941fb (patch) | |
| tree | 20d1d22ac899e8af1b621e5793e834d440399aee /meta-networking/recipes-connectivity/daq | |
| parent | 20b63d32bce7e09a72e945313717702201b6484d (diff) | |
| download | meta-openembedded-contrib-49fa307d479376ce8404d24c6d6d7142dcd941fb.tar.gz | |
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 <zhiquan.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/daq')
| -rw-r--r-- | meta-networking/recipes-connectivity/daq/daq_2.0.6.bb (renamed from meta-networking/recipes-connectivity/daq/daq_2.0.2.bb) | 4 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.2.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb index b8f84077ce..48039f07ad 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.2.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb @@ -20,7 +20,7 @@ SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \ --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" -SRC_URI[md5sum] = "865bf9b750a2a2ca632591a3c70b0ea0" -SRC_URI[sha256sum] = "d65d1e67c4994e02c3142c49a648642e780b7e3d942b4a51f605309beac269a8" +SRC_URI[md5sum] = "2cd6da422a72c129c685fc4bb848c24c" +SRC_URI[sha256sum] = "b40e1d1273e08aaeaa86e69d4f28d535b7e53bdb3898adf539266b63137be7cb" inherit autotools 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 <B40290@freescale.com> ---- 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 <B40290@freescale.com> - 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." |