summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity
diff options
context:
space:
mode:
authorZhiquan Li <zhiquan.li@windriver.com>2015-11-16 10:23:00 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2015-11-30 13:00:15 -0500
commit49fa307d479376ce8404d24c6d6d7142dcd941fb (patch)
tree20d1d22ac899e8af1b621e5793e834d440399aee /meta-networking/recipes-connectivity
parent20b63d32bce7e09a72e945313717702201b6484d (diff)
downloadmeta-openembedded-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')
-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.patch18
-rw-r--r--meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch35
-rw-r--r--meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch50
-rw-r--r--meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch51
-rw-r--r--meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch21
-rw-r--r--meta-networking/recipes-connectivity/snort/snort/not-hardcoded-libdir.patch279
-rw-r--r--meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb (renamed from meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb)25
8 files changed, 162 insertions, 321 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 b8f84077c..48039f07a 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 \
20EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \ 20EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \
21 --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" 21 --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}"
22 22
23SRC_URI[md5sum] = "865bf9b750a2a2ca632591a3c70b0ea0" 23SRC_URI[md5sum] = "2cd6da422a72c129c685fc4bb848c24c"
24SRC_URI[sha256sum] = "d65d1e67c4994e02c3142c49a648642e780b7e3d942b4a51f605309beac269a8" 24SRC_URI[sha256sum] = "b40e1d1273e08aaeaa86e69d4f28d535b7e53bdb3898adf539266b63137be7cb"
25 25
26inherit autotools 26inherit 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 12a6cba60..a100b7cb8 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
5 5
6Signed-off-by: Chunrong Guo <B40290@freescale.com> 6Signed-off-by: Chunrong Guo <B40290@freescale.com>
7 7
8--- a/m4/sf.m4old 2013-08-30 04:08:18.768409680 -0500 8--- a/m4/sf.m4old 2015-10-28 10:21:20.270557986 +0800
9+++ b/m4/sf.m4 2013-08-30 04:09:24.591367890 -0500 9+++ a/m4/sf.m4 2015-10-28 10:23:22.726551974 +0800
10@@ -135,19 +135,6 @@ 10@@ -135,20 +135,7 @@
11 echo
11 exit 1 12 exit 1
12 fi 13 fi
13 AC_MSG_CHECKING([for libpcap version >= $1]) 14- AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x], [
14- AC_RUN_IFELSE( 15- AC_RUN_IFELSE(
15- [AC_LANG_PROGRAM( 16- [AC_LANG_PROGRAM(
16- [[ 17- [[
@@ -22,8 +23,9 @@ Signed-off-by: Chunrong Guo <B40290@freescale.com>
22- if (strcmp(pcap_version, $1) < 0) 23- if (strcmp(pcap_version, $1) < 0)
23- return 1; 24- return 1;
24- ]])], 25- ]])],
25- [libpcap_version_1x="yes"], 26- [daq_cv_libpcap_version_1x="yes"],
26- [libpcap_version_1x="no"]) 27- [daq_cv_libpcap_version_1x="no"])])
27 if test "x$libpcap_version_1x" = "xno"; then 28+ AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x])
28 AC_MSG_RESULT(no) 29 if test "x$daq_cv_libpcap_version_1x" = "xno"; then
29 echo 30 echo
31 echo " ERROR! Libpcap library version >= $1 not found."
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
new file mode 100644
index 000000000..1520553a4
--- /dev/null
+++ b/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch
@@ -0,0 +1,35 @@
1From 815e861721a9c43efddb78521147145ebc7569ca Mon Sep 17 00:00:00 2001
2From: Zhiquan Li <zhiquan.li@windriver.com>
3Date: Fri, 13 Nov 2015 17:40:24 +0800
4Subject: [PATCH] fix do_package failed since snort 2.9.7.0
5
6Remove redundant '/' as a workround for below error:
7/lib/rpm/bin/debugedit: canonicalization unexpectedly shrank by one character
8
9It's a rpm debugedit bug:
10* http://sourceforge.net/p/snort/mailman/message/34130268/
11* https://bugzilla.redhat.com/show_bug.cgi?id=304121
12
13Upstream-Status:Inappropriate [embedded specific]
14
15Signed-off-by: Zhiquan Li <zhiquan.li@windriver.com>
16---
17 src/snort.h | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/src/snort.h b/src/snort.h
21index 8308e57..499d157 100644
22--- a/src/snort.h
23+++ b/src/snort.h
24@@ -39,7 +39,7 @@
25 #include "sfdaq.h"
26 #include "sf_types.h"
27 #include "sfutil/sflsq.h"
28-#include "sfutil//sfActionQueue.h"
29+#include "sfutil/sfActionQueue.h"
30 #include "profiler.h"
31 #include "rules.h"
32 #include "treenodes.h"
33--
341.9.1
35
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
new file mode 100644
index 000000000..e6afcabaa
--- /dev/null
+++ b/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch
@@ -0,0 +1,50 @@
1Upstream-Status:Inappropriate [embedded specific]
2
3fix the below error:
4checking for daq flow ID... configure:
5configure: error: cannot run test program while cross compiling
6
7
8--- a/configure.in 2015-10-28 10:36:42.918512690 +0800
9+++ b/configure.in 2015-10-28 10:37:36.738510048 +0800
10@@ -716,23 +716,23 @@
11 # [DAQ version supports address space ID in header.])
12 #fi
13
14-AC_MSG_CHECKING([for daq flow ID])
15-AC_RUN_IFELSE(
16-[AC_LANG_PROGRAM(
17-[[
18-#include <daq.h>
19-]],
20-[[
21- DAQ_PktHdr_t hdr;
22- hdr.flow_id = 0;
23-]])],
24-[have_daq_flow_id="yes"],
25-[have_daq_flow_id="no"])
26-AC_MSG_RESULT($have_daq_flow_id)
27-if test "x$have_daq_flow_id" = "xyes"; then
28- AC_DEFINE([HAVE_DAQ_FLOW_ID],[1],
29- [DAQ version supports flow ID in header.])
30-fi
31+#AC_MSG_CHECKING([for daq flow ID])
32+#AC_RUN_IFELSE(
33+#[AC_LANG_PROGRAM(
34+#[[
35+##include <daq.h>
36+#]],
37+#[[
38+# DAQ_PktHdr_t hdr;
39+# hdr.flow_id = 0;
40+#]])],
41+have_daq_flow_id="yes"
42+#[have_daq_flow_id="no"])
43+#AC_MSG_RESULT($have_daq_flow_id)
44+#if test "x$have_daq_flow_id" = "xyes"; then
45+# AC_DEFINE([HAVE_DAQ_FLOW_ID],[1],
46+# [DAQ version supports flow ID in header.])
47+#fi
48
49 AC_MSG_CHECKING([for DAQ_VERDICT_RETRY])
50 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
new file mode 100644
index 000000000..1a13298ca
--- /dev/null
+++ b/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch
@@ -0,0 +1,51 @@
1Upstream-Status:Inappropriate [embedded specific]
2
3fix the below error:
4checking for DAQ_VERDICT_RETRY... configure:
5configure: error: cannot run test program while cross compiling
6
7
8--- a/configure.in 2015-10-28 10:45:18.174487395 +0800
9+++ b/configure.in 2015-10-28 10:45:47.586485951 +0800
10@@ -734,23 +734,23 @@
11 # [DAQ version supports flow ID in header.])
12 #fi
13
14-AC_MSG_CHECKING([for DAQ_VERDICT_RETRY])
15-AC_RUN_IFELSE(
16-[AC_LANG_PROGRAM(
17-[[
18-#include <daq.h>
19-]],
20-[[
21- DAQ_Verdict verdict;
22- verdict = DAQ_VERDICT_RETRY;
23-]])],
24-[have_daq_verdict_retry="yes"],
25-[have_daq_verdict_retry="no"])
26-AC_MSG_RESULT($have_daq_verdict_retry)
27-if test "x$have_daq_verdict_retry" = "xyes"; then
28- AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1],
29- [DAQ version supports DAQ_VERDICT_RETRY in DAQ_Verdict.])
30-fi
31+#AC_MSG_CHECKING([for DAQ_VERDICT_RETRY])
32+#AC_RUN_IFELSE(
33+#[AC_LANG_PROGRAM(
34+#[[
35+##include <daq.h>
36+#]],
37+#[[
38+# DAQ_Verdict verdict;
39+# verdict = DAQ_VERDICT_RETRY;
40+#]])],
41+have_daq_verdict_retry="yes"
42+#[have_daq_verdict_retry="no"])
43+#AC_MSG_RESULT($have_daq_verdict_retry)
44+#if test "x$have_daq_verdict_retry" = "xyes"; then
45+# AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1],
46+# [DAQ version supports DAQ_VERDICT_RETRY in DAQ_Verdict.])
47+#fi
48
49 # any sparc platform has to have this one defined.
50 AC_MSG_CHECKING(for sparc)
51
diff --git a/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch b/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch
deleted file mode 100644
index 225061153..000000000
--- a/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Backport
2
3There is an incorrect m4_define() in configure.in which will result in an
4infinite recursion, and it doesn't make sense, since snort 2.9.7 it has been
5commented out. We follow this solution to fix it.
6
7Signed-off-by: Zhiquan Li <zhiquan.li@windriver.com>
8
9--- a/configure.in 2015-10-22 13:58:50.743367251 +0800
10+++ b/configure.in 2015-10-22 13:59:13.855366117 +0800
11@@ -1100,8 +1100,8 @@
12 # Define PKG_CHECK_MODULES if it doesnt already exist.
13 #file_ This prevents './configure' from erroring on machines that dont have
14 # 'pkgconfig' installed.
15-m4_ifdef([PKG_CHECK_MODULES],[], [m4_define([PKG_CHECK_MODULES],
16- [echo "PKG_CHECK_MODULES not defined"])])
17+#m4_ifdef([PKG_CHECK_MODULES],[], [m4_define([PKG_CHECK_MODULES],
18+# [echo "PKG_CHECK_MODULES not defined"])])
19
20 if test "x$enable_rzb_saac" = "xyes"; then
21 AC_CHECK_PROG(PKG_CONFIG,pkg-config,yes)
diff --git a/meta-networking/recipes-connectivity/snort/snort/not-hardcoded-libdir.patch b/meta-networking/recipes-connectivity/snort/snort/not-hardcoded-libdir.patch
deleted file mode 100644
index 075ec138b..000000000
--- a/meta-networking/recipes-connectivity/snort/snort/not-hardcoded-libdir.patch
+++ /dev/null
@@ -1,279 +0,0 @@
1[PATCH] do not hardcoded libdir
2
3Upstream-Status: Pending
4
5libdir is hardcoded to ${exec_prefix}/lib, but we want it to support multilib
6
7Signed-off-by: Roy.Li <rongqing.li@windriver.com>
8---
9 src/dynamic-examples/dynamic-preprocessor/Makefile.am | 2 +-
10 src/dynamic-examples/dynamic-rule/Makefile.am | 2 +-
11 src/dynamic-plugins/sf_engine/Makefile.am | 2 +-
12 src/dynamic-preprocessors/dcerpc2/Makefile.am | 2 +-
13 src/dynamic-preprocessors/dnp3/Makefile.am | 2 +-
14 src/dynamic-preprocessors/dns/Makefile.am | 2 +-
15 src/dynamic-preprocessors/file/Makefile.am | 2 +-
16 src/dynamic-preprocessors/ftptelnet/Makefile.am | 2 +-
17 src/dynamic-preprocessors/gtp/Makefile.am | 2 +-
18 src/dynamic-preprocessors/imap/Makefile.am | 2 +-
19 src/dynamic-preprocessors/modbus/Makefile.am | 2 +-
20 src/dynamic-preprocessors/pop/Makefile.am | 2 +-
21 src/dynamic-preprocessors/reputation/Makefile.am | 2 +-
22 src/dynamic-preprocessors/rzb_saac/Makefile.am | 2 +-
23 src/dynamic-preprocessors/sdf/Makefile.am | 2 +-
24 src/dynamic-preprocessors/sip/Makefile.am | 2 +-
25 src/dynamic-preprocessors/smtp/Makefile.am | 2 +-
26 src/dynamic-preprocessors/ssh/Makefile.am | 2 +-
27 src/dynamic-preprocessors/ssl/Makefile.am | 2 +-
28 19 files changed, 19 insertions(+), 19 deletions(-)
29
30diff --git a/src/dynamic-examples/dynamic-preprocessor/Makefile.am b/src/dynamic-examples/dynamic-preprocessor/Makefile.am
31index 255755e..1cafead 100644
32--- a/src/dynamic-examples/dynamic-preprocessor/Makefile.am
33+++ b/src/dynamic-examples/dynamic-preprocessor/Makefile.am
34@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
35
36 INCLUDES = -I../include
37
38-noinst_libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
39+noinst_libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
40
41 noinst_lib_LTLIBRARIES = lib_sfdynamic_preprocessor_example.la
42
43diff --git a/src/dynamic-examples/dynamic-rule/Makefile.am b/src/dynamic-examples/dynamic-rule/Makefile.am
44index e5338d2..82eb212 100644
45--- a/src/dynamic-examples/dynamic-rule/Makefile.am
46+++ b/src/dynamic-examples/dynamic-rule/Makefile.am
47@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
48
49 INCLUDES = -I../include
50
51-noinst_libdir = ${exec_prefix}/lib/snort_dynamicrules
52+noinst_libdir = ${exec_prefix}${base_libdir}/snort_dynamicrules
53
54 noinst_lib_LTLIBRARIES = lib_sfdynamic_example_rule.la
55
56diff --git a/src/dynamic-plugins/sf_engine/Makefile.am b/src/dynamic-plugins/sf_engine/Makefile.am
57index d6a6200..3d270c3 100644
58--- a/src/dynamic-plugins/sf_engine/Makefile.am
59+++ b/src/dynamic-plugins/sf_engine/Makefile.am
60@@ -5,7 +5,7 @@ INCLUDES = @INCLUDES@
61
62 lib_LTLIBRARIES = libsf_engine.la
63
64-libdir = ${exec_prefix}/lib/snort_dynamicengine
65+libdir = ${exec_prefix}${base_libdir}/snort_dynamicengine
66
67 libsf_engine_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
68
69diff --git a/src/dynamic-preprocessors/dcerpc2/Makefile.am b/src/dynamic-preprocessors/dcerpc2/Makefile.am
70index 9843073..8a0caa5 100644
71--- a/src/dynamic-preprocessors/dcerpc2/Makefile.am
72+++ b/src/dynamic-preprocessors/dcerpc2/Makefile.am
73@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
74
75 INCLUDES = -I../include -I${srcdir}/../libs -I$(srcdir)/includes
76
77-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
78+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
79
80 lib_LTLIBRARIES = libsf_dce2_preproc.la
81
82diff --git a/src/dynamic-preprocessors/dnp3/Makefile.am b/src/dynamic-preprocessors/dnp3/Makefile.am
83index 1358862..18e2178 100644
84--- a/src/dynamic-preprocessors/dnp3/Makefile.am
85+++ b/src/dynamic-preprocessors/dnp3/Makefile.am
86@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
87
88 INCLUDES = -I../include -I${srcdir}/../libs
89
90-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
91+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
92
93 lib_LTLIBRARIES = libsf_dnp3_preproc.la
94
95diff --git a/src/dynamic-preprocessors/dns/Makefile.am b/src/dynamic-preprocessors/dns/Makefile.am
96index f22d90e..49d2f55 100644
97--- a/src/dynamic-preprocessors/dns/Makefile.am
98+++ b/src/dynamic-preprocessors/dns/Makefile.am
99@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
100
101 INCLUDES = -I../include -I${srcdir}/../libs
102
103-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
104+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
105
106 lib_LTLIBRARIES = libsf_dns_preproc.la
107
108diff --git a/src/dynamic-preprocessors/file/Makefile.am b/src/dynamic-preprocessors/file/Makefile.am
109index d71c0fd..834f7ac 100644
110--- a/src/dynamic-preprocessors/file/Makefile.am
111+++ b/src/dynamic-preprocessors/file/Makefile.am
112@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
113
114 INCLUDES = -I../include -I${srcdir}/../libs -I./include
115
116-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
117+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
118
119 lib_LTLIBRARIES = libsf_file_preproc.la
120
121diff --git a/src/dynamic-preprocessors/ftptelnet/Makefile.am b/src/dynamic-preprocessors/ftptelnet/Makefile.am
122index fe73835..3457231 100644
123--- a/src/dynamic-preprocessors/ftptelnet/Makefile.am
124+++ b/src/dynamic-preprocessors/ftptelnet/Makefile.am
125@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
126
127 INCLUDES = -I../include -I${srcdir}/../libs -I$(srcdir)/includes
128
129-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
130+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
131
132 lib_LTLIBRARIES = libsf_ftptelnet_preproc.la
133
134diff --git a/src/dynamic-preprocessors/gtp/Makefile.am b/src/dynamic-preprocessors/gtp/Makefile.am
135index 51c961a..d7fb9b2 100644
136--- a/src/dynamic-preprocessors/gtp/Makefile.am
137+++ b/src/dynamic-preprocessors/gtp/Makefile.am
138@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
139
140 INCLUDES = -I../include -I${srcdir}/../libs -I$(srcdir)/includes
141
142-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
143+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
144
145 lib_LTLIBRARIES = libsf_gtp_preproc.la
146
147diff --git a/src/dynamic-preprocessors/imap/Makefile.am b/src/dynamic-preprocessors/imap/Makefile.am
148index 533e43d..9efcbc4 100644
149--- a/src/dynamic-preprocessors/imap/Makefile.am
150+++ b/src/dynamic-preprocessors/imap/Makefile.am
151@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
152
153 INCLUDES = -I../include -I${srcdir}/../libs
154
155-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
156+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
157
158 lib_LTLIBRARIES = libsf_imap_preproc.la
159
160diff --git a/src/dynamic-preprocessors/modbus/Makefile.am b/src/dynamic-preprocessors/modbus/Makefile.am
161index 05fc63e..e4f1415 100644
162--- a/src/dynamic-preprocessors/modbus/Makefile.am
163+++ b/src/dynamic-preprocessors/modbus/Makefile.am
164@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
165
166 INCLUDES = -I../include -I${srcdir}/../libs
167
168-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
169+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
170
171 lib_LTLIBRARIES = libsf_modbus_preproc.la
172
173diff --git a/src/dynamic-preprocessors/pop/Makefile.am b/src/dynamic-preprocessors/pop/Makefile.am
174index d4b07b3..1345bc6 100644
175--- a/src/dynamic-preprocessors/pop/Makefile.am
176+++ b/src/dynamic-preprocessors/pop/Makefile.am
177@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
178
179 INCLUDES = -I../include -I${srcdir}/../libs
180
181-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
182+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
183
184 lib_LTLIBRARIES = libsf_pop_preproc.la
185
186diff --git a/src/dynamic-preprocessors/reputation/Makefile.am b/src/dynamic-preprocessors/reputation/Makefile.am
187index 4e16142..14ba0cb 100644
188--- a/src/dynamic-preprocessors/reputation/Makefile.am
189+++ b/src/dynamic-preprocessors/reputation/Makefile.am
190@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
191
192 INCLUDES = -I../include -I${srcdir}/../libs -I$(srcdir)/includes
193
194-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
195+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
196
197 lib_LTLIBRARIES = libsf_reputation_preproc.la
198
199diff --git a/src/dynamic-preprocessors/rzb_saac/Makefile.am b/src/dynamic-preprocessors/rzb_saac/Makefile.am
200index f0b0912..6ebe04e 100644
201--- a/src/dynamic-preprocessors/rzb_saac/Makefile.am
202+++ b/src/dynamic-preprocessors/rzb_saac/Makefile.am
203@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
204
205 INCLUDES = -I../include -I${srcdir}/../libs
206
207-pkglibdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
208+pkglibdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
209
210 pkglib_LTLIBRARIES = sf_rzb_saac_preproc.la
211
212diff --git a/src/dynamic-preprocessors/sdf/Makefile.am b/src/dynamic-preprocessors/sdf/Makefile.am
213index 97b416e..04b5ce5 100644
214--- a/src/dynamic-preprocessors/sdf/Makefile.am
215+++ b/src/dynamic-preprocessors/sdf/Makefile.am
216@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
217
218 INCLUDES = -I../include -I${srcdir}/../libs
219
220-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
221+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
222
223 lib_LTLIBRARIES = libsf_sdf_preproc.la
224
225diff --git a/src/dynamic-preprocessors/sip/Makefile.am b/src/dynamic-preprocessors/sip/Makefile.am
226index 67ac1e1..b4f360f 100644
227--- a/src/dynamic-preprocessors/sip/Makefile.am
228+++ b/src/dynamic-preprocessors/sip/Makefile.am
229@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
230
231 INCLUDES = -I../include -I${srcdir}/../libs -I$(srcdir)/includes
232
233-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
234+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
235
236 lib_LTLIBRARIES = libsf_sip_preproc.la
237
238diff --git a/src/dynamic-preprocessors/smtp/Makefile.am b/src/dynamic-preprocessors/smtp/Makefile.am
239index 3b5893f..96750df 100644
240--- a/src/dynamic-preprocessors/smtp/Makefile.am
241+++ b/src/dynamic-preprocessors/smtp/Makefile.am
242@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
243
244 INCLUDES = -I../include -I${srcdir}/../libs
245
246-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
247+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
248
249 lib_LTLIBRARIES = libsf_smtp_preproc.la
250
251diff --git a/src/dynamic-preprocessors/ssh/Makefile.am b/src/dynamic-preprocessors/ssh/Makefile.am
252index 0eab645..5ae9b80 100644
253--- a/src/dynamic-preprocessors/ssh/Makefile.am
254+++ b/src/dynamic-preprocessors/ssh/Makefile.am
255@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
256
257 INCLUDES = -I../include -I${srcdir}/../libs
258
259-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
260+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
261
262 lib_LTLIBRARIES = libsf_ssh_preproc.la
263
264diff --git a/src/dynamic-preprocessors/ssl/Makefile.am b/src/dynamic-preprocessors/ssl/Makefile.am
265index 4ac2943..8d3abe3 100644
266--- a/src/dynamic-preprocessors/ssl/Makefile.am
267+++ b/src/dynamic-preprocessors/ssl/Makefile.am
268@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
269
270 INCLUDES = -I../include -I${srcdir}/../libs
271
272-libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor
273+libdir = ${exec_prefix}${base_libdir}/snort_dynamicpreprocessor
274
275 lib_LTLIBRARIES = libsf_ssl_preproc.la
276
277--
2781.9.1
279
diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb
index e15f7bec8..a81aa7f41 100644
--- a/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb
+++ b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb
@@ -10,13 +10,14 @@ SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \
10 file://snort.init \ 10 file://snort.init \
11 file://disable-inaddr-none.patch \ 11 file://disable-inaddr-none.patch \
12 file://disable-dap-address-space-id.patch \ 12 file://disable-dap-address-space-id.patch \
13 file://disable-daq-flow-id.patch \
14 file://disable-daq-verdict-retry.patch \
13 file://0001-libpcap-search-sysroot-for-headers.patch \ 15 file://0001-libpcap-search-sysroot-for-headers.patch \
14 file://not-hardcoded-libdir.patch \ 16 file://0001-fix-do_package-failed-since-snort-2.9.7.0.patch \
15 file://m4-oom-during-configure.patch \
16" 17"
17 18
18SRC_URI[tarball.md5sum] = "18111f6de3989ca89add36077a7c2659" 19SRC_URI[tarball.md5sum] = "fd271788c0f8876be87a858a9142f202"
19SRC_URI[tarball.sha256sum] = "3cc6c8a9b52f4c863a5736a73b4012aff340b50b5e002771b04d4877f47cd19e" 20SRC_URI[tarball.sha256sum] = "ad03f11b5301b16642199a86aa90388eaa53f5003f83b0c5595745a490047be1"
20 21
21inherit autotools gettext update-rc.d pkgconfig 22inherit autotools gettext update-rc.d pkgconfig
22 23
@@ -33,7 +34,9 @@ EXTRA_OECONF = " \
33 --with-dnet-includes=${STAGING_INCDIR} \ 34 --with-dnet-includes=${STAGING_INCDIR} \
34 --with-dnet-libraries=${STAGING_LIBDIR} \ 35 --with-dnet-libraries=${STAGING_LIBDIR} \
35 --with-libpcre-includes=${STAGING_INCDIR} \ 36 --with-libpcre-includes=${STAGING_INCDIR} \
36 --with-libpcre-libraries=${STAGING_INCDIR} \ 37 --with-libpcre-libraries=${STAGING_LIBDIR} \
38 --with-daq-includes=${STAGING_INCDIR} \
39 --with-daq-libraries=${STAGING_LIBDIR} \
37" 40"
38 41
39# if you want to disable it, you need to patch configure.in first 42# if you want to disable it, you need to patch configure.in first
@@ -43,15 +46,15 @@ PACKAGECONFIG ?= "openssl"
43PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," 46PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl,"
44 47
45do_install_append() { 48do_install_append() {
46 install -d ${D}/${sysconfdir}/snort/rules 49 install -d ${D}${sysconfdir}/snort/rules
47 install -d ${D}/${sysconfdir}/snort/preproc_rules 50 install -d ${D}${sysconfdir}/snort/preproc_rules
48 install -d ${D}${sysconfdir}/init.d 51 install -d ${D}${sysconfdir}/init.d
49 for i in map config conf dtd; do 52 for i in map config conf dtd; do
50 cp ${S}/etc/*.$i ${D}/${sysconfdir}/snort/ 53 cp ${S}/etc/*.$i ${D}${sysconfdir}/snort/
51 done 54 done
52 cp ${S}/preproc_rules/*.rules ${D}/${sysconfdir}/snort/preproc_rules/ 55 cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/
53 install -m 755 ${WORKDIR}/snort.init ${D}/${sysconfdir}/init.d/snort 56 install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort
54 mkdir -p ${D}/${localstatedir}/log/snort 57 mkdir -p ${D}${localstatedir}/log/snort
55 install -d ${D}/var/log/snort 58 install -d ${D}/var/log/snort
56} 59}
57 60
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-27 11:25:01 +0000