mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-01 21:23:51 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/daq: remove package

Browse Source 
As discussed on the mailinglist:
https://lists.buildroot.org/pipermail/buildroot/2026-April/799920.html

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
This commit is contained in:
Bernd Kuhls
2026-05-23 11:11:52 +02:00
committed by Arnout Vandecappelle
parent b057c91e4e
commit e61a94e31a
11 changed files with 7 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.checkpackageignore
View File

@@ -269,8 +269,6 @@ package/dahdi-tools/0002-no-perl-manpages.patch lib_patch.Upstream
package/dante/0001-fix-sparc-compile.patch lib_patch.Upstream
package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch lib_patch.Upstream
package/dante/S50dante Shellcheck lib_sysv.Indent lib_sysv.Variables
package/daq/0001-Fix-build-against-the-musl-C-library.patch lib_patch.Upstream
package/daq/0002-parallel-grammar.patch lib_patch.Upstream
package/darkhttpd/S50darkhttpd Shellcheck lib_sysv.Indent lib_sysv.Variables
package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch lib_patch.Upstream
package/dbus-cpp/0001-gcc4.7.patch lib_patch.Upstream

7
Config.in.legacy
View File

@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2026.05"
config BR2_PACKAGE_DAQ
bool "daq removed"
select BR2_LEGACY
help
The only dependee, snort, has been removed. Look at daq3
for an alternative.
config BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE
bool "fwts efi_runtime kernel module removed"
select BR2_LEGACY

1
DEVELOPERS
View File

@@ -3037,7 +3037,6 @@ F: package/aoetools/
F: package/asn1c/
F: package/azure-iot-sdk-c/
F: package/curlpp/
F: package/daq/
F: package/libgdiplus/
F: package/pimd/
F: package/sloci-image/

1
package/Config.in
View File

@@ -1984,7 +1984,6 @@ menu "Networking"
source "package/cppzmq/Config.in"
source "package/curlpp/Config.in"
source "package/czmq/Config.in"
source "package/daq/Config.in"
source "package/daq3/Config.in"
source "package/davici/Config.in"
source "package/dht/Config.in"

54
package/daq/0001-Fix-build-against-the-musl-C-library.patch
View File

@@ -1,54 +0,0 @@
From 42efa6d76a3b52f35e576a6b941a9afb5b3879e9 Mon Sep 17 00:00:00 2001
From: Sergio Prado <sergio.prado@e-labworks.com>
Date: Tue, 9 Jan 2018 21:39:27 -0200
Subject: [PATCH] Fix build against the musl C library
Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
---
os-daq-modules/daq_ipfw.c | 2 +-
os-daq-modules/daq_ipq.c | 2 +-
os-daq-modules/daq_nfq.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c
index 016beb06ad61..98f67717f646 100644
--- a/os-daq-modules/daq_ipfw.c
+++ b/os-daq-modules/daq_ipfw.c
@@ -26,7 +26,7 @@
#include <sys/types.h>
#include <sys/time.h>
-#include <sys/unistd.h>
+#include <unistd.h>
#include <netinet/in.h>
#include <sys/socket.h>
diff --git a/os-daq-modules/daq_ipq.c b/os-daq-modules/daq_ipq.c
index 77ec6e9505e5..b15e5cf82af0 100644
--- a/os-daq-modules/daq_ipq.c
+++ b/os-daq-modules/daq_ipq.c
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <sys/time.h>
-#include <sys/unistd.h>
+#include <unistd.h>
#include <netinet/ip.h>
diff --git a/os-daq-modules/daq_nfq.c b/os-daq-modules/daq_nfq.c
index 33021c0ec991..0df1e61c74c4 100644
--- a/os-daq-modules/daq_nfq.c
+++ b/os-daq-modules/daq_nfq.c
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <sys/time.h>
-#include <sys/unistd.h>
+#include <unistd.h>
#include <netinet/ip.h>
--
1.9.1

29
package/daq/0002-parallel-grammar.patch
View File

@@ -1,29 +0,0 @@
Fix parallel build
https://bugs.gentoo.org/673390
Downloaded from
https://gitweb.gentoo.org/repo/gentoo.git/tree/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch
Patch was sent upstream: https://seclists.org/snort/2014/q3/1016
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
--- a/sfbpf/Makefile.am
+++ b/sfbpf/Makefile.am
@@ -43,13 +43,14 @@
libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
# use of $@ and $< here is a GNU idiom that borks BSD
-sf_scanner.c: $(srcdir)/scanner.l
+sf_scanner.c: $(srcdir)/scanner.l tokdefs.h
@rm -f $(srcdir)/sf_scanner.c
$(srcdir)/runlex.sh $(V_LEX) -osf_scanner.c $(srcdir)/scanner.l
sf_scanner.o: sf_scanner.c tokdefs.h
tokdefs.h: sf_grammar.c
+
sf_grammar.c: $(srcdir)/grammar.y
@rm -f sf_grammar.c tokdefs.h
$(V_YACC) -d $(srcdir)/grammar.y

