Update to version 1.15.

The directory ${PKGVULNDIR)} holding the 'vulnerabilities' file
which default value is determined at configure time can now be
overridden at runtime from the environment.

As a side effect the strings substituted at configure time in
files/{audit-packages,download-vulnerability-list} are now of the
form '@VAR@' and not '${VAR}'.

3 files changed, 20 insertions, 17 deletions

diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile
index 6bb603f1eb3..7bacb8665c0 100644
--- a/security/audit-packages/Makefile
+++ b/security/audit-packages/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2003/04/25 20:05:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/21 14:07:45 seb Exp $
 
-DISTNAME=	audit-packages-1.14
+DISTNAME=	audit-packages-1.15
 WRKSRC=		${WRKDIR}
 CATEGORIES=	security pkgtools
 MASTER_SITES=	# empty
@@ -15,12 +15,11 @@ NO_MTREE=	yes
 
 do-configure:
 	@for f in audit-packages download-vulnerability-list; do	\
-		${SED} -e 's|\$${PKGVULNDIR}|${PKGVULNDIR}|g' 		\
-			-e 's|\$${AWK}|${AWK}|g'			\
-			-e 's|\$${FETCH_CMD}|${FETCH_CMD}|g'		\
-			-e 's|\$${PKG_TOOLS_BIN}|${PKG_TOOLS_BIN}|g'	\
-			-e 's|\$${SH}|${SH}|g'				\
-			-e 's|\$${TOUCH}|${TOUCH}|g'			\
+		${SED} -e 's|@PKGVULNDIR@|${PKGVULNDIR}|g' 		\
+			-e 's|@AWK@|${AWK}|g'				\
+			-e 's|@FETCH_CMD@|${FETCH_CMD}|g'		\
+			-e 's|@PKG_TOOLS_BIN@|${PKG_TOOLS_BIN}|g'	\
+			-e 's|@SH@|${SH}|g'				\
 			${FILESDIR}/$$f > ${WRKSRC}/$$f;		\
 	done
 
diff --git a/security/audit-packages/files/audit-packages b/security/audit-packages/files/audit-packages
index 6d9e1b2131f..701f5311940 100755
--- a/security/audit-packages/files/audit-packages
+++ b/security/audit-packages/files/audit-packages
@@ -1,5 +1,7 @@
-#! ${SH}
-# $NetBSD: audit-packages,v 1.9 2002/06/04 23:01:34 kim Exp $
+#! @SH@
+# $NetBSD: audit-packages,v 1.10 2003/05/21 14:07:45 seb Exp $
+
+: ${PKGVULNDIR=@PKGVULNDIR@}
 
 if [ ! -f ${PKGVULNDIR}/vulnerabilities ] ;then
     echo "** Missing ${PKGVULNDIR}/vulnerabilities" 1>&2
@@ -14,10 +16,10 @@ then
     exit 1
 fi
 
-${AWK} '
+@AWK@ '
 	/^#.*/ { next }
 	NF == 0 { next }
-	{ cmd = sprintf("${PKG_TOOLS_BIN}/pkg_info -qe \"%s\" && echo Package \"`${PKG_TOOLS_BIN}/pkg_info -e '\''%s\'\''`\" has a %s vulnerability, see %s ; wait", $1, $1, $2, $3);
+	{ cmd = sprintf("@PKG_TOOLS_BIN@/pkg_info -qe \"%s\" && echo Package \"`@PKG_TOOLS_BIN@/pkg_info -e '\''%s\'\''`\" has a %s vulnerability, see %s ; wait", $1, $1, $2, $3);
 	  system(cmd); }
 ' ${PKGVULNDIR}/vulnerabilities
 
diff --git a/security/audit-packages/files/download-vulnerability-list b/security/audit-packages/files/download-vulnerability-list
index a3a14901ddd..78e2da6c203 100644
--- a/security/audit-packages/files/download-vulnerability-list
+++ b/security/audit-packages/files/download-vulnerability-list
@@ -1,5 +1,7 @@
-#! ${SH}
-# $NetBSD: download-vulnerability-list,v 1.13 2002/12/13 11:18:14 uebayasi Exp $
+#! @SH@
+# $NetBSD: download-vulnerability-list,v 1.14 2003/05/21 14:07:45 seb Exp $
+
+: ${PKGVULNDIR=@PKGVULNDIR@}
 
 if [ ! -e ${PKGVULNDIR} ]; then
 	echo "Creating ${PKGVULNDIR}"
@@ -11,14 +13,14 @@ NEW_VUL_LIST=vulnerabilities.$$
 EXIST_VUL_LIST=vulnerabilities
 
 cd ${PKGVULNDIR}
-${FETCH_CMD} -o ${NEW_VUL_LIST} ${VUL_SOURCE}
+@FETCH_CMD@ -o ${NEW_VUL_LIST} ${VUL_SOURCE}
 existsize=0
 newsize=0
 if [ -f ${EXIST_VUL_LIST} ]; then
-	existsize=`/bin/ls -l ${EXIST_VUL_LIST} | ${AWK} '{ print $5 }'`
+	existsize=`/bin/ls -l ${EXIST_VUL_LIST} | @AWK@ '{ print $5 }'`
 fi
 if [ -f ${NEW_VUL_LIST} ]; then
-	newsize=`/bin/ls -l ${NEW_VUL_LIST} | ${AWK} '{ print $5 }'`
+	newsize=`/bin/ls -l ${NEW_VUL_LIST} | @AWK@ '{ print $5 }'`
 fi
 if [ $newsize -lt $existsize ]; then
 	echo "New vulnerability list ($newsize bytes) is smaller than existing list ($existsize bytes)" 1>&2