From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 28 15:30:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 669D7A24 for ; Mon, 28 Oct 2013 15:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 44FC32762 for ; Mon, 28 Oct 2013 15:30:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SFU23U015542 for ; Mon, 28 Oct 2013 15:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r9SFU2q8015541; Mon, 28 Oct 2013 15:30:02 GMT (envelope-from gnats) Resent-Date: Mon, 28 Oct 2013 15:30:02 GMT Resent-Message-Id: <201310281530.r9SFU2q8015541@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Paul Schmehl Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 152AA558 for ; Mon, 28 Oct 2013 15:20:46 +0000 (UTC) (envelope-from prvs=00670cd50=root+buttercup4@utdallas.edu) Received: from ip-relay-051.utdallas.edu (outgoing.utdallas.edu [129.110.182.14]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D362726AF for ; Mon, 28 Oct 2013 15:20:45 +0000 (UTC) Received: from unknown (HELO mx31.utdallas.edu) ([10.110.20.31]) by ip-relay-051.utdallas.edu with ESMTP; 28 Oct 2013 10:18:42 -0500 Received: from buttercup4.utdallas.edu (buttercup4.utdallas.edu [10.110.4.132]) by mx31.utdallas.edu (Postfix) with ESMTP id 352F442238 for ; Mon, 28 Oct 2013 10:18:39 -0500 (CDT) Received: by buttercup4.utdallas.edu (Postfix, from userid 0) id 8718910376D34; Mon, 28 Oct 2013 15:18:07 +0000 (UTC) Message-Id: <20131028151807.8718910376D34@buttercup4.utdallas.edu> Date: Mon, 28 Oct 2013 15:18:07 +0000 (UTC) From: Paul Schmehl To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/183404: security/barnyard2, update port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Paul Schmehl List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Oct 2013 15:30:02 -0000 >Number: 183404 >Category: ports >Synopsis: security/barnyard2, update port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Oct 28 15:30:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Paul Schmehl >Release: FreeBSD 9.1-RELEASE amd64 >Organization: The University of Texas at Dallas >Environment: System: FreeBSD hostname.utdallas.edu 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: security/barnyard2, update port to include libroccoli port which was just accepted into the tree, convert port to STAGE >How-To-Repeat: >Fix: --- barnyard2.diff begins here --- Index: Makefile =================================================================== --- Makefile (revision 331863) +++ Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= barnyard2 PORTVERSION= 1.12 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= pauls@utdallas.edu @@ -37,13 +38,11 @@ USE_RC_SUBR= barnyard2 GNU_CONFIGURE= yes -NO_STAGE= yes SUB_FILES= pkg-message PORTDOCS1= README RELEASE.NOTES PORTDOCS2= INSTALL README.aruba README.database README.sguil README.snortsam -PORTDOCS= ${PORTDOCS1} ${PORTDOCS2} PORTEXAMPLES= SCHEMA_ACCESS create_db2 create_mssql create_mysql create_oracle.sql create_postgresql .include @@ -62,7 +61,7 @@ .if ${PORT_OPTIONS:MBRO} BROKEN= Bro port is in transition right now, so this is not supported at this time -BUILD_DEPENDS+= bro:${PORTSDIR}/security/bro-barnyard2 +LIB_DEPENDS+= libbroccoli.so:${PORTSDIR}/security/broccoli CONFIGURE_ARGS+= --enable-bro --with-broccoli=${LOCALBASE}/lib .else CONFIGURE_ARGS+= --disable-bro @@ -134,23 +133,19 @@ post-patch: @${REINPLACE_CMD} 's|/etc|${LOCALBASE}/etc|' \ ${WRKSRC}/etc/barnyard2.conf + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +do-install: + ${INSTALL_DATA} ${PORTDOCS1:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS2:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/schemas/|} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/src/barnyard2 ${STAGEDIR}${PREFIX}/bin/ + 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; \ + @${CP} ${WRKSRC}/etc/barnyard2.conf ${STAGEDIR}${PREFIX}/etc/barnyard2.conf.sample + if [ ! -f ${STAGEDIR}${PREFIX}/etc/barnyard2.conf ]; then \ + ${CP} -p ${STAGEDIR}${PREFIX}/etc/barnyard2.conf.sample ${STAGEDIR}${PREFIX}/etc/barnyard2.conf; \ fi -.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 Index: pkg-plist =================================================================== --- pkg-plist (revision 331863) +++ pkg-plist (working copy) @@ -2,3 +2,18 @@ @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 +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.aruba +%%PORTDOCS%%%%DOCSDIR%%/README.database +%%PORTDOCS%%%%DOCSDIR%%/README.sguil +%%PORTDOCS%%%%DOCSDIR%%/README.snortsam +%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SCHEMA_ACCESS +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_db2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_mssql +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_mysql +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_oracle.sql +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_postgresql +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% --- barnyard2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: