package/daq: fix parallel build
PATCH v2 1/3 package/daq: fix parallel build
--- package/daq/0002-parallel-grammar.patch | 29 +++++++++++++++++++++++++ package/daq/daq.mk | 6 ++--- 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 package/daq/0002-parallel-grammar.patch
package/daq/0002-parallel-grammar.patch new file +29 -0
@@ -0,0 +1,29 @@ +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 <[email protected]> + +--- 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
package/daq/daq.mk +2 -4
@@ -10,10 +10,8 @@ DAQ_LICENSE = GPL-2.0 DAQ_LICENSE_FILES = COPYING DAQ_INSTALL_STAGING = YES DAQ_DEPENDENCIES = host-bison host-flex - -# package does not build in parallel due to improper make rules -# related to the generation of the tokdefs.h header file -DAQ_MAKE = $(MAKE1) +# 0002-parallel-grammar.patch +DAQ_AUTORECONF = YES # disable ipq module as libipq is deprecated DAQ_CONF_OPTS += --disable-ipq-module
Signature · 1 line
2.28.0
PATCH v2 2/3 package/daq: bump version to 2.0.7
- Add a comment about autoreconf
- Update indentation in hash file
---
Changes v1 -> v2 (after review of Yann E. Morin):
- Add comment about autoreconf (the suggested DAQ_TOUCH_AUTOSTUFF does
not work). Moreover, it should be noted that snort3 is still in beta
stage and a patch is available here:
https://patchwork.ozlabs.org/project/buildroot/patch/20200420144536.708646-2-fontaine.fabrice at gmail.com/
package/daq/daq.hash | 6 ++++-- package/daq/daq.mk | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-)
package/daq/daq.hash +4 -2
@@ -1,5 +1,7 @@ +# From https://www.snort.org/downloads/snort/md5s +md5 ea796f001d1b00302e4e69e337ab2460 daq-2.0.7.tar.gz # Locally computed: -sha256 d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0 daq-2.0.6.tar.gz +sha256 bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e daq-2.0.7.tar.gz # Hash for license files: -sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING +sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819 COPYING
package/daq/daq.mk +2 -1
@@ -4,13 +4,14 @@ # ################################################################################ -DAQ_VERSION = 2.0.6 +DAQ_VERSION = 2.0.7 DAQ_SITE = https://www.snort.org/downloads/snort 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
Signature · 1 line
2.28.0
PATCH v2 3/3 package/snort: bump to version 2.9.16.1
In reply to Fabrice Fontaine- Added md5 hash provided by upstream.
- Update indentation in hash file (two spaces)
- Fix build failure with gcc 10
Fixes:
- http://autobuild.buildroot.org/results/16e1fa98a80182d96e62365491d5a71ed269aa47
---
Changes v1 -> v2:
- Bump to 2.9.16.1
package/snort/snort.hash | 9 ++++++--- package/snort/snort.mk | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-)
package/snort/snort.hash +6 -3
@@ -1,6 +1,9 @@ +# From https://www.snort.org/downloads/snort/md5s +md5 ec148a494cde9095fb590a51efa306de snort-2.9.16.1.tar.gz + # Locally computed: -sha256 2cccfc1d1a706586cd47ae9f085a7d5e4e36390b8e9c28cd2020b4b5b587f6c3 snort-2.9.15.1.tar.gz +sha256 e3ac45a1a3cc2c997d52d19cd92f1adf5641c3a919387adab47a4d13a9dc9f8e snort-2.9.16.1.tar.gz # Hash for license files: -sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE -sha256 3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d COPYING +sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE +sha256 3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d COPYING
package/snort/snort.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -SNORT_VERSION = 2.9.15.1 +SNORT_VERSION = 2.9.16.1 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING
Signature · 1 line
2.28.0
PATCH v2 1/3 package/daq: fix parallel build
In reply to Fabrice FontaineHello Fabrice,
Quoted 7 lines · On Mon, 12 Oct 2020 18:19:58 +0200 Fabrice Fontaine…
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by Fabrice Fontaine <[email protected]>--- package/daq/0002-parallel-grammar.patch | 29 +++++++++++++++++++++++++ package/daq/daq.mk | 6 ++--- 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 package/daq/0002-parallel-grammar.patch
Thanks, I have applied the series. However, you had not properly kept the authorship of Bernd. Bernd indeed appeared as the first Signed-off-by line, but he no longer appeared as the commit author, which was not correct: the Author and first Signed-off-by line should always match. I fixed that up when applying.
Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com