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/flavor | |
| 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/flavor')
| -rw-r--r-- | mk/flavor/pkg/check.mk | 10 | ||||
| -rw-r--r-- | mk/flavor/pkg/flavor-vars.mk | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/mk/flavor/pkg/check.mk b/mk/flavor/pkg/check.mk index bd555bcc90c..8fbe0af08bc 100644 --- a/mk/flavor/pkg/check.mk +++ b/mk/flavor/pkg/check.mk @@ -1,4 +1,4 @@ -# $NetBSD: check.mk,v 1.5 2007/08/04 11:21:08 adrianp Exp $ +# $NetBSD: check.mk,v 1.6 2008/01/03 20:51:21 adrianp Exp $ # # _flavor-check-vulnerable: @@ -17,7 +17,7 @@ _flavor-check-vulnerable: .PHONY ${PHASE_MSG} "Skipping vulnerability checks."; \ ${WARNING_MSG} "No $$vulnfile file found."; \ ${WARNING_MSG} "To fix, install the pkgsrc/security/audit-packages"; \ - ${WARNING_MSG} "package and run: \`\`${LOCALBASE}/sbin/download-vulnerability-list''."; \ + ${WARNING_MSG} "package and run: \`${DOWNLOAD_VULN_LIST}'."; \ exit 0; \ fi; \ ${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \ @@ -48,16 +48,16 @@ _flavor-check-vulnerable: .PHONY ${FALSE}; \ fi; \ else \ - _PKGVULNDIR=`audit-packages ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR`; \ + _PKGVULNDIR=`${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR`; \ vulnfile=$$_PKGVULNDIR/pkg-vulnerabilities; \ if ${TEST} ! -f "$$vulnfile"; then \ ${PHASE_MSG} "Skipping vulnerability checks."; \ ${WARNING_MSG} "No $$vulnfile file found."; \ - ${WARNING_MSG} "To fix run: \`download-vulnerability-list'."; \ + ${WARNING_MSG} "To fix run: \`${DOWNLOAD_VULN_LIST}'."; \ exit 0; \ fi; \ ${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \ - audit-packages ${AUDIT_PACKAGES_FLAGS} -n ${PKGNAME}; \ + ${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -n ${PKGNAME}; \ if ${TEST} "$$?" -ne 0; then \ ${ERROR_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or IGNORE_URLS in audit-packages.conf(5) if this package is absolutely essential."; \ ${FALSE}; \ diff --git a/mk/flavor/pkg/flavor-vars.mk b/mk/flavor/pkg/flavor-vars.mk index c2bbee4c680..32ab03ee7c0 100644 --- a/mk/flavor/pkg/flavor-vars.mk +++ b/mk/flavor/pkg/flavor-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: flavor-vars.mk,v 1.5 2007/12/16 01:49:08 adrianp Exp $ +# $NetBSD: flavor-vars.mk,v 1.6 2008/01/03 20:51:21 adrianp Exp $ # # This Makefile fragment is included indirectly by bsd.prefs.mk and # defines some variables which must be defined earlier than where @@ -45,15 +45,19 @@ MAKEFLAGS+= PKGTOOLS_VERSION=${PKGTOOLS_VERSION} # should pick the correct version to run. # .if defined(OPSYS) && ${OPSYS} != "NetBSD" -AP?= ${PKG_TOOLS_BIN}/audit-packages +AUDIT_PACKAGES?= ${PKG_TOOLS_BIN}/audit-packages +DOWNLOAD_VULN_LIST?= ${PKG_TOOLS_BIN}/download-vulnerability-list .else . if exists(${LOCALBASE}/sbin/audit-packages) -AP?= ${LOCALBASE}/sbin/audit-packages +AUDIT_PACKAGES?= ${LOCALBASE}/sbin/audit-packages +DOWNLOAD_VULN_LIST?= ${LOCALBASE}/sbin/download-vulnerability-list . else . if exists(/usr/sbin/audit-packages) -AP?= /usr/sbin/audit-packages +AUDIT_PACKAGES?= /usr/sbin/audit-packages +DOWNLOAD_VULN_LIST?= /usr/sbin/download-vulnerability-list . else -AP?= audit-packages +AUDIT_PACKAGES?= audit-packages +DOWNLOAD_VULN_LIST?= download-vulnerability-list . endif . endif .endif |