Hello,
here is an update to snort 2.8.4.1. I marked the port as SHARED_ONLY as
pointed out by naddy some time ago on ports@
Please test and report which flavor/arch/output plugin you use/tested.
Thanks.
Regards,
Markus
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile 12 Feb 2009 22:12:08 -0000 1.53
+++ Makefile 22 May 2009 00:00:40 -0000
@@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.53 2009/02/12 22:12:08 rui Exp $
+SHARED_ONLY = Yes
+
COMMENT = highly flexible sniffer/NIDS
-DISTNAME = snort-2.8.3.2
+DISTNAME = snort-2.8.4.1
CATEGORIES = net security
MASTER_SITES = ${HOMEPAGE}dl/
@@ -17,13 +19,14 @@ PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = c m pcap
-SHARED_LIBS = sf_engine 2.0 \
- sf_dns_preproc 2.0 \
- sf_ftptelnet_preproc 2.0 \
- sf_smtp_preproc 2.0 \
- sf_dcerpc_preproc 1.0 \
- sf_ssh_preproc 1.0 \
- sf_ssl_preproc 0.0 \
+SHARED_LIBS = sf_engine 3.0 \
+ sf_dce2_preproc 0.0 \
+ sf_dcerpc_preproc 2.0 \
+ sf_dns_preproc 3.0 \
+ sf_ftptelnet_preproc 3.0 \
+ sf_smtp_preproc 3.0 \
+ sf_ssh_preproc 2.0 \
+ sf_ssl_preproc 1.0 \
_sfdynamic_example_rule 0.0 \
_sfdynamic_preprocessor_example 0.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 12 Feb 2009 22:12:08 -0000 1.17
+++ distinfo 22 May 2009 00:00:40 -0000
@@ -1,5 +1,5 @@
-MD5 (snort-2.8.3.2.tar.gz) = 91VH2jNEbdtMoH7v2c4x3A==
-RMD160 (snort-2.8.3.2.tar.gz) = IkPA8DLM1fFbRGGP2gCQRCbSz4Y=
-SHA1 (snort-2.8.3.2.tar.gz) = P+Y1LMzcN4KPJS8GKwal+jEDXaw=
-SHA256 (snort-2.8.3.2.tar.gz) = nsNBHGgekQcjTKBBAEJAidM3VCsCL4y1gPLrrlsEDD4=
-SIZE (snort-2.8.3.2.tar.gz) = 4478448
+MD5 (snort-2.8.4.1.tar.gz) = Y/TnaulqLRM/THt0G61UWA==
+RMD160 (snort-2.8.4.1.tar.gz) = jzijfJ8Wm6uVKUbMq6JMktJnuIA=
+SHA1 (snort-2.8.4.1.tar.gz) = P/q7U2bAiJUv76sZqNwZzoTWJkU=
+SHA256 (snort-2.8.4.1.tar.gz) = 7n95DrPfTmFWp8hl8boihVOUyePBP9xX1gqGRyZ/wgk=
+SIZE (snort-2.8.4.1.tar.gz) = 4567713
Index: patches/patch-etc_snort_conf
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-etc_snort_conf,v
retrieving revision 1.3
diff -u -p -r1.3 patch-etc_snort_conf
--- patches/patch-etc_snort_conf 12 Feb 2009 22:12:08 -0000 1.3
+++ patches/patch-etc_snort_conf 22 May 2009 00:00:40 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-etc_snort_conf,v 1.3 2009/02/12 22:12:08 rui Exp $
---- etc/snort.conf.orig Mon Sep 15 18:28:02 2008
-+++ etc/snort.conf Thu Nov 6 17:44:46 2008
+--- etc/snort.conf.orig Wed Mar 11 14:22:03 2009
++++ etc/snort.conf Wed Apr 8 12:47:17 2009
@@ -78,7 +78,10 @@ var SNMP_SERVERS $HOME_NET
# like this:
#
Index: patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c
===================================================================
RCS file:
/cvs/ports/net/snort/patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_dynamic-plugins_sf_dynamic_plugins_c
--- patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c 12 Feb 2009
22:12:08 -0000 1.3
+++ patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c 22 May 2009
00:00:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-plugins_sf_dynamic_plugins_c,v 1.3 2009/02/12
22:12:08 rui Exp $
---- src/dynamic-plugins/sf_dynamic_plugins.c.orig Wed Apr 30 20:53:15 2008
-+++ src/dynamic-plugins/sf_dynamic_plugins.c Fri Aug 8 14:57:43 2008
-@@ -227,8 +227,7 @@ void LoadAllLibs(char *path, LoadLibraryFunc loadFunc)
+--- src/dynamic-plugins/sf_dynamic_plugins.c.orig Mon Jan 26 22:50:08 2009
++++ src/dynamic-plugins/sf_dynamic_plugins.c Wed Apr 8 12:40:35 2009
+@@ -233,8 +233,7 @@ void LoadAllLibs(char *path, LoadLibraryFunc loadFunc)
dirEntry = readdir(directory);
while (dirEntry)
{
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.3
diff -u -p -r1.3 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 12 Feb 2009 22:12:08
-0000 1.3
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 22 May 2009 00:00:40
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.3 2009/02/12
22:12:08 rui Exp $
---- src/dynamic-preprocessors/Makefile.in.orig Fri Jul 18 22:52:05 2008
-+++ src/dynamic-preprocessors/Makefile.in Fri Aug 8 14:57:43 2008
-@@ -569,8 +569,7 @@ maintainer-clean-generic:
+--- src/dynamic-preprocessors/Makefile.in.orig Wed Mar 11 14:19:27 2009
++++ src/dynamic-preprocessors/Makefile.in Wed Apr 8 12:40:35 2009
+@@ -574,8 +574,7 @@ 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)
@@ -11,7 +11,7 @@ $OpenBSD: patch-src_dynamic-preprocessor
clean: clean-recursive
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-@@ -737,20 +736,6 @@ include/str_search.h: $(srcdir)/../preprocessors/str_s
+@@ -757,20 +756,6 @@ include/str_search.h: $(srcdir)/../preprocessors/str_s
clean-local:
rm -rf include build
Index: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
===================================================================
RCS file: patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
diff -N patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in 22 May 2009
00:00:40 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig Wed Mar 11 14:19:28 2009
++++ src/dynamic-preprocessors/dcerpc2/Makefile.in Wed Apr 8 15:58:27 2009
+@@ -418,7 +418,7 @@ distdir: $(DISTFILES)
+ check-am: all-am
+ check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
+-all-am: Makefile $(LTLIBRARIES) all-local
++all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+ for dir in "$(DESTDIR)$(libdir)"; 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.3
diff -u -p -r1.3 patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
--- patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 12 Feb
2009 22:12:08 -0000 1.3
+++ patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in 22 May
2009 00:00:40 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.3
2009/02/12 22:12:08 rui Exp $
---- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Fri Jul 18
22:52:06 2008
-+++ src/dynamic-preprocessors/ftptelnet/Makefile.in Fri Aug 8 14:57:43 2008
-@@ -414,7 +414,7 @@ distdir: $(DISTFILES)
+--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Wed Mar 11
14:19:29 2009
++++ src/dynamic-preprocessors/ftptelnet/Makefile.in Wed Apr 8 12:43:22 2009
+@@ -528,7 +528,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-am
+ $(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES)
- installdirs:
+ installdirs: installdirs-recursive
+ installdirs-am:
for dir in "$(DESTDIR)$(libdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: patches/patch-src_log_text_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_log_text_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_log_text_c
--- patches/patch-src_log_text_c 12 Feb 2009 22:12:08 -0000 1.1
+++ patches/patch-src_log_text_c 22 May 2009 00:00:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_log_text_c,v 1.1 2009/02/12 22:12:08 rui Exp $
---- src/log_text.c.orig Wed Apr 30 20:41:31 2008
-+++ src/log_text.c Fri Aug 8 16:03:17 2008
-@@ -61,7 +61,7 @@ extern OptTreeNode *otn_tmp; /* global ptr to curre
+--- src/log_text.c.orig Mon Jan 26 22:49:57 2009
++++ src/log_text.c Wed Apr 8 12:40:36 2009
+@@ -62,7 +62,7 @@ extern OptTreeNode *otn_tmp; /* global ptr to curre
void LogTimeStamp(TextLog* log, Packet* p)
{
char timestamp[TIMEBUF_SIZE];
Index: patches/patch-src_ppm_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_ppm_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_ppm_c
--- patches/patch-src_ppm_c 12 Feb 2009 22:12:08 -0000 1.2
+++ patches/patch-src_ppm_c 22 May 2009 00:00:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_ppm_c,v 1.2 2009/02/12 22:12:08 rui Exp $
---- src/ppm.c.orig Mon Sep 15 16:41:26 2008
-+++ src/ppm.c Thu Oct 30 18:26:56 2008
-@@ -395,7 +395,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
+--- src/ppm.c.orig Mon Jan 26 22:49:58 2009
++++ src/ppm.c Wed Apr 8 12:40:37 2009
+@@ -361,7 +361,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
if( ppm_cfg.rule_log & PPM_LOG_MESSAGE )
{
if(!*timestamp)
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_ppm_c,v 1.2 2009/02/
for (i=0; i< ppm_n_crules; i++)
{
-@@ -451,7 +451,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
+@@ -417,7 +417,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
if( ppm_cfg.rule_log & PPM_LOG_MESSAGE )
{
if(!*timestamp)
@@ -19,21 +19,3 @@ $OpenBSD: patch-src_ppm_c,v 1.2 2009/02/
for (i=0; i< ppm_n_rules; i++)
{
-@@ -520,7 +520,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
- if( ppm_cfg.rule_log & PPM_LOG_MESSAGE )
- {
- if(!*timestamp)
-- ts_print((struct timeval*)&p->pkth->ts, timestamp);
-+ ts_print((struct timeval32*)&p->pkth->ts, timestamp);
-
- LogMessage(PPM_FMT_REENABLED,
- otn->sigInfo.generator,
-@@ -583,7 +583,7 @@ void ppm_rule_log( UINT64 pktcnt, Packet * p)
- if( ppm_cfg.rule_log & PPM_LOG_MESSAGE )
- {
- if(!*timestamp)
-- ts_print((struct timeval*)&p->pkth->ts, timestamp);
-+ ts_print((struct timeval32*)&p->pkth->ts, timestamp);
-
- LogMessage(PPM_FMT_SUSPENDED,
- otn->sigInfo.generator,
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.2
diff -u -p -r1.2 patch-src_preprocessors_Stream5_snort_stream5_tcp_c
--- patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 12 Feb 2009
22:12:08 -0000 1.2
+++ patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 22 May 2009
00:00:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.2 2009/02/12
22:12:08 rui Exp $
---- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Tue Dec 30 16:50:33 2008
-+++ src/preprocessors/Stream5/snort_stream5_tcp.c Wed Jan 21 02:42:47 2009
-@@ -6501,7 +6501,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
+--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Tue Apr 21 18:52:36 2009
++++ src/preprocessors/Stream5/snort_stream5_tcp.c Wed Apr 29 12:42:40 2009
+@@ -6804,7 +6804,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
char src_addr[17];
char dst_addr[17];
bzero((char *)timestamp, TIMEBUF_SIZE);
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.2
diff -u -p -r1.2 patch-src_preprocessors_spp_sfportscan_c
--- patches/patch-src_preprocessors_spp_sfportscan_c 12 Feb 2009 22:12:08
-0000 1.2
+++ patches/patch-src_preprocessors_spp_sfportscan_c 22 May 2009 00:00:40
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.2 2009/02/12 22:12:08
rui Exp $
---- src/preprocessors/spp_sfportscan.c.orig Mon Feb 25 20:27:45 2008
-+++ src/preprocessors/spp_sfportscan.c Fri Aug 8 14:57:45 2008
-@@ -287,7 +287,7 @@ static int LogPortscanAlert(Packet *p, char *msg, u_in
+--- src/preprocessors/spp_sfportscan.c.orig Mon Jan 26 22:50:30 2009
++++ src/preprocessors/spp_sfportscan.c Wed Apr 8 12:40:37 2009
+@@ -288,7 +288,7 @@ static int LogPortscanAlert(Packet *p, char *msg, u_in
return 0;
}
Index: patches/patch-src_util_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_util_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_util_c
--- patches/patch-src_util_c 12 Feb 2009 22:12:08 -0000 1.2
+++ patches/patch-src_util_c 22 May 2009 00:00:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_util_c,v 1.2 2009/02/12 22:12:08 rui Exp $
---- src/util.c.orig Tue Apr 15 20:13:56 2008
-+++ src/util.c Fri Aug 8 14:57:45 2008
-@@ -406,12 +406,13 @@ int DisplayBanner()
+--- src/util.c.orig Wed Mar 11 13:54:59 2009
++++ src/util.c Wed Apr 8 12:40:37 2009
+@@ -418,12 +418,13 @@ int DisplayBanner()
* Returns: void function
*
****************************************************************************/
@@ -16,7 +16,7 @@ $OpenBSD: patch-src_util_c,v 1.2 2009/02
struct timezone tz;
struct tm *lt; /* place to stick the adjusted clock data */
-@@ -421,7 +422,9 @@ void ts_print(register const struct timeval *tvp, char
+@@ -433,7 +434,9 @@ void ts_print(register const struct timeval *tvp, char
/* manual page (for linux) says tz is never used, so.. */
bzero((char *) &tz, sizeof(tz));
gettimeofday(&tv, &tz);
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/net/snort/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.shared
--- pkg/PFRAG.shared 12 Feb 2009 22:12:08 -0000 1.3
+++ pkg/PFRAG.shared 22 May 2009 00:00:40 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2009/02/12 22:12:08 rui Exp $
@lib lib/snort_dynamicengine/libsf_engine.so.${LIBsf_engine_VERSION}
@lib
lib/snort_dynamicpreprocessor/lib_sfdynamic_preprocessor_example.so.${LIB_sfdynamic_preprocessor_example_VERSION}
+...@lib
lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.${LIBsf_dce2_preproc_VERSION}
@lib
lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.so.${LIBsf_dcerpc_preproc_VERSION}
@lib
lib/snort_dynamicpreprocessor/libsf_dns_preproc.so.${LIBsf_dns_preproc_VERSION}
@lib
lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.${LIBsf_ftptelnet_preproc_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/snort/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 12 Feb 2009 22:12:08 -0000 1.17
+++ pkg/PLIST 22 May 2009 00:00:40 -0000
@@ -3,13 +3,15 @@
@newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
%%prelude%%
%%SHARED%%
-...@bin bin/snort
+bin/snort
lib/snort_dynamicengine/
lib/snort_dynamicengine/libsf_engine.a
@comment lib/snort_dynamicengine/libsf_engine.la
lib/snort_dynamicpreprocessor/
lib/snort_dynamicpreprocessor/lib_sfdynamic_preprocessor_example.a
@comment lib/snort_dynamicpreprocessor/lib_sfdynamic_preprocessor_example.la
+lib/snort_dynamicpreprocessor/libsf_dce2_preproc.a
+...@comment lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la
lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.a
@comment lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.la
lib/snort_dynamicpreprocessor/libsf_dns_preproc.a
@@ -48,12 +50,11 @@ share/doc/snort/README.asn1
share/doc/snort/README.csv
share/doc/snort/README.database
share/doc/snort/README.dcerpc
+share/doc/snort/README.dcerpc2
share/doc/snort/README.decode
share/doc/snort/README.decoder_preproc_rules
share/doc/snort/README.dns
share/doc/snort/README.event_queue
-share/doc/snort/README.flow
-share/doc/snort/README.flow-portscan
share/doc/snort/README.flowbits
share/doc/snort/README.frag3
share/doc/snort/README.ftptelnet
@@ -66,7 +67,6 @@ share/doc/snort/README.ppm
share/doc/snort/README.sfportscan
share/doc/snort/README.ssh
share/doc/snort/README.ssl
-share/doc/snort/README.stream4
share/doc/snort/README.stream5
share/doc/snort/README.tag
share/doc/snort/README.thresholding
@@ -108,7 +108,7 @@ share/examples/snort/threshold.conf
@sample ${SYSCONFDIR}/snort/threshold.conf
share/examples/snort/unicode.map
@sample ${SYSCONFDIR}/snort/unicode.map
-...@sample /var/snort/
@owner _snort
@group _snort
+...@sample /var/snort/
@sample /var/snort/log/
