Update to Snort 2.9.4.0, from Markus Lude (maintainer).

Notable changes:

* Consolidation of IPv6 -- now only a single build supports both
  IPv4 & IPv6, and removal of the IPv4 "only" code paths.
* File API and improvements to file processing for HTTP downloads
  and email attachments via SMTP, POP, and IMAP to facilitate
  broader file support
* Use of address space ID for tracking Frag & Stream connections
  when it is available with the DAQ
* Logging of packet data that triggers PPM for post-analysis via
  Snort event
* Decoding of IPv6 with PPPoE

This commit also includes a patch to snort.conf that was done by myself
with feedback from Markus.  The snort.conf patch ensures that Snort will
load the latest Snort ruleset since the rule files have been reorganized
by upstream.  It also excludes local.rules by default, since rule
managers like Oinkmaster skip that file when downloading rules.

Tested by Markus on i386 and sparc64, Rodolfo Gouveia on 5.2/amd64 with
his own snort.conf, and myself on amd64 and i386.

OK sthen@
This commit is contained in:
lteo 2013-01-16 04:52:53 +00:00
parent 9d63b08c10
commit e1048a5d4e
28 changed files with 222 additions and 140 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.72 2012/10/25 19:52:16 naddy Exp $
# $OpenBSD: Makefile,v 1.73 2013/01/16 04:52:53 lteo Exp $
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 \

View File

@ -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

View File

@ -1,9 +1,12 @@
$OpenBSD: patch-etc_snort_conf,v 1.7 2012/10/11 02:40:48 lteo Exp $
$OpenBSD: patch-etc_snort_conf,v 1.8 2013/01/16 04:52:53 lteo Exp $
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
load the new Snort rule files since they have been reorganized:
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 Thu Jan 10 23:43:15 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,
@ -54,15 +57,103 @@ reputation preprocessor disabled, still experimental
###################################################
# Step #6: Configure output plugins
@@ -544,6 +545,7 @@ include reference.config
@@ -542,42 +543,93 @@ include reference.config
###################################################
# site specific rules
include $RULE_PATH/local.rules
-include $RULE_PATH/local.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

View File

@ -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 {
$OpenBSD: patch-src_decode_h,v 1.3 2013/01/16 04:52:53 lteo Exp $
--- 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

View File

@ -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)
$OpenBSD: patch-src_dynamic-plugins_sf_dynamic_plugins_c,v 1.7 2013/01/16 04:52:53 lteo Exp $
--- 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)
{

View File

@ -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@
$OpenBSD: patch-src_dynamic-plugins_sf_engine_Makefile_in,v 1.3 2013/01/16 04:52:53 lteo Exp $
--- 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

View File

@ -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:
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.7 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_Makefile_in,v 1.6 2012/09/26 02:11:05
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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.4 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_dcerpc2_Makefile_in,v 1.3 2012/09/26 0
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.2 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_dnp3_Makefile_in,v 1.1 2012/09/26 02:1
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.6 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_dns_Makefile_in,v 1.5 2012/09/26 02:11
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.7 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_ftptelnet_Makefile_in,v 1.6 2012/09/26
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_gtp_Makefile_in,v 1.2 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_gtp_Makefile_in,v 1.1 2012/09/26 02:11
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_imap_Makefile_in,v 1.2 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_imap_Makefile_in,v 1.1 2012/09/26 02:1
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_modbus_Makefile_in,v 1.2 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_modbus_Makefile_in,v 1.1 2012/09/26 02
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_pop_Makefile_in,v 1.2 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_pop_Makefile_in,v 1.1 2012/09/26 02:11
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_reputation_Makefile_in,v 1.2 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_reputation_Makefile_in,v 1.1 2012/09/2
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.3 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_sdf_Makefile_in,v 1.2 2012/09/26 02:11
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_sip_Makefile_in,v 1.2 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_sip_Makefile_in,v 1.1 2012/09/26 02:11
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.6 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_smtp_Makefile_in,v 1.5 2012/09/26 02:1
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.5 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_ssh_Makefile_in,v 1.4 2012/09/26 02:11
@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

View File

@ -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@
$OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.4 2013/01/16 04:52:53 lteo Exp $
--- 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-preprocessors_ssl_Makefile_in,v 1.3 2012/09/26 02:11
@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

View File

@ -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)
$OpenBSD: patch-src_log_c,v 1.5 2013/01/16 04:52:53 lteo Exp $
--- 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/26 02:11:05 lteo Exp $
/* 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/26 02:11:05 lteo Exp $
/* 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);

View File

@ -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 *);
$OpenBSD: patch-src_log_text_c,v 1.5 2013/01/16 04:52:53 lteo Exp $
--- 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];

View File

@ -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,
$OpenBSD: patch-src_ppm_c,v 1.6 2013/01/16 04:52:53 lteo Exp $
--- 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/26 02:11:05 lteo Exp $
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);

View File

@ -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
$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.6 2013/01/16 04:52:53 lteo Exp $
--- 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);

View File

@ -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
$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.6 2013/01/16 04:52:53 lteo Exp $
--- 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;
}

View File

@ -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)
$OpenBSD: patch-src_util_c,v 1.6 2013/01/16 04:52:53 lteo Exp $
--- 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/26 02:11:05 lteo Exp $
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);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.22 2012/10/11 02:40:48 lteo Exp $
@comment $OpenBSD: PLIST,v 1.23 2013/01/16 04:52:53 lteo Exp $
@pkgpath net/snort[,flexresp][,mysql][,prelude][,postgresql]
@newgroup _snort:557
@newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
@ -82,6 +82,7 @@ share/doc/snort/README.decoder_preproc_rules
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