diff options
7 files changed, 78 insertions, 34 deletions
diff --git a/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch b/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch index 1520553a45..047caec324 100644 --- a/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch +++ b/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch @@ -1,4 +1,4 @@ -From 815e861721a9c43efddb78521147145ebc7569ca Mon Sep 17 00:00:00 2001 +From 4335c4c61877c0b65ff4ec767e8ad3ad8c73c32d Mon Sep 17 00:00:00 2001 From: Zhiquan Li <zhiquan.li@windriver.com> Date: Fri, 13 Nov 2015 17:40:24 +0800 Subject: [PATCH] fix do_package failed since snort 2.9.7.0 @@ -13,6 +13,7 @@ It's a rpm debugedit bug: Upstream-Status:Inappropriate [embedded specific] Signed-off-by: Zhiquan Li <zhiquan.li@windriver.com> + --- src/snort.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -30,6 +31,3 @@ index 8308e57..499d157 100644 #include "profiler.h" #include "rules.h" #include "treenodes.h" --- -1.9.1 - diff --git a/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch b/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch index 54c2a9521b..2e28cd0486 100644 --- a/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch +++ b/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch @@ -1,4 +1,4 @@ -From 4d7ebe3ed6cee72bc7db98bd408d22c10ef5dd82 Mon Sep 17 00:00:00 2001 +From 5875dea90f71350b7205788fbc67e3759077cefe Mon Sep 17 00:00:00 2001 From: Joe MacDonald <joe@deserted.net> Date: Wed, 20 Nov 2013 16:06:07 -0500 Subject: [PATCH] libpcap: search sysroot for headers @@ -9,15 +9,16 @@ the search path at the sysroot instead. Upstream-Status: Pending Signed-off-by: Joe MacDonald <joe@deserted.net> + --- - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index e52bb6c..8ded35d 100644 +index 62573a8..fded45b 100644 --- a/configure.in +++ b/configure.in -@@ -78,7 +78,7 @@ case "$host" in +@@ -69,7 +69,7 @@ case "$host" in linux="yes" AC_DEFINE([LINUX],[1],[Define if Linux]) AC_SUBST(extra_incl) @@ -26,6 +27,3 @@ index e52bb6c..8ded35d 100644 ;; *-hpux10*|*-hpux11*) AC_DEFINE([HPUX],[1],[Define if HP-UX 10 or 11]) --- -1.7.10.4 - diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch b/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch index 39e5c9c03a..6aa0b736f9 100644 --- a/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch +++ b/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch @@ -1,17 +1,27 @@ +From 5a53260a819e2873f58165e96852529719101c53 Mon Sep 17 00:00:00 2001 +From: Chunrong Guo <B40290@freescale.com> +Date: Mon, 4 Nov 2013 10:39:56 +0800 +Subject: [PATCH] snort: add recipe + Upstream-Status:Inappropriate [embedded specific] fix the below error: -checking for dap address space id... configure: +checking for dap address space id... configure: configure: error: cannot run test program while cross compiling - Signed-off-by: Chunrong Guo <B40290@freescale.com> ---- a/configure.in 2013-08-23 00:06:37.239361932 -0500 -+++ b/configure.in 2013-08-23 00:07:32.860266534 -0500 -@@ -679,23 +679,23 @@ +--- + configure.in | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/configure.in b/configure.in +index 6fe5d68..e7636ce 100644 +--- a/configure.in ++++ b/configure.in +@@ -698,23 +698,23 @@ if test "x$ac_cv_func_daq_dp_add_dc" = "xyes"; then - AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta]) + fi -AC_MSG_CHECKING([for daq address space ID]) -AC_RUN_IFELSE( @@ -48,5 +58,5 @@ Signed-off-by: Chunrong Guo <B40290@freescale.com> +# [DAQ version supports address space ID in header.]) +#fi - # any sparc platform has to have this one defined. - AC_MSG_CHECKING(for sparc) + AC_MSG_CHECKING([for daq flow ID]) + AC_RUN_IFELSE( diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch b/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch index e6afcabaa8..04df37c94f 100644 --- a/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch +++ b/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch @@ -1,16 +1,26 @@ +From 5aa42a3137c657b5eddd4608343aa1854bd7cd27 Mon Sep 17 00:00:00 2001 +From: Zhiquan Li <zhiquan.li@windriver.com> +Date: Mon, 16 Nov 2015 10:23:00 +0800 +Subject: [PATCH] snort: 2.9.6.0 -> 2.9.7.5 + Upstream-Status:Inappropriate [embedded specific] fix the below error: checking for daq flow ID... configure: configure: error: cannot run test program while cross compiling +--- + configure.in | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) ---- a/configure.in 2015-10-28 10:36:42.918512690 +0800 -+++ b/configure.in 2015-10-28 10:37:36.738510048 +0800 -@@ -716,23 +716,23 @@ +diff --git a/configure.in b/configure.in +index e7636ce..2fbd298 100644 +--- a/configure.in ++++ b/configure.in +@@ -716,23 +716,23 @@ have_daq_address_space_id="yes" # [DAQ version supports address space ID in header.]) #fi - + -AC_MSG_CHECKING([for daq flow ID]) -AC_RUN_IFELSE( -[AC_LANG_PROGRAM( @@ -45,6 +55,6 @@ configure: error: cannot run test program while cross compiling +# AC_DEFINE([HAVE_DAQ_FLOW_ID],[1], +# [DAQ version supports flow ID in header.]) +#fi - + AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) AC_RUN_IFELSE( diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch b/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch index 1a13298ca2..15958a72d0 100644 --- a/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch +++ b/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch @@ -1,16 +1,26 @@ +From b916443d43f2e1eeacfbed0033274a0270ef634d Mon Sep 17 00:00:00 2001 +From: Zhiquan Li <zhiquan.li@windriver.com> +Date: Mon, 16 Nov 2015 10:23:00 +0800 +Subject: [PATCH] snort: 2.9.6.0 -> 2.9.7.5 + Upstream-Status:Inappropriate [embedded specific] fix the below error: checking for DAQ_VERDICT_RETRY... configure: configure: error: cannot run test program while cross compiling +--- + configure.in | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) ---- a/configure.in 2015-10-28 10:45:18.174487395 +0800 -+++ b/configure.in 2015-10-28 10:45:47.586485951 +0800 -@@ -734,23 +734,23 @@ +diff --git a/configure.in b/configure.in +index 2fbd298..62573a8 100644 +--- a/configure.in ++++ b/configure.in +@@ -734,23 +734,23 @@ have_daq_flow_id="yes" # [DAQ version supports flow ID in header.]) #fi - + -AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) -AC_RUN_IFELSE( -[AC_LANG_PROGRAM( @@ -45,7 +55,6 @@ configure: error: cannot run test program while cross compiling +# AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1], +# [DAQ version supports DAQ_VERDICT_RETRY in DAQ_Verdict.]) +#fi - + # any sparc platform has to have this one defined. AC_MSG_CHECKING(for sparc) - diff --git a/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch b/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch index 9dafe63459..79e9f076b1 100644 --- a/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch +++ b/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch @@ -1,3 +1,8 @@ +From a1fdbced4166cb0f35d23b63a59312d86860485a Mon Sep 17 00:00:00 2001 +From: Chunrong Guo <B40290@freescale.com> +Date: Mon, 4 Nov 2013 10:39:56 +0800 +Subject: [PATCH] snort: add recipe + Upstream-Status: Inappropriate [embedded specific] fix the below error: @@ -6,10 +11,15 @@ configure: error: cannot run test program while cross compiling Signed-off-by: Chunrong Guo <B40290@freescale.com> +--- + configure.in | 50 ++++++++++++++++---------------------------------- + 1 file changed, 16 insertions(+), 34 deletions(-) ---- a/configure.in 2013-08-21 03:56:17.197414789 -0500 -+++ b/configure.in 2013-08-21 23:19:05.298553560 -0500 -@@ -281,25 +281,7 @@ +diff --git a/configure.in b/configure.in +index 20d15eb..6fe5d68 100644 +--- a/configure.in ++++ b/configure.in +@@ -274,25 +274,7 @@ AC_CHECK_TYPES([int8_t,int16_t,int32_t,int64_t]) AC_CHECK_TYPES([boolean]) # In case INADDR_NONE is not defined (like on Solaris) @@ -36,7 +46,7 @@ Signed-off-by: Chunrong Guo <B40290@freescale.com> AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> -@@ -397,21 +379,21 @@ +@@ -421,21 +403,21 @@ if test "x$LPCAP" = "xno"; then fi fi diff --git a/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch b/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch index 2becc06244..0404ea0fab 100644 --- a/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch +++ b/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch @@ -1,3 +1,8 @@ +From f46d096015d7402a37a59eb66b8f6b7fbf0cdff0 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 24 May 2017 17:38:53 +0800 +Subject: [PATCH] snort: enable static daq + Upstream-Status: Inappropriate [embedded specific] When enable static daq for snort, it calls to daq-modules-config to get link @@ -5,7 +10,11 @@ library and library path. Library path is useless for oe and cause host contamination issue. So filter it. Signed-off-by: Kai Kang <kai.kang@windriver.com> + --- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/configure.in b/configure.in index fded45b..a247bb9 100644 --- a/configure.in |