Re: [UPDATE] net/snort 2.8.0.1 (was: [UPDATE] net/snort 2.8.0)
On Sat, Dec 01, 2007 at 01:42:41PM +0100, Markus Lude wrote:
>
> New diff against CVS attached. Please test/comment/commit/...
new diff with a few changes. Please test.
Comments/oks?
cheers,
rui
Index: Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- Makefile15 Sep 2007 22:36:59 - 1.51
+++ Makefile9 Feb 2008 17:38:12 -
@@ -2,29 +2,34 @@
COMMENT= highly flexible sniffer/NIDS
-DISTNAME= snort-2.6.0.2
-PKGNAME= ${DISTNAME}p1
+DISTNAME= snort-2.8.0.1
CATEGORIES=net security
MASTER_SITES= ${HOMEPAGE}/dl/current/
HOMEPAGE= http://www.snort.org/
-# GPL
+MAINTAINER=Markus Lude <[EMAIL PROTECTED]>
+
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m pcap
+WANTLIB= c m pcap
-SHARED_LIBS= sf_engine 0.0 \
- sf_dns_preproc 0.0 \
- sf_ftptelnet_preproc 0.0 \
- sf_smtp_preproc 0.0
+SHARED_LIBS= sf_engine 1.0 \
+ sf_dns_preproc 1.0 \
+ sf_ftptelnet_preproc 1.0 \
+ sf_smtp_preproc 1.0 \
+ sf_dcerpc_preproc 0.0 \
+ sf_ssh_preproc 0.0 \
+ _sfdynamic_example_rule 0.0 \
+ _sfdynamic_preprocessor_example 0.0
USE_LIBTOOL= Yes
SEPARATE_BUILD=concurrent
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=simple
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-dynamicplugin
@@ -41,6 +46,9 @@
.if ${FLAVOR:L:Mflexresp}
LIB_DEPENDS+= dnet.=1::net/libdnet
CONFIGURE_ARGS+=--enable-flexresp2
+
+MASTER_SITES0=
http://www-fs.informatik.uni-tuebingen.de/~lude/openbsd/distfiles/
+PATCHFILES=snort-flexresp_patch.diff:0
.endif
.if ${FLAVOR:L:Mpostgresql}
@@ -50,22 +58,31 @@
.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
.endif
-CONFIGS= classification.config gen-msg.map generators reference.config \
- sid sid-msg.map snort.conf threshold.conf unicode.map
+CONFIGS= classification.config gen-msg.map reference.config \
+ sid-msg.map snort.conf threshold.conf unicode.map
-DOCS= AUTHORS CREDITS README.* *.pdf
+PREPROC= decoder.rules preprocessor.rules
+
+DOCS= AUTHORS CREDITS README README.* *.pdf TODO USAGE WISHLIST
+
+# workaround conflicts between distpatches and patches
+post-patch:
+.if ${FLAVOR:L:Mflexresp}
+ @perl -pi -e "s,ip_t,snort_ip," ${WRKSRC}/src/preprocessors/stream.h
+.endif
post-build:
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \
@@ -77,6 +94,11 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snort
.for i in ${CONFIGS}
${INSTALL_DATA} ${WRKSRC}/etc/${i} ${PREFIX}/share/examples/snort
+.endfor
+ ${INSTALL_DATA} ${WRKSRC}/doc/generators ${PREFIX}/share/examples/snort
+
+.for i in ${PREPROC}
+ ${INSTALL_DATA} ${WRKSRC}/preproc_rules/${i}
${PREFIX}/share/examples/snort
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snort
Index: distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo5 Apr 2007 16:20:15 - 1.15
+++ distinfo9 Feb 2008 17:38:12 -
@@ -1,5 +1,10 @@
-MD5 (snort-2.6.0.2.tar.gz) = XAlP9tgtuEWl8CPkpJIQPg==
-RMD160 (snort-2.6.0.2.tar.gz) = cG1j24O30DesinHIEEMk2bdZTrU=
-SHA1 (snort-2.6.0.2.tar.gz) = Gms/sZqC+Dvw/OWo226xJ3xyN5s=
-SHA256 (snort-2.6.0.2.tar.gz) = B716x7ZF0TgKzmWzPAZO1Y2dwhvXNrH3a8V13CLhpeI=
-SIZE (snort-2.6.0.2.tar.gz) = 3350277
+MD5 (snort-2.8.0.1.tar.gz) = u2UOjv6Fj1w8yx5HF3XX5w==
+MD5 (snort-flexresp_patch.diff) = ZYyI5dSWIpCkny37tRidUQ==
+RMD160 (snort-2.8.0.1.tar.gz) = oLC+wvfMoNR6WYcIu/xpysr0ShI=
+RMD160 (snort-flexresp_patch.diff) = vrc4csTm8t0HUKMbYMrMzDs66jA=
+SHA1 (snort-2.8.0.1.tar.gz) = s7RfptUDcvZYfNd2r0O0FSURljA=
+SHA1 (snort-flexresp_patch.diff) = qkgi0RNWJintUwpX6uYE4QdeWV4=
+SHA256 (snort-2.8.0.1.tar.gz) = T6dP2/5nc2Kw/vImAm5/EQ196Fa6qtIbX+Pr0PYnsRI=
+SHA256 (snort-flexresp_patch.diff) =
cBSVJQ939iIageqqNMHQnsa1GjjplPju96ePvHBMyNY=
+SIZE (snort-2.8.0.1.tar.gz) = 4331731
+SIZE (snort-flexresp_patch.diff) = 48418
Index: patches/patch-etc_snort_conf
===
RCS file: /cvs/ports/net/s
[UPDATE] net/snort 2.8.0.1 (was: [UPDATE] net/snort 2.8.0)
On Fri, Nov 30, 2007 at 12:34:06PM +0200, Nikns Siankin wrote:
> 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.
Thanks for the diff.
> * Updated to 2.8.0.1
> * Fixes flexresp flavor: http://marc.info/?l=snort-users&m=119099490314507&w=2
Main problem here: one hunk of the distpatch file for
src/preprocessors/stream.h conflicts with a patch. I solved this by
removing that hunk from the distpatch file and do the patch in
post-patch.
Some questions here:
* Is it ok to use this distpatch file? IMO this makes it easier to get
rid of it when the stuff made it upstream in the next release
* Is there some prefered way to resolve conflicts between a distpatch
file which is used only for a flavor and the normal patches?
> * Fixes prelude WANTLIB
> * Replaces depricated --with-mysql
Fixed flavors stuff.
New diff against CVS attached. Please test/comment/commit/...
Regards,
Markus
Index: net/snort/Makefile
===
RCS file: /cvs/ports/net/snort/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- net/snort/Makefile 15 Sep 2007 22:36:59 - 1.51
+++ net/snort/Makefile 1 Dec 2007 11:28:45 -
@@ -2,24 +2,28 @@
COMMENT= highly flexible sniffer/NIDS
-DISTNAME= snort-2.6.0.2
-PKGNAME= ${DISTNAME}p1
+DISTNAME= snort-2.8.0.1
+PKGNAME= ${DISTNAME}
CATEGORIES=net security
MASTER_SITES= ${HOMEPAGE}/dl/current/
HOMEPAGE= http://www.snort.org/
-# GPL
+MAINTAINER=Markus Lude <[EMAIL PROTECTED]>
+
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m pcap
+WANTLIB= c m pcap
SHARED_LIBS= sf_engine 0.0 \
+ sf_dcerpc_preproc 0.0 \
sf_dns_preproc 0.0 \
sf_ftptelnet_preproc 0.0 \
- sf_smtp_preproc 0.0
+ sf_smtp_preproc 0.0 \
+ sf_ssh_preproc 0.0
USE_LIBTOOL= Yes
@@ -41,6 +45,9 @@
.if ${FLAVOR:L:Mflexresp}
LIB_DEPENDS+= dnet.=1::net/libdnet
CONFIGURE_ARGS+=--enable-flexresp2
+
+MASTER_SITES0=
http://www-fs.informatik.uni-tuebingen.de/~lude/openbsd/distfiles/
+PATCHFILES=snort-flexresp_patch.diff:0
.endif
.if ${FLAVOR:L:Mpostgresql}
@@ -50,22 +57,31 @@
.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
.endif
-CONFIGS= classification.config gen-msg.map generators reference.config \
- sid sid-msg.map snort.conf threshold.conf unicode.map
+CONFIGS= classification.config gen-msg.map reference.config \
+ sid-msg.map snort.conf threshold.conf unicode.map
-DOCS= AUTHORS CREDITS README.* *.pdf
+PREPROC= decoder.rules preprocessor.rules
+
+DOCS= AUTHORS CREDITS README README.* *.pdf TODO USAGE WISHLIST
+
+# workaround conflicts between distpatches and patches
+post-patch:
+.if ${FLAVOR:L:Mflexresp}
+ @perl -pi -e "s,ip_t,snort_ip," ${WRKSRC}/src/preprocessors/stream.h
+.endif
post-build:
@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \
@@ -77,6 +93,11 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snort
.for i in ${CONFIGS}
${INSTALL_DATA} ${WRKSRC}/etc/${i} ${PREFIX}/share/examples/snort
+.endfor
+ ${INSTALL_DATA} ${WRKSRC}/doc/generators ${PREFIX}/share/examples/snort
+
+.for i in ${PREPROC}
+ ${INSTALL_DATA} ${WRKSRC}/preproc_rules/${i}
${PREFIX}/share/examples/snort
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snort
Index: net/snort/distinfo
===
RCS file: /cvs/ports/net/snort/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- net/snort/distinfo 5 Apr 2007 16:20:15 - 1.15
+++ net/snort/distinfo 1 Dec 2007 11:28:45 -
@@ -1,5 +1,10 @@
-MD5 (snort-2.6.0.2.tar.gz) = XAlP9tgtuEWl8CPkpJIQPg==
-RMD160 (snort-2.6.0.2.tar.gz) = cG1j24O30DesinHIEEMk2bdZTrU=
-SHA1 (snort-2.6.0.2.tar.gz) = Gms/sZqC+Dvw/OWo226xJ3xyN5s=
-SHA256 (snort-2.6.0.2.tar.gz) = B716x7ZF0TgKzmWzPAZO1Y2dwhvXNrH3a8V13CLhpeI=
