diff options
Diffstat (limited to 'package/daq')
| -rw-r--r-- | package/daq/0002-parallel-grammar.patch | 29 | ||||
| -rw-r--r-- | package/daq/daq.hash | 6 | ||||
| -rw-r--r-- | package/daq/daq.mk | 9 |
3 files changed, 37 insertions, 7 deletions
diff --git a/package/daq/0002-parallel-grammar.patch b/package/daq/0002-parallel-grammar.patch new file mode 100644 index 0000000000..ba0e256f53 --- /dev/null +++ b/package/daq/0002-parallel-grammar.patch @@ -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 <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 diff --git a/package/daq/daq.hash b/package/daq/daq.hash index 6a0cb5ed07..0fa1edecc2 100644 --- a/package/daq/daq.hash +++ b/package/daq/daq.hash @@ -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 diff --git a/package/daq/daq.mk b/package/daq/daq.mk index f0f996ba2c..8a5394a63c 100644 --- a/package/daq/daq.mk +++ b/package/daq/daq.mk @@ -4,16 +4,15 @@ # ################################################################################ -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 - -# 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 +# 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 |