diff options
| author | joerg <joerg> | 2009-04-04 19:07:58 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-04-04 19:07:58 +0000 |
| commit | 0a236b55a93d1c9a90e59f950715b8fa67834a09 (patch) | |
| tree | a428a73188c3f575532fbb11084705c81d182825 /mk | |
| parent | bd67aacf6892d7e2f6211f7b47240ffee6754fa6 (diff) | |
| download | pkgsrc-0a236b55a93d1c9a90e59f950715b8fa67834a09.tar.gz | |
Tell the user the right config file and option for vulnerabilities based
on the pkg_install version. Reported by Nicolas Joly.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/check.mk | 4 | ||||
| -rw-r--r-- | mk/flavor/pkg/flavor-vars.mk | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mk/flavor/pkg/check.mk b/mk/flavor/pkg/check.mk index 287c4a45d94..235fbe2ba9b 100644 --- a/mk/flavor/pkg/check.mk +++ b/mk/flavor/pkg/check.mk @@ -1,4 +1,4 @@ -# $NetBSD: check.mk,v 1.12 2009/03/20 16:52:40 joerg Exp $ +# $NetBSD: check.mk,v 1.13 2009/04/04 19:07:58 joerg Exp $ # # _flavor-check-vulnerable: @@ -21,5 +21,5 @@ _flavor-check-vulnerable: .PHONY fi; \ ${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \ ${AUDIT_PACKAGES} ${_AUDIT_PACKAGES_CMD} ${AUDIT_PACKAGES_FLAGS} ${PKGNAME} \ - || ${FAIL_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or IGNORE_URLS in audit-packages.conf(5) if this package is absolutely essential." + || ${FAIL_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or ${_AUDIT_CONFIG_OPTION} in ${_AUDIT_CONFIG_FILE}(5) if this package is absolutely essential." .endif diff --git a/mk/flavor/pkg/flavor-vars.mk b/mk/flavor/pkg/flavor-vars.mk index bab8ea2d481..80c453211e3 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.11 2009/03/20 16:52:40 joerg Exp $ +# $NetBSD: flavor-vars.mk,v 1.12 2009/04/04 19:07:58 joerg Exp $ # # This Makefile fragment is included indirectly by bsd.prefs.mk and # defines some variables which must be defined earlier than where @@ -54,11 +54,15 @@ AUDIT_PACKAGES?= ${PKG_ADMIN} _AUDIT_PACKAGES_CMD?= audit-pkg _EXTRACT_PKGVULNDIR= ${PKG_ADMIN} config-var PKGVULNDIR DOWNLOAD_VULN_LIST?= ${PKG_ADMIN} fetch-pkg-vulnerabilities +_AUDIT_CONFIG_FILE= pkg_install.conf +_AUDIT_CONFIG_OPTION= IGNORE_URL .else AUDIT_PACKAGES?= ${PKG_TOOLS_BIN}/audit-packages _AUDIT_PACKAGES_CMD?= -n _EXTRACT_PKGVULNDIR= ${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR DOWNLOAD_VULN_LIST?= ${PKG_TOOLS_BIN}/download-vulnerability-list +_AUDIT_CONFIG_FILE= audit-packages.conf +_AUDIT_CONFIG_OPTION= IGNORE_URLS .endif |