On Sat, Dec 15, 2012 at 07:20:53PM +0100, Markus Lude wrote:
> Hello,
>
> attached are updates of daq to version 2.0.0 and snort to version
> 2.9.4.0. Build on i386 and sparc64 works. Been running it on sparc64 for
> two days with low traffic.
>
> Please test, comment.
Hi Markus,
Thank you for the update!
I have tested both diffs and here are my comments. The Snort rule
categories are going through a reorganization (please see
http://blog.snort.org/2012/10/rule-category-reorganization-phase-3.html)
where a lot of rules have moved to new files.
During this transition, some old rule files are now empty; for example,
web-iis.rules now has no rules because most of them have been moved to
the new server-iis.rules file.
I have added a patch to your snort-2.9.4.0 diff so that snort.conf will
include the new rule filenames. While there, I have also sync'ed a few
parts of snort.conf with the snort.conf in the Dec 6, 2012 Snort ruleset
(the latest ruleset I have access to) to make them consistent. Apart
from that, everything remains the same. I have made no changes to your
daq-2.0.0.diff.
I have tested the attached snort-2.9.4.0a.diff and daq-2.0.0.diff on
amd64 and i386 using my simple test procedure described at
http://lteo.net/blog/2012/10/26/an-easy-way-to-test-your-snort-rules/
and it works as expected.
Thoughts? OK?
Thanks,
Lawrence
Index: net/daq/Makefile
===================================================================
RCS file: /cvs/ports/net/daq/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- net/daq/Makefile 28 Sep 2012 19:30:55 -0000 1.2
+++ net/daq/Makefile 15 Dec 2012 18:10:29 -0000
@@ -2,9 +2,9 @@
COMMENT = data acquisition library for snort
-DISTNAME = daq-1.1.1
+DISTNAME = daq-2.0.0
-SHARED_LIBS += daq 0.0 # 1.0
+SHARED_LIBS += daq 1.0 # 2.0
SHARED_LIBS += sfbpf 0.0 # 0.1
CATEGORIES = net
Index: net/daq/distinfo
===================================================================
RCS file: /cvs/ports/net/daq/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- net/daq/distinfo 26 Sep 2012 01:40:32 -0000 1.1.1.1
+++ net/daq/distinfo 15 Dec 2012 18:10:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (daq-1.1.1.tar.gz) = UPA8rMq7H8oCpWyzyOCrnKJcCwEnEDQu9rJmWRAaHuU=
-SIZE (daq-1.1.1.tar.gz) = 472223
+SHA256 (daq-2.0.0.tar.gz) = +6/I42Kpb8rcaXMfkSA++QhFUHquCkd01cKCXp0sHDg=
+SIZE (daq-2.0.0.tar.gz) = 480030
Index: net/daq/patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/daq/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- net/daq/patches/patch-configure 26 Sep 2012 01:40:32 -0000 1.1.1.1
+++ net/daq/patches/patch-configure 15 Dec 2012 18:10:29 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2012/09/26 01:40:32 lteo Exp $
---- configure.orig Tue Jul 10 21:32:51 2012
-+++ configure Sat Aug 11 17:23:56 2012
-@@ -12727,12 +12727,20 @@ else
+--- configure.orig Mon Nov 5 22:07:56 2012
++++ configure Wed Dec 12 23:13:06 2012
+@@ -12784,12 +12784,20 @@ else
#include <pcap.h>
#include <string.h>
Index: net/snort/Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- net/snort/Makefile 25 Oct 2012 19:52:16 -0000 1.72
+++ net/snort/Makefile 15 Dec 2012 18:10:53 -0000
@@ -4,9 +4,9 @@ SHARED_ONLY = Yes
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.3.1
-DISTNAME = snort-${VERSION}
-REVISION = 0
+VERSION = 2.9.4.0
+DISTNAME = snort-2.9.4
+PKGNAME = snort-${VERSION}
CATEGORIES = net security
@@ -20,7 +20,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = c daq dnet m pcap pcre pthread z
+WANTLIB = c crypto daq dnet m pcap pcre pthread z
MASTER_SITES = http://www.snort.org/dl/snort-current/
@@ -31,7 +31,6 @@ SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--disable-static-daq
-CONFIGURE_ENV= MKDIR_P="/bin/mkdir -p"
LIB_DEPENDS = devel/pcre \
net/libdnet \
Index: net/snort/distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- net/snort/distinfo 26 Sep 2012 02:11:05 -0000 1.20
+++ net/snort/distinfo 15 Dec 2012 18:10:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.3.1.tar.gz) = sbIVTfVMW7b4GqmeLGyAgSiDmcAJSYO4/6Oy7lQsvlA=
-SIZE (snort-2.9.3.1.tar.gz) = 5295237
+SHA256 (snort-2.9.4.tar.gz) = QgKuD2ZqU0jGJEdqRUPx0FmnCZjesNytq2hlzWukmbU=
+SIZE (snort-2.9.4.tar.gz) = 5289321
Index: net/snort/patches/patch-etc_snort_conf
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-etc_snort_conf,v
retrieving revision 1.7
diff -u -p -r1.7 patch-etc_snort_conf
--- net/snort/patches/patch-etc_snort_conf 11 Oct 2012 02:40:48 -0000
1.7
+++ net/snort/patches/patch-etc_snort_conf 6 Jan 2013 19:40:28 -0000
@@ -2,8 +2,22 @@ $OpenBSD: patch-etc_snort_conf,v 1.7 201
reputation preprocessor disabled, still experimental
---- etc/snort.conf.orig Tue Jul 31 12:21:16 2012
-+++ etc/snort.conf Sat Oct 6 22:13:19 2012
+sync with changes from the snort.conf in the Dec 6, 2012 Snort ruleset,
+primarily to load the correct Snort rule files since they have been
+reorganized; please see
+http://blog.snort.org/2012/10/rule-category-reorganization-phase-3.html
+
+--- etc/snort.conf.orig Thu Nov 15 17:54:40 2012
++++ etc/snort.conf Sat Jan 5 22:47:00 2013
+@@ -72,7 +72,7 @@ ipvar FTP_SERVERS $HOME_NET
+ ipvar SIP_SERVERS $HOME_NET
+
+ # List of ports you run web servers on
+-portvar HTTP_PORTS
[80,81,311,591,593,901,1220,1414,1830,2301,2381,2809,3128,3702,4343,5250,7001,7145,7510,7777,7779,8000,8008,8014,8028,8080,8088,8118,8123,8180,8181,8243,8280,8800,8888,8899,9080,9090,9091,9443,9999,11371,55555]
++portvar HTTP_PORTS
[80,81,311,383,591,593,901,1220,1414,1741,1830,2301,2381,2809,3128,3702,4343,4848,5250,7001,7145,7510,7777,7779,8000,8008,8014,8028,8080,8088,8090,8118,8123,8180,8181,8243,8280,8300,8800,8888,8899,9000,9060,9080,9090,9091,9443,9999,11371,50002,55555]
+
+ # List of ports you want to look for SHELLCODE on.
+ portvar SHELLCODE_PORTS !80
@@ -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,
@@ -35,6 +49,51 @@ reputation preprocessor disabled, still
# config daq_mode: <mode>
# config daq_var: <var>
#
+@@ -198,7 +199,7 @@ config pcre_match_limit_recursion: 1500
+ config detection: search-method ac-split search-optimize max-pattern-len 20
+
+ # Configure the event queue. For more information, see README.event_queue
+-config event_queue: max_queue 8 log 3 order_events content_length
++config event_queue: max_queue 8 log 5 order_events content_length
+
+ ###################################################
+ ## Configure GTP if it is to be used.
+@@ -283,11 +284,11 @@ preprocessor stream5_global: track_tcp yes, \
+ preprocessor stream5_tcp: policy windows, detect_anomalies, require_3whs 180,
\
+ overlap_limit 10, small_segments 3 bytes 150, timeout 180, \
+ ports client 21 22 23 25 42 53 79 109 110 111 113 119 135 136 137 139 143
\
+- 161 445 513 514 587 593 691 1433 1521 2100 3306 6070 6665 6666 6667
6668 6669 \
++ 161 445 513 514 587 593 691 1433 1521 1741 2100 3306 6070 6665 6666
6667 6668 6669 \
+ 7000 8181 32770 32771 32772 32773 32774 32775 32776 32777 32778
32779, \
+- ports both 80 81 311 443 465 563 591 593 636 901 989 992 993 994 995 1220
1414 1830 2301 2381 2809 3128 3702 4343 5250 7907 7001 7145 7510 7802 7777 7779
\
++ ports both 80 81 311 383 443 465 563 591 593 636 901 989 992 993 994 995
1220 1414 1830 2301 2381 2809 3128 3702 4343 4848 5250 7907 7001 7145 7510 7802
7777 7779 \
+ 7801 7900 7901 7902 7903 7904 7905 7906 7908 7909 7910 7911 7912 7913
7914 7915 7916 \
+- 7917 7918 7919 7920 8000 8008 8014 8028 8080 8088 8118 8123 8180 8243
8280 8800 8888 8899 9080 9090 9091 9443 9999 11371 55555
++ 7917 7918 7919 7920 8000 8008 8014 8028 8080 8088 8090 8118 8123 8180
8243 8280 8300 8800 8888 8899 9000 9060 9080 9090 9091 9443 9999 11371 50002
55555
+ preprocessor stream5_udp: timeout 180
+
+ # performance statistics. For more information, see the Snort Manual,
Configuring Snort - Preprocessors - Performance Monitor
+@@ -304,9 +305,9 @@ preprocessor http_inspect_server: server default \
+ oversize_dir_length 500 \
+ max_header_length 750 \
+ max_headers 100 \
+- max_spaces 0 \
++ max_spaces 200 \
+ small_chunk_length { 10 5 } \
+- ports { 80 81 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702
4343 5250 7001 7145 7510 7777 7779 8000 8008 8014 8028 8080 8088 8118 8123 8180
8181 8243 8280 8800 8888 8899 9080 9090 9091 9443 9999 11371 55555 } \
++ ports { 80 81 311 383 591 593 901 1220 1414 1741 1830 2301 2381 2809 3128
3702 4343 4848 5250 7001 7145 7510 7777 7779 8000 8008 8014 8028 8080 8088 8090
8118 8123 8180 8181 8243 8280 8300 8800 8888 8899 9000 9060 9080 9090 9091 9443
9999 11371 50002 55555 } \
+ non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \
+ enable_cookie \
+ extended_response_inspection \
+@@ -334,7 +335,7 @@ preprocessor rpc_decode: 111 32770 32771 32772 32773 3
+ preprocessor bo
+
+ # FTP / Telnet normalization and anomaly detection. For more information,
see README.ftptelnet
+-preprocessor ftp_telnet: global inspection_type stateful encrypted_traffic no
++preprocessor ftp_telnet: global inspection_type stateful encrypted_traffic no
check_encrypted
+ preprocessor ftp_telnet_protocol: telnet \
+ ayt_attack_thresh 20 \
+ normalize ports { 23 } \
@@ -503,12 +504,12 @@ preprocessor dnp3: ports { 20000 } \
check_crc
@@ -54,15 +113,100 @@ reputation preprocessor disabled, still
###################################################
# Step #6: Configure output plugins
-@@ -544,6 +545,7 @@ include reference.config
+@@ -544,40 +545,91 @@ include reference.config
# site specific rules
include $RULE_PATH/local.rules
+# Official Sourcefire VRT rules from http://www.snort.org/snort-rules/
++include $RULE_PATH/app-detect.rules
include $RULE_PATH/attack-responses.rules
include $RULE_PATH/backdoor.rules
include $RULE_PATH/bad-traffic.rules
-@@ -598,6 +600,9 @@ include $RULE_PATH/web-iis.rules
+ include $RULE_PATH/blacklist.rules
+ include $RULE_PATH/botnet-cnc.rules
++include $RULE_PATH/browser-chrome.rules
++include $RULE_PATH/browser-firefox.rules
++include $RULE_PATH/browser-ie.rules
++include $RULE_PATH/browser-other.rules
++include $RULE_PATH/browser-plugins.rules
++include $RULE_PATH/browser-webkit.rules
+ include $RULE_PATH/chat.rules
+ include $RULE_PATH/content-replace.rules
+ include $RULE_PATH/ddos.rules
+ include $RULE_PATH/dns.rules
+ include $RULE_PATH/dos.rules
++include $RULE_PATH/experimental.rules
++include $RULE_PATH/exploit-kit.rules
+ include $RULE_PATH/exploit.rules
++include $RULE_PATH/file-executable.rules
++include $RULE_PATH/file-flash.rules
+ include $RULE_PATH/file-identify.rules
++include $RULE_PATH/file-image.rules
++include $RULE_PATH/file-multimedia.rules
++include $RULE_PATH/file-office.rules
++include $RULE_PATH/file-other.rules
++include $RULE_PATH/file-pdf.rules
+ include $RULE_PATH/finger.rules
+ include $RULE_PATH/ftp.rules
+-include $RULE_PATH/icmp.rules
+ include $RULE_PATH/icmp-info.rules
++include $RULE_PATH/icmp.rules
+ include $RULE_PATH/imap.rules
++include $RULE_PATH/indicator-compromise.rules
++include $RULE_PATH/indicator-obfuscation.rules
++include $RULE_PATH/indicator-shellcode.rules
+ include $RULE_PATH/info.rules
++include $RULE_PATH/malware-backdoor.rules
++include $RULE_PATH/malware-cnc.rules
++include $RULE_PATH/malware-other.rules
++include $RULE_PATH/malware-tools.rules
+ include $RULE_PATH/misc.rules
+ include $RULE_PATH/multimedia.rules
+ include $RULE_PATH/mysql.rules
+ include $RULE_PATH/netbios.rules
+ include $RULE_PATH/nntp.rules
+ include $RULE_PATH/oracle.rules
++include $RULE_PATH/os-linux.rules
++include $RULE_PATH/os-other.rules
++include $RULE_PATH/os-solaris.rules
++include $RULE_PATH/os-windows.rules
+ include $RULE_PATH/other-ids.rules
+ include $RULE_PATH/p2p.rules
+ include $RULE_PATH/phishing-spam.rules
++include $RULE_PATH/policy-multimedia.rules
++include $RULE_PATH/policy-other.rules
+ include $RULE_PATH/policy.rules
++include $RULE_PATH/policy-social.rules
++include $RULE_PATH/policy-spam.rules
+ include $RULE_PATH/pop2.rules
+ include $RULE_PATH/pop3.rules
++include $RULE_PATH/protocol-finger.rules
++include $RULE_PATH/protocol-ftp.rules
++include $RULE_PATH/protocol-icmp.rules
++include $RULE_PATH/protocol-imap.rules
++include $RULE_PATH/protocol-pop.rules
++include $RULE_PATH/protocol-services.rules
++include $RULE_PATH/protocol-voip.rules
++include $RULE_PATH/pua-adware.rules
++include $RULE_PATH/pua-other.rules
++include $RULE_PATH/pua-p2p.rules
++include $RULE_PATH/pua-toolbars.rules
+ include $RULE_PATH/rpc.rules
+ include $RULE_PATH/rservices.rules
+ include $RULE_PATH/scada.rules
+ include $RULE_PATH/scan.rules
++include $RULE_PATH/server-apache.rules
++include $RULE_PATH/server-iis.rules
++include $RULE_PATH/server-mail.rules
++include $RULE_PATH/server-mssql.rules
++include $RULE_PATH/server-mysql.rules
++include $RULE_PATH/server-oracle.rules
++include $RULE_PATH/server-other.rules
++include $RULE_PATH/server-webapp.rules
+ include $RULE_PATH/shellcode.rules
+ include $RULE_PATH/smtp.rules
+ include $RULE_PATH/snmp.rules
+@@ -598,6 +650,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: net/snort/patches/patch-src_decode_h
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_decode_h
--- net/snort/patches/patch-src_decode_h 26 Sep 2012 02:11:05 -0000
1.2
+++ net/snort/patches/patch-src_decode_h 15 Dec 2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_decode_h,v 1.2 2012/09/26 02:11:05 lteo Exp $
---- src/decode.h.orig Wed Jun 6 16:49:28 2012
-+++ src/decode.h Sat Aug 11 18:16:55 2012
-@@ -804,9 +804,9 @@ typedef struct _SLLHdr {
+--- src/decode.h.orig Fri Sep 21 02:09:13 2012
++++ src/decode.h Tue Oct 9 22:18:48 2012
+@@ -806,9 +806,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: net/snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_dynamic-plugins_sf_dynamic_plugins_c
--- net/snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c 26 Sep
2012 02:11:05 -0000 1.6
+++ net/snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c 15 Dec
2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-plugins_sf_dynamic_plugins_c,v 1.6 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-plugins/sf_dynamic_plugins.c.orig Tue Jul 31 16:47:43 2012
-+++ src/dynamic-plugins/sf_dynamic_plugins.c Sat Aug 11 17:32:10 2012
-@@ -252,8 +252,7 @@ void LoadAllLibs(char *path, LoadLibraryFunc loadFunc)
+--- src/dynamic-plugins/sf_dynamic_plugins.c.orig Fri Sep 21 02:09:13 2012
++++ src/dynamic-plugins/sf_dynamic_plugins.c Tue Oct 9 22:18:49 2012
+@@ -253,8 +253,7 @@ void LoadAllLibs(char *path, LoadLibraryFunc loadFunc)
dir_entry = readdir(directory);
while (dir_entry != NULL)
{
Index: net/snort/patches/patch-src_dynamic-plugins_sf_engine_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-plugins_sf_engine_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_dynamic-plugins_sf_engine_Makefile_in
--- net/snort/patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 26 Sep
2012 02:11:05 -0000 1.2
+++ net/snort/patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 15 Dec
2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-plugins_sf_engine_Makefile_in,v 1.2 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-plugins/sf_engine/Makefile.in.orig Tue Jul 31 18:17:12 2012
-+++ src/dynamic-plugins/sf_engine/Makefile.in Sat Aug 11 17:51:39 2012
-@@ -268,7 +268,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-plugins/sf_engine/Makefile.in.orig Thu Nov 15 23:53:01 2012
++++ src/dynamic-plugins/sf_engine/Makefile.in Mon Dec 3 22:17:26 2012
+@@ -263,7 +263,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_engine.la
Index: net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_dynamic-preprocessors_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in 26 Sep
2012 02:11:05 -0000 1.6
+++ net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in 15 Dec
2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.6 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/Makefile.in.orig Tue Jul 31 18:17:13 2012
-+++ src/dynamic-preprocessors/Makefile.in Sat Aug 11 17:32:10 2012
-@@ -989,8 +989,8 @@ maintainer-clean-generic:
+--- src/dynamic-preprocessors/Makefile.in.orig Thu Nov 15 23:53:02 2012
++++ src/dynamic-preprocessors/Makefile.in Mon Dec 3 22:17:26 2012
+@@ -987,8 +987,8 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
@@ -12,7 +12,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
clean: clean-recursive
clean-am: clean-generic clean-libtool clean-local \
-@@ -1297,20 +1297,7 @@ include/sf_seqnums.h: $(top_srcdir)/src/sfutil/sf_seqn
+@@ -1298,20 +1298,7 @@ include/file_lib.h: $(top_srcdir)/src/file-process/lib
clean-local:
rm -rf include build
Index: net/snort/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.3
diff -u -p -r1.3 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
26 Sep 2012 02:11:05 -0000 1.3
+++ net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
15 Dec 2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.3 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Tue Jul 31 18:17:13 2012
-+++ src/dynamic-preprocessors/dcerpc2/Makefile.in Sat Aug 11 17:52:33 2012
-@@ -234,7 +234,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Thu Nov 15 23:53:02 2012
++++ src/dynamic-preprocessors/dcerpc2/Makefile.in Mon Dec 3 22:17:26 2012
+@@ -229,7 +229,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_dce2_preproc.la
@@ -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 \
-@@ -473,7 +473,7 @@ distdir: $(DISTFILES)
+@@ -468,7 +468,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.1
diff -u -p -r1.1 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 26 Sep
2012 02:11:05 -0000 1.1
+++ net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 15 Dec
2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.1 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/dnp3/Makefile.in.orig Tue Jul 31 18:17:13 2012
-+++ src/dynamic-preprocessors/dnp3/Makefile.in Sat Aug 11 17:52:39 2012
-@@ -231,7 +231,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/dnp3/Makefile.in.orig Thu Nov 15 23:53:02 2012
++++ src/dynamic-preprocessors/dnp3/Makefile.in Mon Dec 3 22:17:27 2012
+@@ -226,7 +226,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_dnp3_preproc.la
@@ -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 \
-@@ -439,7 +439,7 @@ distdir: $(DISTFILES)
+@@ -434,7 +434,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.5
diff -u -p -r1.5 patch-src_dynamic-preprocessors_dns_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in 26 Sep
2012 02:11:05 -0000 1.5
+++ net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in 15 Dec
2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.5 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/dns/Makefile.in.orig Tue Jul 31 18:17:13 2012
-+++ src/dynamic-preprocessors/dns/Makefile.in Sat Aug 11 17:52:46 2012
-@@ -229,7 +229,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/dns/Makefile.in.orig Thu Nov 15 23:53:02 2012
++++ src/dynamic-preprocessors/dns/Makefile.in Mon Dec 3 22:17:27 2012
+@@ -224,7 +224,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_dns_preproc.la
@@ -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 \
-@@ -421,7 +421,7 @@ distdir: $(DISTFILES)
+@@ -416,7 +416,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.6
diff -u -p -r1.6 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
26 Sep 2012 02:11:05 -0000 1.6
+++ net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
15 Dec 2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.6
2012/09/26 02:11:05 lteo Exp $
---- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Tue Jul 31
18:17:14 2012
-+++ src/dynamic-preprocessors/ftptelnet/Makefile.in Sat Aug 11 17:52:53 2012
-@@ -236,7 +236,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Thu Nov 15
23:53:02 2012
++++ src/dynamic-preprocessors/ftptelnet/Makefile.in Mon Dec 3 22:17:27 2012
+@@ -231,7 +231,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_ftptelnet_preproc.la
@@ -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 \
-@@ -470,7 +470,7 @@ distdir: $(DISTFILES)
+@@ -465,7 +465,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.1
diff -u -p -r1.1 patch-src_dynamic-preprocessors_gtp_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 26 Sep
2012 02:11:05 -0000 1.1
+++ net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 15 Dec
2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_gtp_Makefile_in,v 1.1 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/gtp/Makefile.in.orig Tue Jul 31 18:17:14 2012
-+++ src/dynamic-preprocessors/gtp/Makefile.in Sat Aug 11 17:53:00 2012
-@@ -230,7 +230,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/gtp/Makefile.in.orig Thu Nov 15 23:53:02 2012
++++ src/dynamic-preprocessors/gtp/Makefile.in Mon Dec 3 22:17:27 2012
+@@ -225,7 +225,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_gtp_preproc.la
@@ -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 \
-@@ -429,7 +429,7 @@ distdir: $(DISTFILES)
+@@ -424,7 +424,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.1
diff -u -p -r1.1 patch-src_dynamic-preprocessors_imap_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in 26 Sep
2012 02:11:05 -0000 1.1
+++ net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in 15 Dec
2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_imap_Makefile_in,v 1.1 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/imap/Makefile.in.orig Tue Jul 31 18:17:14 2012
-+++ src/dynamic-preprocessors/imap/Makefile.in Sat Aug 11 17:53:08 2012
-@@ -233,7 +233,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/imap/Makefile.in.orig Thu Nov 15 23:53:02 2012
++++ src/dynamic-preprocessors/imap/Makefile.in Mon Dec 3 22:17:27 2012
+@@ -228,7 +228,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_imap_preproc.la
@@ -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 \
-@@ -453,7 +453,7 @@ distdir: $(DISTFILES)
+@@ -448,7 +448,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.1
diff -u -p -r1.1 patch-src_dynamic-preprocessors_modbus_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in
26 Sep 2012 02:11:05 -0000 1.1
+++ net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in
15 Dec 2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_modbus_Makefile_in,v 1.1 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/modbus/Makefile.in.orig Tue Jul 31 18:17:15 2012
-+++ src/dynamic-preprocessors/modbus/Makefile.in Sat Aug 11 17:53:18 2012
-@@ -231,7 +231,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/modbus/Makefile.in.orig Thu Nov 15 23:53:03 2012
++++ src/dynamic-preprocessors/modbus/Makefile.in Mon Dec 3 22:17:28 2012
+@@ -226,7 +226,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_modbus_preproc.la
@@ -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 \
-@@ -429,7 +429,7 @@ distdir: $(DISTFILES)
+@@ -424,7 +424,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.1
diff -u -p -r1.1 patch-src_dynamic-preprocessors_pop_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in 26 Sep
2012 02:11:05 -0000 1.1
+++ net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in 15 Dec
2012 18:10:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_pop_Makefile_in,v 1.1 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/pop/Makefile.in.orig Tue Jul 31 18:17:15 2012
-+++ src/dynamic-preprocessors/pop/Makefile.in Sat Aug 11 17:53:26 2012
-@@ -233,7 +233,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/pop/Makefile.in.orig Thu Nov 15 23:53:03 2012
++++ src/dynamic-preprocessors/pop/Makefile.in Mon Dec 3 22:17:28 2012
+@@ -228,7 +228,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_pop_preproc.la
@@ -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 \
-@@ -453,7 +453,7 @@ distdir: $(DISTFILES)
+@@ -448,7 +448,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.1
diff -u -p -r1.1 patch-src_dynamic-preprocessors_reputation_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in
26 Sep 2012 02:11:05 -0000 1.1
+++ net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in
15 Dec 2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_reputation_Makefile_in,v 1.1
2012/09/26 02:11:05 lteo Exp $
---- src/dynamic-preprocessors/reputation/Makefile.in.orig Tue Jul 31
18:17:15 2012
-+++ src/dynamic-preprocessors/reputation/Makefile.in Sat Aug 11 17:53:32 2012
-@@ -248,7 +248,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/reputation/Makefile.in.orig Thu Nov 15
23:53:03 2012
++++ src/dynamic-preprocessors/reputation/Makefile.in Mon Dec 3 22:17:28 2012
+@@ -243,7 +243,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_reputation_preproc.la
@@ -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 \
-@@ -504,7 +504,7 @@ distdir: $(DISTFILES)
+@@ -499,7 +499,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.2
diff -u -p -r1.2 patch-src_dynamic-preprocessors_sdf_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 26 Sep
2012 02:11:05 -0000 1.2
+++ net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 15 Dec
2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.2 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/sdf/Makefile.in.orig Tue Jul 31 18:17:16 2012
-+++ src/dynamic-preprocessors/sdf/Makefile.in Sat Aug 11 17:53:46 2012
-@@ -230,7 +230,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/sdf/Makefile.in.orig Thu Nov 15 23:53:03 2012
++++ src/dynamic-preprocessors/sdf/Makefile.in Mon Dec 3 22:17:28 2012
+@@ -225,7 +225,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_sdf_preproc.la
@@ -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 \
-@@ -430,7 +430,7 @@ distdir: $(DISTFILES)
+@@ -425,7 +425,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.1
diff -u -p -r1.1 patch-src_dynamic-preprocessors_sip_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in 26 Sep
2012 02:11:05 -0000 1.1
+++ net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in 15 Dec
2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_sip_Makefile_in,v 1.1 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/sip/Makefile.in.orig Tue Jul 31 18:17:16 2012
-+++ src/dynamic-preprocessors/sip/Makefile.in Sat Aug 11 17:53:52 2012
-@@ -230,7 +230,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/sip/Makefile.in.orig Thu Nov 15 23:53:03 2012
++++ src/dynamic-preprocessors/sip/Makefile.in Mon Dec 3 22:17:28 2012
+@@ -225,7 +225,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_sip_preproc.la
@@ -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 \
-@@ -437,7 +437,7 @@ distdir: $(DISTFILES)
+@@ -432,7 +432,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.5
diff -u -p -r1.5 patch-src_dynamic-preprocessors_smtp_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 26 Sep
2012 02:11:05 -0000 1.5
+++ net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 15 Dec
2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.5 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/smtp/Makefile.in.orig Tue Jul 31 18:17:17 2012
-+++ src/dynamic-preprocessors/smtp/Makefile.in Sat Aug 11 17:53:59 2012
-@@ -234,7 +234,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/smtp/Makefile.in.orig Thu Nov 15 23:53:03 2012
++++ src/dynamic-preprocessors/smtp/Makefile.in Mon Dec 3 22:17:29 2012
+@@ -229,7 +229,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_smtp_preproc.la
@@ -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 \
-@@ -463,7 +463,7 @@ distdir: $(DISTFILES)
+@@ -458,7 +458,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.4
diff -u -p -r1.4 patch-src_dynamic-preprocessors_ssh_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 26 Sep
2012 02:11:05 -0000 1.4
+++ net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 15 Dec
2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.4 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/ssh/Makefile.in.orig Tue Jul 31 18:17:17 2012
-+++ src/dynamic-preprocessors/ssh/Makefile.in Sat Aug 11 17:54:05 2012
-@@ -229,7 +229,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/ssh/Makefile.in.orig Thu Nov 15 23:53:04 2012
++++ src/dynamic-preprocessors/ssh/Makefile.in Mon Dec 3 22:17:29 2012
+@@ -224,7 +224,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_ssh_preproc.la
@@ -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 \
-@@ -421,7 +421,7 @@ distdir: $(DISTFILES)
+@@ -416,7 +416,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/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.3
diff -u -p -r1.3 patch-src_dynamic-preprocessors_ssl_Makefile_in
--- net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 26 Sep
2012 02:11:05 -0000 1.3
+++ net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 15 Dec
2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.3 2012/09/26
02:11:05 lteo Exp $
---- src/dynamic-preprocessors/ssl/Makefile.in.orig Tue Jul 31 18:17:17 2012
-+++ src/dynamic-preprocessors/ssl/Makefile.in Sat Aug 11 17:54:12 2012
-@@ -229,7 +229,7 @@ top_builddir = @top_builddir@
+--- src/dynamic-preprocessors/ssl/Makefile.in.orig Thu Nov 15 23:53:04 2012
++++ src/dynamic-preprocessors/ssl/Makefile.in Mon Dec 3 22:17:29 2012
+@@ -224,7 +224,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_ssl_preproc.la
@@ -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 \
-@@ -431,7 +431,7 @@ distdir: $(DISTFILES)
+@@ -426,7 +426,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
Index: net/snort/patches/patch-src_log_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_log_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_log_c
--- net/snort/patches/patch-src_log_c 26 Sep 2012 02:11:05 -0000 1.4
+++ net/snort/patches/patch-src_log_c 15 Dec 2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_log_c,v 1.4 2012/09/26 02:11:05 lteo Exp $
---- src/log.c.orig Thu Jan 12 23:11:40 2012
-+++ src/log.c Sat May 26 15:10:20 2012
-@@ -461,7 +461,7 @@ void PrintIPPkt(FILE * fp, int type, Packet * p)
+--- src/log.c.orig Fri Sep 21 02:09:13 2012
++++ src/log.c Tue Oct 9 22:24:01 2012
+@@ -456,7 +456,7 @@ void PrintIPPkt(FILE * fp, int type, Packet * p)
DEBUG_WRAP(DebugMessage(DEBUG_LOG, "PrintIPPkt type = %d\n", type););
bzero((char *) timestamp, TIMEBUF_SIZE);
@@ -10,16 +10,7 @@ $OpenBSD: patch-src_log_c,v 1.4 2012/09/
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
-@@ -1017,7 +1017,7 @@ void PrintArpHeader(FILE * fp, Packet * p)
-
- bzero((struct in_addr *) &ip_addr, sizeof(struct in_addr));
- bzero((char *) timestamp, TIMEBUF_SIZE);
-- ts_print((struct timeval *) & p->pkth->ts, timestamp);
-+ ts_print((struct sf_timeval32 *) & p->pkth->ts, timestamp);
-
- /* determine what to use as MAC src and dst */
- if (p->eh != NULL)
-@@ -2108,7 +2108,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
+@@ -1943,7 +1943,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
bzero((char *) timestamp, TIMEBUF_SIZE);
@@ -28,7 +19,7 @@ $OpenBSD: patch-src_log_c,v 1.4 2012/09/
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
-@@ -2282,7 +2282,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
+@@ -2117,7 +2117,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
bzero((char *) timestamp, TIMEBUF_SIZE);
Index: net/snort/patches/patch-src_log_text_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_log_text_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_log_text_c
--- net/snort/patches/patch-src_log_text_c 26 Sep 2012 02:11:05 -0000
1.4
+++ net/snort/patches/patch-src_log_text_c 15 Dec 2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_log_text_c,v 1.4 2012/09/26 02:11:05 lteo Exp $
---- src/log_text.c.orig Thu Jan 12 23:11:40 2012
-+++ src/log_text.c Sat May 26 15:10:20 2012
-@@ -73,7 +73,7 @@ extern int IsJSNormData(void *);
+--- src/log_text.c.orig Fri Sep 21 02:09:13 2012
++++ src/log_text.c Tue Oct 9 22:18:53 2012
+@@ -71,7 +71,7 @@ extern int IsJSNormData(void *);
void LogTimeStamp(TextLog* log, Packet* p)
{
char timestamp[TIMEBUF_SIZE];
Index: net/snort/patches/patch-src_ppm_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_ppm_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_ppm_c
--- net/snort/patches/patch-src_ppm_c 26 Sep 2012 02:11:05 -0000 1.5
+++ net/snort/patches/patch-src_ppm_c 15 Dec 2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_ppm_c,v 1.5 2012/09/26 02:11:05 lteo Exp $
---- src/ppm.c.orig Wed Jun 6 16:49:28 2012
-+++ src/ppm.c Sat Aug 11 17:32:11 2012
-@@ -408,7 +408,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
+--- src/ppm.c.orig Fri Sep 21 02:09:13 2012
++++ src/ppm.c Tue Oct 9 22:18:53 2012
+@@ -456,7 +456,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
int i;
if(!*timestamp)
@@ -10,8 +10,8 @@ $OpenBSD: patch-src_ppm_c,v 1.5 2012/09/
for (i=0; i< ppm_n_crules; i++)
{
-@@ -456,7 +456,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
- int i;
+@@ -512,7 +512,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)
- ts_print((struct timeval*)&p->pkth->ts, timestamp);
Index: net/snort/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.5
diff -u -p -r1.5 patch-src_preprocessors_Stream5_snort_stream5_tcp_c
--- net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
26 Sep 2012 02:11:05 -0000 1.5
+++ net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
15 Dec 2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.5 2012/09/26
02:11:05 lteo Exp $
---- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Wed Jun 6 16:49:28 2012
-+++ src/preprocessors/Stream5/snort_stream5_tcp.c Sat Aug 11 17:32:11 2012
-@@ -7760,7 +7760,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
+--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Fri Sep 21 02:09:14 2012
++++ src/preprocessors/Stream5/snort_stream5_tcp.c Tue Oct 9 22:18:53 2012
+@@ -7465,7 +7465,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
char src_addr[17];
char dst_addr[17];
bzero((char *)timestamp, TIMEBUF_SIZE);
Index: net/snort/patches/patch-src_preprocessors_spp_sfportscan_c
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_preprocessors_spp_sfportscan_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_preprocessors_spp_sfportscan_c
--- net/snort/patches/patch-src_preprocessors_spp_sfportscan_c 26 Sep 2012
02:11:05 -0000 1.5
+++ net/snort/patches/patch-src_preprocessors_spp_sfportscan_c 15 Dec 2012
18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.5 2012/09/26 02:11:05
lteo Exp $
---- src/preprocessors/spp_sfportscan.c.orig Thu Jan 12 23:11:41 2012
-+++ src/preprocessors/spp_sfportscan.c Sat May 26 15:10:21 2012
-@@ -283,7 +283,7 @@ static int LogPortscanAlert(Packet *p, char *msg, uint
+--- src/preprocessors/spp_sfportscan.c.orig Fri Sep 21 02:09:14 2012
++++ src/preprocessors/spp_sfportscan.c Tue Oct 9 22:18:53 2012
+@@ -272,7 +272,7 @@ static int LogPortscanAlert(Packet *p, char *msg, uint
return 0;
}
Index: net/snort/patches/patch-src_util_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_util_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_util_c
--- net/snort/patches/patch-src_util_c 26 Sep 2012 02:11:05 -0000 1.5
+++ net/snort/patches/patch-src_util_c 15 Dec 2012 18:10:54 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_util_c,v 1.5 2012/09/26 02:11:05 lteo Exp $
---- src/util.c.orig Sat Mar 17 22:59:47 2012
-+++ src/util.c Sat May 26 15:10:21 2012
-@@ -221,12 +221,13 @@ int DisplayBanner(void)
+--- src/util.c.orig Fri Sep 21 02:09:13 2012
++++ src/util.c Tue Oct 9 22:18:54 2012
+@@ -216,12 +216,13 @@ int DisplayBanner(void)
* Returns: void function
*
****************************************************************************/
@@ -16,7 +16,7 @@ $OpenBSD: patch-src_util_c,v 1.5 2012/09
struct timezone tz;
struct tm *lt; /* place to stick the adjusted clock data */
-@@ -236,7 +237,9 @@ void ts_print(register const struct timeval *tvp, char
+@@ -231,7 +232,9 @@ void ts_print(register const struct timeval *tvp, char
/* manual page (for linux) says tz is never used, so.. */
bzero((char *) &tz, sizeof(tz));
gettimeofday(&tv, &tz);
Index: net/snort/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/snort/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST
--- net/snort/pkg/PLIST 11 Oct 2012 02:40:48 -0000 1.22
+++ net/snort/pkg/PLIST 15 Dec 2012 18:10:54 -0000
@@ -82,6 +82,7 @@ share/doc/snort/README.decoder_preproc_r
share/doc/snort/README.dnp3
share/doc/snort/README.dns
share/doc/snort/README.event_queue
+share/doc/snort/README.file
share/doc/snort/README.filters
share/doc/snort/README.flowbits
share/doc/snort/README.frag3
