aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authorremko <remko@FreeBSD.org>2013-08-09 15:34:31 +0800
committerremko <remko@FreeBSD.org>2013-08-09 15:34:31 +0800
commita81207f792b0c7131148b9aeec58315459a4df32 (patch)
treeb6b438eead927edc6818cbab46ce15fcc09ae1b9 /ports-mgmt
parentdfca47f83123b4eae14d289f5875fbb089863760 (diff)
downloadfreebsd-ports-gnome-a81207f792b0c7131148b9aeec58315459a4df32.tar.gz
freebsd-ports-gnome-a81207f792b0c7131148b9aeec58315459a4df32.tar.zst
freebsd-ports-gnome-a81207f792b0c7131148b9aeec58315459a4df32.zip
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
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portaudit-db/Makefile2
-rw-r--r--ports-mgmt/portaudit-db/files/packaudit.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/ports-mgmt/portaudit-db/Makefile b/ports-mgmt/portaudit-db/Makefile
index b851babda119..7201eacdc5ba 100644
--- a/ports-mgmt/portaudit-db/Makefile
+++ b/ports-mgmt/portaudit-db/Makefile
@@ -7,7 +7,7 @@
PORTNAME= portaudit-db
PORTVERSION= 0.2.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ports-mgmt
DISTFILES=
diff --git a/ports-mgmt/portaudit-db/files/packaudit.sh b/ports-mgmt/portaudit-db/files/packaudit.sh
index 935e7526d34b..bfb1d5687453 100644
--- a/ports-mgmt/portaudit-db/files/packaudit.sh
+++ b/ports-mgmt/portaudit-db/files/packaudit.sh
@@ -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