From 2f7382b6f6c2fcb0f0a26ec1cf19df9128257cc3 Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Sun, 24 Dec 2017 19:18:05 -0200 Subject: [PATCH] daq: new package Signed-off-by: Sergio Prado [Thomas: - re-order depends on/select in Config.in - add _INSTALL_STAGING = YES - drop double quotes when passing values in _CONF_ENV.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...Fix-build-against-the-musl-C-library.patch | 29 +++++++++++++++++++ package/daq/Config.in | 13 +++++++++ package/daq/daq.hash | 5 ++++ package/daq/daq.mk | 25 ++++++++++++++++ 6 files changed, 74 insertions(+) create mode 100644 package/daq/0001-Fix-build-against-the-musl-C-library.patch create mode 100644 package/daq/Config.in create mode 100644 package/daq/daq.hash create mode 100644 package/daq/daq.mk diff --git a/DEVELOPERS b/DEVELOPERS index f00329c048..0588a0c38f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1566,6 +1566,7 @@ F: package/rtl8189fs/ F: package/xr819-xradio/ N: Sergio Prado +F: package/daq/ F: package/libgdiplus/ F: package/mongodb/ F: package/pimd/ diff --git a/package/Config.in b/package/Config.in index bd39a374f0..c1e52a3f09 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1338,6 +1338,7 @@ menu "Networking" source "package/cgic/Config.in" source "package/cppzmq/Config.in" source "package/czmq/Config.in" + source "package/daq/Config.in" source "package/filemq/Config.in" source "package/flickcurl/Config.in" source "package/fmlib/Config.in" diff --git a/package/daq/0001-Fix-build-against-the-musl-C-library.patch b/package/daq/0001-Fix-build-against-the-musl-C-library.patch new file mode 100644 index 0000000000..a37fe9a7ec --- /dev/null +++ b/package/daq/0001-Fix-build-against-the-musl-C-library.patch @@ -0,0 +1,29 @@ +From d3eec1a3b7c67a5e6f524c65608fd2eacac3782b Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Sun, 24 Dec 2017 12:58:49 -0200 +Subject: [PATCH] Fix build against the musl C library + +Signed-off-by: Sergio Prado +--- + os-daq-modules/daq_ipfw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c +index 016beb06ad61..c2a41759bb04 100644 +--- a/os-daq-modules/daq_ipfw.c ++++ b/os-daq-modules/daq_ipfw.c +@@ -23,10 +23,10 @@ + #include + #include + #include ++#include + + #include + #include +-#include + + #include + #include +-- +1.9.1 + diff --git a/package/daq/Config.in b/package/daq/Config.in new file mode 100644 index 0000000000..7800061642 --- /dev/null +++ b/package/daq/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_DAQ + bool "daq" + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBDNET + help + DAQ is a Data Acquisition library for packet I/O from the + Snort project. + + https://www.snort.org + +comment "daq needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/daq/daq.hash b/package/daq/daq.hash new file mode 100644 index 0000000000..6a0cb5ed07 --- /dev/null +++ b/package/daq/daq.hash @@ -0,0 +1,5 @@ +# Locally computed: +sha256 d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0 daq-2.0.6.tar.gz + +# Hash for license files: +sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING diff --git a/package/daq/daq.mk b/package/daq/daq.mk new file mode 100644 index 0000000000..c4b4c881f1 --- /dev/null +++ b/package/daq/daq.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# daq +# +################################################################################ + +DAQ_VERSION = 2.0.6 +DAQ_SITE = https://www.snort.org/downloads/snort +DAQ_SOURCE = daq-$(DAQ_VERSION).tar.gz +DAQ_LICENSE = GPL-2.0 +DAQ_LICENSE_FILES = COPYING +DAQ_INSTALL_STAGING = YES +DAQ_DEPENDENCIES = libpcap libdnet + +# package does not build in parallel due to improper make rules +# related to the generation of the tokdefs.h header file +DAQ_MAKE = $(MAKE1) + +# assume these flags are available to prevent configure from running +# test programs while cross compiling +DAQ_CONF_ENV = \ + ac_cv_lib_pcap_pcap_lib_version=yes \ + daq_cv_libpcap_version_1x=yes + +$(eval $(autotools-package)) -- 2.30.2