Markus Lude <markus.l...@gmx.de> wrote: > On Wed, Jul 28, 2010 at 03:45:48PM +0200, viq wrote: > > > > And looks like it's time to deal with it, as I can't fetch the distfile > > right now... I guess the reason is the 2.8.6.1 release, though it's > > highly annoying that older release sources are not available anymore... > > I contacted upstream about the old tar ball. Hopefully they'll fix it > soon. > > For those interested, here's an update to 2.8.6.1. Still testing it > myself. Tests welcome, especially with flavored versions. I mainly use > the unflavored one, testing on i386 and sparc64.
looks okey to me except pkg/PLIST. make plist says that PLIST has changes: --- pkg/PLIST.orig Mon Jul 12 13:38:40 2010 +++ pkg/PLIST Sun Aug 22 05:27:33 2010 @@ -33,7 +33,6 @@ lib/snort_dynamicpreprocessor/libsf_ssl_preproc.a @comment lib/snort_dynamicpreprocessor/libsf_ssl_preproc.la lib/snort_dynamicpreprocessor/libsf_ssl_preproc.so -lib/snort_dynamicrules/ @man man/man8/snort.8 share/doc/snort/ share/doc/snort/AUTHORS what is this directory for? alek > > Regards, > Markus > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/snort/Makefile,v > retrieving revision 1.57 > diff -u -p -r1.57 Makefile > --- Makefile 12 Jul 2010 19:38:40 -0000 1.57 > +++ Makefile 2 Aug 2010 12:29:20 -0000 > @@ -4,12 +4,8 @@ SHARED_ONLY = Yes > > COMMENT = highly flexible sniffer/NIDS > > -# Original URL http://dl.snort.org/downloads/14 redirects to a > -# time-limited Amazon S3 url. This would mean a bad distfile name. > -# The following hack allows it to work but XXX if updating, the > -# MASTER_SITES URL will need to be adjusted, not just DISTNAME. > -DISTNAME = snort-2.8.6 > -MASTER_SITES = http://dl.snort.org/downloads/14?/ > +DISTNAME = snort-2.8.6.1 > +MASTER_SITES = http://www.snort.org/ports/snort-current/ > > CATEGORIES = net security > > @@ -22,7 +18,7 @@ PERMIT_PACKAGE_CDROM = Yes > PERMIT_PACKAGE_FTP = Yes > PERMIT_DISTFILES_CDROM = Yes > PERMIT_DISTFILES_FTP = Yes > -WANTLIB = c m pcap > +WANTLIB = c m pcap pcre > > USE_LIBTOOL = Yes > > @@ -34,33 +30,35 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ > > MAKE_FLAGS = mandir=${TRUEPREFIX}/man > > -LIB_DEPENDS = pcre::devel/pcre > +LIB_DEPENDS = ::devel/pcre > > FLAVORS = postgresql mysql flexresp prelude > FLAVOR ?= > > .if ${FLAVOR:L:Mflexresp} > -LIB_DEPENDS += dnet.=1::net/libdnet > +LIB_DEPENDS += ::net/libdnet > CONFIGURE_ARGS += --enable-flexresp2 > +WANTLIB += dnet.=1 > .endif > > .if ${FLAVOR:L:Mpostgresql} > -LIB_DEPENDS += pq.>=2::databases/postgresql > +LIB_DEPENDS += ::databases/postgresql > CONFIGURE_ARGS += --with-postgresql="${LOCALBASE}" > +WANTLIB += pq > .endif > > .if ${FLAVOR:L:Mmysql} > -LIB_DEPENDS += lib/mysql/mysqlclient.>=10::databases/mysql > +LIB_DEPENDS += ::databases/mysql > CONFIGURE_ARGS += --with-mysql-libraries="${LOCALBASE}/lib" \ > --with-mysql-includes="${LOCALBASE}/include" > -WANTLIB += z > +WANTLIB += lib/mysql/mysqlclient z > .endif > > .if ${FLAVOR:L:Mprelude} > MODULES = devel/gettext > -WANTLIB += gcrypt gnutls gpg-error pthread tasn1 z > -LIB_DEPENDS += prelude.>=8::security/prelude/libprelude > +LIB_DEPENDS += ::security/prelude/libprelude > CONFIGURE_ARGS += --enable-prelude > +WANTLIB += gcrypt gnutls gpg-error prelude pthread tasn1 z > MESSAGE = ${PKGDIR}/MESSAGE-prelude > .endif > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/snort/distinfo,v > retrieving revision 1.19 > diff -u -p -r1.19 distinfo > --- distinfo 12 Jul 2010 19:38:40 -0000 1.19 > +++ distinfo 2 Aug 2010 12:29:20 -0000 > @@ -1,5 +1,5 @@ > -MD5 (snort-2.8.6.tar.gz) = scLT3bHAqFmkfFox0Z5grQ== > -RMD160 (snort-2.8.6.tar.gz) = W1Seqzmm4KDxgvbS7kb9YJlcgi4= > -SHA1 (snort-2.8.6.tar.gz) = 5GPJmZTlIXFDliPhsFueG88BrI8= > -SHA256 (snort-2.8.6.tar.gz) = YGTXu3jWQ4tFX/NJuT1S9A05d/H+yx15WMh4gbADA1g= > -SIZE (snort-2.8.6.tar.gz) = 4960740 > +MD5 (snort-2.8.6.1.tar.gz) = sRGTlqMunfDYBATktsSRZg== > +RMD160 (snort-2.8.6.1.tar.gz) = J5JcDfnevJ5g4ZoMmJ2yjI0cp/A= > +SHA1 (snort-2.8.6.1.tar.gz) = ZumR8VH2quXc3ukqvICSzVCKKqo= > +SHA256 (snort-2.8.6.1.tar.gz) = epSO8jXFmxk8oIg7BKDT70zFJQ+TPK/E0G/u1XFQriM= > +SIZE (snort-2.8.6.1.tar.gz) = 4939019 > Index: patches/patch-src_dynamic-examples_dynamic-preprocessor_Makefile_in > =================================================================== > RCS file: > /cvs/ports/net/snort/patches/patch-src_dynamic-examples_dynamic-preprocessor_Makefile_in,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-src_dynamic-examples_dynamic-preprocessor_Makefile_in > --- patches/patch-src_dynamic-examples_dynamic-preprocessor_Makefile_in > 12 Jul 2010 19:38:40 -0000 1.1 > +++ patches/patch-src_dynamic-examples_dynamic-preprocessor_Makefile_in > 2 Aug 2010 12:29:20 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-src_dynamic-examples_dynamic-preprocessor_Makefile_in,v 1.1 > 2010/07/12 19:38:40 sthen Exp $ > ---- src/dynamic-examples/dynamic-preprocessor/Makefile.in.orig Fri Mar > 19 20:39:38 2010 > -+++ src/dynamic-examples/dynamic-preprocessor/Makefile.in Mon Apr 26 > 20:14:12 2010 > -@@ -200,7 +200,7 @@ target_alias = @target_alias@ > +--- src/dynamic-examples/dynamic-preprocessor/Makefile.in.orig Thu Jun > 24 17:47:41 2010 > ++++ src/dynamic-examples/dynamic-preprocessor/Makefile.in Thu Jul 22 > 23:21:55 2010 > +@@ -221,7 +221,7 @@ top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > noinst_libdir = ${exec_prefix}/lib/snort_dynamicpreprocessor > noinst_lib_LTLIBRARIES = lib_sfdynamic_preprocessor_example.la > Index: patches/patch-src_dynamic-examples_dynamic-rule_Makefile_in > =================================================================== > RCS file: > /cvs/ports/net/snort/patches/patch-src_dynamic-examples_dynamic-rule_Makefile_in,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-src_dynamic-examples_dynamic-rule_Makefile_in > --- patches/patch-src_dynamic-examples_dynamic-rule_Makefile_in 12 Jul > 2010 19:38:40 -0000 1.1 > +++ patches/patch-src_dynamic-examples_dynamic-rule_Makefile_in 2 Aug > 2010 12:29:20 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-src_dynamic-examples_dynamic-rule_Makefile_in,v 1.1 > 2010/07/12 19:38:40 sthen Exp $ > ---- src/dynamic-examples/dynamic-rule/Makefile.in.orig Fri Mar 19 > 20:39:38 2010 > -+++ src/dynamic-examples/dynamic-rule/Makefile.in Mon Apr 26 20:14:12 2010 > -@@ -200,7 +200,7 @@ target_alias = @target_alias@ > +--- src/dynamic-examples/dynamic-rule/Makefile.in.orig Thu Jun 24 > 17:47:41 2010 > ++++ src/dynamic-examples/dynamic-rule/Makefile.in Thu Jul 22 23:21:55 2010 > +@@ -220,7 +220,7 @@ top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > noinst_libdir = ${exec_prefix}/lib/snort_dynamicrules > noinst_lib_LTLIBRARIES = lib_sfdynamic_example_rule.la > 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.1 > diff -u -p -r1.1 patch-src_dynamic-plugins_sf_engine_Makefile_in > --- patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 12 Jul 2010 > 19:38:40 -0000 1.1 > +++ patches/patch-src_dynamic-plugins_sf_engine_Makefile_in 2 Aug 2010 > 12:29:20 -0000 > @@ -1,8 +1,8 @@ > $OpenBSD: patch-src_dynamic-plugins_sf_engine_Makefile_in,v 1.1 2010/07/12 > 19:38:40 sthen Exp $ > ---- src/dynamic-plugins/sf_engine/Makefile.in.orig Fri Mar 19 20:39:38 2010 > -+++ src/dynamic-plugins/sf_engine/Makefile.in Mon Apr 26 20:14:12 2010 > -@@ -211,7 +211,7 @@ sysconfdir = @sysconfdir@ > - target_alias = @target_alias@ > +--- src/dynamic-plugins/sf_engine/Makefile.in.orig Thu Jun 24 17:47:42 2010 > ++++ src/dynamic-plugins/sf_engine/Makefile.in Thu Jul 22 23:21:55 2010 > +@@ -261,7 +261,7 @@ top_builddir = @top_builddir@ > + top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > lib_LTLIBRARIES = libsf_engine.la > -libsf_engine_la_LDFLAGS = -module > 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.5 > diff -u -p -r1.5 patch-src_dynamic-preprocessors_Makefile_in > --- patches/patch-src_dynamic-preprocessors_Makefile_in 12 Jul 2010 > 19:38:40 -0000 1.5 > +++ patches/patch-src_dynamic-preprocessors_Makefile_in 2 Aug 2010 > 12:29:20 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.5 2010/07/12 > 19:38:40 sthen Exp $ > ---- src/dynamic-preprocessors/Makefile.in.orig Fri Mar 19 20:39:38 2010 > -+++ src/dynamic-preprocessors/Makefile.in Tue May 4 20:13:09 2010 > -@@ -636,8 +636,8 @@ maintainer-clean-generic: > +--- src/dynamic-preprocessors/Makefile.in.orig Thu Jun 24 17:47:42 2010 > ++++ src/dynamic-preprocessors/Makefile.in Thu Jul 22 23:24:55 2010 > +@@ -684,8 +684,8 @@ maintainer-clean-generic: > @echo "This command is intended for maintainers to use" > @echo "it deletes files that may require special tools to rebuild." > -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) > @@ -12,10 +12,11 @@ $OpenBSD: patch-src_dynamic-preprocessor > clean: clean-recursive > > clean-am: clean-generic clean-libtool clean-local mostlyclean-am > -@@ -838,20 +838,6 @@ include/plugin_enum.h: $(srcdir)/../plugin_enum.h > +@@ -906,21 +906,6 @@ include/plugin_enum.h: $(srcdir)/../plugin_enum.h > + > clean-local: > rm -rf include build > - > +- > -...@have_dynamic_plugins_true@install-data-local: > -...@have_dynamic_plugins_true@ @for f in $(exported_files); do \ > -...@have_dynamic_plugins_true@ truefile=`echo $$f | sed -e > "s/.*\///"`; \ > @@ -30,6 +31,6 @@ $OpenBSD: patch-src_dynamic-preprocessor > -...@have_dynamic_plugins_true@ $(mkinstalldirs) > $(DESTDIR)$(srcinstdir); \ > -...@have_dynamic_plugins_true@ $(RM) -f > $(DESTDIR)$(srcinstdir)/$$truefile; \ > -...@have_dynamic_plugins_true@ done > + > # Tell versions [3.59,3.63) of GNU make to not export all variables. > # Otherwise a system limit (for SysV at least) may be exceeded. > - .NOEXPORT: > 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.2 > diff -u -p -r1.2 patch-src_dynamic-preprocessors_dcerpc2_Makefile_in > --- patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 12 Jul > 2010 19:38:40 -0000 1.2 > +++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 2 Aug > 2010 12:29:20 -0000 > @@ -1,8 +1,8 @@ > $OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.2 > 2010/07/12 19:38:40 sthen Exp $ > ---- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Fri Mar 19 > 20:39:38 2010 > -+++ src/dynamic-preprocessors/dcerpc2/Makefile.in Mon Apr 26 20:14:12 2010 > -@@ -205,7 +205,7 @@ sysconfdir = @sysconfdir@ > - target_alias = @target_alias@ > +--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Thu Jun 24 > 17:47:42 2010 > ++++ src/dynamic-preprocessors/dcerpc2/Makefile.in Thu Jul 22 23:21:56 2010 > +@@ -224,7 +224,7 @@ top_builddir = @top_builddir@ > + top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > lib_LTLIBRARIES = libsf_dce2_preproc.la > -libsf_dce2_preproc_la_LDFLAGS = -module > @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor > BUILT_SOURCES = \ > sf_dynamic_preproc_lib.c \ > sf_ip.c \ > -@@ -428,7 +428,7 @@ distdir: $(DISTFILES) > +@@ -455,7 +455,7 @@ distdir: $(DISTFILES) > check-am: all-am > check: $(BUILT_SOURCES) > $(MAKE) $(AM_MAKEFLAGS) check-am > @@ -18,4 +18,4 @@ $OpenBSD: patch-src_dynamic-preprocessor > +all-am: Makefile $(LTLIBRARIES) > installdirs: > for dir in "$(DESTDIR)$(libdir)"; do \ > - test -z "$$dir" || $(mkdir_p) "$$dir"; \ > + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ > Index: patches/patch-src_dynamic-preprocessors_dcerpc_Makefile_in > =================================================================== > RCS file: > /cvs/ports/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc_Makefile_in,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-src_dynamic-preprocessors_dcerpc_Makefile_in > --- patches/patch-src_dynamic-preprocessors_dcerpc_Makefile_in 12 Jul > 2010 19:38:40 -0000 1.3 > +++ patches/patch-src_dynamic-preprocessors_dcerpc_Makefile_in 2 Aug > 2010 12:29:20 -0000 > @@ -1,8 +1,8 @@ > $OpenBSD: patch-src_dynamic-preprocessors_dcerpc_Makefile_in,v 1.3 > 2010/07/12 19:38:40 sthen Exp $ > ---- src/dynamic-preprocessors/dcerpc/Makefile.in.orig Fri Mar 19 > 20:39:38 2010 > -+++ src/dynamic-preprocessors/dcerpc/Makefile.in Mon Apr 26 20:14:12 2010 > -@@ -204,7 +204,7 @@ sysconfdir = @sysconfdir@ > - target_alias = @target_alias@ > +--- src/dynamic-preprocessors/dcerpc/Makefile.in.orig Thu Jun 24 > 17:47:42 2010 > ++++ src/dynamic-preprocessors/dcerpc/Makefile.in Thu Jul 22 23:21:56 2010 > +@@ -223,7 +223,7 @@ top_builddir = @top_builddir@ > + top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > lib_LTLIBRARIES = libsf_dcerpc_preproc.la > -libsf_dcerpc_preproc_la_LDFLAGS = -module > @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor > BUILT_SOURCES = \ > sf_dynamic_preproc_lib.c \ > sfPolicyUserData.c > -@@ -403,7 +403,7 @@ distdir: $(DISTFILES) > +@@ -430,7 +430,7 @@ distdir: $(DISTFILES) > check-am: all-am > check: $(BUILT_SOURCES) > $(MAKE) $(AM_MAKEFLAGS) check-am > @@ -18,4 +18,4 @@ $OpenBSD: patch-src_dynamic-preprocessor > +all-am: Makefile $(LTLIBRARIES) > installdirs: > for dir in "$(DESTDIR)$(libdir)"; do \ > - test -z "$$dir" || $(mkdir_p) "$$dir"; \ > + 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.4 > diff -u -p -r1.4 patch-src_dynamic-preprocessors_dns_Makefile_in > --- patches/patch-src_dynamic-preprocessors_dns_Makefile_in 12 Jul 2010 > 19:38:40 -0000 1.4 > +++ patches/patch-src_dynamic-preprocessors_dns_Makefile_in 2 Aug 2010 > 12:29:20 -0000 > @@ -1,8 +1,8 @@ > $OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.4 2010/07/12 > 19:38:40 sthen Exp $ > ---- src/dynamic-preprocessors/dns/Makefile.in.orig Fri Mar 19 20:39:38 2010 > -+++ src/dynamic-preprocessors/dns/Makefile.in Mon Apr 26 20:14:12 2010 > -@@ -201,7 +201,7 @@ sysconfdir = @sysconfdir@ > - target_alias = @target_alias@ > +--- src/dynamic-preprocessors/dns/Makefile.in.orig Thu Jun 24 17:47:42 2010 > ++++ src/dynamic-preprocessors/dns/Makefile.in Thu Jul 22 23:21:56 2010 > +@@ -220,7 +220,7 @@ top_builddir = @top_builddir@ > + top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > lib_LTLIBRARIES = libsf_dns_preproc.la > -libsf_dns_preproc_la_LDFLAGS = -module > @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor > BUILT_SOURCES = \ > sf_dynamic_preproc_lib.c \ > sfPolicyUserData.c > -@@ -385,7 +385,7 @@ distdir: $(DISTFILES) > +@@ -412,7 +412,7 @@ distdir: $(DISTFILES) > check-am: all-am > check: $(BUILT_SOURCES) > $(MAKE) $(AM_MAKEFLAGS) check-am > @@ -18,4 +18,4 @@ $OpenBSD: patch-src_dynamic-preprocessor > +all-am: Makefile $(LTLIBRARIES) > installdirs: > for dir in "$(DESTDIR)$(libdir)"; do \ > - test -z "$$dir" || $(mkdir_p) "$$dir"; \ > + 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.5 > diff -u -p -r1.5 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in > --- patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 12 Jul > 2010 19:38:40 -0000 1.5 > +++ patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 2 Aug > 2010 12:29:20 -0000 > @@ -1,8 +1,8 @@ > $OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.5 > 2010/07/12 19:38:40 sthen Exp $ > ---- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Fri Mar 19 > 20:39:38 2010 > -+++ src/dynamic-preprocessors/ftptelnet/Makefile.in Mon Apr 26 20:14:12 2010 > -@@ -213,7 +213,7 @@ sysconfdir = @sysconfdir@ > - target_alias = @target_alias@ > +--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Thu Jun 24 > 17:47:42 2010 > ++++ src/dynamic-preprocessors/ftptelnet/Makefile.in Thu Jul 22 23:21:56 2010 > +@@ -264,7 +264,7 @@ top_builddir = @top_builddir@ > + top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > lib_LTLIBRARIES = libsf_ftptelnet_preproc.la > -libsf_ftptelnet_preproc_la_LDFLAGS = -module > @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor > BUILT_SOURCES = \ > sf_dynamic_preproc_lib.c \ > sf_ip.c \ > -@@ -533,7 +533,7 @@ distdir: $(DISTFILES) > +@@ -604,7 +604,7 @@ distdir: $(DISTFILES) > check-am: all-am > check: $(BUILT_SOURCES) > $(MAKE) $(AM_MAKEFLAGS) check-recursive > 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.1 > diff -u -p -r1.1 patch-src_dynamic-preprocessors_sdf_Makefile_in > --- patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 12 Jul 2010 > 19:38:40 -0000 1.1 > +++ patches/patch-src_dynamic-preprocessors_sdf_Makefile_in 2 Aug 2010 > 12:29:20 -0000 > @@ -1,8 +1,8 @@ > $OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.1 2010/07/12 > 19:38:40 sthen Exp $ > ---- src/dynamic-preprocessors/sdf/Makefile.in.orig Fri Mar 19 20:39:38 2010 > -+++ src/dynamic-preprocessors/sdf/Makefile.in Mon Apr 26 20:14:13 2010 > -@@ -202,7 +202,7 @@ sysconfdir = @sysconfdir@ > - target_alias = @target_alias@ > +--- src/dynamic-preprocessors/sdf/Makefile.in.orig Thu Jun 24 17:47:42 2010 > ++++ src/dynamic-preprocessors/sdf/Makefile.in Thu Jul 22 23:21:57 2010 > +@@ -221,7 +221,7 @@ top_builddir = @top_builddir@ > + top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > lib_LTLIBRARIES = libsf_sdf_preproc.la > -libsf_sdf_preproc_la_LDFLAGS = -module > @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor > BUILT_SOURCES = \ > sf_dynamic_preproc_lib.c \ > sfPolicyUserData.c > -@@ -394,7 +394,7 @@ distdir: $(DISTFILES) > +@@ -421,7 +421,7 @@ distdir: $(DISTFILES) > check-am: all-am > check: $(BUILT_SOURCES) > $(MAKE) $(AM_MAKEFLAGS) check-am > @@ -18,4 +18,4 @@ $OpenBSD: patch-src_dynamic-preprocessor > +all-am: Makefile $(LTLIBRARIES) > installdirs: > for dir in "$(DESTDIR)$(libdir)"; do \ > - test -z "$$dir" || $(mkdir_p) "$$dir"; \ > + 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.4 > diff -u -p -r1.4 patch-src_dynamic-preprocessors_smtp_Makefile_in > --- patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 12 Jul 2010 > 19:38:40 -0000 1.4 > +++ patches/patch-src_dynamic-preprocessors_smtp_Makefile_in 2 Aug 2010 > 12:29:20 -0000 > @@ -1,8 +1,8 @@ > $OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.4 2010/07/12 > 19:38:40 sthen Exp $ > ---- src/dynamic-preprocessors/smtp/Makefile.in.orig Fri Mar 19 20:39:38 2010 > -+++ src/dynamic-preprocessors/smtp/Makefile.in Mon Apr 26 20:14:13 2010 > -@@ -203,7 +203,7 @@ sysconfdir = @sysconfdir@ > - target_alias = @target_alias@ > +--- src/dynamic-preprocessors/smtp/Makefile.in.orig Thu Jun 24 17:47:42 2010 > ++++ src/dynamic-preprocessors/smtp/Makefile.in Thu Jul 22 23:21:57 2010 > +@@ -222,7 +222,7 @@ top_builddir = @top_builddir@ > + top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > lib_LTLIBRARIES = libsf_smtp_preproc.la > -libsf_smtp_preproc_la_LDFLAGS = -module > @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor > BUILT_SOURCES = \ > sf_dynamic_preproc_lib.c \ > sfPolicyUserData.c > -@@ -404,7 +404,7 @@ distdir: $(DISTFILES) > +@@ -431,7 +431,7 @@ distdir: $(DISTFILES) > check-am: all-am > check: $(BUILT_SOURCES) > $(MAKE) $(AM_MAKEFLAGS) check-am > @@ -18,4 +18,4 @@ $OpenBSD: patch-src_dynamic-preprocessor > +all-am: Makefile $(LTLIBRARIES) > installdirs: > for dir in "$(DESTDIR)$(libdir)"; do \ > - test -z "$$dir" || $(mkdir_p) "$$dir"; \ > + 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.3 > diff -u -p -r1.3 patch-src_dynamic-preprocessors_ssh_Makefile_in > --- patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 12 Jul 2010 > 19:38:40 -0000 1.3 > +++ patches/patch-src_dynamic-preprocessors_ssh_Makefile_in 2 Aug 2010 > 12:29:20 -0000 > @@ -1,8 +1,8 @@ > $OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.3 2010/07/12 > 19:38:40 sthen Exp $ > ---- src/dynamic-preprocessors/ssh/Makefile.in.orig Fri Mar 19 20:39:38 2010 > -+++ src/dynamic-preprocessors/ssh/Makefile.in Mon Apr 26 20:14:13 2010 > -@@ -201,7 +201,7 @@ sysconfdir = @sysconfdir@ > - target_alias = @target_alias@ > +--- src/dynamic-preprocessors/ssh/Makefile.in.orig Thu Jun 24 17:47:43 2010 > ++++ src/dynamic-preprocessors/ssh/Makefile.in Thu Jul 22 23:21:57 2010 > +@@ -220,7 +220,7 @@ top_builddir = @top_builddir@ > + top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > lib_LTLIBRARIES = libsf_ssh_preproc.la > -libsf_ssh_preproc_la_LDFLAGS = -module > @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor > BUILT_SOURCES = \ > sf_dynamic_preproc_lib.c \ > sfPolicyUserData.c > -@@ -385,7 +385,7 @@ distdir: $(DISTFILES) > +@@ -412,7 +412,7 @@ distdir: $(DISTFILES) > check-am: all-am > check: $(BUILT_SOURCES) > $(MAKE) $(AM_MAKEFLAGS) check-am > @@ -18,4 +18,4 @@ $OpenBSD: patch-src_dynamic-preprocessor > +all-am: Makefile $(LTLIBRARIES) > installdirs: > for dir in "$(DESTDIR)$(libdir)"; do \ > - test -z "$$dir" || $(mkdir_p) "$$dir"; \ > + 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.2 > diff -u -p -r1.2 patch-src_dynamic-preprocessors_ssl_Makefile_in > --- patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 12 Jul 2010 > 19:38:40 -0000 1.2 > +++ patches/patch-src_dynamic-preprocessors_ssl_Makefile_in 2 Aug 2010 > 12:29:20 -0000 > @@ -1,8 +1,8 @@ > $OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.2 2010/07/12 > 19:38:40 sthen Exp $ > ---- src/dynamic-preprocessors/ssl/Makefile.in.orig Fri Mar 19 20:39:38 2010 > -+++ src/dynamic-preprocessors/ssl/Makefile.in Mon Apr 26 20:14:13 2010 > -@@ -201,7 +201,7 @@ sysconfdir = @sysconfdir@ > - target_alias = @target_alias@ > +--- src/dynamic-preprocessors/ssl/Makefile.in.orig Thu Jun 24 17:47:43 2010 > ++++ src/dynamic-preprocessors/ssl/Makefile.in Thu Jul 22 23:21:57 2010 > +@@ -220,7 +220,7 @@ top_builddir = @top_builddir@ > + top_srcdir = @top_srcdir@ > AUTOMAKE_OPTIONS = foreign no-dependencies > lib_LTLIBRARIES = libsf_ssl_preproc.la > -libsf_ssl_preproc_la_LDFLAGS = -module > @@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessor > BUILT_SOURCES = \ > sf_dynamic_preproc_lib.c \ > sfPolicyUserData.c > -@@ -395,7 +395,7 @@ distdir: $(DISTFILES) > +@@ -422,7 +422,7 @@ distdir: $(DISTFILES) > check-am: all-am > check: $(BUILT_SOURCES) > $(MAKE) $(AM_MAKEFLAGS) check-am > @@ -18,4 +18,4 @@ $OpenBSD: patch-src_dynamic-preprocessor > +all-am: Makefile $(LTLIBRARIES) > installdirs: > for dir in "$(DESTDIR)$(libdir)"; do \ > - test -z "$$dir" || $(mkdir_p) "$$dir"; \ > + 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.3 > diff -u -p -r1.3 patch-src_log_c > --- patches/patch-src_log_c 12 Jul 2010 19:38:40 -0000 1.3 > +++ patches/patch-src_log_c 2 Aug 2010 12:29:20 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-src_log_c,v 1.3 2010/07/12 19:38:40 sthen Exp $ > ---- src/log.c.orig Tue Jan 26 19:10:51 2010 > -+++ src/log.c Thu Apr 22 07:53:46 2010 > -@@ -407,7 +407,7 @@ void PrintIPPkt(FILE * fp, int type, Packet * p) > +--- src/log.c.orig Sat Jun 26 00:23:15 2010 > ++++ src/log.c Thu Jul 22 23:21:57 2010 > +@@ -408,7 +408,7 @@ void PrintIPPkt(FILE * fp, int type, Packet * p) > DEBUG_WRAP(DebugMessage(DEBUG_LOG, "PrintIPPkt type = %d\n", type);); > > bzero((char *) timestamp, TIMEBUF_SIZE); > @@ -10,7 +10,7 @@ $OpenBSD: patch-src_log_c,v 1.3 2010/07/ > > /* dump the timestamp */ > fwrite(timestamp, strlen(timestamp), 1, fp); > -@@ -918,7 +918,7 @@ void PrintArpHeader(FILE * fp, Packet * p) > +@@ -933,7 +933,7 @@ void PrintArpHeader(FILE * fp, Packet * p) > > bzero((struct in_addr *) &ip_addr, sizeof(struct in_addr)); > bzero((char *) timestamp, TIMEBUF_SIZE); > @@ -19,7 +19,7 @@ $OpenBSD: patch-src_log_c,v 1.3 2010/07/ > > /* determine what to use as MAC src and dst */ > if (p->eh != NULL) > -@@ -1959,7 +1959,7 @@ void PrintEapolPkt(FILE * fp, Packet * p) > +@@ -1974,7 +1974,7 @@ void PrintEapolPkt(FILE * fp, Packet * p) > > > bzero((char *) timestamp, TIMEBUF_SIZE); > @@ -28,7 +28,7 @@ $OpenBSD: patch-src_log_c,v 1.3 2010/07/ > > /* dump the timestamp */ > fwrite(timestamp, strlen(timestamp), 1, fp); > -@@ -2133,7 +2133,7 @@ void PrintWifiPkt(FILE * fp, Packet * p) > +@@ -2148,7 +2148,7 @@ void PrintWifiPkt(FILE * fp, Packet * p) > > > bzero((char *) timestamp, TIMEBUF_SIZE); > Index: patches/patch-src_log_text_c > =================================================================== > RCS file: /cvs/ports/net/snort/patches/patch-src_log_text_c,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-src_log_text_c > --- patches/patch-src_log_text_c 12 Jul 2010 19:38:40 -0000 1.3 > +++ patches/patch-src_log_text_c 2 Aug 2010 12:29:20 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-src_log_text_c,v 1.3 2010/07/12 19:38:40 sthen Exp $ > ---- src/log_text.c.orig Tue Jan 26 19:10:51 2010 > -+++ src/log_text.c Thu Apr 22 07:53:46 2010 > -@@ -66,7 +66,7 @@ extern OptTreeNode *otn_tmp; /* global ptr to curre > +--- src/log_text.c.orig Sat Jun 26 00:23:15 2010 > ++++ src/log_text.c Thu Jul 22 23:21:57 2010 > +@@ -67,7 +67,7 @@ extern uint8_t DecodeBuffer[DECODE_BLEN]; > void LogTimeStamp(TextLog* log, Packet* p) > { > char timestamp[TIMEBUF_SIZE]; > Index: patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c > =================================================================== > RCS file: > /cvs/ports/net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v > retrieving revision 1.4 > diff -u -p -r1.4 patch-src_preprocessors_Stream5_snort_stream5_tcp_c > --- patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 12 Jul > 2010 19:38:40 -0000 1.4 > +++ patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 2 Aug > 2010 12:29:20 -0000 > @@ -1,18 +1,7 @@ > $OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.4 > 2010/07/12 19:38:40 sthen Exp $ > ---- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Thu Mar 18 > 18:50:59 2010 > -+++ src/preprocessors/Stream5/snort_stream5_tcp.c Tue May 4 20:30:20 2010 > -@@ -143,8 +143,10 @@ extern tSfPolicyUserContextId s5_swap_config; > - #define SEQ_GEQ(a,b) ((int)((a) - (b)) >= 0) > - #define SEQ_EQ(a,b) ((int)((a) - (b)) == 0) > - > -+/* already in sys/param.h > - #define MIN(a,b) (((a)<(b)) ? (a):(b)) > - #define MAX(a,b) (((a)>(b)) ? (a):(b)) > -+*/ > - > - #define PAWS_WINDOW 60 > - #define PAWS_24DAYS 2073600 /* 24 days in seconds */ > -@@ -7077,7 +7079,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet > +--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Sat Jun 26 > 00:23:31 2010 > ++++ src/preprocessors/Stream5/snort_stream5_tcp.c Thu Jul 22 23:21:58 2010 > +@@ -7081,7 +7081,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet > char src_addr[17]; > char dst_addr[17]; > bzero((char *)timestamp, TIMEBUF_SIZE); > Index: patches/patch-src_snort_h > =================================================================== > RCS file: patches/patch-src_snort_h > diff -N patches/patch-src_snort_h > --- patches/patch-src_snort_h 12 Jul 2010 19:38:40 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-src_snort_h,v 1.1 2010/07/12 19:38:40 sthen Exp $ > ---- src/snort.h.orig Thu Mar 18 18:50:54 2010 > -+++ src/snort.h Wed May 5 20:26:16 2010 > -@@ -60,7 +60,7 @@ > - # include "inline.h" > - #endif /* GIDS */ > - > --#if defined(INLINE_FAILOPEN) || defined(TARGET_BASED) || > defined(SNORT_RELOAD) > -+#if defined(HAVE_LIBPRELUDE) || defined(INLINE_FAILOPEN) || > defined(TARGET_BASED) || defined(SNORT_RELOAD) > - # include <pthread.h> > - #endif > -
