Hello,
attached is an update to daq-2.0.5, a bugfix release.
Most of the diff are regenerated patches.
Tested with snort 2.9.7.3 on i386.
Also at least builds on sparc64.
Please test, comment.
Regards,
Markus
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/daq/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 15 Jan 2015 03:48:31 -0000 1.11
+++ Makefile 26 May 2015 19:58:01 -0000
@@ -2,7 +2,7 @@
COMMENT = data acquisition library for snort
-DISTNAME = daq-2.0.4
+DISTNAME = daq-2.0.5
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.5
diff -u -p -r1.5 distinfo
--- distinfo 15 Jan 2015 03:48:31 -0000 1.5
+++ distinfo 26 May 2015 19:58:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (daq-2.0.4.tar.gz) = opSqPQHNiQK/hC0yDn8sBDr56tldDnGYw7caDbydJTw=
-SIZE (daq-2.0.4.tar.gz) = 495316
+SHA256 (daq-2.0.5.tar.gz) = dwS124WHMhQlhvUEPesHM+LDllNcgwgekY+2mTJYvG0=
+SIZE (daq-2.0.5.tar.gz) = 517801
Index: patches/patch-api_daq_common_h
===================================================================
RCS file: /cvs/ports/net/daq/patches/patch-api_daq_common_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-api_daq_common_h
--- patches/patch-api_daq_common_h 15 Jan 2015 03:48:31 -0000 1.3
+++ patches/patch-api_daq_common_h 26 May 2015 19:58:01 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-api_daq_common_h,v 1.3 2015/01/15 03:48:31 lteo Exp $
---- api/daq_common.h.orig Tue Sep 9 21:57:29 2014
-+++ api/daq_common.h Sat Oct 25 13:55:21 2014
-@@ -26,6 +26,10 @@
- #include <netinet/in.h>
+--- 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
+ #include <netinet/in.h>
#include <sys/time.h>
+#if defined(__OpenBSD__)
+/* for struct bpf_timeval */
@@ -12,7 +12,7 @@ $OpenBSD: patch-api_daq_common_h,v 1.3 2
#else
/* for struct timeavl */
#include <winsock2.h>
-@@ -98,7 +102,11 @@
+@@ -100,7 +104,11 @@
#define DAQ_PKTHDR_FLOOD -2 /* Egress is flooding */
typedef struct _daq_pkthdr
{
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/daq/patches/patch-configure,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure
--- patches/patch-configure 15 Jan 2015 03:48:31 -0000 1.5
+++ patches/patch-configure 26 May 2015 19:58:01 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2015/01/15 03:48:31 lteo Exp $
---- configure.orig Sat Sep 20 01:30:04 2014
-+++ configure Sat Oct 25 13:55:21 2014
-@@ -12977,12 +12977,20 @@ else
+--- configure.orig Thu Apr 23 17:25:35 2015
++++ configure Sun May 24 16:51:38 2015
+@@ -13562,12 +13562,20 @@ else
#include <pcap.h>
#include <string.h>
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.3
diff -u -p -r1.3 patch-os-daq-modules_daq_ipfw_c
--- patches/patch-os-daq-modules_daq_ipfw_c 30 Jan 2014 03:22:48 -0000
1.3
+++ patches/patch-os-daq-modules_daq_ipfw_c 26 May 2015 19:58:01 -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 Tue Nov 5 16:00:32 2013
-+++ os-daq-modules/daq_ipfw.c Thu Jan 23 22:05:29 2014
-@@ -403,7 +403,7 @@ static int ipfw_daq_get_snaplen (void* handle)
+--- 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)
static uint32_t ipfw_daq_get_capabilities (void* handle)
{
return DAQ_CAPA_BLOCK | DAQ_CAPA_REPLACE | DAQ_CAPA_INJECT |
DAQ_CAPA_INJECT_RAW
