diff options
| author | adrianp <adrianp@pkgsrc.org> | 2008-01-03 20:51:21 +0000 |
|---|---|---|
| committer | adrianp <adrianp@pkgsrc.org> | 2008-01-03 20:51:21 +0000 |
| commit | 8c8f2165fb7b67da615c5b3753f7fc570cd70173 (patch) | |
| tree | f2850d766030514082f6a46f2d7b2484a04df753 /mk/scripts | |
| parent | c79c548835013bfed13b4e168623757b90eebc50 (diff) | |
| download | pkgsrc-8c8f2165fb7b67da615c5b3753f7fc570cd70173.tar.gz | |
* Rename AP var to AUDIT_PACKAGES as the former was a bit obscure
* Add DOWNLOAD_VULN_LIST var
* Get AUDIT_PACKAGES and DOWNLOAD_VULN_LIST to point to the right binaries
taking into consideration OPSYS and pkg_install version
* Replace all references to audit-packages and download-vulnerability-list
with AUDIT_PACKAGES and DOWNLOAD_VULN_LIST
Diffstat (limited to 'mk/scripts')
| -rwxr-xr-x | mk/scripts/genreadme.awk | 4 | ||||
| -rwxr-xr-x | mk/scripts/mkreadme | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mk/scripts/genreadme.awk b/mk/scripts/genreadme.awk index a4044bb5f0a..417faa7f9b4 100755 --- a/mk/scripts/genreadme.awk +++ b/mk/scripts/genreadme.awk @@ -1,5 +1,5 @@ #!/usr/bin/awk -f -# $NetBSD: genreadme.awk,v 1.29 2007/10/20 13:35:12 adrianp Exp $ +# $NetBSD: genreadme.awk,v 1.30 2008/01/03 20:51:22 adrianp Exp $ # # Copyright (c) 2002, 2003, 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -418,7 +418,7 @@ END { toppkg, pkg); } - cmd = sprintf("audit-packages -n %s", pkg); + cmd = sprintf("%s -n %s", AUDIT_PACKAGES, pkg); while (cmd | getline vuln_entry) { split(vuln_entry, entry, " "); vul = sprintf("%s<LI><STRONG>%s has a <a href=\"%s\">%s</a> vulnerability</STRONG></LI>\n", diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme index 9c426e3a6bf..806da75d9bc 100755 --- a/mk/scripts/mkreadme +++ b/mk/scripts/mkreadme @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mkreadme,v 1.20 2007/10/20 13:35:12 adrianp Exp $ +# $NetBSD: mkreadme,v 1.21 2008/01/03 20:51:22 adrianp Exp $ # # Script for README.html generation # @@ -287,7 +287,7 @@ if [ -d ${PKGSRCDIR}/pkgtools/prereq-readme ]; then cd ${PKGSRCDIR}/pkgtools/prereq-readme for v in CDROM_PKG_URL_HOST CDROM_PKG_URL_DIR DISTDIR \ FTP_PKG_URL_HOST FTP_PKG_URL_DIR PACKAGES PKG_INFO PKG_SUFX PKG_ADMIN \ - AUDIT_PACKAGES_FLAGS PKGVULNDIR PKGTOOLS_VERSION + AUDIT_PACKAGES AUDIT_PACKAGES_FLAGS PKGTOOLS_VERSION do val=`${BMAKE} show-var VARNAME=${v}` if [ $? != 0 ]; then @@ -308,9 +308,9 @@ fi # if [ "$pv" = "default" ]; then if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${PKGTOOLS_VERSION}; then - PVDIR=$PKGVULNDIR + PVDIR=`${BMAKE} show-var VARNAME=PKGVULNDIR` else - PVDIR=`audit-packages ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR` + PVDIR=`${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR` fi fi echo "----> PVDIR=\"${PVDIR}\"" @@ -436,6 +436,7 @@ ${AWK} -f ${PKGSRCDIR}/mk/scripts/genreadme.awk \ debug=$debug \ dependsfile=${TMPDIR}/pkgsrc.depends.debug \ summary=${summary} \ + AUDIT_PACKAGES=$AUDIT_PACKAGES \ AWK=$AWK \ CMP=$CMP \ DISTDIR=$DISTDIR \ |