diff options
| author | joerg <joerg> | 2009-03-20 16:52:40 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-03-20 16:52:40 +0000 |
| commit | 385d8584364ce0ea5d6f9396988982ae21fb7158 (patch) | |
| tree | 572fe963bc93794a95282025adcf1e3d42991b1d /mk | |
| parent | 62969b98dcafb3b41c33e4b1d1980bf0fcf1e489 (diff) | |
| download | pkgsrc-385d8584364ce0ea5d6f9396988982ae21fb7158.tar.gz | |
Skip vulnerability check for packages that set NO_PKGTOOLS_REQD_CHECK.
Set AUDIT_PACKAGES and friends correctly though. Fixes bootstrap on
platforms with pdksh.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/check.mk | 7 | ||||
| -rw-r--r-- | mk/flavor/pkg/flavor-vars.mk | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mk/flavor/pkg/check.mk b/mk/flavor/pkg/check.mk index 52cf51da8a4..287c4a45d94 100644 --- a/mk/flavor/pkg/check.mk +++ b/mk/flavor/pkg/check.mk @@ -1,10 +1,14 @@ -# $NetBSD: check.mk,v 1.11 2009/03/17 22:13:36 rillig Exp $ +# $NetBSD: check.mk,v 1.12 2009/03/20 16:52:40 joerg Exp $ # # _flavor-check-vulnerable: # Checks for known vulnerabilities in the package if a vulnerability # file exists. # +.if defined(NO_PKGTOOLS_REQD_CHECK) +_flavor-check-vulnerable: .PHONY + ${RUN}${DO_NADA} +.else _flavor-check-vulnerable: .PHONY ${RUN}\ _PKGVULNDIR=`${_EXTRACT_PKGVULNDIR}`; \ @@ -18,3 +22,4 @@ _flavor-check-vulnerable: .PHONY ${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." +.endif diff --git a/mk/flavor/pkg/flavor-vars.mk b/mk/flavor/pkg/flavor-vars.mk index 81b7c7424a7..bab8ea2d481 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.10 2009/02/11 14:34:36 joerg Exp $ +# $NetBSD: flavor-vars.mk,v 1.11 2009/03/20 16:52:40 joerg Exp $ # # This Makefile fragment is included indirectly by bsd.prefs.mk and # defines some variables which must be defined earlier than where @@ -49,7 +49,7 @@ BOOTSTRAP_DEPENDS+= pkg_install>=${PKGTOOLS_REQD}:../../pkgtools/pkg_install _PKG_INSTALL_DEPENDS= yes .endif -.if !defined(NO_PKGTOOLS_REQD_CHECK) && ${PKGTOOLS_VERSION} >= 20090201 +.if ${PKGTOOLS_VERSION} >= 20090201 AUDIT_PACKAGES?= ${PKG_ADMIN} _AUDIT_PACKAGES_CMD?= audit-pkg _EXTRACT_PKGVULNDIR= ${PKG_ADMIN} config-var PKGVULNDIR |