[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Skip vulnerability check for packages th...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/623af4a53464
branches:  trunk
changeset: 556363:623af4a53464
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Mar 20 16:52:40 2009 +0000

description:
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:

 mk/flavor/pkg/check.mk       |  7 ++++++-
 mk/flavor/pkg/flavor-vars.mk |  4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 21b632864a47 -r 623af4a53464 mk/flavor/pkg/check.mk
--- a/mk/flavor/pkg/check.mk    Fri Mar 20 16:38:59 2009 +0000
+++ b/mk/flavor/pkg/check.mk    Fri Mar 20 16:52:40 2009 +0000
@@ -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 @@
        ${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 -r 21b632864a47 -r 623af4a53464 mk/flavor/pkg/flavor-vars.mk
--- a/mk/flavor/pkg/flavor-vars.mk      Fri Mar 20 16:38:59 2009 +0000
+++ b/mk/flavor/pkg/flavor-vars.mk      Fri Mar 20 16:52:40 2009 +0000
@@ -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 @@
 _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