kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move the sourcing of packaudit.conf higher up in the tree

Browse source 
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
This commit is contained in:
Remko Lodder 2013-08-09 07:34:31 +00:00
parent 64b5e87d3f
commit 315aa157bd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=324417
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ports-mgmt/portaudit-db/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= portaudit-db
PORTVERSION= 0.2.3
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= ports-mgmt
DISTFILES=

4
ports-mgmt/portaudit-db/files/packaudit.sh
View file

@ -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