diff options
| author | agc <agc@pkgsrc.org> | 2000-09-20 19:11:34 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-09-20 19:11:34 +0000 |
| commit | 52820563b012879a42dadc06846bc2cf2bf85f1b (patch) | |
| tree | f11bcbdf43ba8215b986864811ac0a0c2fccec4e /mk/bsd.pkg.mk | |
| parent | 9e8ec87da9cf5824d41f8d7f9f53c631157a2b04 (diff) | |
| download | pkgsrc-52820563b012879a42dadc06846bc2cf2bf85f1b.tar.gz | |
Test to see if there's a ${DISTDIR}/vulnerabilities file before trying
to access it at root-install time. Fixes a problem reported by Michael
Graff and Johnny Lam.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a2212ab4b44..d30fb92d278 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.577 2000/09/19 19:29:11 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.578 2000/09/20 19:11:34 agc Exp $ # # This file is in the public domain. # @@ -1624,10 +1624,16 @@ root-install: ${ECHO_MSG} "and install this package again by \`\`${MAKE} deinstall reinstall''."; \ fi ${_PKG_SILENT}${_PKG_DEBUG} \ - vul="`${MAKE} show-vulnerabilities`"; \ - if [ "$$vul" != "" ]; then \ - ${ECHO_MSG} '*** WARNING: Vulnerabilities in this package ***'; \ - ${ECHO_MSG} "$$vul"; \ + if [ -f ${DISTDIR}/vulnerabilities ]; then \ + vul="`${MAKE} show-vulnerabilities`"; \ + if [ "$$vul" != "" ]; then \ + ${ECHO_MSG} '*** WARNING: Vulnerabilities in this package ***'; \ + ${ECHO_MSG} "$$vul"; \ + fi \ + else \ + ${ECHO} "No ${DISTDIR}/vulnerabilities file."; \ + ${ECHO} "Consider installing the pkgsrc/security/audit-packages package"; \ + ${ECHO} "to provide automatic package security vulnerability detection."; \ fi .if !defined(NO_MTREE) ${_PKG_SILENT}${_PKG_DEBUG}if [ `${ID} -u` = 0 ]; then \ |