Fri Mar 20 16:52:40 2009 UTC ()
Skip vulnerability check for packages that set NO_PKGTOOLS_REQD_CHECK.
Set AUDIT_PACKAGES and friends correctly though. Fixes bootstrap on
platforms with pdksh.


(joerg)
diff -r1.11 -r1.12 pkgsrc/mk/flavor/pkg/check.mk
diff -r1.10 -r1.11 pkgsrc/mk/flavor/pkg/flavor-vars.mk
cvs diff -r1.11 -r1.12 pkgsrc/mk/flavor/pkg/Attic/check.mk (expand / switch to unified diff)

--- pkgsrc/mk/flavor/pkg/Attic/check.mk 2009/03/17 22:13:36 1.11
+++ pkgsrc/mk/flavor/pkg/Attic/check.mk 2009/03/20 16:52:40 1.12
@@ -1,20 +1,25 @@ @@ -1,20 +1,25 @@
1# $NetBSD: check.mk,v 1.11 2009/03/17 22:13:36 rillig Exp $ 1# $NetBSD: check.mk,v 1.12 2009/03/20 16:52:40 joerg Exp $
2# 2#
3 3
4# _flavor-check-vulnerable: 4# _flavor-check-vulnerable:
5# Checks for known vulnerabilities in the package if a vulnerability 5# Checks for known vulnerabilities in the package if a vulnerability
6# file exists. 6# file exists.
7# 7#
 8.if defined(NO_PKGTOOLS_REQD_CHECK)
 9_flavor-check-vulnerable: .PHONY
 10 ${RUN}${DO_NADA}
 11.else
