From owner-svn-ports-head@FreeBSD.ORG Fri Aug 15 00:05:18 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 349D27CF; Fri, 15 Aug 2014 00:05:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 156A824F8; Fri, 15 Aug 2014 00:05:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7F05HQS092222; Fri, 15 Aug 2014 00:05:17 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7F05HJq092220; Fri, 15 Aug 2014 00:05:17 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201408150005.s7F05HJq092220@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 15 Aug 2014 00:05:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364876 - head/security/bro 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.18-1 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: Fri, 15 Aug 2014 00:05:18 -0000 Author: marino Date: Fri Aug 15 00:05:17 2014 New Revision: 364876 URL: http://svnweb.freebsd.org/changeset/ports/364876 QAT: https://qat.redports.org/buildarchive/r364876/ Log: security/bro: Add su flags so pkg initialization works PR: 192646 Submitted by: maintainer (Craig Leres) Modified: head/security/bro/Makefile head/security/bro/pkg-plist Modified: head/security/bro/Makefile ============================================================================== --- head/security/bro/Makefile Thu Aug 14 23:06:13 2014 (r364875) +++ head/security/bro/Makefile Fri Aug 15 00:05:17 2014 (r364876) @@ -3,7 +3,7 @@ PORTNAME= bro PORTVERSION= 2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.bro.org/downloads/release/ @@ -18,8 +18,7 @@ LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net SUB_LIST+= PYTHON_CMD="${PYTHON_CMD}" -USES= cmake:outsource perl5 -USE_PYTHON= yes +USES= cmake:outsource perl5 python SUB_FILES= pkg-message NO_MTREE= yes @@ -140,11 +139,8 @@ post-install: .endif @${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto @${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/site -.for F in broctl.cfg - @${INSTALL_DATA} ${INSTALL_WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example -.endfor -.for F in networks.cfg node.cfg - @${MV} ${WRKSRC}/aux/broctl/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example +.for F in broctl.cfg networks.cfg node.cfg + @${MV} ${STAGEDIR}${PREFIX}/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example .endfor .endif Modified: head/security/bro/pkg-plist ============================================================================== --- head/security/bro/pkg-plist Thu Aug 14 23:06:13 2014 (r364875) +++ head/security/bro/pkg-plist Fri Aug 15 00:05:17 2014 (r364876) @@ -4,6 +4,7 @@ %%BROCTL%%@exec mkdir -p %D/spool/tmp %%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool %%BROCTL%%@exec chown %%BROUSER%%:%%BROGROUP%% %D/spool/tmp +%%BROCTL%%@exec chown -R %%BROUSER%%:%%BROGROUP%% %D/spool/installed-scripts-do-not-touch bin/bro bin/bro-cut %%BROCTL%%bin/broctl @@ -454,11 +455,8 @@ bin/bro-cut %%BROCTL%%@unexec rm -f %D/spool/installed-scripts-do-not-touch/site/local.bro %%BROCTL%%@dirrmtry spool/tmp %%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/site -%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/site -%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/auto %%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch/auto %%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch -%%BROCTL%%@dirrmtry spool/installed-scripts-do-not-touch %%BROCTL%%@dirrmtry spool %%BROCTL%%@dirrm %%DATADIR%%ctl/scripts/postprocessors %%BROCTL%%@dirrm %%DATADIR%%ctl/scripts/helpers @@ -560,4 +558,4 @@ bin/bro-cut %%CLEANUP_PREFIX%%@dirrmtry etc %%CLEANUP_PREFIX%%@dirrmtry bin %%CLEANUP_PREFIX%%@dirrmtry %D -%%BROCTL%%@exec su %%BROUSER%% -c '%D/bin/broctl install' +%%BROCTL%%@exec su -fm %%BROUSER%% -c '%D/bin/broctl install'