cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Snort 2.9.6.0, from maintainer Markus Lude.

Browse Source 
Tested on sparc64 by Markus; tested on amd64 and macppc by myself.
This commit is contained in:
lteo 2014-01-30 03:23:48 +00:00
parent 947359f460
commit fe1ba045cb
30 changed files with 132 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/snort/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.83 2013/12/16 03:32:39 lteo Exp $
# $OpenBSD: Makefile,v 1.84 2014/01/30 03:23:48 lteo Exp $
SHARED_ONLY = Yes
COMMENT = highly flexible sniffer/NIDS
VERSION = 2.9.5.6
VERSION = 2.9.6.0
DISTNAME = snort-${VERSION}
CATEGORIES = net security

4
net/snort/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (snort-2.9.5.6.tar.gz) = ae0JB3wfoiaPgUyO/25hO3/oh2oTjfHNZXnP+7dH21U=
SIZE (snort-2.9.5.6.tar.gz) = 5049188
SHA256 (snort-2.9.6.0.tar.gz) = PMbIqbUvTIY6VzanO0ASr/NAtQteACdxsE1Id/R80Z4=
SIZE (snort-2.9.6.0.tar.gz) = 5189146

8
net/snort/patches/patch-src_decode_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_decode_h,v 1.5 2013/08/21 02:28:43 lteo Exp $
--- 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 {
$OpenBSD: patch-src_decode_h,v 1.6 2014/01/30 03:23:48 lteo Exp $
--- src/decode.h.orig Tue Dec 31 17:07:53 2013
+++ src/decode.h Thu Jan 23 23:02:17 2014
@@ -814,9 +814,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

8
net/snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-plugins_sf_dynamic_plugins_c,v 1.8 2013/07/10 02:10:22 lteo Exp $
--- src/dynamic-plugins/sf_dynamic_plugins.c.orig Tue Jun 4 23:19:52 2013
+++ src/dynamic-plugins/sf_dynamic_plugins.c Mon Jul 1 23:00:39 2013
@@ -256,8 +256,7 @@ void LoadAllLibs(const char * const path, LoadLibraryF
$OpenBSD: patch-src_dynamic-plugins_sf_dynamic_plugins_c,v 1.9 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-plugins/sf_dynamic_plugins.c.orig Tue Dec 31 17:07:54 2013
+++ src/dynamic-plugins/sf_dynamic_plugins.c Thu Jan 23 23:02:17 2014
@@ -257,8 +257,7 @@ void LoadAllLibs(const char * const path, LoadLibraryF
dir_entry = readdir(directory);
while (dir_entry != NULL)
{

8
net/snort/patches/patch-src_dynamic-plugins_sf_engine_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-plugins_sf_engine_Makefile_in,v 1.6 2013/05/31 20:26:01 lteo Exp $
--- src/dynamic-plugins/sf_engine/Makefile.in.orig Mon Apr 15 15:57:46 2013
+++ src/dynamic-plugins/sf_engine/Makefile.in Wed Apr 24 14:51:57 2013
@@ -296,7 +296,7 @@ top_builddir = @top_builddir@
$OpenBSD: patch-src_dynamic-plugins_sf_engine_Makefile_in,v 1.7 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-plugins/sf_engine/Makefile.in.orig Tue Dec 31 19:30:40 2013
+++ src/dynamic-plugins/sf_engine/Makefile.in Thu Jan 23 23:02:17 2014
@@ -371,7 +371,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
lib_LTLIBRARIES = libsf_engine.la

8
net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.12 2013/08/21 02:28:43 lteo Exp $
--- 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:
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.13 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/Makefile.in.orig Tue Dec 31 19:30:41 2013
+++ src/dynamic-preprocessors/Makefile.in Thu Jan 23 23:02:17 2014
@@ -1368,19 +1368,8 @@ clean-local:
rm -rf include build
install-data-local:

10
net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.8 2013/08/21 02:28:43 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.9 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Tue Dec 31 19:30:41 2013
+++ src/dynamic-preprocessors/dcerpc2/Makefile.in Thu Jan 23 23:02:17 2014
@@ -333,7 +333,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.8 2013/08/21 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 \
@@ -518,7 +518,7 @@ distdir: $(DISTFILES)
@@ -577,7 +577,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.6 2013/08/21 02:28:43 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.7 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/dnp3/Makefile.in.orig Tue Dec 31 19:30:41 2013
+++ src/dynamic-preprocessors/dnp3/Makefile.in Thu Jan 23 23:02:18 2014
@@ -330,7 +330,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.6 2013/08/21 02:2
@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 \
@@ -484,7 +484,7 @@ distdir: $(DISTFILES)
@@ -543,7 +543,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.10 2013/08/21 02:28:43 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.11 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/dns/Makefile.in.orig Tue Dec 31 19:30:41 2013
+++ src/dynamic-preprocessors/dns/Makefile.in Thu Jan 23 23:02:18 2014
@@ -328,7 +328,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.10 2013/08/21 02:2
@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 \
@@ -466,7 +466,7 @@ distdir: $(DISTFILES)
@@ -525,7 +525,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.11 2013/08/21 02:28:44 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.12 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Tue Dec 31 19:30:41 2013
+++ src/dynamic-preprocessors/ftptelnet/Makefile.in Thu Jan 23 23:02:18 2014
@@ -334,7 +334,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.11 2013/08/2
@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 \
@@ -515,7 +515,7 @@ distdir: $(DISTFILES)
@@ -573,7 +573,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_gtp_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_gtp_Makefile_in,v 1.7 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/gtp/Makefile.in.orig Tue Dec 31 19:30:42 2013
+++ src/dynamic-preprocessors/gtp/Makefile.in Thu Jan 23 23:02:18 2014
@@ -329,7 +329,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.6 2013/08/21 02:28
@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 \
@@ -474,7 +474,7 @@ distdir: $(DISTFILES)
@@ -533,7 +533,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_imap_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_imap_Makefile_in,v 1.7 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/imap/Makefile.in.orig Tue Dec 31 19:30:42 2013
+++ src/dynamic-preprocessors/imap/Makefile.in Thu Jan 23 23:02:18 2014
@@ -332,7 +332,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.6 2013/08/21 02:2
@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 \
@@ -498,7 +498,7 @@ distdir: $(DISTFILES)
@@ -557,7 +557,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_modbus_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_modbus_Makefile_in,v 1.7 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/modbus/Makefile.in.orig Tue Dec 31 19:30:42 2013
+++ src/dynamic-preprocessors/modbus/Makefile.in Thu Jan 23 23:02:18 2014
@@ -330,7 +330,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.6 2013/08/21 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 \
@@ -474,7 +474,7 @@ distdir: $(DISTFILES)
@@ -533,7 +533,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_pop_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_pop_Makefile_in,v 1.7 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/pop/Makefile.in.orig Tue Dec 31 19:30:42 2013
+++ src/dynamic-preprocessors/pop/Makefile.in Thu Jan 23 23:02:18 2014
@@ -332,7 +332,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.6 2013/08/21 02:28
@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 \
@@ -498,7 +498,7 @@ distdir: $(DISTFILES)
@@ -557,7 +557,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_reputation_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_reputation_Makefile_in,v 1.7 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/reputation/Makefile.in.orig Tue Dec 31 19:30:42 2013
+++ src/dynamic-preprocessors/reputation/Makefile.in Thu Jan 23 23:02:19 2014
@@ -346,7 +346,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.6 2013/08/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 \
@@ -549,7 +549,7 @@ distdir: $(DISTFILES)
@@ -607,7 +607,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.7 2013/08/21 02:28:44 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.8 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/sdf/Makefile.in.orig Tue Dec 31 19:30:43 2013
+++ src/dynamic-preprocessors/sdf/Makefile.in Thu Jan 23 23:02:19 2014
@@ -329,7 +329,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.7 2013/08/21 02:28
@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 \
@@ -475,7 +475,7 @@ distdir: $(DISTFILES)
@@ -534,7 +534,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_sip_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_sip_Makefile_in,v 1.7 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/sip/Makefile.in.orig Tue Dec 31 19:30:43 2013
+++ src/dynamic-preprocessors/sip/Makefile.in Thu Jan 23 23:02:19 2014
@@ -329,7 +329,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.6 2013/08/21 02:28
@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 \
@@ -482,7 +482,7 @@ distdir: $(DISTFILES)
@@ -541,7 +541,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.10 2013/08/21 02:28:45 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.11 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/smtp/Makefile.in.orig Tue Dec 31 19:30:43 2013
+++ src/dynamic-preprocessors/smtp/Makefile.in Thu Jan 23 23:02:19 2014
@@ -333,7 +333,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.10 2013/08/21 02:
@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 \
@@ -508,7 +508,7 @@ distdir: $(DISTFILES)
@@ -567,7 +567,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.9 2013/08/21 02:28:45 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.10 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/ssh/Makefile.in.orig Tue Dec 31 19:30:43 2013
+++ src/dynamic-preprocessors/ssh/Makefile.in Thu Jan 23 23:02:19 2014
@@ -328,7 +328,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.9 2013/08/21 02:28
@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 \
@@ -466,7 +466,7 @@ distdir: $(DISTFILES)
@@ -525,7 +525,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

10
net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.8 2013/08/21 02:28:45 lteo Exp $
--- 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@
$OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.9 2014/01/30 03:23:48 lteo Exp $
--- src/dynamic-preprocessors/ssl/Makefile.in.orig Tue Dec 31 19:30:43 2013
+++ src/dynamic-preprocessors/ssl/Makefile.in Thu Jan 23 23:02:19 2014
@@ -328,7 +328,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.8 2013/08/21 02:28
@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 \
@@ -476,7 +476,7 @@ distdir: $(DISTFILES)
@@ -535,7 +535,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am

18
net/snort/patches/patch-src_log_c
View File

@ -1,28 +1,28 @@
$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)
$OpenBSD: patch-src_log_c,v 1.6 2014/01/30 03:23:48 lteo Exp $
--- src/log.c.orig Tue Dec 31 17:07:53 2013
+++ src/log.c Thu Jan 23 23:07:23 2014
@@ -457,7 +457,7 @@ void PrintIPPkt(FILE * fp, int type, Packet * p)
DEBUG_WRAP(DebugMessage(DEBUG_LOG, "PrintIPPkt type = %d\n", type););
bzero((char *) timestamp, TIMEBUF_SIZE);
memset((char *) timestamp, 0, TIMEBUF_SIZE);
- ts_print((struct timeval *) & p->pkth->ts, timestamp);
+ ts_print((struct sf_timeval32 *) & p->pkth->ts, timestamp);
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
@@ -1943,7 +1943,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
@@ -1944,7 +1944,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
bzero((char *) timestamp, TIMEBUF_SIZE);
memset((char *) timestamp, 0, TIMEBUF_SIZE);
- ts_print((struct timeval *) & p->pkth->ts, timestamp);
+ ts_print((struct sf_timeval32 *) & p->pkth->ts, timestamp);
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
@@ -2117,7 +2117,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
@@ -2118,7 +2118,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
bzero((char *) timestamp, TIMEBUF_SIZE);
memset((char *) timestamp, 0, TIMEBUF_SIZE);
- ts_print((struct timeval *) & p->pkth->ts, timestamp);
+ ts_print((struct sf_timeval32 *) & p->pkth->ts, timestamp);

8
net/snort/patches/patch-src_log_text_c
View File

@ -1,7 +1,7 @@
$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 *);
$OpenBSD: patch-src_log_text_c,v 1.6 2014/01/30 03:23:48 lteo Exp $
--- src/log_text.c.orig Tue Dec 31 17:07:53 2013
+++ src/log_text.c Thu Jan 23 23:02:20 2014
@@ -72,7 +72,7 @@ extern int IsJSNormData(void *);
void LogTimeStamp(TextLog* log, Packet* p)
{
char timestamp[TIMEBUF_SIZE];

10
net/snort/patches/patch-src_ppm_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_ppm_c,v 1.8 2013/08/21 02:28:45 lteo Exp $
--- 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,
$OpenBSD: patch-src_ppm_c,v 1.9 2014/01/30 03:23:48 lteo Exp $
--- src/ppm.c.orig Tue Dec 31 17:07:53 2013
+++ src/ppm.c Thu Jan 23 23:02:20 2014
@@ -510,7 +510,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.8 2013/08/21 02:28:45 lteo Exp $
for (i=0; i< ppm_n_crules; i++)
{
@@ -588,7 +588,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
@@ -589,7 +589,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)

10
net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.11 2013/12/16 03:32:39 lteo Exp $
--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Fri Sep 27 17:37:54 2013
+++ src/preprocessors/Stream5/snort_stream5_tcp.c Wed Nov 20 20:07:03 2013
@@ -7505,7 +7505,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.12 2014/01/30 03:23:48 lteo Exp $
--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Tue Dec 31 17:07:55 2013
+++ src/preprocessors/Stream5/snort_stream5_tcp.c Thu Jan 23 23:04:06 2014
@@ -7585,7 +7585,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
char src_addr[17];
char dst_addr[17];
bzero((char *)timestamp, TIMEBUF_SIZE);
memset((char *)timestamp, 0, TIMEBUF_SIZE);
- ts_print((struct timeval *) &p->pkth->ts, timestamp);
+ ts_print((struct sf_timeval32 *) &p->pkth->ts, timestamp);
SnortSnprintf(src_addr, 17, "%s",

8
net/snort/patches/patch-src_preprocessors_spp_sfportscan_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.8 2013/08/21 02:28:45 lteo Exp $
--- 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
$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.9 2014/01/30 03:23:48 lteo Exp $
--- src/preprocessors/spp_sfportscan.c.orig Tue Dec 31 17:07:55 2013
+++ src/preprocessors/spp_sfportscan.c Thu Jan 23 23:02:20 2014
@@ -273,7 +273,7 @@ static int LogPortscanAlert(Packet *p, char *msg, uint
return 0;
}

49
net/snort/patches/patch-src_sfutil_sfxhash_c
View File

@ -1,49 +0,0 @@
$OpenBSD: patch-src_sfutil_sfxhash_c,v 1.1 2013/12/16 03:32:39 lteo Exp $
fix crashes on archs with strict memory alignment, at least sparc64
patch from Bhagya Bantwal from Sourcefire, Thanks!
--- src/sfutil/sfxhash.c.orig Tue Jun 4 23:19:53 2013
+++ src/sfutil/sfxhash.c Tue Dec 3 22:27:24 2013
@@ -235,6 +235,13 @@ SFXHASH * sfxhash_new( int nrows, int keysize, int dat
h->anrfree = anrfree;
h->usrfree = usrfree;
h->keysize = keysize;
+
+#ifdef WORDS_MUSTALIGN
+ if ((h->keysize) & 7)
+ h->pad = (8 - ((h->keysize) & 7));
+#else
+ h->pad = 0;
+#endif
h->datasize = datasize;
h->nrows = nrows;
h->max_nodes = 0;
@@ -579,7 +586,7 @@ SFXHASH_NODE * sfxhash_newnode( SFXHASH * t )
{
if ((t->max_nodes == 0) || (t->count < t->max_nodes))
{
- hnode = (SFXHASH_NODE*)s_alloc( t, sizeof(SFXHASH_NODE) +
+ hnode = (SFXHASH_NODE*)s_alloc( t, sizeof(SFXHASH_NODE) + t->pad +
t->keysize + t->datasize );
}
}
@@ -727,7 +734,7 @@ int sfxhash_add( SFXHASH * t, void * key, void * data
if( t->datasize )
{
/* Set up the new data pointer */
- hnode->data= (char*)hnode + sizeof(SFXHASH_NODE) + t->keysize;
+ hnode->data= (char*)hnode + sizeof(SFXHASH_NODE) + t->pad + t->keysize;
if(data)
{
@@ -806,7 +813,7 @@ SFXHASH_NODE * sfxhash_get_node( SFXHASH * t, const vo
if( t->datasize )
{
/* Set up the new data pointer */
- hnode->data= (char*)hnode + sizeof(SFXHASH_NODE) + t->keysize;
+ hnode->data= (char*)hnode + sizeof(SFXHASH_NODE) + t->pad + t->keysize;
}
else
{

16
net/snort/patches/patch-src_sfutil_sfxhash_h
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_sfutil_sfxhash_h,v 1.1 2013/12/16 03:32:39 lteo Exp $
fix crashes on archs with strict memory alignment, at least sparc64
patch from Bhagya Bantwal from Sourcefire, Thanks!
--- src/sfutil/sfxhash.h.orig Tue Dec 3 22:27:32 2013
+++ src/sfutil/sfxhash.h Tue Dec 3 22:27:59 2013
@@ -75,6 +75,7 @@ typedef struct _sfxhash
unsigned count; /// total # nodes in table
unsigned crow; /// findfirst/next row in table
+ unsigned pad;
SFXHASH_NODE * cnode; /// findfirst/next node ptr
int splay; /// whether to splay nodes with same hash bucket

12
net/snort/patches/patch-src_util_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_util_c,v 1.7 2013/07/10 02:10:22 lteo Exp $
--- src/util.c.orig Tue Jun 4 23:19:52 2013
+++ src/util.c Mon Jul 1 23:00:43 2013
@@ -226,12 +226,13 @@ int DisplayBanner(void)
$OpenBSD: patch-src_util_c,v 1.8 2014/01/30 03:23:48 lteo Exp $
--- src/util.c.orig Tue Dec 31 17:07:54 2013
+++ src/util.c Thu Jan 23 23:02:21 2014
@@ -233,12 +233,13 @@ int DisplayBanner(void)
* Returns: void function
*
****************************************************************************/
@ -16,9 +16,9 @@ $OpenBSD: patch-src_util_c,v 1.7 2013/07/10 02:10:22 lteo Exp $
struct timezone tz;
struct tm *lt; /* place to stick the adjusted clock data */
@@ -241,7 +242,9 @@ void ts_print(register const struct timeval *tvp, char
@@ -248,7 +249,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));
memset((char *) &tz, 0, sizeof(tz));
gettimeofday(&tv, &tz);
- tvp = &tv;
+ tvnow.tv_sec = tv.tv_sec;

10
net/snort/patches/patch-src_util_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_util_h,v 1.6 2013/08/21 02:28:45 lteo Exp $
--- 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 @@
$OpenBSD: patch-src_util_h,v 1.7 2014/01/30 03:23:48 lteo Exp $
--- src/util.h.orig Tue Dec 31 17:07:54 2013
+++ src/util.h Thu Jan 23 23:02:21 2014
@@ -50,6 +50,7 @@
#include "sflsq.h"
#include "sfutil/sf_ipvar.h"
#include "ipv6_port.h"
@ -9,7 +9,7 @@ $OpenBSD: patch-src_util_h,v 1.6 2013/08/21 02:28:45 lteo Exp $
/* Macros *********************************************************************/
@@ -160,7 +161,7 @@ typedef struct _IntervalStats
@@ -161,7 +162,7 @@ typedef struct _IntervalStats
void StoreSnortInfoStrings(void);
int DisplayBanner(void);
int gmt2local(time_t);

5
net/snort/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.26 2013/09/24 02:35:23 lteo Exp $
@comment $OpenBSD: PLIST,v 1.27 2014/01/30 03:23:48 lteo Exp $
@pkgpath net/snort[,flexresp][,mysql][,prelude][,postgresql]
@newgroup _snort:557
@newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
@ -82,11 +82,14 @@ 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.file_ips
share/doc/snort/README.filters
share/doc/snort/README.flowbits
share/doc/snort/README.frag3
share/doc/snort/README.ftptelnet
share/doc/snort/README.gre
share/doc/snort/README.ha
share/doc/snort/README.http_inspect
share/doc/snort/README.imap
share/doc/snort/README.ipip