This updates DAQ to 2.0.1. Upstream has accepted one of my IPFW DAQ
fixes, so this diff updates the patch file accordingly.
Tested with Snort 2.9.5.3 (to be sent shortly) on amd64, i386, macppc.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/daq/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 17 Jul 2013 18:18:05 -0000 1.7
+++ Makefile 5 Aug 2013 18:33:16 -0000
@@ -2,11 +2,10 @@
COMMENT = data acquisition library for snort
-DISTNAME = daq-2.0.0
-REVISION = 1
+DISTNAME = daq-2.0.1
-SHARED_LIBS += daq 1.0 # 2.0
-SHARED_LIBS += sfbpf 0.0 # 0.1
+SHARED_LIBS += daq 2.0 # 2.1
+SHARED_LIBS += sfbpf 1.0 # 0.1
CATEGORIES = net
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/daq/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 16 Jan 2013 04:48:39 -0000 1.2
+++ distinfo 5 Aug 2013 18:15:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (daq-2.0.0.tar.gz) = +6/I42Kpb8rcaXMfkSA++QhFUHquCkd01cKCXp0sHDg=
-SIZE (daq-2.0.0.tar.gz) = 480030
+SHA256 (daq-2.0.1.tar.gz) = 67qHwux2rGXSmAk0QjsFl5Ccrq06hs5dG6HqbOUY7G0=
+SIZE (daq-2.0.1.tar.gz) = 472510
Index: patches/patch-api_daq_common_h
===================================================================
RCS file: /cvs/ports/net/daq/patches/patch-api_daq_common_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-api_daq_common_h
--- patches/patch-api_daq_common_h 26 Sep 2012 01:40:32 -0000 1.1.1.1
+++ patches/patch-api_daq_common_h 5 Aug 2013 18:38:12 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-api_daq_common_h,v 1.1.1.1 2012/09/26 01:40:32 lteo Exp $
---- api/daq_common.h.orig Wed Jan 4 06:54:49 2012
-+++ api/daq_common.h Sat Aug 11 14:55:42 2012
+--- api/daq_common.h.orig Mon Jul 1 12:44:59 2013
++++ api/daq_common.h Mon Aug 5 14:33:20 2013
@@ -25,6 +25,10 @@
#include <unistd.h>
#ifndef WIN32
@@ -12,7 +12,7 @@ $OpenBSD: patch-api_daq_common_h,v 1.1.1
#else
/* for struct timeavl */
#include <winsock2.h>
-@@ -89,7 +93,11 @@
+@@ -92,7 +96,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.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 16 Jan 2013 04:48:39 -0000 1.2
+++ patches/patch-configure 5 Aug 2013 18:38:24 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2013/01/16 04:48:39 lteo Exp $
---- configure.orig Mon Nov 5 22:07:56 2012
-+++ configure Wed Dec 12 23:13:06 2012
-@@ -12784,12 +12784,20 @@ else
+--- configure.orig Wed Jul 3 01:36:06 2013
++++ configure Mon Aug 5 14:33:20 2013
+@@ -12727,12 +12727,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.1
diff -u -p -r1.1 patch-os-daq-modules_daq_ipfw_c
--- patches/patch-os-daq-modules_daq_ipfw_c 17 Jul 2013 18:18:05 -0000
1.1
+++ patches/patch-os-daq-modules_daq_ipfw_c 5 Aug 2013 18:38:21 -0000
@@ -1,28 +1,12 @@
$OpenBSD: patch-os-daq-modules_daq_ipfw_c,v 1.1 2013/07/17 18:18:05 lteo Exp $
-This patch fixes two issues in the IPFW DAQ module that is used by
-Snort in inline mode (both fixes have been sent upstream):
+This patch removes DAQ_CAPA_UNPRIV_START from the list of capabilities so that
+Snort can run as an unprivileged user in inline mode. Sent upstream:
+http://marc.info/?l=snort-devel&m=136254358118711&w=2
-1. Fixes a bug where ipfw_daq_inject() ignores the buf and len
- arguments that are passed to it, causing packet injections to fail
- http://marc.info/?l=snort-devel&m=136185602610571&w=2
-
-2. Removes DAQ_CAPA_UNPRIV_START from the list of capabilities so that
- Snort can run as an unprivileged user in inline mode
- http://marc.info/?l=snort-devel&m=136254358118711&w=2
-
---- os-daq-modules/daq_ipfw.c.orig Thu Sep 6 11:17:26 2012
-+++ os-daq-modules/daq_ipfw.c Fri May 31 17:26:38 2013
-@@ -256,7 +256,7 @@ static int ipfw_daq_inject (
- int reverse)
- {
- IpfwImpl* impl = (IpfwImpl*)handle;
-- int status = ipfw_daq_forward(impl, hdr, impl->buf, hdr->pktlen, 0);
-+ int status = ipfw_daq_forward(impl, hdr, buf, len, 0);
-
- if ( status == DAQ_SUCCESS )
- impl->stats.packets_injected++;
-@@ -397,7 +397,7 @@ static int ipfw_daq_get_snaplen (void* handle)
+--- os-daq-modules/daq_ipfw.c.orig Mon Jul 1 12:44:59 2013
++++ os-daq-modules/daq_ipfw.c Mon Aug 5 14:33:20 2013
+@@ -401,7 +401,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
