On Thu, Nov 29, 2007 at 12:21:13AM +0100, Markus Lude wrote:
>Hello,
>here is an update to snort 2.8.0. Please test/comment/commit/...
>
>Based on changes for 2.7.0.1 by Jason Dixon.
>Some added patches fix bus errors on sparc64 noticed by [EMAIL PROTECTED]
>
>If noone other wants, I would take maintainership (not included in
>diff).
>
>Regards,
>Markus
>
Attached diff to apply after your diff.
* Updated to 2.8.0.1
* Fixes flexresp flavor: http://marc.info/?l=snort-users&m=119099490314507&w=2
* Fixes prelude WANTLIB
* Replaces depricated --with-mysql
diff -ur ../snort.patched/Makefile ./Makefile
--- ../snort.patched/Makefile Fri Nov 30 11:56:08 2007
+++ ./Makefile Fri Nov 30 11:59:14 2007
@@ -2,8 +2,7 @@
COMMENT= highly flexible sniffer/NIDS
-DISTNAME= snort-2.8.0
-PKGNAME= ${DISTNAME}
+DISTNAME= snort-2.8.0.1
CATEGORIES= net security
MASTER_SITES= ${HOMEPAGE}/dl/current/
@@ -43,6 +42,9 @@
.if ${FLAVOR:L:Mflexresp}
LIB_DEPENDS+= dnet.=1::net/libdnet
CONFIGURE_ARGS+=--enable-flexresp2
+
+MASTER_SITES0= http://ftp.secure.lv/pub/distfiles/
+PATCHFILES= respond2_patch.diff:0
.endif
.if ${FLAVOR:L:Mpostgresql}
@@ -52,13 +54,14 @@
.if ${FLAVOR:L:Mmysql}
LIB_DEPENDS+= lib/mysql/mysqlclient.>=10::databases/mysql
-CONFIGURE_ARGS+=--with-mysql="${LOCALBASE}"
+CONFIGURE_ARGS+=--with-mysql-libraries="${LOCALBASE}/lib" \
+ --with-mysql-includes="${LOCALBASE}/include"
WANTLIB+= z
.endif
.if ${FLAVOR:L:Mprelude}
MODULES= devel/gettext
-WANTLIB+= gcrypt gpg-error pthread z
+WANTLIB+= gcrypt gnutls gpg-error pthread z
LIB_DEPENDS+= prelude.>=8::security/prelude/libprelude
CONFIGURE_ARGS+=--enable-prelude
MESSAGE= ${PKGDIR}/MESSAGE-prelude
diff -ur ../snort.patched/distinfo ./distinfo
--- ../snort.patched/distinfo Fri Nov 30 11:56:08 2007
+++ ./distinfo Fri Nov 30 11:59:54 2007
@@ -1,5 +1,10 @@
-MD5 (snort-2.8.0.tar.gz) = z7qxwuOc27iRISxL8V6C8w==
-RMD160 (snort-2.8.0.tar.gz) = 2sNqSh/aYLZszcXHdKthqqD2yKg=
-SHA1 (snort-2.8.0.tar.gz) = 8HuEoIcthhAGtWqManmmAwjdaLQ=
-SHA256 (snort-2.8.0.tar.gz) = uaBzfTL2nEvnSySDJLQBc2Z7W8e09Yru9PInGi6oQtE=
-SIZE (snort-2.8.0.tar.gz) = 4278872
+MD5 (respond2_patch.diff) = PbuGzELzemmJOZefznO2nw==
+MD5 (snort-2.8.0.1.tar.gz) = u2UOjv6Fj1w8yx5HF3XX5w==
+RMD160 (respond2_patch.diff) = FyVgr7CGRT+jzTMg+iyJbmgkfxI=
+RMD160 (snort-2.8.0.1.tar.gz) = oLC+wvfMoNR6WYcIu/xpysr0ShI=
+SHA1 (respond2_patch.diff) = IJhimg/OA7fMfov6qQCYA2DJlng=
+SHA1 (snort-2.8.0.1.tar.gz) = s7RfptUDcvZYfNd2r0O0FSURljA=
+SHA256 (respond2_patch.diff) = zzARQQev9cVyJscTaI8HaBbvBenvAn+TS67YIF3hpFo=
+SHA256 (snort-2.8.0.1.tar.gz) = T6dP2/5nc2Kw/vImAm5/EQ196Fa6qtIbX+Pr0PYnsRI=
+SIZE (respond2_patch.diff) = 48704
+SIZE (snort-2.8.0.1.tar.gz) = 4331731
diff -ur ../snort.patched/patches/patch-src_dynamic-preprocessors_Makefile_in
./patches/patch-src_dynamic-preprocessors_Makefile_in
--- ../snort.patched/patches/patch-src_dynamic-preprocessors_Makefile_in
Fri Nov 30 11:56:08 2007
+++ ./patches/patch-src_dynamic-preprocessors_Makefile_in Fri Nov 30
12:09:44 2007
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.1 2006/10/10
13:33:17 aanriot Exp $
---- src/dynamic-preprocessors/Makefile.in.orig Fri Sep 7 20:31:51 2007
-+++ src/dynamic-preprocessors/Makefile.in Mon Nov 19 22:18:10 2007
-@@ -540,8 +540,7 @@ maintainer-clean-generic:
+--- src/dynamic-preprocessors/Makefile.in.orig Wed Nov 14 16:32:47 2007
++++ src/dynamic-preprocessors/Makefile.in Fri Nov 30 12:09:32 2007
+@@ -543,8 +543,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 @@
clean: clean-recursive
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-@@ -705,20 +704,6 @@ include/str_search.h: $(srcdir)/../preprocessors/str_s
+@@ -700,20 +699,6 @@ include/str_search.h: $(srcdir)/../preprocessors/str_s
clean-local:
rm -rf include build
diff -ur
../snort.patched/patches/patch-src_dynamic-preprocessors_dcerpc_Makefile_in
./patches/patch-src_dynamic-preprocessors_dcerpc_Makefile_in
--- ../snort.patched/patches/patch-src_dynamic-preprocessors_dcerpc_Makefile_in
Fri Nov 30 11:56:08 2007
+++ ./patches/patch-src_dynamic-preprocessors_dcerpc_Makefile_in Fri Nov
30 12:09:44 2007
@@ -1,7 +1,7 @@
$OpenBSD$
---- src/dynamic-preprocessors/dcerpc/Makefile.in.orig Fri Sep 7 20:31:51 2007
-+++ src/dynamic-preprocessors/dcerpc/Makefile.in Mon Nov 19 22:18:11 2007
-@@ -392,7 +392,7 @@ distdir: $(DISTFILES)
+--- src/dynamic-preprocessors/dcerpc/Makefile.in.orig Wed Nov 14 16:32:47 2007
++++ src/dynamic-preprocessors/dcerpc/Makefile.in Fri Nov 30 12:09:32 2007
+@@ -394,7 +394,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@@ -9,4 +9,4 @@
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
diff -ur
../snort.patched/patches/patch-src_dynamic-preprocessors_dns_Makefile_in
./patches/patch-src_dynamic-preprocessors_dns_Makefile_in
--- ../snort.patched/patches/patch-src_dynamic-preprocessors_dns_Makefile_in
Fri Nov 30 11:56:08 2007
+++ ./patches/patch-src_dynamic-preprocessors_dns_Makefile_in Fri Nov 30
12:09:44 2007
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.1 2006/10/10
13:33:17 aanriot Exp $
---- src/dynamic-preprocessors/dns/Makefile.in.orig Fri Sep 7 20:31:51 2007
-+++ src/dynamic-preprocessors/dns/Makefile.in Mon Nov 19 22:18:12 2007
-@@ -374,7 +374,7 @@ distdir: $(DISTFILES)
+--- src/dynamic-preprocessors/dns/Makefile.in.orig Wed Nov 14 16:32:47 2007
++++ src/dynamic-preprocessors/dns/Makefile.in Fri Nov 30 12:09:32 2007
+@@ -376,7 +376,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@@ -9,4 +9,4 @@
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
diff -ur
../snort.patched/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
./patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
---
../snort.patched/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
Fri Nov 30 11:56:08 2007
+++ ./patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in Fri Nov
30 12:09:44 2007
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.1
2006/10/10 13:33:17 aanriot Exp $
---- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Fri Sep 7
20:31:51 2007
-+++ src/dynamic-preprocessors/ftptelnet/Makefile.in Mon Nov 19 22:18:14 2007
-@@ -414,7 +414,7 @@ distdir: $(DISTFILES)
+--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig Wed Nov 14
16:32:47 2007
++++ src/dynamic-preprocessors/ftptelnet/Makefile.in Fri Nov 30 12:09:32 2007
+@@ -415,7 +415,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@@ -9,4 +9,4 @@
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
diff -ur
../snort.patched/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
./patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
--- ../snort.patched/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
Fri Nov 30 11:56:08 2007
+++ ./patches/patch-src_dynamic-preprocessors_smtp_Makefile_in Fri Nov 30
12:09:44 2007
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.1 2006/10/10
13:33:17 aanriot Exp $
---- src/dynamic-preprocessors/smtp/Makefile.in.orig Fri Sep 7 20:31:52 2007
-+++ src/dynamic-preprocessors/smtp/Makefile.in Mon Nov 19 22:18:14 2007
-@@ -388,7 +388,7 @@ distdir: $(DISTFILES)
+--- src/dynamic-preprocessors/smtp/Makefile.in.orig Wed Nov 14 16:32:47 2007
++++ src/dynamic-preprocessors/smtp/Makefile.in Fri Nov 30 12:09:32 2007
+@@ -390,7 +390,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@@ -9,4 +9,4 @@
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
diff -ur
../snort.patched/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
./patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
--- ../snort.patched/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
Fri Nov 30 11:56:08 2007
+++ ./patches/patch-src_dynamic-preprocessors_ssh_Makefile_in Fri Nov 30
12:09:44 2007
@@ -1,7 +1,7 @@
$OpenBSD$
---- src/dynamic-preprocessors/ssh/Makefile.in.orig Fri Sep 7 20:31:52 2007
-+++ src/dynamic-preprocessors/ssh/Makefile.in Mon Nov 19 22:18:15 2007
-@@ -374,7 +374,7 @@ distdir: $(DISTFILES)
+--- src/dynamic-preprocessors/ssh/Makefile.in.orig Wed Nov 14 16:32:47 2007
++++ src/dynamic-preprocessors/ssh/Makefile.in Fri Nov 30 12:09:32 2007
+@@ -376,7 +376,7 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@@ -9,4 +9,4 @@
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
diff -ur
../snort.patched/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
./patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
---
../snort.patched/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
Fri Nov 30 11:56:08 2007
+++ ./patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c Fri Nov
30 12:10:10 2007
@@ -1,6 +1,6 @@
$OpenBSD$
---- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Fri Sep 7 20:04:06 2007
-+++ src/preprocessors/Stream5/snort_stream5_tcp.c Mon Nov 19 22:38:27 2007
+--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig Fri Nov 30 12:09:32 2007
++++ src/preprocessors/Stream5/snort_stream5_tcp.c Fri Nov 30 12:09:33 2007
@@ -6076,7 +6076,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet
char src_addr[17];
char dst_addr[17];
@@ -8,5 +8,5 @@
- ts_print((struct timeval *) &p->pkth->ts, timestamp);
+ ts_print((struct timeval32 *) &p->pkth->ts, timestamp);
SnortSnprintf(src_addr, 17, "%s",
- inet_ntoa(GET_SRC_IP(p)));
+ inet_ntoa(GET_SRC_ADDR(p)));
SnortSnprintf(dst_addr, 17, "%s",
diff -ur ../snort.patched/patches/patch-src_preprocessors_stream_h
./patches/patch-src_preprocessors_stream_h
--- ../snort.patched/patches/patch-src_preprocessors_stream_h Fri Nov 30
11:56:08 2007
+++ ./patches/patch-src_preprocessors_stream_h Fri Nov 30 12:08:31 2007
@@ -19,7 +19,7 @@
@@ -66,34 +66,37 @@ typedef struct _StreamAlertInfo
typedef struct _Stream
{
- ip_t ip; /* IP addr */
+ snort_ip ip; /* IP addr */
- u_int16_t port; /* port number */
- u_int8_t state; /* stream state */
u_int32_t isn; /* initial sequence number */
diff -ur ../snort.patched/pkg/PFRAG.prelude ./pkg/PFRAG.prelude
--- ../snort.patched/pkg/PFRAG.prelude Fri Nov 30 11:56:08 2007
+++ ./pkg/PFRAG.prelude Fri Nov 30 12:14:57 2007
@@ -1 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
@exec usermod -G _prelude _snort
