On Thu, Jan 08, 2015 at 11:37:16PM -0500, Lawrence Teo wrote:
> This updates Snort to 2.9.7.0.
>
> Tested with DAQ 2.0.4 (sent earlier) on amd64.
>
> ok?
your tree is/was not up-to-date.
for example the in-tree version of Makefile is r1.88 and the in-tree
version of the snort package is at 2.9.6.2p0...
a patch for src/preprocessors/Stream6/snort_stream_tcp.c is missing. All
other ts_print calls were patched for the first parameter.
attached is a diff which works for me on i386.
Regards,
Markus
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/snort/Makefile,v
> retrieving revision 1.86
> diff -u -p -r1.86 Makefile
> --- Makefile 4 Jun 2014 03:17:12 -0000 1.86
> +++ Makefile 24 Dec 2014 20:19:16 -0000
> @@ -4,9 +4,8 @@ SHARED_ONLY = Yes
>
> COMMENT = highly flexible sniffer/NIDS
>
> -VERSION = 2.9.6.1
> +VERSION = 2.9.7.0
> DISTNAME = snort-${VERSION}
> -REVISION = 0
>
> CATEGORIES = net security
>
> @@ -19,7 +18,7 @@ PERMIT_PACKAGE_CDROM = Yes
>
> WANTLIB = c crypto daq dnet m pcap pcre pthread z
>
> -MASTER_SITES = http://www.snort.org/dl/snort-current/
> +MASTER_SITES = https://www.snort.org/downloads/snort/
>
> USE_GROFF = Yes
>
the second hunk is already in-tree
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/snort/distinfo,v
> retrieving revision 1.30
> diff -u -p -r1.30 distinfo
> --- distinfo 15 May 2014 20:11:43 -0000 1.30
> +++ distinfo 24 Dec 2014 20:44:30 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (snort-2.9.6.1.tar.gz) = EZ5MXfg/42qNRl5yoDR/4x53cXBNoobwQRWwxbql97g=
> -SIZE (snort-2.9.6.1.tar.gz) = 5226869
> +SHA256 (snort-2.9.7.0.tar.gz) = lziv6kXSC393mXzAAFXn3XD2rqAQEgnYfv7EvE6s5Js=
> +SIZE (snort-2.9.7.0.tar.gz) = 6340553
> Index: patches/patch-etc_snort_conf
> ===================================================================
> RCS file: /cvs/ports/net/snort/patches/patch-etc_snort_conf,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-etc_snort_conf
> --- patches/patch-etc_snort_conf 4 Jun 2014 03:17:12 -0000 1.12
> +++ patches/patch-etc_snort_conf 24 Dec 2014 21:22:01 -0000
> @@ -2,9 +2,9 @@ $OpenBSD: patch-etc_snort_conf,v 1.12 20
>
> reputation preprocessor disabled, still experimental
>
> ---- etc/snort.conf.orig Thu Apr 3 17:25:10 2014
> -+++ etc/snort.conf Mon Jun 2 00:13:35 2014
> -@@ -101,13 +101,13 @@ ipvar AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.1
> +--- etc/snort.conf.orig Mon Oct 13 11:44:08 2014
> ++++ etc/snort.conf Wed Dec 24 16:21:36 2014
> +@@ -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,
> # such as: c:\snort\rules
> @@ -16,6 +16,10 @@ reputation preprocessor disabled, still
> +var PREPROC_RULE_PATH ${SYSCONFDIR}/snort/preproc_rules
>
> # If you are using reputation preprocessor set these
> + # Currently there is a bug with relative paths, they are relative to where
> snort is
> + # not relative to snort.conf like the above variables
> + # This is completely inconsistent with how other vars work, BUG 89986
> + # Set the absolute path appropriately
> -var WHITE_LIST_PATH ../rules
> -var BLACK_LIST_PATH ../rules
> +var WHITE_LIST_PATH ${SYSCONFDIR}/snort/rules
> @@ -23,7 +27,7 @@ reputation preprocessor disabled, still
>
> ###################################################
> # Step #2: Configure the decoder. For more information, see README.decode
> -@@ -138,7 +138,11 @@ config disable_ipopt_alerts
> +@@ -142,7 +142,11 @@ config disable_ipopt_alerts
> # config enable_decode_oversized_drops
>
> # Configure IP / TCP checksum mode
> @@ -36,15 +40,16 @@ reputation preprocessor disabled, still
>
> # Configure maximum number of flowbit references. For more information,
> see README.flowbits
> # config flowbits_size: 64
> -@@ -154,6 +158,7 @@ config checksum_mode: all
> +@@ -157,7 +161,7 @@ config checksum_mode: all
> + # Configure DAQ related options for inline operation. For more information,
> see README.daq
> #
> # config daq: <type>
> - # config daq_dir: <dir>
> +-# config daq_dir: <dir>
> +config daq_dir: ${PREFIX}/lib/daq/
> # config daq_mode: <mode>
> # config daq_var: <var>
> #
> -@@ -499,12 +504,12 @@ preprocessor dnp3: ports { 20000 } \
> +@@ -503,12 +507,12 @@ preprocessor dnp3: ports { 20000 } \
> check_crc
>
> # Reputation preprocessor. For more information see README.reputation
> @@ -63,18 +68,19 @@ reputation preprocessor disabled, still
>
> ###################################################
> # Step #6: Configure output plugins
> -@@ -538,8 +543,9 @@ include reference.config
> +@@ -542,8 +546,10 @@ include reference.config
> ###################################################
>
> # site specific rules
> -include $RULE_PATH/local.rules
> +#include $RULE_PATH/local.rules
>
> -+# Official Sourcefire VRT rules from http://www.snort.org/snort-rules/
> ++# Official Sourcefire VRT rules from
> ++# https://www.snort.org/downloads/#rule-downloads
> include $RULE_PATH/app-detect.rules
> include $RULE_PATH/attack-responses.rules
> include $RULE_PATH/backdoor.rules
> -@@ -655,6 +661,9 @@ include $RULE_PATH/web-iis.rules
> +@@ -648,6 +654,9 @@ include $RULE_PATH/web-iis.rules
> include $RULE_PATH/web-misc.rules
> include $RULE_PATH/web-php.rules
> include $RULE_PATH/x11.rules
> Index: patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
> ===================================================================
> RCS file: patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
> diff -N patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
> --- patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c 30 Jan 2014
> 03:23:48 -0000 1.9
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$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)
> - {
> -- if ((dir_entry->d_reclen != 0) &&
> -- (fnmatch(MODULE_EXT, dir_entry->d_name, FNM_PATHNAME |
> FNM_PERIOD) == 0))
> -+ if (fnmatch(MODULE_EXT, dir_entry->d_name, FNM_PATHNAME |
> FNM_PERIOD) == 0)
> - {
> - /* Get the string up until the first dot. This will be
> - * considered the file prefix. */
> Index: 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.7
> diff -u -p -r1.7 patch-src_dynamic-plugins_sf_engine_Makefile_in
> --- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.7
> +++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,12 +1,12 @@
> $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@
> +--- src/dynamic-plugins/sf_engine/Makefile.in.orig Mon Oct 13 11:43:44 2014
> ++++ src/dynamic-plugins/sf_engine/Makefile.in Tue Dec 16 16:27:19 2014
> +@@ -377,7 +377,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_engine.la
> + dynamicengine_LTLIBRARIES = libsf_engine.la
> + dynamicenginedir = $(libdir)/snort_dynamicengine
> -libsf_engine_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_engine_la_LDFLAGS = -export-dynamic -module -avoid-version @XCCFLAGS@
> - BUILT_SOURCES = \
> - sfhashfcn.c \
> - sfhashfcn.h \
> + @BUILD_OPENSSL_MD5_TRUE@OPENSSL_MD5 = \
> + @BUILD_OPENSSL_MD5_TRUE@ md5.c md5.h
> +
> Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v
> retrieving revision 1.9
> diff -u -p -r1.9 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 30 Jan
> 2014 03:23:48 -0000 1.9
> +++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 24 Dec
> 2014 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Mon Oct 13
> 11:43:44 2014
> ++++ src/dynamic-preprocessors/dcerpc2/Makefile.in Tue Dec 16 16:28:21 2014
> +@@ -336,7 +336,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_dce2_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_dce2_preproc.la
> -libsf_dce2_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_dce2_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -577,7 +577,7 @@ distdir: $(DISTFILES)
> +@@ -580,7 +580,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-src_dynamic-preprocessors_dnp3_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.7
> +++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/dnp3/Makefile.in.orig Mon Oct 13 11:43:44 2014
> ++++ src/dynamic-preprocessors/dnp3/Makefile.in Tue Dec 16 16:29:02 2014
> +@@ -333,7 +333,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_dnp3_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_dnp3_preproc.la
> -libsf_dnp3_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_dnp3_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -543,7 +543,7 @@ distdir: $(DISTFILES)
> +@@ -546,7 +546,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_dns_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in,v
> retrieving revision 1.11
> diff -u -p -r1.11 patch-src_dynamic-preprocessors_dns_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_dns_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.11
> +++ patches/patch-src_dynamic-preprocessors_dns_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/dns/Makefile.in.orig Mon Oct 13 11:43:44 2014
> ++++ src/dynamic-preprocessors/dns/Makefile.in Tue Dec 16 16:29:33 2014
> +@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_dns_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_dns_preproc.la
> -libsf_dns_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_dns_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -525,7 +525,7 @@ distdir: $(DISTFILES)
> +@@ -528,7 +528,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 30 Jan
> 2014 03:23:48 -0000 1.12
> +++ patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 24 Dec
> 2014 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Mon Oct 13
> 11:43:45 2014
> ++++ src/dynamic-preprocessors/ftptelnet/Makefile.in Tue Dec 16 16:31:35 2014
> +@@ -339,7 +339,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_ftptelnet_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_ftptelnet_preproc.la
> -libsf_ftptelnet_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_ftptelnet_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -573,7 +573,7 @@ distdir: $(DISTFILES)
> +@@ -594,7 +594,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_gtp_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-src_dynamic-preprocessors_gtp_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.7
> +++ patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/gtp/Makefile.in.orig Mon Oct 13 11:43:45 2014
> ++++ src/dynamic-preprocessors/gtp/Makefile.in Tue Dec 16 16:32:28 2014
> +@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_gtp_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_gtp_preproc.la
> -libsf_gtp_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_gtp_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -533,7 +533,7 @@ distdir: $(DISTFILES)
> +@@ -536,7 +536,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_imap_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-src_dynamic-preprocessors_imap_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_imap_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.7
> +++ patches/patch-src_dynamic-preprocessors_imap_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/imap/Makefile.in.orig Mon Oct 13 11:43:45 2014
> ++++ src/dynamic-preprocessors/imap/Makefile.in Tue Dec 16 16:32:50 2014
> +@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_imap_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_imap_preproc.la
> -libsf_imap_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_imap_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -557,7 +557,7 @@ distdir: $(DISTFILES)
> +@@ -580,7 +580,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_modbus_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-src_dynamic-preprocessors_modbus_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 30 Jan
> 2014 03:23:48 -0000 1.7
> +++ patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 24 Dec
> 2014 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/modbus/Makefile.in.orig Mon Oct 13
> 11:43:45 2014
> ++++ src/dynamic-preprocessors/modbus/Makefile.in Tue Dec 16 16:34:36 2014
> +@@ -333,7 +333,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_modbus_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_modbus_preproc.la
> -libsf_modbus_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_modbus_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -533,7 +533,7 @@ distdir: $(DISTFILES)
> +@@ -536,7 +536,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_pop_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-src_dynamic-preprocessors_pop_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_pop_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.7
> +++ patches/patch-src_dynamic-preprocessors_pop_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/pop/Makefile.in.orig Mon Oct 13 11:43:45 2014
> ++++ src/dynamic-preprocessors/pop/Makefile.in Tue Dec 16 16:35:01 2014
> +@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_pop_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_pop_preproc.la
> -libsf_pop_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_pop_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -557,7 +557,7 @@ distdir: $(DISTFILES)
> +@@ -580,7 +580,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_reputation_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-src_dynamic-preprocessors_reputation_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 30 Jan
> 2014 03:23:48 -0000 1.7
> +++ patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 24 Dec
> 2014 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/reputation/Makefile.in.orig Mon Oct 13
> 11:43:45 2014
> ++++ src/dynamic-preprocessors/reputation/Makefile.in Tue Dec 16 16:35:40 2014
> +@@ -349,7 +349,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_reputation_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_reputation_preproc.la
> -libsf_reputation_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_reputation_preproc_la_LDFLAGS = -export-dynamic -module
> -avoid-version @XCCFLAGS@
> @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 \
> -@@ -607,7 +607,7 @@ distdir: $(DISTFILES)
> +@@ -610,7 +610,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_sdf_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-src_dynamic-preprocessors_sdf_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.8
> +++ patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/sdf/Makefile.in.orig Mon Oct 13 11:43:45 2014
> ++++ src/dynamic-preprocessors/sdf/Makefile.in Tue Dec 16 16:36:04 2014
> +@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_sdf_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_sdf_preproc.la
> -libsf_sdf_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_sdf_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -534,7 +534,7 @@ distdir: $(DISTFILES)
> +@@ -537,7 +537,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_sip_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-src_dynamic-preprocessors_sip_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_sip_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.7
> +++ patches/patch-src_dynamic-preprocessors_sip_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/sip/Makefile.in.orig Mon Oct 13 11:43:45 2014
> ++++ src/dynamic-preprocessors/sip/Makefile.in Tue Dec 16 16:36:28 2014
> +@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_sip_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_sip_preproc.la
> -libsf_sip_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_sip_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -541,7 +541,7 @@ distdir: $(DISTFILES)
> +@@ -544,7 +544,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in,v
> retrieving revision 1.11
> diff -u -p -r1.11 patch-src_dynamic-preprocessors_smtp_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.11
> +++ patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/smtp/Makefile.in.orig Mon Oct 13 11:43:45 2014
> ++++ src/dynamic-preprocessors/smtp/Makefile.in Tue Dec 16 16:36:52 2014
> +@@ -338,7 +338,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_smtp_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_smtp_preproc.la
> -libsf_smtp_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_smtp_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -567,7 +567,7 @@ distdir: $(DISTFILES)
> +@@ -589,7 +589,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-src_dynamic-preprocessors_ssh_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.10
> +++ patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/ssh/Makefile.in.orig Mon Oct 13 11:43:45 2014
> ++++ src/dynamic-preprocessors/ssh/Makefile.in Tue Dec 16 16:37:19 2014
> +@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_ssh_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_ssh_preproc.la
> -libsf_ssh_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_ssh_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -525,7 +525,7 @@ distdir: $(DISTFILES)
> +@@ -528,7 +528,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_dynamic-preprocessors_ssl_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in,v
> retrieving revision 1.9
> diff -u -p -r1.9 patch-src_dynamic-preprocessors_ssl_Makefile_in
> --- patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 30 Jan 2014
> 03:23:48 -0000 1.9
> +++ patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 24 Dec 2014
> 21:17:56 -0000
> @@ -1,21 +1,21 @@
> $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@
> +--- src/dynamic-preprocessors/ssl/Makefile.in.orig Mon Oct 13 11:43:45 2014
> ++++ src/dynamic-preprocessors/ssl/Makefile.in Tue Dec 16 16:37:42 2014
> +@@ -333,7 +333,7 @@ top_srcdir = @top_srcdir@
> AUTOMAKE_OPTIONS = foreign no-dependencies
> - lib_LTLIBRARIES = libsf_ssl_preproc.la
> + dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
> + dynamicpreprocessor_LTLIBRARIES = libsf_ssl_preproc.la
> -libsf_ssl_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
> +libsf_ssl_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
> @XCCFLAGS@
> @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 \
> -@@ -535,7 +535,7 @@ distdir: $(DISTFILES)
> +@@ -546,7 +546,7 @@ distdir: $(DISTFILES)
> done
> check-am: all-am
> check: check-am
> -all-am: Makefile $(LTLIBRARIES) all-local
> +all-am: Makefile $(LTLIBRARIES)
> installdirs:
> - for dir in "$(DESTDIR)$(libdir)"; do \
> + for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
> test -z "$$dir" || $(MKDIR_P) "$$dir"; \
> Index: patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
> ===================================================================
> RCS file: patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
> diff -N patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
> --- patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 30 Jan
> 2014 03:23:48 -0000 1.12
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$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];
> - 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",
> - inet_ntoa(GET_SRC_ADDR(p)));
> - SnortSnprintf(dst_addr, 17, "%s",
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/net/snort/pkg/PLIST,v
> retrieving revision 1.27
> diff -u -p -r1.27 PLIST
> --- pkg/PLIST 30 Jan 2014 03:23:48 -0000 1.27
> +++ pkg/PLIST 24 Dec 2014 21:18:45 -0000
> @@ -62,6 +62,7 @@ share/doc/snort/BUGS
> share/doc/snort/CREDITS
> share/doc/snort/INSTALL
> share/doc/snort/NEWS
> +share/doc/snort/OpenDetectorDeveloperGuide.pdf
> share/doc/snort/PROBLEMS
> share/doc/snort/README
> share/doc/snort/README.GTP
> @@ -72,6 +73,7 @@ share/doc/snort/README.UNSOCK
> @comment share/doc/snort/README.WIN32
> share/doc/snort/README.active
> share/doc/snort/README.alert_order
> +share/doc/snort/README.appid
> share/doc/snort/README.asn1
> share/doc/snort/README.counts
> share/doc/snort/README.csv
> @@ -102,7 +104,6 @@ share/doc/snort/README.pop
> share/doc/snort/README.ppm
> share/doc/snort/README.reload
> share/doc/snort/README.reputation
> -share/doc/snort/README.rzb_saac
> share/doc/snort/README.sensitive_data
> share/doc/snort/README.sfportscan
> share/doc/snort/README.sip
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile 5 Oct 2014 19:23:00 -0000 1.88
+++ Makefile 21 Jan 2015 22:25:11 -0000
@@ -4,9 +4,8 @@ SHARED_ONLY = Yes
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.6.2
+VERSION = 2.9.7.0
DISTNAME = snort-${VERSION}
-REVISION = 0
CATEGORIES = net security
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo 19 Aug 2014 04:22:53 -0000 1.31
+++ distinfo 21 Jan 2015 22:25:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.6.2.tar.gz) = jh1/xeFSOnhthFygECzEdKv86/zH6WShZTaAA0tbXXc=
-SIZE (snort-2.9.6.2.tar.gz) = 5229232
+SHA256 (snort-2.9.7.0.tar.gz) = lziv6kXSC393mXzAAFXn3XD2rqAQEgnYfv7EvE6s5Js=
+SIZE (snort-2.9.7.0.tar.gz) = 6340553
Index: patches/patch-etc_snort_conf
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-etc_snort_conf,v
retrieving revision 1.12
diff -u -p -r1.12 patch-etc_snort_conf
--- patches/patch-etc_snort_conf 4 Jun 2014 03:17:12 -0000 1.12
+++ patches/patch-etc_snort_conf 21 Jan 2015 22:25:11 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-etc_snort_conf,v 1.12 20
reputation preprocessor disabled, still experimental
---- etc/snort.conf.orig Thu Apr 3 17:25:10 2014
-+++ etc/snort.conf Mon Jun 2 00:13:35 2014
-@@ -101,13 +101,13 @@ ipvar AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.1
+--- etc/snort.conf.orig Mon Oct 13 17:44:08 2014
++++ etc/snort.conf Sat Jan 10 16:16:45 2015
+@@ -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,
# such as: c:\snort\rules
@@ -16,6 +16,10 @@ reputation preprocessor disabled, still
+var PREPROC_RULE_PATH ${SYSCONFDIR}/snort/preproc_rules
# If you are using reputation preprocessor set these
+ # Currently there is a bug with relative paths, they are relative to where
snort is
+ # not relative to snort.conf like the above variables
+ # This is completely inconsistent with how other vars work, BUG 89986
+ # Set the absolute path appropriately
-var WHITE_LIST_PATH ../rules
-var BLACK_LIST_PATH ../rules
+var WHITE_LIST_PATH ${SYSCONFDIR}/snort/rules
@@ -23,7 +27,7 @@ reputation preprocessor disabled, still
###################################################
# Step #2: Configure the decoder. For more information, see README.decode
-@@ -138,7 +138,11 @@ config disable_ipopt_alerts
+@@ -142,7 +142,11 @@ config disable_ipopt_alerts
# config enable_decode_oversized_drops
# Configure IP / TCP checksum mode
@@ -36,7 +40,7 @@ reputation preprocessor disabled, still
# Configure maximum number of flowbit references. For more information, see
README.flowbits
# config flowbits_size: 64
-@@ -154,6 +158,7 @@ config checksum_mode: all
+@@ -158,6 +162,7 @@ config checksum_mode: all
#
# config daq: <type>
# config daq_dir: <dir>
@@ -44,7 +48,7 @@ reputation preprocessor disabled, still
# config daq_mode: <mode>
# config daq_var: <var>
#
-@@ -499,12 +504,12 @@ preprocessor dnp3: ports { 20000 } \
+@@ -503,12 +508,12 @@ preprocessor dnp3: ports { 20000 } \
check_crc
# Reputation preprocessor. For more information see README.reputation
@@ -63,18 +67,19 @@ reputation preprocessor disabled, still
###################################################
# Step #6: Configure output plugins
-@@ -538,8 +543,9 @@ include reference.config
+@@ -542,8 +547,10 @@ include reference.config
###################################################
# site specific rules
-include $RULE_PATH/local.rules
+#include $RULE_PATH/local.rules
-+# Official Sourcefire VRT rules from http://www.snort.org/snort-rules/
++# Official Sourcefire VRT rules from
++# https://www.snort.org/downloads/#rule-downloads
include $RULE_PATH/app-detect.rules
include $RULE_PATH/attack-responses.rules
include $RULE_PATH/backdoor.rules
-@@ -655,6 +661,9 @@ include $RULE_PATH/web-iis.rules
+@@ -648,6 +655,9 @@ include $RULE_PATH/web-iis.rules
include $RULE_PATH/web-misc.rules
include $RULE_PATH/web-php.rules
include $RULE_PATH/x11.rules
Index: patches/patch-src_decode_h
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_decode_h
--- patches/patch-src_decode_h 30 Jan 2014 03:23:48 -0000 1.6
+++ patches/patch-src_decode_h 21 Jan 2015 22:25:11 -0000
@@ -1,7 +1,7 @@
$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 {
+--- src/decode.h.orig Tue Sep 16 20:24:43 2014
++++ src/decode.h Sat Oct 25 16:32:12 2014
+@@ -815,9 +815,9 @@ typedef struct _SLLHdr {
* Pflog1_Hdr: CVS = 1.3, DLT_OLD_PFLOG = 17, Length = 28
* Pflog2_Hdr: CVS = 1.8, DLT_PFLOG = 117, Length = 48
* Pflog3_Hdr: CVS = 1.12, DLT_PFLOG = 117, Length = 64
Index: patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
===================================================================
RCS file: patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
diff -N patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
--- patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c 30 Jan 2014
03:23:48 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$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)
- {
-- if ((dir_entry->d_reclen != 0) &&
-- (fnmatch(MODULE_EXT, dir_entry->d_name, FNM_PATHNAME |
FNM_PERIOD) == 0))
-+ if (fnmatch(MODULE_EXT, dir_entry->d_name, FNM_PATHNAME |
FNM_PERIOD) == 0)
- {
- /* Get the string up until the first dot. This will be
- * considered the file prefix. */
Index: 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.7
diff -u -p -r1.7 patch-src_dynamic-plugins_sf_engine_Makefile_in
--- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 30 Jan 2014
03:23:48 -0000 1.7
+++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,12 +1,12 @@
$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@
+--- src/dynamic-plugins/sf_engine/Makefile.in.orig Mon Oct 13 17:43:44 2014
++++ src/dynamic-plugins/sf_engine/Makefile.in Sat Oct 25 16:47:53 2014
+@@ -377,7 +377,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_engine.la
+ dynamicengine_LTLIBRARIES = libsf_engine.la
+ dynamicenginedir = $(libdir)/snort_dynamicengine
-libsf_engine_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_engine_la_LDFLAGS = -export-dynamic -module -avoid-version @XCCFLAGS@
- BUILT_SOURCES = \
- sfhashfcn.c \
- sfhashfcn.h \
+ @BUILD_OPENSSL_MD5_TRUE@OPENSSL_MD5 = \
+ @BUILD_OPENSSL_MD5_TRUE@ md5.c md5.h
+
Index: patches/patch-src_dynamic-preprocessors_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 30 Jan 2014 03:23:48
-0000 1.13
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 21 Jan 2015 22:25:11
-0000
@@ -1,7 +1,7 @@
$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:
+--- src/dynamic-preprocessors/Makefile.in.orig Mon Oct 13 17:43:44 2014
++++ src/dynamic-preprocessors/Makefile.in Sat Oct 25 16:32:13 2014
+@@ -1483,19 +1483,8 @@ clean-local:
rm -rf include build
install-data-local:
Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 30 Jan 2014
03:23:48 -0000 1.9
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Mon Oct 13 17:43:44 2014
++++ src/dynamic-preprocessors/dcerpc2/Makefile.in Sat Oct 25 16:48:58 2014
+@@ -336,7 +336,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_dce2_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_dce2_preproc.la
-libsf_dce2_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_dce2_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -577,7 +577,7 @@ distdir: $(DISTFILES)
+@@ -580,7 +580,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_dynamic-preprocessors_dnp3_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 30 Jan 2014
03:23:48 -0000 1.7
+++ patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/dnp3/Makefile.in.orig Mon Oct 13 17:43:44 2014
++++ src/dynamic-preprocessors/dnp3/Makefile.in Sat Oct 25 16:49:19 2014
+@@ -333,7 +333,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_dnp3_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_dnp3_preproc.la
-libsf_dnp3_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_dnp3_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -543,7 +543,7 @@ distdir: $(DISTFILES)
+@@ -546,7 +546,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_dns_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_dynamic-preprocessors_dns_Makefile_in
--- patches/patch-src_dynamic-preprocessors_dns_Makefile_in 30 Jan 2014
03:23:48 -0000 1.11
+++ patches/patch-src_dynamic-preprocessors_dns_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/dns/Makefile.in.orig Mon Oct 13 17:43:44 2014
++++ src/dynamic-preprocessors/dns/Makefile.in Sat Oct 25 16:49:38 2014
+@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_dns_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_dns_preproc.la
-libsf_dns_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_dns_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -525,7 +525,7 @@ distdir: $(DISTFILES)
+@@ -528,7 +528,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 30 Jan
2014 03:23:48 -0000 1.12
+++ patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 21 Jan
2015 22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Mon Oct 13
17:43:45 2014
++++ src/dynamic-preprocessors/ftptelnet/Makefile.in Sat Oct 25 16:49:59 2014
+@@ -339,7 +339,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_ftptelnet_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_ftptelnet_preproc.la
-libsf_ftptelnet_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_ftptelnet_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -573,7 +573,7 @@ distdir: $(DISTFILES)
+@@ -594,7 +594,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_gtp_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_dynamic-preprocessors_gtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 30 Jan 2014
03:23:48 -0000 1.7
+++ patches/patch-src_dynamic-preprocessors_gtp_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/gtp/Makefile.in.orig Mon Oct 13 17:43:45 2014
++++ src/dynamic-preprocessors/gtp/Makefile.in Sat Oct 25 16:50:16 2014
+@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_gtp_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_gtp_preproc.la
-libsf_gtp_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_gtp_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -533,7 +533,7 @@ distdir: $(DISTFILES)
+@@ -536,7 +536,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_imap_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_dynamic-preprocessors_imap_Makefile_in
--- patches/patch-src_dynamic-preprocessors_imap_Makefile_in 30 Jan 2014
03:23:48 -0000 1.7
+++ patches/patch-src_dynamic-preprocessors_imap_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/imap/Makefile.in.orig Mon Oct 13 17:43:45 2014
++++ src/dynamic-preprocessors/imap/Makefile.in Sat Oct 25 16:50:26 2014
+@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_imap_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_imap_preproc.la
-libsf_imap_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_imap_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -557,7 +557,7 @@ distdir: $(DISTFILES)
+@@ -580,7 +580,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_modbus_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_dynamic-preprocessors_modbus_Makefile_in
--- patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 30 Jan 2014
03:23:48 -0000 1.7
+++ patches/patch-src_dynamic-preprocessors_modbus_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/modbus/Makefile.in.orig Mon Oct 13 17:43:45 2014
++++ src/dynamic-preprocessors/modbus/Makefile.in Sat Oct 25 16:50:41 2014
+@@ -333,7 +333,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_modbus_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_modbus_preproc.la
-libsf_modbus_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_modbus_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -533,7 +533,7 @@ distdir: $(DISTFILES)
+@@ -536,7 +536,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_pop_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_dynamic-preprocessors_pop_Makefile_in
--- patches/patch-src_dynamic-preprocessors_pop_Makefile_in 30 Jan 2014
03:23:48 -0000 1.7
+++ patches/patch-src_dynamic-preprocessors_pop_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/pop/Makefile.in.orig Mon Oct 13 17:43:45 2014
++++ src/dynamic-preprocessors/pop/Makefile.in Sat Oct 25 16:50:54 2014
+@@ -337,7 +337,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_pop_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_pop_preproc.la
-libsf_pop_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_pop_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -557,7 +557,7 @@ distdir: $(DISTFILES)
+@@ -580,7 +580,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_reputation_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_dynamic-preprocessors_reputation_Makefile_in
--- patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 30 Jan
2014 03:23:48 -0000 1.7
+++ patches/patch-src_dynamic-preprocessors_reputation_Makefile_in 21 Jan
2015 22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/reputation/Makefile.in.orig Mon Oct 13
17:43:45 2014
++++ src/dynamic-preprocessors/reputation/Makefile.in Sat Oct 25 16:51:05 2014
+@@ -349,7 +349,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_reputation_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_reputation_preproc.la
-libsf_reputation_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_reputation_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -607,7 +607,7 @@ distdir: $(DISTFILES)
+@@ -610,7 +610,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_sdf_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_dynamic-preprocessors_sdf_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 30 Jan 2014
03:23:48 -0000 1.8
+++ patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/sdf/Makefile.in.orig Mon Oct 13 17:43:45 2014
++++ src/dynamic-preprocessors/sdf/Makefile.in Sat Oct 25 16:51:18 2014
+@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_sdf_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_sdf_preproc.la
-libsf_sdf_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_sdf_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -534,7 +534,7 @@ distdir: $(DISTFILES)
+@@ -537,7 +537,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_sip_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_dynamic-preprocessors_sip_Makefile_in
--- patches/patch-src_dynamic-preprocessors_sip_Makefile_in 30 Jan 2014
03:23:48 -0000 1.7
+++ patches/patch-src_dynamic-preprocessors_sip_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/sip/Makefile.in.orig Mon Oct 13 17:43:45 2014
++++ src/dynamic-preprocessors/sip/Makefile.in Sat Oct 25 16:51:33 2014
+@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_sip_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_sip_preproc.la
-libsf_sip_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_sip_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -541,7 +541,7 @@ distdir: $(DISTFILES)
+@@ -544,7 +544,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_dynamic-preprocessors_smtp_Makefile_in
--- patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 30 Jan 2014
03:23:48 -0000 1.11
+++ patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/smtp/Makefile.in.orig Mon Oct 13 17:43:45 2014
++++ src/dynamic-preprocessors/smtp/Makefile.in Sat Oct 25 16:51:48 2014
+@@ -338,7 +338,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_smtp_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_smtp_preproc.la
-libsf_smtp_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_smtp_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -567,7 +567,7 @@ distdir: $(DISTFILES)
+@@ -589,7 +589,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_dynamic-preprocessors_ssh_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 30 Jan 2014
03:23:48 -0000 1.10
+++ patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/ssh/Makefile.in.orig Mon Oct 13 17:43:45 2014
++++ src/dynamic-preprocessors/ssh/Makefile.in Sat Oct 25 16:51:59 2014
+@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_ssh_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_ssh_preproc.la
-libsf_ssh_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_ssh_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -525,7 +525,7 @@ distdir: $(DISTFILES)
+@@ -528,7 +528,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_dynamic-preprocessors_ssl_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-src_dynamic-preprocessors_ssl_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 30 Jan 2014
03:23:48 -0000 1.9
+++ patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 21 Jan 2015
22:25:11 -0000
@@ -1,21 +1,21 @@
$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@
+--- src/dynamic-preprocessors/ssl/Makefile.in.orig Mon Oct 13 17:43:45 2014
++++ src/dynamic-preprocessors/ssl/Makefile.in Sat Oct 25 16:52:09 2014
+@@ -333,7 +333,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
- lib_LTLIBRARIES = libsf_ssl_preproc.la
+ dynamicpreprocessordir = ${libdir}/snort_dynamicpreprocessor
+ dynamicpreprocessor_LTLIBRARIES = libsf_ssl_preproc.la
-libsf_ssl_preproc_la_LDFLAGS = -export-dynamic -module @XCCFLAGS@
+libsf_ssl_preproc_la_LDFLAGS = -export-dynamic -module -avoid-version
@XCCFLAGS@
@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 \
-@@ -535,7 +535,7 @@ distdir: $(DISTFILES)
+@@ -546,7 +546,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(dynamicpreprocessordir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_log_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_log_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_log_c
--- patches/patch-src_log_c 30 Jan 2014 03:23:48 -0000 1.6
+++ patches/patch-src_log_c 21 Jan 2015 22:25:11 -0000
@@ -1,6 +1,6 @@
$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
+--- src/log.c.orig Sat Feb 22 03:45:22 2014
++++ src/log.c Sat Oct 25 16:32:17 2014
@@ -457,7 +457,7 @@ void PrintIPPkt(FILE * fp, int type, Packet * p)
DEBUG_WRAP(DebugMessage(DEBUG_LOG, "PrintIPPkt type = %d\n", type););
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_log_c,v 1.6 2014/01/
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
-@@ -1944,7 +1944,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
+@@ -1955,7 +1955,7 @@ void PrintEapolPkt(FILE * fp, Packet * p)
memset((char *) timestamp, 0, TIMEBUF_SIZE);
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_log_c,v 1.6 2014/01/
/* dump the timestamp */
fwrite(timestamp, strlen(timestamp), 1, fp);
-@@ -2118,7 +2118,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
+@@ -2129,7 +2129,7 @@ void PrintWifiPkt(FILE * fp, Packet * p)
memset((char *) timestamp, 0, TIMEBUF_SIZE);
Index: patches/patch-src_ppm_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_ppm_c,v
retrieving revision 1.9
diff -u -p -r1.9 patch-src_ppm_c
--- patches/patch-src_ppm_c 30 Jan 2014 03:23:48 -0000 1.9
+++ patches/patch-src_ppm_c 21 Jan 2015 22:25:11 -0000
@@ -1,7 +1,7 @@
$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,
+--- src/ppm.c.orig Tue Jun 10 15:29:29 2014
++++ src/ppm.c Sat Oct 25 16:32:17 2014
+@@ -518,7 +518,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.9 2014/01/
for (i=0; i< ppm_n_crules; i++)
{
-@@ -589,7 +589,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
+@@ -601,7 +601,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
LogMessage(PPM_FMT_SUS_PKT, pktcnt, src, p->sp, dst, p->dp);
if(!*timestamp)
Index: patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
===================================================================
RCS file: patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
diff -N patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
--- patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 30 Jan 2014
03:23:48 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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];
- 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",
- inet_ntoa(GET_SRC_ADDR(p)));
- SnortSnprintf(dst_addr, 17, "%s",
Index: patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c
===================================================================
RCS file: patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c
diff -N patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c 21 Jan 2015
22:25:11 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/preprocessors/Stream6/snort_stream_tcp.c.orig Fri Oct 10 21:17:45 2014
++++ src/preprocessors/Stream6/snort_stream_tcp.c Sat Oct 25 16:54:16 2014
+@@ -8161,7 +8161,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet
+ char src_addr[17];
+ char dst_addr[17];
+ 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",
+ inet_ntoa(GET_SRC_ADDR(p)));
+ SnortSnprintf(dst_addr, 17, "%s",
Index: patches/patch-src_preprocessors_spp_sfportscan_c
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_preprocessors_spp_sfportscan_c,v
retrieving revision 1.9
diff -u -p -r1.9 patch-src_preprocessors_spp_sfportscan_c
--- patches/patch-src_preprocessors_spp_sfportscan_c 30 Jan 2014 03:23:48
-0000 1.9
+++ patches/patch-src_preprocessors_spp_sfportscan_c 21 Jan 2015 22:25:11
-0000
@@ -1,7 +1,7 @@
$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
+--- src/preprocessors/spp_sfportscan.c.orig Tue Jun 10 15:29:30 2014
++++ src/preprocessors/spp_sfportscan.c Sat Oct 25 16:33:34 2014
+@@ -274,7 +274,7 @@ static int LogPortscanAlert(Packet *p, char *msg, uint
return 0;
}
Index: patches/patch-src_util_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_util_c,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_util_c
--- patches/patch-src_util_c 30 Jan 2014 03:23:48 -0000 1.8
+++ patches/patch-src_util_c 21 Jan 2015 22:25:11 -0000
@@ -1,7 +1,7 @@
$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)
+--- src/util.c.orig Tue Sep 16 20:24:43 2014
++++ src/util.c Sat Oct 25 16:33:34 2014
+@@ -225,12 +225,13 @@ int DisplayBanner(void)
* Returns: void function
*
****************************************************************************/
@@ -16,7 +16,7 @@ $OpenBSD: patch-src_util_c,v 1.8 2014/01
struct timezone tz;
struct tm *lt; /* place to stick the adjusted clock data */
-@@ -248,7 +249,9 @@ void ts_print(register const struct timeval *tvp, char
+@@ -240,7 +241,9 @@ void ts_print(register const struct timeval *tvp, char
/* manual page (for linux) says tz is never used, so.. */
memset((char *) &tz, 0, sizeof(tz));
gettimeofday(&tv, &tz);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/snort/pkg/PLIST,v
retrieving revision 1.27
diff -u -p -r1.27 PLIST
--- pkg/PLIST 30 Jan 2014 03:23:48 -0000 1.27
+++ pkg/PLIST 21 Jan 2015 22:25:11 -0000
@@ -62,6 +62,7 @@ share/doc/snort/BUGS
share/doc/snort/CREDITS
share/doc/snort/INSTALL
share/doc/snort/NEWS
+share/doc/snort/OpenDetectorDeveloperGuide.pdf
share/doc/snort/PROBLEMS
share/doc/snort/README
share/doc/snort/README.GTP
@@ -72,6 +73,7 @@ share/doc/snort/README.UNSOCK
@comment share/doc/snort/README.WIN32
share/doc/snort/README.active
share/doc/snort/README.alert_order
+share/doc/snort/README.appid
share/doc/snort/README.asn1
share/doc/snort/README.counts
share/doc/snort/README.csv
@@ -102,7 +104,6 @@ share/doc/snort/README.pop
share/doc/snort/README.ppm
share/doc/snort/README.reload
share/doc/snort/README.reputation
-share/doc/snort/README.rzb_saac
share/doc/snort/README.sensitive_data
share/doc/snort/README.sfportscan
share/doc/snort/README.sip
