This updates DAQ to 2.0.6. Tested on amd64 with an upcoming Snort 2.9.8.2 port
which I will mail shortly.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/daq/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile 4 Apr 2016 16:09:09 -0000 1.14
+++ Makefile 30 Apr 2016 00:34:03 -0000
@@ -2,8 +2,7 @@
COMMENT = data acquisition library for snort
-DISTNAME = daq-2.0.5
-REVISION = 0
+DISTNAME = daq-2.0.6
SHARED_LIBS += daq 2.1 # 2.4
SHARED_LIBS += sfbpf 1.0 # 0.1
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/daq/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 29 May 2015 03:27:27 -0000 1.6
+++ distinfo 30 Apr 2016 00:34:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (daq-2.0.5.tar.gz) = dwS124WHMhQlhvUEPesHM+LDllNcgwgekY+2mTJYvG0=
-SIZE (daq-2.0.5.tar.gz) = 517801
+SHA256 (daq-2.0.6.tar.gz) = tA4dEnPgiq6qhuadTyjVNbflO9s4mK31OSZrYxN758s=
+SIZE (daq-2.0.6.tar.gz) = 514687
Index: patches/patch-api_daq_common_h
===================================================================
RCS file: /cvs/ports/net/daq/patches/patch-api_daq_common_h,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-api_daq_common_h
--- patches/patch-api_daq_common_h 29 May 2015 03:27:27 -0000 1.4
+++ patches/patch-api_daq_common_h 30 Apr 2016 00:34:03 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-api_daq_common_h,v 1.4 2015/05/29 03:27:27 lteo Exp $
---- api/daq_common.h.orig Thu Apr 23 02:15:57 2015
-+++ api/daq_common.h Sun May 24 16:51:38 2015
-@@ -27,6 +27,10 @@
- #ifndef WIN32
+--- api/daq_common.h.orig Tue Sep 9 15:57:29 2014
++++ api/daq_common.h Fri Apr 29 10:54:35 2016
+@@ -26,6 +26,10 @@
#include <netinet/in.h>
+ #ifndef WIN32
#include <sys/time.h>
+#if defined(__OpenBSD__)
+/* for struct bpf_timeval */
@@ -12,7 +12,7 @@ $OpenBSD: patch-api_daq_common_h,v 1.4 2
#else
/* for struct timeavl */
#include <winsock2.h>
-@@ -100,7 +104,11 @@
+@@ -98,7 +102,11 @@
#define DAQ_PKTHDR_FLOOD -2 /* Egress is flooding */
typedef struct _daq_pkthdr
{
Index: patches/patch-os-daq-modules_daq_ipfw_c
===================================================================
RCS file: /cvs/ports/net/daq/patches/patch-os-daq-modules_daq_ipfw_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-os-daq-modules_daq_ipfw_c
--- patches/patch-os-daq-modules_daq_ipfw_c 29 May 2015 03:27:27 -0000
1.4
+++ patches/patch-os-daq-modules_daq_ipfw_c 30 Apr 2016 00:34:03 -0000
@@ -4,9 +4,9 @@ This patch removes DAQ_CAPA_UNPRIV_START
Snort can run as an unprivileged user in inline mode. Sent upstream:
http://marc.info/?l=snort-devel&m=136254358118711&w=2
---- os-daq-modules/daq_ipfw.c.orig Thu Apr 23 02:15:57 2015
-+++ os-daq-modules/daq_ipfw.c Sun May 24 16:51:39 2015
-@@ -404,7 +404,7 @@ static int ipfw_daq_get_snaplen (void* handle)
+--- os-daq-modules/daq_ipfw.c.orig Tue Sep 9 15:57:31 2014
++++ os-daq-modules/daq_ipfw.c Fri Apr 29 10:54:35 2016
+@@ -403,7 +403,7 @@ static int ipfw_daq_get_snaplen (void* handle)
static uint32_t ipfw_daq_get_capabilities (void* handle)
{
return DAQ_CAPA_BLOCK | DAQ_CAPA_REPLACE | DAQ_CAPA_INJECT |
DAQ_CAPA_INJECT_RAW
