Hello,
attached is an update to recent snort 2.9.5.
Please test, comment, and maybe commit.
Test build and run on sparc64 so far.
Regards,
Markus
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- Makefile 31 May 2013 20:26:00 -0000 1.79
+++ Makefile 3 Jul 2013 20:53:10 -0000
@@ -4,8 +4,8 @@ SHARED_ONLY = Yes
COMMENT = highly flexible sniffer/NIDS
-VERSION = 2.9.4.6
-DISTNAME = snort-${VERSION}
+VERSION = 2.9.5.0
+DISTNAME = snort-2.9.5
CATEGORIES = net security
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo 31 May 2013 20:26:00 -0000 1.24
+++ distinfo 3 Jul 2013 20:53:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.4.6.tar.gz) = z6pTkLGECqqmimwFpwd92Sy5FuYYagFLqkUdQ82ws7w=
-SIZE (snort-2.9.4.6.tar.gz) = 5338762
+SHA256 (snort-2.9.5.tar.gz) = H5mXcW6MCGydYIKUpVwyOEaHfI8WrNEpqQyl+tu6GJA=
+SIZE (snort-2.9.5.tar.gz) = 5422421
Index: patches/patch-src_decode_h
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_decode_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_decode_h
--- patches/patch-src_decode_h 16 Jan 2013 04:52:53 -0000 1.3
+++ patches/patch-src_decode_h 3 Jul 2013 20:53:10 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_decode_h,v 1.3 2013/01/16 04:52:53 lteo Exp $
---- src/decode.h.orig Fri Sep 21 02:09:13 2012
-+++ src/decode.h Tue Oct 9 22:18:48 2012
-@@ -806,9 +806,9 @@ typedef struct _SLLHdr {
+--- src/decode.h.orig Tue Jun 4 23:19:52 2013
++++ src/decode.h Tue Jul 2 20:52:28 2013
+@@ -812,9 +812,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
-- * Pflog3_Hdr: CVS = 1.172, DLT_PFLOG = 117, Length = 100
-+ * Pflog4_Hdr: CVS = 1.16, DLT_PFLOG = 117, Length = 100
+- * Pflog3_Hdr: CVS = 1.172, DLT_PFLOG = 117, Length = 100
++ * Pflog4_Hdr: CVS = 1.16, DLT_PFLOG = 117, Length = 100
*
- * Since they have the same DLT, Pflog{2,3}Hdr are distinguished
+ * Since they have the same DLT, Pflog{2,3,4}Hdr are distinguished
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.7
diff -u -p -r1.7 patch-src_dynamic-plugins_sf_dynamic_plugins_c
--- patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c 16 Jan 2013
04:52:53 -0000 1.7
+++ patches/patch-src_dynamic-plugins_sf_dynamic_plugins_c 3 Jul 2013
20:53:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-plugins_sf_dynamic_plugins_c,v 1.7 2013/01/16
04:52:53 lteo Exp $
---- src/dynamic-plugins/sf_dynamic_plugins.c.orig Fri Sep 21 02:09:13 2012
-+++ src/dynamic-plugins/sf_dynamic_plugins.c Tue Oct 9 22:18:49 2012
-@@ -253,8 +253,7 @@ void LoadAllLibs(char *path, LoadLibraryFunc loadFunc)
+--- src/dynamic-plugins/sf_dynamic_plugins.c.orig Tue Jun 4 23:19:52 2013
++++ src/dynamic-plugins/sf_dynamic_plugins.c Mon Jul 1 23:00:39 2013
+@@ -256,8 +256,7 @@ void LoadAllLibs(const char * const path, LoadLibraryF
dir_entry = readdir(directory);
while (dir_entry != NULL)
{
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.10
diff -u -p -r1.10 patch-src_dynamic-preprocessors_Makefile_in
--- patches/patch-src_dynamic-preprocessors_Makefile_in 31 May 2013 20:26:01
-0000 1.10
+++ patches/patch-src_dynamic-preprocessors_Makefile_in 3 Jul 2013 20:53:10
-0000
@@ -1,35 +1,23 @@
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.10 2013/05/31
20:26:01 lteo Exp $
---- src/dynamic-preprocessors/Makefile.in.orig Mon Apr 15 15:57:47 2013
-+++ src/dynamic-preprocessors/Makefile.in Wed Apr 24 14:51:57 2013
-@@ -1024,8 +1024,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)
--@HAVE_DYNAMIC_PLUGINS_FALSE@uninstall-local:
--@HAVE_DYNAMIC_PLUGINS_FALSE@install-data-local:
-+uninstall-local:
-+install-data-local:
- clean: clean-recursive
-
- clean-am: clean-generic clean-libtool clean-local \
-@@ -1335,20 +1335,7 @@ include/file_lib.h: $(top_srcdir)/src/file-process/lib
- clean-local:
+--- src/dynamic-preprocessors/Makefile.in.orig Tue Jun 4 23:21:39 2013
++++ src/dynamic-preprocessors/Makefile.in Mon Jul 1 23:06:13 2013
+@@ -1333,19 +1333,8 @@ 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/.*\///"`; \
--@HAVE_DYNAMIC_PLUGINS_TRUE@ $(mkinstalldirs)
$(DESTDIR)$(srcinstdir); \
--@HAVE_DYNAMIC_PLUGINS_TRUE@ if test -f $(srcdir)/$$f; then
p=$(srcdir)/$$f; else p=$$f; fi; \
--@HAVE_DYNAMIC_PLUGINS_TRUE@ $(INSTALL_DATA) $$p
$(DESTDIR)$(srcinstdir)/$$truefile; \
--@HAVE_DYNAMIC_PLUGINS_TRUE@ done
+ install-data-local:
+- @for f in $(exported_files); do \
+- truefile=`echo $$f | sed -e "s/.*\///"`; \
+- $(mkinstalldirs) $(DESTDIR)$(srcinstdir); \
+- if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi;
\
+- $(INSTALL_DATA) $$p $(DESTDIR)$(srcinstdir)/$$truefile; \
+- done
--@HAVE_DYNAMIC_PLUGINS_TRUE@uninstall-local:
--@HAVE_DYNAMIC_PLUGINS_TRUE@ @for f in $(exported_files); do \
--@HAVE_DYNAMIC_PLUGINS_TRUE@ truefile=`echo $$f | sed -e
"s/.*\///"`; \
--@HAVE_DYNAMIC_PLUGINS_TRUE@ $(mkinstalldirs)
$(DESTDIR)$(srcinstdir); \
--@HAVE_DYNAMIC_PLUGINS_TRUE@ rm -f
$(DESTDIR)$(srcinstdir)/$$truefile; \
--@HAVE_DYNAMIC_PLUGINS_TRUE@ done
+ uninstall-local:
+- @for f in $(exported_files); do \
+- truefile=`echo $$f | sed -e "s/.*\///"`; \
+- $(mkinstalldirs) $(DESTDIR)$(srcinstdir); \
+- rm -f $(DESTDIR)$(srcinstdir)/$$truefile; \
+- 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.
Index: patches/patch-src_ppm_c
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_ppm_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_ppm_c
--- patches/patch-src_ppm_c 16 Jan 2013 04:52:53 -0000 1.6
+++ patches/patch-src_ppm_c 3 Jul 2013 20:53:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_ppm_c,v 1.6 2013/01/16 04:52:53 lteo Exp $
---- src/ppm.c.orig Fri Sep 21 02:09:13 2012
-+++ src/ppm.c Tue Oct 9 22:18:53 2012
-@@ -456,7 +456,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
+--- src/ppm.c.orig Tue Jun 4 23:19:52 2013
++++ src/ppm.c Mon Jul 1 23:00:43 2013
+@@ -505,7 +505,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.6 2013/01/
for (i=0; i< ppm_n_crules; i++)
{
-@@ -512,7 +512,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
+@@ -584,7 +584,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:
/cvs/ports/net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_preprocessors_Stream5_snort_stream5_tcp_c
--- patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 23 Apr 2013
02:04:13 -0000 1.8
+++ patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c 3 Jul 2013
20:53:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.8 2013/04/23
02:04:13 lteo Exp $
---- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Thu Mar 21 14:03:47 2013
-+++ src/preprocessors/Stream5/snort_stream5_tcp.c Thu Apr 4 22:28:17 2013
-@@ -7523,7 +7523,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
+--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Tue Jun 4 23:19:53 2013
++++ src/preprocessors/Stream5/snort_stream5_tcp.c Mon Jul 1 23:00:43 2013
+@@ -7449,7 +7449,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.6
diff -u -p -r1.6 patch-src_preprocessors_spp_sfportscan_c
--- patches/patch-src_preprocessors_spp_sfportscan_c 16 Jan 2013 04:52:53
-0000 1.6
+++ patches/patch-src_preprocessors_spp_sfportscan_c 3 Jul 2013 20:53:10
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.6 2013/01/16 04:52:53
lteo Exp $
---- src/preprocessors/spp_sfportscan.c.orig Fri Sep 21 02:09:14 2012
-+++ src/preprocessors/spp_sfportscan.c Tue Oct 9 22:18:53 2012
-@@ -272,7 +272,7 @@ static int LogPortscanAlert(Packet *p, char *msg, uint
+--- src/preprocessors/spp_sfportscan.c.orig Tue Jun 4 23:19:53 2013
++++ src/preprocessors/spp_sfportscan.c Mon Jul 1 23:00:43 2013
+@@ -271,7 +271,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.6
diff -u -p -r1.6 patch-src_util_c
--- patches/patch-src_util_c 16 Jan 2013 04:52:53 -0000 1.6
+++ patches/patch-src_util_c 3 Jul 2013 20:53:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_util_c,v 1.6 2013/01/16 04:52:53 lteo Exp $
---- src/util.c.orig Fri Sep 21 02:09:13 2012
-+++ src/util.c Tue Oct 9 22:18:54 2012
-@@ -216,12 +216,13 @@ int DisplayBanner(void)
+--- src/util.c.orig Tue Jun 4 23:19:52 2013
++++ src/util.c Mon Jul 1 23:00:43 2013
+@@ -226,12 +226,13 @@ int DisplayBanner(void)
* Returns: void function
*
****************************************************************************/
@@ -16,7 +16,7 @@ $OpenBSD: patch-src_util_c,v 1.6 2013/01
struct timezone tz;
struct tm *lt; /* place to stick the adjusted clock data */
-@@ -231,7 +232,9 @@ void ts_print(register const struct timeval *tvp, char
+@@ -241,7 +242,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: patches/patch-src_util_h
===================================================================
RCS file: /cvs/ports/net/snort/patches/patch-src_util_h,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_util_h
--- patches/patch-src_util_h 26 Sep 2012 02:11:05 -0000 1.4
+++ patches/patch-src_util_h 3 Jul 2013 20:53:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_util_h,v 1.4 2012/09/26 02:11:05 lteo Exp $
---- src/util.h.orig Sat Mar 17 22:51:54 2012
-+++ src/util.h Sat May 26 15:10:21 2012
-@@ -44,6 +44,7 @@
+--- src/util.h.orig Tue Jun 4 23:19:52 2013
++++ src/util.h Mon Jul 1 23:00:43 2013
+@@ -49,6 +49,7 @@
#include "sflsq.h"
#include "sfutil/sf_ipvar.h"
#include "ipv6_port.h"
@@ -9,7 +9,7 @@ $OpenBSD: patch-src_util_h,v 1.4 2012/09
/* Macros
*********************************************************************/
-@@ -177,7 +178,7 @@ typedef struct _IntervalStats
+@@ -183,7 +184,7 @@ void StoreSnortInfoStrings(void);
int DisplayBanner(void);
void GetTime(char *);
int gmt2local(time_t);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/snort/pkg/PLIST,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST
--- pkg/PLIST 16 Jan 2013 04:52:53 -0000 1.23
+++ pkg/PLIST 3 Jul 2013 20:53:10 -0000
@@ -82,7 +82,6 @@ share/doc/snort/README.decoder_preproc_r
share/doc/snort/README.dnp3
share/doc/snort/README.dns
share/doc/snort/README.event_queue
-share/doc/snort/README.file
share/doc/snort/README.filters
share/doc/snort/README.flowbits
share/doc/snort/README.frag3
