svn commit: r305773 - in head/security: barnyard2 barnyard2-sguil barnyard2/files
Jason E. Hale
jhale at FreeBSD.org
Fri Oct 12 11:10:31 UTC 2012
Author: jhale
Date: Fri Oct 12 11:10:30 2012
New Revision: 305773
URL: http://svn.freebsd.org/changeset/ports/305773
Log:
- Update to 1.10
- Convert to new options framework
- Allow for any available version of TCL to be used
- Add LICENSE
- Remove indefinite article from COMMENT, update
- Mark MAKE_JOBS_SAFE
- Trim Makefile header
PR: ports/172456
Submitted by: Paul Schmehl <pauls at utdallas.edu> (maintainer)
Approved by: makc (mentor)
Feature safe: yes
Added:
head/security/barnyard2/files/patch-etc__Makefile.am (contents, props changed)
Deleted:
head/security/barnyard2/files/patch-configure
head/security/barnyard2/files/patch-etc-Makefile.in
Modified:
head/security/barnyard2-sguil/Makefile (contents, props changed)
head/security/barnyard2/Makefile (contents, props changed)
head/security/barnyard2/distinfo (contents, props changed)
head/security/barnyard2/pkg-plist (contents, props changed)
Modified: head/security/barnyard2-sguil/Makefile
==============================================================================
--- head/security/barnyard2-sguil/Makefile Fri Oct 12 11:03:24 2012 (r305772)
+++ head/security/barnyard2-sguil/Makefile Fri Oct 12 11:10:30 2012 (r305773)
@@ -1,12 +1,11 @@
# $FreeBSD$
-#
PKGNAMESUFFIX= -sguil
MASTERDIR= ${.CURDIR}/../barnyard2
# enable tcl binding for sguil
-WITH_TCL= yes
+PORT_OPTIONS+= TCL
SLAVE= yes
.include "${MASTERDIR}/Makefile"
Modified: head/security/barnyard2/Makefile
==============================================================================
--- head/security/barnyard2/Makefile Fri Oct 12 11:03:24 2012 (r305772)
+++ head/security/barnyard2/Makefile Fri Oct 12 11:10:30 2012 (r305773)
@@ -1,88 +1,116 @@
-# New ports collection makefile for: barnyard2
-# Date created: 28 Aug 2009
-# Whom: pauls
-#
# $FreeBSD$
-#
PORTNAME= barnyard2
-PORTVERSION= 1.9
-PORTREVISION= 2
+PORTVERSION= 1.10
+PORTREVISION?= 0
CATEGORIES= security
-MASTER_SITES= http://www.securixlive.com/download/barnyard2/
MAINTAINER= pauls at utdallas.edu
-COMMENT= An output system for Snort or Suricata that parses unified2 files
+COMMENT= Interpreter for Snort unified2 binary output files
+
+LICENSE= GPLv2
+
+USE_GITHUB= yes
+GH_ACCOUNT= firnsy
+GH_PROJECT= ${PORTNAME}
+GH_TAGNAME= v2-${PORTVERSION}
+GH_COMMIT= 2f5d496
+
+OPTIONS_DEFINE= MYSQL PGSQL BRO SNORT SNORTSAM SURICATA
+OPTIONS_DEFAULT=#empty
+NO_OPTIONS_SORT=yes
+
+BRO_DESC= Depend on security/bro
+MYSQL_DESC= Enable MySQL support
+PGSQL_DESC= Enable PostgreSQL support
+SNORT_DESC= Depend on security/snort
+SNORTSAM_DESC= Depend on security/snortsam
+SURICATA_DESC= Depend on security/suricata
-OPTIONS= MYSQL "Enable MySQL support" on \
- POSTGRESQL "Enable PostgreSQL support" off \
- SNORT "Depend on security/snort" off \
- SURICATA "Depend on security/suricata" off
.if !defined(SLAVE)
-OPTIONS+= TCL "Enable TCL support" off
+OPTIONS_DEFINE+=TCL
.endif
+USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf
+LIBTOOLIZE_ARGS=--copy --force
+AUTOMAKE_ARGS= --add-missing --copy
+ACLOCAL_ARGS= -I m4 -I ${LOCALBASE}/share/aclocal
+
USE_RC_SUBR= barnyard2
GNU_CONFIGURE= yes
+MAKE_JOBS_SAFE= yes
+
SUB_FILES= pkg-message
-PORTDOCS1= README
-PORTDOCS2= INSTALL README.aruba README.database README.sguil
+PORTDOCS1= README RELEASE.NOTES
+PORTDOCS2= INSTALL README.aruba README.database README.sguil README.snortsam
+PORTEXAMPLES= create_db2 create_mysql create_postgresql SCHEMA_ACCESS create_mssql create_oracle.sql
PORTDOCS= ${PORTDOCS1} ${PORTDOCS2}
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql \
--with-mysql-includes=${LOCALBASE}/include/mysql \
--with-mysql-libraries=${LOCALBASE}/lib/mysql
SUB_LIST+= MYSQL=" mysql"
.else
+CONFIGURE_ARGS+= --without-mysql
SUB_LIST+= MYSQL=""
.endif
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
-CONFIGURE_ARGS+= --with-postgresql
+CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE}
SUB_LIST+= PGSQL=" postgresql"
.else
+CONFIGURE_ARGS+= --without-postgresql
SUB_LIST+= PGSQL=""
.endif
-.if defined(WITH_SNORT)
+.if ${PORT_OPTIONS:MBRO}
+RUN_DEPENDS+= ${LOCALBASE}/bin/bro:${PORTSDIR}/security/bro
+.endif
+
+.if ${PORT_OPTIONS:MSNORT}
RUN_DEPENDS+= ${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort
.endif
-.if defined(WITH_SURICATA)
+.if ${PORT_OPTIONS:MSNORTSAM}
+RUN_DEPENDS+= ${LOCALBASE}/bin/snortsnam:${PORTSDIR}/security/snortsam
+.endif
+
+.if ${PORT_OPTIONS:MSURICATA}
RUN_DEPENDS+= ${LOCALBASE}/bin/suricata:${PORTSDIR}/security/suricata
.endif
-.if defined(WITH_TCL)
+.if ${PORT_OPTIONS:MTCL}
USE_TCL= yes
-CONFIGURE_ARGS+= --with-tcl=${PREFIX}/lib/tcl8.4
-LIB_DEPENDS+= tcl84.1:${PORTSDIR}/lang/tcl84
+CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}
+.else
+CONFIGURE_ARGS+= --without-tcl
.endif
-pre-install:
- ${CHMOD} 744 ${WRKSRC}/install-sh
-
post-patch:
@${REINPLACE_CMD} 's|/etc|${LOCALBASE}/etc|' \
${WRKSRC}/etc/barnyard2.conf
post-install:
+ if [ ! -f ${PREFIX}/etc/barnyard2.conf ]; then \
+ ${CP} -p ${PREFIX}/etc/barnyard2.conf.sample ${PREFIX}/etc/barnyard2.conf; \
+ fi
-.for f in barnyard2.conf
- [ -f ${PREFIX}/etc/${f} ] || \
- ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}
-.endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS1} ${DOCSDIR}
cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS2} ${DOCSDIR}
.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+ @${MKDIR} ${EXAMPLESDIR}
+ cd ${WRKSRC}/schemas && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
+.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/security/barnyard2/distinfo
==============================================================================
--- head/security/barnyard2/distinfo Fri Oct 12 11:03:24 2012 (r305772)
+++ head/security/barnyard2/distinfo Fri Oct 12 11:10:30 2012 (r305773)
@@ -1,2 +1,2 @@
-SHA256 (barnyard2-1.9.tar.gz) = 6bce0d5bd4a6fa2be2e5b1daaed1d6d0ec8e7f50b33bc1125125c8a9e78a5b0c
-SIZE (barnyard2-1.9.tar.gz) = 652879
+SHA256 (barnyard2-1.10.tar.gz) = 31d4e3745606489658bd411f74ffeb8a27573fdc08d0b51a6a71e1bf4dece8a2
+SIZE (barnyard2-1.10.tar.gz) = 419781
Added: head/security/barnyard2/files/patch-etc__Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/barnyard2/files/patch-etc__Makefile.am Fri Oct 12 11:10:30 2012 (r305773)
@@ -0,0 +1,8 @@
+--- ./etc/Makefile.am.orig 2012-10-08 10:03:32.000000000 -0400
++++ ./etc/Makefile.am 2012-10-08 10:05:02.000000000 -0400
+@@ -4,4 +4,4 @@
+ EXTRA_DIST = barnyard2.conf
+
+ install-data-am:
+- test -e $(sysconfdir)/barnyard2.conf || install -m 600 $(top_srcdir)/etc/barnyard2.conf $(sysconfdir)
++ install -m 600 $(top_srcdir)/etc/barnyard2.conf $(sysconfdir)/barnyard2.conf.sample
Modified: head/security/barnyard2/pkg-plist
==============================================================================
--- head/security/barnyard2/pkg-plist Fri Oct 12 11:03:24 2012 (r305772)
+++ head/security/barnyard2/pkg-plist Fri Oct 12 11:10:30 2012 (r305773)
@@ -1,4 +1,4 @@
bin/barnyard2
- at unexec if [ -f %D/etc/barnyard2.conf ] && cmp -s %D/etc/barnyard2.conf %D/etc/barnyard2.conf-sample; then rm -f %D/etc/barnyard2.conf; fi
-etc/barnyard2.conf-sample
- at exec if [ ! -f %D/etc/barnyard2.conf ] ; then cp -p %D/%F %B/barnyard2.conf; fi
+ at unexec if cmp -s %D/etc/barnyard2.conf %D/etc/barnyard2.conf.sample; then rm -f %D/etc/barnyard2.conf; fi
+etc/barnyard2.conf.sample
+ at exec [ -f %B/barnyard2.conf ] || cp -p %B/%f %B/barnyard2.conf
More information about the svn-ports-all
mailing list