diff options
| author | agc <agc@pkgsrc.org> | 2003-05-18 20:52:28 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2003-05-18 20:52:28 +0000 |
| commit | 6f3c5aef75ab39ea67484eecd3757a0628177baa (patch) | |
| tree | f9081a304e8cab17b88eb267dcd03f1bfde84c36 /mk | |
| parent | 4506594896debffa0fce6211feaf01a724002d3a (diff) | |
| download | pkgsrc-6f3c5aef75ab39ea67484eecd3757a0628177baa.tar.gz | |
Check for the existence of the vulnerabilities file before telling people
that we're checking for vulnerabilities. If the vulnerabilities file can't
be found, display a warning.
Addresses PR 21572 from Robert Elz.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b5e5f74ee12..1166886db9c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1182 2003/05/18 13:06:56 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1183 2003/05/18 20:52:28 agc Exp $ # # This file is in the public domain. # @@ -1425,15 +1425,19 @@ check-vulnerable: .if !target(do-fetch) do-fetch: . if !defined(ALLOW_VULNERABLE_PACKAGES) - @${ECHO_MSG} "${_PKGSRC_IN}> Checking for vulnerabilities in ${PKGNAME}" ${_PKG_SILENT}${_PKG_DEBUG} \ - vul=`${MAKE} ${MAKEFLAGS} check-vulnerable`; \ - case "$$vul" in \ - "") ;; \ - *) ${ECHO} "$$vul"; \ - ${ECHO} "or define ALLOW_VULNERABLE_PACKAGES if this package is absolutely essential"; \ - ${FALSE} ;; \ - esac + if [ -f ${PKGVULNDIR}/vulnerabilities ]; then \ + ${ECHO_MSG} "${_PKGSRC_IN}> Checking for vulnerabilities in ${PKGNAME}"; \ + vul=`${MAKE} ${MAKEFLAGS} check-vulnerable`; \ + case "$$vul" in \ + "") ;; \ + *) ${ECHO} "$$vul"; \ + ${ECHO} "or define ALLOW_VULNERABLE_PACKAGES if this package is absolutely essential"; \ + ${FALSE} ;; \ + esac; \ + else \ + ${ECHO_MSG} "${_PKGSRC_IN}> *** No ${PKGVULNDIR}/vulnerabilities file found - skipping vulnerability checks ***"; \ + fi . endif . if !empty(_ALLFILES) ${_PKG_SILENT}${_PKG_DEBUG} \ |