From owner-svn-ports-head@FreeBSD.ORG Sun Dec 2 12:56:59 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BB42330A; Sun, 2 Dec 2012 12:56:59 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8E07A8FC08; Sun, 2 Dec 2012 12:56:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB2CuxXS071056; Sun, 2 Dec 2012 12:56:59 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB2Cux0M071051; Sun, 2 Dec 2012 12:56:59 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201212021256.qB2Cux0M071051@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Sun, 2 Dec 2012 12:56:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308105 - in head/security: barnyard2 barnyard2-sguil barnyard2/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Dec 2012 12:56:59 -0000 Author: rm Date: Sun Dec 2 12:56:59 2012 New Revision: 308105 URL: http://svnweb.freebsd.org/changeset/ports/308105 Log: - update to 1.11 - add new port options PR: 174024 Submitted by: Paul Schmehl (maintainer) Feature safe: yes Deleted: head/security/barnyard2/files/patch-etc__Makefile.am Modified: head/security/barnyard2-sguil/Makefile head/security/barnyard2/Makefile head/security/barnyard2/distinfo head/security/barnyard2/files/pkg-message.in head/security/barnyard2/pkg-plist Modified: head/security/barnyard2-sguil/Makefile ============================================================================== --- head/security/barnyard2-sguil/Makefile Sun Dec 2 12:46:56 2012 (r308104) +++ head/security/barnyard2-sguil/Makefile Sun Dec 2 12:56:59 2012 (r308105) @@ -5,7 +5,6 @@ PKGNAMESUFFIX= -sguil MASTERDIR= ${.CURDIR}/../barnyard2 # enable tcl binding for sguil -PORT_OPTIONS+= TCL SLAVE= yes .include "${MASTERDIR}/Makefile" Modified: head/security/barnyard2/Makefile ============================================================================== --- head/security/barnyard2/Makefile Sun Dec 2 12:46:56 2012 (r308104) +++ head/security/barnyard2/Makefile Sun Dec 2 12:56:59 2012 (r308105) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= barnyard2 -PORTVERSION= 1.10 -PORTREVISION?= 0 +PORTVERSION= 1.11 CATEGORIES= security MAINTAINER= pauls@utdallas.edu @@ -13,22 +12,23 @@ LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= firnsy GH_PROJECT= ${PORTNAME} -GH_TAGNAME= v2-${PORTVERSION} -GH_COMMIT= 2f5d496 +GH_TAGNAME= master +GH_COMMIT= 4dfdc80 -OPTIONS_DEFINE= MYSQL PGSQL BRO SNORT SNORTSAM SURICATA -OPTIONS_DEFAULT=#empty +OPTIONS_DEFINE= 64BIT ARUBA BRO GRE IPV6 MPLS MYSQL MYSQL-SSL ODBC PRELUDE PGSQL 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 - -.if !defined(SLAVE) -OPTIONS_DEFINE+=TCL +64BIT_DESC= Enable 64bit compilation (experimental) +ARUBA_DESC= Enable aruba support +BRO_DESC= Enable bro support (libbroccoli) +GRE_DESC= Enable gre support +MYSQL-SSL_DESC= Enable mysql ssl support (experimental) +PRELUDE_DESC= Enable prelude support + +.if defined(SLAVE) +OPTIONS_DEFINE+= TCL +OPTIONS_DESC= Enable tcl support for sguil +OPTIONS_DEFAULT+= TCL .endif USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf @@ -44,45 +44,83 @@ SUB_FILES= pkg-message 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} +PORTEXAMPLES= SCHEMA_ACCESS create_db2 create_mssql create_mysql create_oracle.sql create_postgresql .include +.if ${PORT_OPTIONS:M64BIT} +CONFIGURE_ARGS+= --enable-64bit-gcc +.else +CONFIGURE_ARGS+= --disable-64bit-gcc +.endif + +.if ${PORT_OPTIONS:MARUBA} +CONFIGURE_ARGS+= --enable-aruba +.else +CONFIGURE_ARGS+= --disable-aruba +.endif + +.if ${PORT_OPTIONS:MBRO} +BROKEN= Will not compile until bro update is committed - deselect this option +BUILD_DEPENDS+= bro:${PORTSDIR}/security/bro-barnyard2 +CONFIGURE_ARGS+= --enable-bro --with-broccoli=${LOCALBASE}/lib +.else +CONFIGURE_ARGS+= --disable-bro +.endif + +.if ${PORT_OPTIONS:MGRE} +CONFIGURE_ARGS+= --enable-gre +.else +CONFIGURE_ARGS+= --disable-gre +.endif + +.if ${PORT_OPTIONS:MIPV6} +CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 +.endif + +.if ${PORT_OPTIONS:MMPLS} +CONFIGURE_ARGS+= --enable-mpls +.else +CONFIGURE_ARGS+= --disable-mpls +.endif + .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 ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} -SUB_LIST+= PGSQL=" postgresql" +.if ${PORT_OPTIONS:MMYSQL-SSL} +OPTIONS_DEFAULT+= MYSQL +CONFIGURE_ARGS+= --enable-mysql-ssl-support .else -CONFIGURE_ARGS+= --without-postgresql -SUB_LIST+= PGSQL="" -.endif - -.if ${PORT_OPTIONS:MBRO} -RUN_DEPENDS+= ${LOCALBASE}/bin/bro:${PORTSDIR}/security/bro +CONFIGURE_ARGS+= --disable-mysql-ssl-support .endif -.if ${PORT_OPTIONS:MSNORT} -RUN_DEPENDS+= ${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort +.if ${PORT_OPTIONS:MODBC} +LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC +CONFIGURE_ARGS+= --with-odbc +.else +CONFIGURE_ARGS+= --without-odbc .endif -.if ${PORT_OPTIONS:MSNORTSAM} -RUN_DEPENDS+= ${LOCALBASE}/bin/snortsnam:${PORTSDIR}/security/snortsam +.if ${PORT_OPTIONS:MPRELUDE} +BUILD_DEPENDS+= prelude-manager:${PORTSDIR}/security/prelude-manager +CONFIGURE_ARGS+= --enable-prelude +.else +CONFIGURE_ARGS+= --disable-prelude .endif -.if ${PORT_OPTIONS:MSURICATA} -RUN_DEPENDS+= ${LOCALBASE}/bin/suricata:${PORTSDIR}/security/suricata +.if ${PORT_OPTIONS:MPGSQL} +USE_PGSQL= yes +CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE}/bin/pg_config --with-pgsql-includes=${LOCALBASE}/include/postgresql/server +.else +CONFIGURE_ARGS+= --without-postgresql .endif .if ${PORT_OPTIONS:MTCL} @@ -97,6 +135,7 @@ post-patch: ${WRKSRC}/etc/barnyard2.conf post-install: + @cp ${WRKSRC}/etc/barnyard2.conf ${PREFIX}/etc/barnyard2.conf.sample if [ ! -f ${PREFIX}/etc/barnyard2.conf ]; then \ ${CP} -p ${PREFIX}/etc/barnyard2.conf.sample ${PREFIX}/etc/barnyard2.conf; \ fi Modified: head/security/barnyard2/distinfo ============================================================================== --- head/security/barnyard2/distinfo Sun Dec 2 12:46:56 2012 (r308104) +++ head/security/barnyard2/distinfo Sun Dec 2 12:56:59 2012 (r308105) @@ -1,2 +1,2 @@ -SHA256 (barnyard2-1.10.tar.gz) = 31d4e3745606489658bd411f74ffeb8a27573fdc08d0b51a6a71e1bf4dece8a2 -SIZE (barnyard2-1.10.tar.gz) = 419781 +SHA256 (barnyard2-1.11.tar.gz) = 345d6dfd7f88cc7d72258338e2db0fa05499dc434c0fe33b685d998f497f2bcd +SIZE (barnyard2-1.11.tar.gz) = 425392 Modified: head/security/barnyard2/files/pkg-message.in ============================================================================== --- head/security/barnyard2/files/pkg-message.in Sun Dec 2 12:46:56 2012 (r308104) +++ head/security/barnyard2/files/pkg-message.in Sun Dec 2 12:56:59 2012 (r308105) @@ -1,12 +1,16 @@ -Read the notes in the barnyard2.conf file for how to configure +Read the notes in the barnyard2.conf file for how to configure %%PREFIX%%/etc/barnyard2.conf after installation. For addtional information see the Securixlive FAQ at http://www.securixlive.com/barnyard2/faq.php. -In order to enable barnyard2 to start on boot, you must edit /etc/rc.conf +In order to enable barnyard2 to start on boot, you must edit /etc/rc.conf with the appropriate flags, etc. See the FreeBSD Handbook for syntax: http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/configtuning-rcng.html For the various options available, type % barnyard2 -h after install or read the options in the startup script - in %%PREFIX%%/etc/rc.d. +Barnyard2 can process unified2 files from snort or suricata. It can also +interact with snortsam firewall rules as well as the sguil-sensor. Those +ports must be installed separately if you wish to use them. + ************************************************************************ Modified: head/security/barnyard2/pkg-plist ============================================================================== --- head/security/barnyard2/pkg-plist Sun Dec 2 12:46:56 2012 (r308104) +++ head/security/barnyard2/pkg-plist Sun Dec 2 12:56:59 2012 (r308105) @@ -2,3 +2,11 @@ bin/barnyard2 @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 @exec [ -f %B/barnyard2.conf ] || cp -p %B/%f %B/barnyard2.conf +%%DOCSDIR%%/INSTALL +%%DOCSDIR%%/README +%%DOCSDIR%%/README.aruba +%%DOCSDIR%%/README.database +%%DOCSDIR%%/README.sguil +%%DOCSDIR%%/README.snortsam +%%DOCSDIR%%/RELEASE.NOTES +@dirrm %%DOCSDIR%%