8_flavor-check-vulnerable: .PHONY 12_flavor-check-vulnerable: .PHONY
9 ${RUN}\ 13 ${RUN}\
10 _PKGVULNDIR=`${_EXTRACT_PKGVULNDIR}`; \ 14 _PKGVULNDIR=`${_EXTRACT_PKGVULNDIR}`; \
11 vulnfile=$$_PKGVULNDIR/pkg-vulnerabilities; \ 15 vulnfile=$$_PKGVULNDIR/pkg-vulnerabilities; \
12 if ${TEST} ! -f "$$vulnfile"; then \ 16 if ${TEST} ! -f "$$vulnfile"; then \
13 ${PHASE_MSG} "Skipping vulnerability checks."; \ 17 ${PHASE_MSG} "Skipping vulnerability checks."; \
14 ${WARNING_MSG} "No $$vulnfile file found."; \ 18 ${WARNING_MSG} "No $$vulnfile file found."; \
15 ${WARNING_MSG} "To fix run: \`${DOWNLOAD_VULN_LIST}'."; \ 19 ${WARNING_MSG} "To fix run: \`${DOWNLOAD_VULN_LIST}'."; \
16 exit 0; \ 20 exit 0; \
17 fi; \ 21 fi; \
18 ${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \ 22 ${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \
19 ${AUDIT_PACKAGES} ${_AUDIT_PACKAGES_CMD} ${AUDIT_PACKAGES_FLAGS} ${PKGNAME} \ 23 ${AUDIT_PACKAGES} ${_AUDIT_PACKAGES_CMD} ${AUDIT_PACKAGES_FLAGS} ${PKGNAME} \
20 || ${FAIL_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or IGNORE_URLS in audit-packages.conf(5) if this package is absolutely essential." 24 || ${FAIL_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or IGNORE_URLS in audit-packages.conf(5) if this package is absolutely essential."
 25.endif
cvs diff -r1.10 -r1.11 pkgsrc/mk/flavor/pkg/Attic/flavor-vars.mk (expand / switch to unified diff)

--- pkgsrc/mk/flavor/pkg/Attic/flavor-vars.mk 2009/02/11 14:34:36 1.10
+++ pkgsrc/mk/flavor/pkg/Attic/flavor-vars.mk 2009/03/20 16:52:40 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: flavor-vars.mk,v 1.10 2009/02/11 14:34:36 joerg Exp $ 1# $NetBSD: flavor-vars.mk,v 1.11 2009/03/20 16:52:40 joerg Exp $
2# 2#
3# This Makefile fragment is included indirectly by bsd.prefs.mk and 3# This Makefile fragment is included indirectly by bsd.prefs.mk and
4# defines some variables which must be defined earlier than where 4# defines some variables which must be defined earlier than where
5# flavor.mk is included. 5# flavor.mk is included.
6# 6#
7 7
8PKGSRC_MESSAGE_RECIPIENTS?= # empty 8PKGSRC_MESSAGE_RECIPIENTS?= # empty
9 9
10.if !empty(PKGSRC_MESSAGE_RECIPIENTS) 10.if !empty(PKGSRC_MESSAGE_RECIPIENTS)
11USE_TOOLS+= mail 11USE_TOOLS+= mail
12.endif 12.endif
13 13
14.if defined(PKG_PRESERVE) 14.if defined(PKG_PRESERVE)
@@ -39,27 +39,27 @@ LINKFARM_CMD?= ${PKG_TOOLS_BIN}/linkfar @@ -39,27 +39,27 @@ LINKFARM_CMD?= ${PKG_TOOLS_BIN}/linkfar
39PKGTOOLS_REQD= 20070813 39PKGTOOLS_REQD= 20070813
40 40
41.if !defined(PKGTOOLS_VERSION) 41.if !defined(PKGTOOLS_VERSION)
42PKGTOOLS_VERSION!= ${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302 42PKGTOOLS_VERSION!= ${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302
43MAKEFLAGS+= PKGTOOLS_VERSION=${PKGTOOLS_VERSION} 43MAKEFLAGS+= PKGTOOLS_VERSION=${PKGTOOLS_VERSION}
44.endif 44.endif
45 45
46# Check that we are using up-to-date pkg_* tools with this file. 46# Check that we are using up-to-date pkg_* tools with this file.
47.if !defined(NO_PKGTOOLS_REQD_CHECK) && ${PKGTOOLS_VERSION} < ${PKGTOOLS_REQD} 47.if !defined(NO_PKGTOOLS_REQD_CHECK) && ${PKGTOOLS_VERSION} < ${PKGTOOLS_REQD}
48BOOTSTRAP_DEPENDS+= pkg_install>=${PKGTOOLS_REQD}:../../pkgtools/pkg_install 48BOOTSTRAP_DEPENDS+= pkg_install>=${PKGTOOLS_REQD}:../../pkgtools/pkg_install
49_PKG_INSTALL_DEPENDS= yes 49_PKG_INSTALL_DEPENDS= yes
50.endif 50.endif
51 51
52.if !defined(NO_PKGTOOLS_REQD_CHECK) && ${PKGTOOLS_VERSION} >= 20090201 52.if ${PKGTOOLS_VERSION} >= 20090201
53AUDIT_PACKAGES?= ${PKG_ADMIN} 53AUDIT_PACKAGES?= ${PKG_ADMIN}
54_AUDIT_PACKAGES_CMD?= audit-pkg 54_AUDIT_PACKAGES_CMD?= audit-pkg
55_EXTRACT_PKGVULNDIR= ${PKG_ADMIN} config-var PKGVULNDIR 55_EXTRACT_PKGVULNDIR= ${PKG_ADMIN} config-var PKGVULNDIR
56DOWNLOAD_VULN_LIST?= ${PKG_ADMIN} fetch-pkg-vulnerabilities 56DOWNLOAD_VULN_LIST?= ${PKG_ADMIN} fetch-pkg-vulnerabilities
57.else 57.else
58AUDIT_PACKAGES?= ${PKG_TOOLS_BIN}/audit-packages 58AUDIT_PACKAGES?= ${PKG_TOOLS_BIN}/audit-packages
59_AUDIT_PACKAGES_CMD?= -n 59_AUDIT_PACKAGES_CMD?= -n
60_EXTRACT_PKGVULNDIR= ${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR 60_EXTRACT_PKGVULNDIR= ${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR
61DOWNLOAD_VULN_LIST?= ${PKG_TOOLS_BIN}/download-vulnerability-list 61DOWNLOAD_VULN_LIST?= ${PKG_TOOLS_BIN}/download-vulnerability-list
62.endif 62.endif
63 63
64 64
65# The binary pkg_install tools all need to consistently to refer to the 65# The binary pkg_install tools all need to consistently to refer to the