OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libdaq: update to 2.2.2 

Signed-off-by: W. Michael Petullo <mike@flyn.org>
This commit is contained in:
W. Michael Petullo 2019-03-28 21:22:07 -04:00 committed by Daniel Engberg
parent fcfaea54e6
commit b36790d1d2
3 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/libdaq/Makefile
View File

@ -8,18 +8,19 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libdaq PKG_NAME:=libdaq
PKG_VERSION:=2.0.6 PKG_VERSION:=2.2.2
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE_URL:=https://www.snort.org/downloads/snort/ \ PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/
@SF/snort
PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz
PKG_HASH:=d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0 PKG_HASH:=7cd818cabb1ad35360e83076e54775f07165ee71407dc672d147e27d3cd37f7b
PKG_BUILD_DIR:=$(BUILD_DIR)/daq-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/daq-$(PKG_VERSION)
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
@ -43,14 +44,6 @@ CONFIGURE_ARGS+= \
--with-libpcap-includes="$(STAGING_DIR)/usr/include" \ --with-libpcap-includes="$(STAGING_DIR)/usr/include" \
--with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \ --with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \
define Build/Compile
$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)
endef
define Build/Install
$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR) install DESTDIR=$(PKG_INSTALL_DIR)
endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR)/usr/include $(INSTALL_DIR) $(STAGING_DIR)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/

7
libs/libdaq/patches/001-compile.patch
View File

@ -1,6 +1,7 @@
--- a/configure diff -u --recursive daq-2.2.2-vanilla/configure daq-2.2.2/configure
+++ b/configure --- daq-2.2.2-vanilla/configure 2017-07-05 15:58:03.000000000 -0400
@@ -13552,10 +13552,11 @@ if ${daq_cv_libpcap_version_1x+:} false; +++ daq-2.2.2/configure 2018-09-01 17:18:56.774898034 -0400
@@ -13244,10 +13244,11 @@
else else
if test "$cross_compiling" = yes; then : if test "$cross_compiling" = yes; then :

15
libs/libdaq/patches/100-musl-compat.patch
View File

@ -1,5 +1,6 @@
--- a/os-daq-modules/daq_ipfw.c diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_ipfw.c daq-2.2.2/os-daq-modules/daq_ipfw.c
+++ b/os-daq-modules/daq_ipfw.c --- daq-2.2.2-vanilla/os-daq-modules/daq_ipfw.c 2017-02-08 17:04:18.000000000 -0500
+++ daq-2.2.2/os-daq-modules/daq_ipfw.c 2018-09-01 17:21:10.608181841 -0400
@@ -23,10 +23,10 @@ @@ -23,10 +23,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -12,8 +13,9 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
--- a/os-daq-modules/daq_ipq.c diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_ipq.c daq-2.2.2/os-daq-modules/daq_ipq.c
+++ b/os-daq-modules/daq_ipq.c --- daq-2.2.2-vanilla/os-daq-modules/daq_ipq.c 2017-02-08 17:04:18.000000000 -0500
+++ daq-2.2.2/os-daq-modules/daq_ipq.c 2018-09-01 17:21:23.162208457 -0400
@@ -24,10 +24,10 @@ @@ -24,10 +24,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -26,8 +28,9 @@
#include <netinet/ip.h> #include <netinet/ip.h>
--- a/os-daq-modules/daq_nfq.c diff -u --recursive daq-2.2.2-vanilla/os-daq-modules/daq_nfq.c daq-2.2.2/os-daq-modules/daq_nfq.c
+++ b/os-daq-modules/daq_nfq.c --- daq-2.2.2-vanilla/os-daq-modules/daq_nfq.c 2017-02-08 17:04:18.000000000 -0500
+++ daq-2.2.2/os-daq-modules/daq_nfq.c 2018-09-01 17:21:35.202233988 -0400
@@ -24,10 +24,10 @@ @@ -24,10 +24,10 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>