On Thu, Aug 08, 2013 at 03:21:05PM -0400, Adam Jeanguenat wrote:
> On 2013-08-07 at 15:59:44 -0400, Lawrence Teo wrote:
> > This updates Snort to 2.9.5.3.
> >
> > While testing I found that since Snort 2.9.4.1, upstream has removed the
> > ability for Snort to listen on "non-Ethernet" devices such as our
> > pflog(4) by default. This diff re-enables that ability by using the
> > --enable-non-ether-decoders configure flag.
> >
> > Tested on amd64, i386, macppc.
>
> Tested these and the daq patches on amd64 and i386 with no issues.
Thank you for testing, Adam.
I have also tested this and the DAQ 2.0.1 update
(http://marc.info/?l=openbsd-ports&m=137590540710450&w=2) on the
64-bit time_t amd64 and i386 snapshots.
If there are no objections, I would like to commit both the Snort and
DAQ updates sometime this week. OK's are also welcome. :)
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.80
diff -u -p -u -p -r1.80 Makefile
--- Makefile 10 Jul 2013 02:10:22 -0000 1.80
+++ Makefile 7 Aug 2013 01:57:51 -0000
@@ -4,8 +4,8 @@ SHARED_ONLY = Yes
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.5.0
-DISTNAME = snort-2.9.5
+VERSION = 2.9.5.3
+DISTNAME = snort-${VERSION}
CATEGORIES = net security
@@ -25,7 +25,8 @@ USE_GROFF = Yes
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
- --disable-static-daq
+ --disable-static-daq \
+ --enable-non-ether-decoders
LIB_DEPENDS = devel/pcre \
net/libdnet \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 distinfo
--- distinfo 10 Jul 2013 02:10:22 -0000 1.25
+++ distinfo 7 Aug 2013 01:34:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.5.tar.gz) = H5mXcW6MCGydYIKUpVwyOEaHfI8WrNEpqQyl+tu6GJA=
-SIZE (snort-2.9.5.tar.gz) = 5422421
+SHA256 (snort-2.9.5.3.tar.gz) = Pv0x/TN+g2r1PXkPwpl/SfzDUeUHHUxuT1hqiLBwxSo=
+SIZE (snort-2.9.5.3.tar.gz) = 5047591
Index: patches/patch-etc_snort_conf
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-etc_snort_conf,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-etc_snort_conf
--- patches/patch-etc_snort_conf 23 Apr 2013 02:04:13 -0000 1.9
+++ patches/patch-etc_snort_conf 7 Aug 2013 01:34:18 -0000
@@ -2,8 +2,8 @@ $OpenBSD: patch-etc_snort_conf,v 1.9 201
reputation preprocessor disabled, still experimental
---- etc/snort.conf.orig Thu Mar 21 14:09:05 2013
-+++ etc/snort.conf Thu Apr 4 22:31:37 2013
+--- etc/snort.conf.orig Tue Jul 23 14:37:33 2013
++++ etc/snort.conf Mon Aug 5 14:38:56 2013
@@ -101,17 +101,17 @@ ipvar AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.1
# Path to your rules files (this can be a relative path)
# Note for Windows users: You are advised to make this an absolute path,
@@ -65,7 +65,7 @@ reputation preprocessor disabled, still
include $RULE_PATH/app-detect.rules
include $RULE_PATH/attack-responses.rules
include $RULE_PATH/backdoor.rules
-@@ -648,6 +650,9 @@ include $RULE_PATH/web-iis.rules
+@@ -659,6 +661,9 @@ include $RULE_PATH/web-iis.rules
include $RULE_PATH/web-misc.rules
include $RULE_PATH/web-php.rules
include $RULE_PATH/x11.rules
Index: patches/patch-src_decode_h
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_decode_h
--- patches/patch-src_decode_h 10 Jul 2013 02:10:22 -0000 1.4
+++ patches/patch-src_decode_h 7 Aug 2013 01:34:18 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_decode_h,v 1.4 2013/07/10 02:10:22 lteo Exp $
---- src/decode.h.orig Tue Jun 4 23:19:52 2013
-+++ src/decode.h Tue Jul 2 20:52:28 2013
-@@ -812,9 +812,9 @@ typedef struct _SLLHdr {
+--- src/decode.h.orig Wed Jul 3 17:31:22 2013
++++ src/decode.h Mon Aug 5 14:37:49 2013
+@@ -813,9 +813,9 @@ typedef struct _SLLHdr {
* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
Index: patches/patch-src_dynamic-preprocessors_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 10 Jul 2013 02:10:22
-0000 1.11
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 7 Aug 2013 01:34:18
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.11 2013/07/10
02:10:22 lteo Exp $
---- src/dynamic-preprocessors/Makefile.in.orig Tue Jun 4 23:21:39 2013
-+++ src/dynamic-preprocessors/Makefile.in Mon Jul 1 23:06:13 2013
-@@ -1333,19 +1333,8 @@ clean-local:
+--- src/dynamic-preprocessors/Makefile.in.orig Tue Jul 23 14:35:44 2013
++++ src/dynamic-preprocessors/Makefile.in Mon Aug 5 14:37:49 2013
+@@ -1327,19 +1327,8 @@ clean-local:
rm -rf include build
install-data-local:
Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 31 May 2013
20:26:01 -0000 1.7
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.7 2013/05/31
20:26:01 lteo Exp $
---- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Mon Apr 15 15:57:47 2013
-+++ src/dynamic-preprocessors/dcerpc2/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Tue Jul 23 14:35:44 2013
++++ src/dynamic-preprocessors/dcerpc2/Makefile.in Mon Aug 5 14:37:49 2013
@@ -262,7 +262,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_dce2_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_dce2_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -502,7 +502,7 @@ distdir: $(DISTFILES)
+@@ -518,7 +518,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 31 May 2013
20:26:01 -0000 1.5
+++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.5 2013/05/31
20:26:01 lteo Exp $
---- src/dynamic-preprocessors/dnp3/Makefile.in.orig Mon Apr 15 15:57:47 2013
-+++ src/dynamic-preprocessors/dnp3/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/dnp3/Makefile.in.orig Tue Jul 23 14:35:44 2013
++++ src/dynamic-preprocessors/dnp3/Makefile.in Mon Aug 5 14:37:49 2013
@@ -259,7 +259,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_dnp3_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_dnp3_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -468,7 +468,7 @@ distdir: $(DISTFILES)
+@@ -484,7 +484,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_dns_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-src_dynamic-preprocessors_dns_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dns_Makefile_in 31 May 2013
20:26:01 -0000 1.9
+++ patches/patch-src_dynamic-preprocessors_dns_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.9 2013/05/31
20:26:01 lteo Exp $
---- src/dynamic-preprocessors/dns/Makefile.in.orig Mon Apr 15 15:57:47 2013
-+++ src/dynamic-preprocessors/dns/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/dns/Makefile.in.orig Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/dns/Makefile.in Mon Aug 5 14:37:49 2013
@@ -257,7 +257,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_dns_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_dns_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -450,7 +450,7 @@ distdir: $(DISTFILES)
+@@ -466,7 +466,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 31 May
2013 20:26:02 -0000 1.10
+++ patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 7 Aug
2013 01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.10
2013/05/31 20:26:02 lteo Exp $
---- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Mon Apr 15
15:57:47 2013
-+++ src/dynamic-preprocessors/ftptelnet/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Tue Jul 23
14:35:45 2013
++++ src/dynamic-preprocessors/ftptelnet/Makefile.in Mon Aug 5 14:37:49 2013
@@ -264,7 +264,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_ftptelnet_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_ftptelnet_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -499,7 +499,7 @@ distdir: $(DISTFILES)
+@@ -515,7 +515,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_gtp_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_dynamic-preprocessors_gtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 31 May 2013
20:26:02 -0000 1.5
+++ patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_gtp_Makefile_in,v 1.5 2013/05/31
20:26:02 lteo Exp $
---- src/dynamic-preprocessors/gtp/Makefile.in.orig Mon Apr 15 15:57:47 2013
-+++ src/dynamic-preprocessors/gtp/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/gtp/Makefile.in.orig Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/gtp/Makefile.in Mon Aug 5 14:37:49 2013
@@ -258,7 +258,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_gtp_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_gtp_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -458,7 +458,7 @@ distdir: $(DISTFILES)
+@@ -474,7 +474,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_imap_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_dynamic-preprocessors_imap_Makefile_in
--- patches/patch-src_dynamic-preprocessors_imap_Makefile_in 31 May 2013
20:26:02 -0000 1.5
+++ patches/patch-src_dynamic-preprocessors_imap_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_imap_Makefile_in,v 1.5 2013/05/31
20:26:02 lteo Exp $
---- src/dynamic-preprocessors/imap/Makefile.in.orig Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/imap/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/imap/Makefile.in.orig Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/imap/Makefile.in Mon Aug 5 14:37:49 2013
@@ -261,7 +261,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_imap_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_imap_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -482,7 +482,7 @@ distdir: $(DISTFILES)
+@@ -498,7 +498,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_modbus_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_dynamic-preprocessors_modbus_Makefile_in
--- patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 31 May 2013
20:26:02 -0000 1.5
+++ patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_modbus_Makefile_in,v 1.5 2013/05/31
20:26:02 lteo Exp $
---- src/dynamic-preprocessors/modbus/Makefile.in.orig Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/modbus/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/modbus/Makefile.in.orig Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/modbus/Makefile.in Mon Aug 5 14:37:49 2013
@@ -259,7 +259,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_modbus_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_modbus_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -458,7 +458,7 @@ distdir: $(DISTFILES)
+@@ -474,7 +474,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_pop_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_dynamic-preprocessors_pop_Makefile_in
--- patches/patch-src_dynamic-preprocessors_pop_Makefile_in 31 May 2013
20:26:02 -0000 1.5
+++ patches/patch-src_dynamic-preprocessors_pop_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_pop_Makefile_in,v 1.5 2013/05/31
20:26:02 lteo Exp $
---- src/dynamic-preprocessors/pop/Makefile.in.orig Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/pop/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/pop/Makefile.in.orig Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/pop/Makefile.in Mon Aug 5 14:37:49 2013
@@ -261,7 +261,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_pop_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_pop_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -482,7 +482,7 @@ distdir: $(DISTFILES)
+@@ -498,7 +498,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_reputation_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_dynamic-preprocessors_reputation_Makefile_in
--- patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 31 May
2013 20:26:03 -0000 1.5
+++ patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 7 Aug
2013 01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_reputation_Makefile_in,v 1.5
2013/05/31 20:26:03 lteo Exp $
---- src/dynamic-preprocessors/reputation/Makefile.in.orig Mon Apr 15
15:57:48 2013
-+++ src/dynamic-preprocessors/reputation/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/reputation/Makefile.in.orig Tue Jul 23
14:35:46 2013
++++ src/dynamic-preprocessors/reputation/Makefile.in Mon Aug 5 14:37:49 2013
@@ -276,7 +276,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_reputation_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_reputation_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -533,7 +533,7 @@ distdir: $(DISTFILES)
+@@ -549,7 +549,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_sdf_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-src_dynamic-preprocessors_sdf_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 31 May 2013
20:26:03 -0000 1.6
+++ patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.6 2013/05/31
20:26:03 lteo Exp $
---- src/dynamic-preprocessors/sdf/Makefile.in.orig Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/sdf/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/sdf/Makefile.in.orig Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/sdf/Makefile.in Mon Aug 5 14:37:49 2013
@@ -258,7 +258,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_sdf_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_sdf_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -459,7 +459,7 @@ distdir: $(DISTFILES)
+@@ -475,7 +475,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_sip_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_dynamic-preprocessors_sip_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sip_Makefile_in 31 May 2013
20:26:03 -0000 1.5
+++ patches/patch-src_dynamic-preprocessors_sip_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_sip_Makefile_in,v 1.5 2013/05/31
20:26:03 lteo Exp $
---- src/dynamic-preprocessors/sip/Makefile.in.orig Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/sip/Makefile.in Wed Apr 24 14:51:57 2013
+--- src/dynamic-preprocessors/sip/Makefile.in.orig Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/sip/Makefile.in Mon Aug 5 14:37:49 2013
@@ -258,7 +258,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_sip_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_sip_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -466,7 +466,7 @@ distdir: $(DISTFILES)
+@@ -482,7 +482,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-src_dynamic-preprocessors_smtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 31 May 2013
20:26:03 -0000 1.9
+++ patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.9 2013/05/31
20:26:03 lteo Exp $
---- src/dynamic-preprocessors/smtp/Makefile.in.orig Mon Apr 15 15:57:49 2013
-+++ src/dynamic-preprocessors/smtp/Makefile.in Wed Apr 24 14:51:58 2013
+--- src/dynamic-preprocessors/smtp/Makefile.in.orig Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/smtp/Makefile.in Mon Aug 5 14:37:49 2013
@@ -262,7 +262,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_smtp_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_smtp_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -492,7 +492,7 @@ distdir: $(DISTFILES)
+@@ -508,7 +508,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-src_dynamic-preprocessors_ssh_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 31 May 2013
20:26:03 -0000 1.8
+++ patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.8 2013/05/31
20:26:03 lteo Exp $
---- src/dynamic-preprocessors/ssh/Makefile.in.orig Mon Apr 15 15:57:49 2013
-+++ src/dynamic-preprocessors/ssh/Makefile.in Wed Apr 24 14:51:58 2013
+--- src/dynamic-preprocessors/ssh/Makefile.in.orig Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/ssh/Makefile.in Mon Aug 5 14:37:49 2013
@@ -257,7 +257,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_ssh_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_ssh_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -450,7 +450,7 @@ distdir: $(DISTFILES)
+@@ -466,7 +466,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_dynamic-preprocessors_ssl_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-src_dynamic-preprocessors_ssl_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 31 May 2013
20:26:03 -0000 1.7
+++ patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 7 Aug 2013
01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.7 2013/05/31
20:26:03 lteo Exp $
---- src/dynamic-preprocessors/ssl/Makefile.in.orig Mon Apr 15 15:57:49 2013
-+++ src/dynamic-preprocessors/ssl/Makefile.in Wed Apr 24 14:51:58 2013
+--- src/dynamic-preprocessors/ssl/Makefile.in.orig Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/ssl/Makefile.in Mon Aug 5 14:37:49 2013
@@ -257,7 +257,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
@SO_WITH_STATIC_LIB_TRUE@libsf_ssl_preproc_la_LIBADD =
../libsf_dynamic_preproc.la
@SO_WITH_STATIC_LIB_FALSE@nodist_libsf_ssl_preproc_la_SOURCES = \
@SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -460,7 +460,7 @@ distdir: $(DISTFILES)
+@@ -476,7 +476,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: patches/patch-src_ppm_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_ppm_c,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-src_ppm_c
--- patches/patch-src_ppm_c 10 Jul 2013 02:10:22 -0000 1.7
+++ patches/patch-src_ppm_c 7 Aug 2013 01:34:18 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_ppm_c,v 1.7 2013/07/10 02:10:22 lteo Exp $
---- src/ppm.c.orig Tue Jun 4 23:19:52 2013
-+++ src/ppm.c Mon Jul 1 23:00:43 2013
-@@ -505,7 +505,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
+--- src/ppm.c.orig Wed Jul 3 17:31:22 2013
++++ src/ppm.c Mon Aug 5 14:37:49 2013
+@@ -509,7 +509,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
int i;
if(!*timestamp)
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_ppm_c,v 1.7 2013/07/
for (i=0; i< ppm_n_crules; i++)
{
-@@ -584,7 +584,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
+@@ -588,7 +588,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
LogMessage(PPM_FMT_SUS_PKT, pktcnt, src, p->sp, dst, p->dp);
if(!*timestamp)
Index: patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-src_preprocessors_Stream5_snort_stream5_tcp_c
--- patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 10 Jul 2013
02:10:22 -0000 1.9
+++ patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 7 Aug 2013
01:34:18 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.9 2013/07/10
02:10:22 lteo Exp $
---- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Tue Jun 4 23:19:53 2013
-+++ src/preprocessors/Stream5/snort_stream5_tcp.c Mon Jul 1 23:00:43 2013
-@@ -7449,7 +7449,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
+--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Tue Jul 9 17:33:09 2013
++++ src/preprocessors/Stream5/snort_stream5_tcp.c Mon Aug 5 14:37:49 2013
+@@ -7495,7 +7495,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
char src_addr[17];
char dst_addr[17];
bzero((char *)timestamp, TIMEBUF_SIZE);
Index: patches/patch-src_preprocessors_spp_sfportscan_c
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_preprocessors_spp_sfportscan_c,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-src_preprocessors_spp_sfportscan_c
--- patches/patch-src_preprocessors_spp_sfportscan_c 10 Jul 2013 02:10:22
-0000 1.7
+++ patches/patch-src_preprocessors_spp_sfportscan_c 7 Aug 2013 01:34:18
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.7 2013/07/10 02:10:22
lteo Exp $
---- src/preprocessors/spp_sfportscan.c.orig Tue Jun 4 23:19:53 2013
-+++ src/preprocessors/spp_sfportscan.c Mon Jul 1 23:00:43 2013
-@@ -271,7 +271,7 @@ static int LogPortscanAlert(Packet *p, char *msg, uint
+--- src/preprocessors/spp_sfportscan.c.orig Wed Jul 3 17:31:22 2013
++++ src/preprocessors/spp_sfportscan.c Mon Aug 5 14:37:49 2013
+@@ -272,7 +272,7 @@ static int LogPortscanAlert(Packet *p, char *msg, uint
return 0;
}
Index: patches/patch-src_util_h
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_util_h,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_util_h
--- patches/patch-src_util_h 10 Jul 2013 02:10:22 -0000 1.5
+++ patches/patch-src_util_h 7 Aug 2013 01:34:18 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_util_h,v 1.5 2013/07/10 02:10:22 lteo Exp $
---- src/util.h.orig Tue Jun 4 23:19:52 2013
-+++ src/util.h Mon Jul 1 23:00:43 2013
+--- src/util.h.orig Wed Jul 3 17:31:22 2013
++++ src/util.h Mon Aug 5 14:37:50 2013
@@ -49,6 +49,7 @@
#include "sflsq.h"
#include "sfutil/sf_ipvar.h"
@@ -9,9 +9,9 @@ $OpenBSD: patch-src_util_h,v 1.5 2013/07
/* Macros
*********************************************************************/
-@@ -183,7 +184,7 @@ void StoreSnortInfoStrings(void);
+@@ -160,7 +161,7 @@ typedef struct _IntervalStats
+ void StoreSnortInfoStrings(void);
int DisplayBanner(void);
- void GetTime(char *);
int gmt2local(time_t);
-void ts_print(register const struct timeval *, char *);
+void ts_print(register const struct sf_timeval32 *, char *);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/snort/pkg/PLIST,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 PLIST
--- pkg/PLIST 10 Jul 2013 02:10:22 -0000 1.24
+++ pkg/PLIST 7 Aug 2013 01:34:18 -0000
@@ -114,7 +114,6 @@ share/doc/snort/README.variables
share/doc/snort/TODO
share/doc/snort/USAGE
share/doc/snort/WISHLIST
-share/doc/snort/faq.pdf
share/doc/snort/generators
share/doc/snort/snort_manual.pdf
share/examples/snort/