31
package/daq/0003-daq-fix-incompatible-pointer-type-error.patch
View File

@@ -1,31 +0,0 @@
Fix daq incompatible pointer type error when gcc option
'-Wincompatible-pointer-types is set:
| ../../daq-2.0.7/os-daq-modules/daq_nfq.c: In function 'SetPktHdr':
| ../../daq-2.0.7/os-daq-modules/daq_nfq.c:394:37: error: passing argument 2
of 'nfq_get_payload' from incompatible pointer type [-Wincompatible-pointer-types]
| 394 | int len = nfq_get_payload(nfad, (char**)pkt);
| | ^~~~~~~~~~~
| | |
| | char **
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Upstream: https://git.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/daq/files/daq-fix-incompatible-pointer-type-error.patch?h=master
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
---
os-daq-modules/daq_nfq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/os-daq-modules/daq_nfq.c b/os-daq-modules/daq_nfq.c
index 4de94b6..a6de2f3 100644
--- a/os-daq-modules/daq_nfq.c
+++ b/os-daq-modules/daq_nfq.c
@@ -391,7 +391,7 @@ static inline int SetPktHdr (
DAQ_PktHdr_t* hdr,
uint8_t** pkt
) {
- int len = nfq_get_payload(nfad, (char**)pkt);
+ int len = nfq_get_payload(nfad, (unsigned char**)pkt);
if ( len <= 0 )
return -1;

11
package/daq/Config.in
View File

@@ -1,11 +0,0 @@
config BR2_PACKAGE_DAQ
bool "daq"
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

7
package/daq/daq.hash
View File

@@ -1,7 +0,0 @@
# From https://www.snort.org/downloads/snort/md5s
md5 60e5ddcafb985fac7374884d28f299d1 daq-2.0.7-modified.tar.gz
# Locally computed:
sha256 d1f6709bc5dbddee3fdf170cdc1e49fb926e2031d4869ecf367a8c47efc87279 daq-2.0.7-modified.tar.gz
# Hash for license files:
sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING

50
package/daq/daq.mk
View File

@@ -1,50 +0,0 @@
################################################################################
#
# daq
#
################################################################################
DAQ_VERSION = 2.0.7
# Upstream re-published a modified archive for the same 2.0.7 version, so change
# its name locally, to avoid conflict with older BR versions which had a hash
# for the previous archive.
DAQ_SOURCE = daq-2.0.7-modified.tar.gz
DAQ_SITE = https://www.snort.org/downloads/snort/daq-$(DAQ_VERSION).tar.gz?buildroot-path=filename
DAQ_LICENSE = GPL-2.0
DAQ_LICENSE_FILES = COPYING
DAQ_INSTALL_STAGING = YES
DAQ_DEPENDENCIES = host-bison host-flex
# 0002-parallel-grammar.patch
# 2.0.7 needs autoreconf due to configure being older than configure.ac
DAQ_AUTORECONF = YES
# disable ipq module as libipq is deprecated
DAQ_CONF_OPTS += --disable-ipq-module
# Set --with-dnet-{includes,libraries} even if ipq and nfq modules are disabled
# otherwise daq will call 'dnet-config --cflags' and 'dnet-config --libs' which
# will result in a build failure if libdnet is installed on host
DAQ_CONF_OPTS += \
--with-dnet-includes=$(STAGING_DIR)/usr/include \
--with-dnet-libraries=$(STAGING_DIR)/usr/lib
ifeq ($(BR2_PACKAGE_LIBDNET)$(BR2_PACKAGE_LIBNETFILTER_QUEUE),yy)
DAQ_DEPENDENCIES += libdnet libnetfilter_queue
DAQ_CONF_OPTS += --enable-nfq-module
else
DAQ_CONF_OPTS += --disable-nfq-module
endif
ifeq ($(BR2_PACKAGE_LIBPCAP),y)
DAQ_DEPENDENCIES += libpcap
# 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
DAQ_CONF_OPTS += --enable-pcap-module
else
DAQ_CONF_OPTS += --disable-pcap-module
endif
$(eval $(autotools-package))

2
package/daq3/Config.in
View File

@@ -1,6 +1,5 @@
config BR2_PACKAGE_DAQ3
bool "daq3"
depends on !BR2_PACKAGE_DAQ
depends on !BR2_STATIC_LIBS # dlfcn.h
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -11,6 +10,5 @@ config BR2_PACKAGE_DAQ3
https://www.snort.org
comment "daq3 needs a toolchain w/ dynamic library, gcc >= 4.9, threads"
depends on !BR2_PACKAGE_DAQ
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
|| !BR2_TOOLCHAIN_HAS_THREADS