From owner-svn-ports-head@FreeBSD.ORG Fri Aug 9 07:34:32 2013 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 ESMTP id 96391DDA; Fri, 9 Aug 2013 07:34:32 +0000 (UTC) (envelope-from remko@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 81F7523BB; Fri, 9 Aug 2013 07:34:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r797YWXI012399; Fri, 9 Aug 2013 07:34:32 GMT (envelope-from remko@svn.freebsd.org) Received: (from remko@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r797YWbA012397; Fri, 9 Aug 2013 07:34:32 GMT (envelope-from remko@svn.freebsd.org) Message-Id: <201308090734.r797YWbA012397@svn.freebsd.org> From: Remko Lodder Date: Fri, 9 Aug 2013 07:34:32 +0000 (UTC) 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 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: Fri, 09 Aug 2013 07:34:32 -0000 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 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