From patchwork Sun Dec 24 21:18:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Prado X-Patchwork-Id: 852747 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=e-labworks-com.20150623.gappssmtp.com header.i=@e-labworks-com.20150623.gappssmtp.com header.b="nOTwdhMa"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z4ZqB4hrNz9s03 for ; Mon, 25 Dec 2017 08:18:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 858EF88713; Sun, 24 Dec 2017 21:18:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DJGCLusKyaYe; Sun, 24 Dec 2017 21:18:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9A5E687F49; Sun, 24 Dec 2017 21:18:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 181E31C0A65 for ; Sun, 24 Dec 2017 21:18:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1465187FBA for ; Sun, 24 Dec 2017 21:18:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GW7SwPIXxBKy for ; Sun, 24 Dec 2017 21:18:21 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id 4D53487FA2 for ; Sun, 24 Dec 2017 21:18:21 +0000 (UTC) Received: by mail-qk0-f194.google.com with SMTP id g81so10433561qke.1 for ; Sun, 24 Dec 2017 13:18:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=e-labworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=BNRolhVUrtUmXIRuPuVCigycrlgR4KoA+Lg35RCNcuo=; b=nOTwdhMauxFdTUZ0zS9HhgEtuPFlbZ1KtTg5T1vJqMc2sV2ywUkhbOPxuXXeP7T1vG CzeKyyGfziQUG6YELd9v8gzoVbAqupnww0rX5dryPYuN7jO/GCqL8pYeIFJz9NNuzXj1 kagSY1NZxTBSzVklAKd1YxFoeNRWIjv+WJwx4JC5Hq+x+sspVDaPrlNLcPRmJpVdiyZx GVlJ1Yw61Z1YNg+NNk3U5bquRuDU4l5/n4hPyZGjuGOVm5HvvGPvH23P8fzlBkxrD7d/ MBAtRetIpIRPf/0FcPZzvQnobD3VzHSPsEIHOTEdyfEcqvE2WrNmosoM/STdZh9B5VlX 0H4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BNRolhVUrtUmXIRuPuVCigycrlgR4KoA+Lg35RCNcuo=; b=DY7rMSinN4Hjw9A/LB4rU6H8yU4F2Rbyn5QOi2vhcYkXbcJh4jWRdv0T5PwGyPaa4d 0PshEoAQs12C72+ln1knODM7nertMri2czcRlE9V+noZhDZ8gbY4MOxS++WCWpUkdRfG nyzXpa60uHqEcFIDHKWpjhYIz35I+4tyfQTCUiLQyh1N95FmDM+XiwnaFh/IYN4+PYg7 1lxWmVLMPvmomU3VUIYSXHE9e+6Ij86lEXuFcBlvh+MEsZOJSF6eKF8XsXgvoj04ZsVl 1qdGYAWxhK5ehD307QaKgXIWaGU3q/uW5BjCxj6L4CAP0XOcC8x9J4RPfZLDFi4KNamT cr1w== X-Gm-Message-State: AKGB3mIyFYO4FlVdak5jIoApoYeZXJeoqUikbNzYlA8mmcEGYrsouzcu X03cBwJyhRbNWRibhbjUa7r0DQJC X-Google-Smtp-Source: ACJfBos3LPkLDoEij8o6jyG/++O5hKIALuSrqIXCayVHn7V+4nBv9VqBt0RFn3bGpvP3b4tvbdRBtA== X-Received: by 10.55.86.194 with SMTP id k185mr18629637qkb.352.1514150300010; Sun, 24 Dec 2017 13:18:20 -0800 (PST) Received: from localhost.localdomain ([189.100.34.201]) by smtp.gmail.com with ESMTPSA id z40sm17527620qtj.30.2017.12.24.13.18.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Dec 2017 13:18:19 -0800 (PST) From: Sergio Prado To: buildroot@buildroot.org Date: Sun, 24 Dec 2017 19:18:05 -0200 Message-Id: <1514150285-19871-1-git-send-email-sergio.prado@e-labworks.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH] daq: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergio Prado MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Sergio Prado --- DEVELOPERS | 1 + package/Config.in | 1 + ...0001-Fix-build-against-the-musl-C-library.patch | 29 ++++++++++++++++++++++ package/daq/Config.in | 13 ++++++++++ package/daq/daq.hash | 5 ++++ package/daq/daq.mk | 26 +++++++++++++++++++ 6 files changed, 75 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 9f4f2822036e..8f847358f614 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1564,6 +1564,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 bd39a374f06f..c1e52a3f0998 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 000000000000..a37fe9a7ec56 --- /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 000000000000..0627274b52ad --- /dev/null +++ b/package/daq/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_DAQ + bool "daq" + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBDNET + depends on !BR2_STATIC_LIBS # dlfcn.h + 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 000000000000..6a0cb5ed0781 --- /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 000000000000..f10c31d4a157 --- /dev/null +++ b/package/daq/daq.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# 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_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))