Date: Fri, 9 Aug 2013 07:34:32 +0000 (UTC) From: Remko Lodder <remko@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324417 - in head/ports-mgmt/portaudit-db: . files Message-ID: <201308090734.r797YWbA012397@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: remko (src,doc committer) Date: Fri Aug 9 07:34:31 2013 New Revision: 324417 URL: http://svnweb.freebsd.org/changeset/ports/324417 Log: Move the sourcing of packaudit.conf higher up in the tree so that for examplee DATABASEDIR can be specified there and is not "ignored" PR: 135471 Submitted by: John Marshall <john@rwsrv05.mby.riverwillow.net.au> Discussed with: des Modified: head/ports-mgmt/portaudit-db/Makefile head/ports-mgmt/portaudit-db/files/packaudit.sh Modified: head/ports-mgmt/portaudit-db/Makefile ============================================================================== --- head/ports-mgmt/portaudit-db/Makefile Fri Aug 9 07:16:28 2013 (r324416) +++ head/ports-mgmt/portaudit-db/Makefile Fri Aug 9 07:34:31 2013 (r324417) @@ -7,7 +7,7 @@ PORTNAME= portaudit-db PORTVERSION= 0.2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ports-mgmt DISTFILES= Modified: head/ports-mgmt/portaudit-db/files/packaudit.sh ============================================================================== --- head/ports-mgmt/portaudit-db/files/packaudit.sh Fri Aug 9 07:16:28 2013 (r324416) +++ head/ports-mgmt/portaudit-db/files/packaudit.sh Fri Aug 9 07:34:31 2013 (r324417) @@ -44,6 +44,8 @@ SED=/usr/bin/sed TAR=/usr/bin/tar XSLTPROC=%%LOCALBASE%%/bin/xsltproc +[ -r "%%PREFIX%%/etc/packaudit.conf" ] && . "%%PREFIX%%/etc/packaudit.conf" + PORTSDIR="${PORTSDIR:-%%PORTSDIR%%}" VUXMLDIR="${VUXMLDIR:-$PORTSDIR/security/vuxml}" PORTAUDITDBDIR="${PORTAUDITDBDIR:-$PORTSDIR/ports-mgmt/portaudit-db}" @@ -89,8 +91,6 @@ if [ -z "$VULPATH" ]; then fi VULURL="https://svnweb.freebsd.org/ports/$VULPATH" -[ -r "%%PREFIX%%/etc/packaudit.conf" ] && . "%%PREFIX%%/etc/packaudit.conf" - if [ -d "$PUBLIC_HTML" -a -w "$PUBLIC_HTML" ]; then VULNMD5=`$CAT "$VUXMLDIR/vuln.xml" "$PORTAUDITDBDIR/database/portaudit.xml" "$PORTAUDITDBDIR/database/portaudit.txt" | $MD5` if [ -f "$PUBLIC_HTML/portaudit.md5" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308090734.r797YWbA012397>