summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity/daq
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-connectivity/daq')
-rw-r--r--meta-networking/recipes-connectivity/daq/daq_2.0.7.bb5
-rw-r--r--meta-networking/recipes-connectivity/daq/files/daq-fix-incompatible-pointer-type-error.patch31
-rw-r--r--meta-networking/recipes-connectivity/daq/libdaq_3.0.19.bb (renamed from meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb)4
3 files changed, 36 insertions, 4 deletions
diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb
index 66ad83f711..a686ef5840 100644
--- a/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb
+++ b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb
@@ -8,11 +8,12 @@ PARALLEL_MAKE = ""
8 8
9DEPENDS = "libpcap libpcre libdnet bison-native libnetfilter-queue" 9DEPENDS = "libpcap libpcre libdnet bison-native libnetfilter-queue"
10 10
11SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ 11SRC_URI = "https://www.snort.org/downloads/snort/${BPN}-${PV}.tar.gz;downloadfilename=${BPN}-${PV}_snort_org.tar.gz \
12 file://disable-run-test-program-while-cross-compiling.patch \ 12 file://disable-run-test-program-while-cross-compiling.patch \
13 file://0001-correct-the-location-of-unistd.h.patch \ 13 file://0001-correct-the-location-of-unistd.h.patch \
14 file://daq-fix-incompatible-pointer-type-error.patch \
14 " 15 "
15SRC_URI[sha256sum] = "bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e" 16SRC_URI[sha256sum] = "d1f6709bc5dbddee3fdf170cdc1e49fb926e2031d4869ecf367a8c47efc87279"
16# these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking 17# these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking
17# this error from test-dependencies script: 18# this error from test-dependencies script:
18# daq/daq/latest lost dependency on libdnet libmnl libnetfilter-queue libnfnetlink 19# daq/daq/latest lost dependency on libdnet libmnl libnetfilter-queue libnfnetlink
diff --git a/meta-networking/recipes-connectivity/daq/files/daq-fix-incompatible-pointer-type-error.patch b/meta-networking/recipes-connectivity/daq/files/daq-fix-incompatible-pointer-type-error.patch
new file mode 100644
index 0000000000..ade3ec686b
--- /dev/null
+++ b/meta-networking/recipes-connectivity/daq/files/daq-fix-incompatible-pointer-type-error.patch
@@ -0,0 +1,31 @@
1Fix daq incompatible pointer type error when gcc option
2'-Wincompatible-pointer-types is set:
3
4| ../../daq-2.0.7/os-daq-modules/daq_nfq.c: In function 'SetPktHdr':
5| ../../daq-2.0.7/os-daq-modules/daq_nfq.c:394:37: error: passing argument 2
6 of 'nfq_get_payload' from incompatible pointer type [-Wincompatible-pointer-types]
7| 394 | int len = nfq_get_payload(nfad, (char**)pkt);
8| | ^~~~~~~~~~~
9| | |
10| | char **
11
12Upstream-Status: Inactive-Upstream [lastrelease: 2019-03-09]
13
14Signed-off-by: Kai Kang <kai.kang@windriver.com>
15---
16 os-daq-modules/daq_nfq.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/os-daq-modules/daq_nfq.c b/os-daq-modules/daq_nfq.c
20index 4de94b6..a6de2f3 100644
21--- a/os-daq-modules/daq_nfq.c
22+++ b/os-daq-modules/daq_nfq.c
23@@ -391,7 +391,7 @@ static inline int SetPktHdr (
24 DAQ_PktHdr_t* hdr,
25 uint8_t** pkt
26 ) {
27- int len = nfq_get_payload(nfad, (char**)pkt);
28+ int len = nfq_get_payload(nfad, (unsigned char**)pkt);
29
30 if ( len <= 0 )
31 return -1;
diff --git a/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb b/meta-networking/recipes-connectivity/daq/libdaq_3.0.19.bb
index 74964e0741..23a439a989 100644
--- a/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb
+++ b/meta-networking/recipes-connectivity/daq/libdaq_3.0.19.bb
@@ -11,8 +11,8 @@ inherit autotools pkgconfig
11 11
12SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master \ 12SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master \
13 file://0001-example-Use-lm-for-the-fst-module.patch" 13 file://0001-example-Use-lm-for-the-fst-module.patch"
14SRCREV = "4e68d7ba6940df9a1503599d7b177029112d6b6a"
15 14
16S = "${WORKDIR}/git" 15SRCREV = "434f205cbd45de0961cc42e541b5bf54569e912a"
16
17 17
18FILES:${PN} += "${libdir}/daq/*.so" 18FILES:${PN} += "${libdir}/daq/*.so"