diff options
author | agc <agc@pkgsrc.org> | 2002-01-28 20:55:26 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 2002-01-28 20:55:26 +0000 |
commit | f5aeb6d3be0a96957c927137152bc55c46546c40 (patch) | |
tree | 47bf18800ee589f34b60021972140dff41fd87f9 /mk | |
parent | 6270866043a0d6ac59e29f54eb7b6a33ab450ae9 (diff) | |
download | pkgsrc-f5aeb6d3be0a96957c927137152bc55c46546c40.tar.gz |
Fix PR 15395, whereby a package entry in the vulnerabilities file,
which shared a common prefix with a package being installed, would
erroneously be flagged as having a vulnerability. (e.g. samba and
sam).
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d80c37f18c8..cb536c4a2e0 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.918 2002/01/28 19:08:18 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.919 2002/01/28 20:55:26 agc Exp $ # # This file is in the public domain. # @@ -3179,15 +3179,17 @@ SED_HOMEPAGE_EXPR= -e 's|%%HOMEPAGE%%||' .endif show-vulnerabilities: - @if [ -f ${DISTDIR}/vulnerabilities ]; then \ - ${AWK} '/^${PKGBASE}/ { print $$0 }' ${DISTDIR}/vulnerabilities; \ + ${_PKG_SILENT}${_PKG_DEBUG} \ + if [ -f ${DISTDIR}/vulnerabilities ]; then \ + ${AWK} '/^${PKGBASE}[-<>]/ { print $$0 }' ${DISTDIR}/vulnerabilities; \ else \ ${ECHO} "No vulnerabilities list found."; \ fi show-vulnerabilities-html: - @if [ -f ${DISTDIR}/vulnerabilities ]; then \ - ${AWK} '/^${PKGBASE}/ { gsub("\<", "\\<", $$1); \ + ${_PKG_SILENT}${_PKG_DEBUG} \ + if [ -f ${DISTDIR}/vulnerabilities ]; then \ + ${AWK} '/^${PKGBASE}[-<>]/ { gsub("\<", "\\<", $$1); \ gsub("\>", "\\>", $$1); \ printf("<STRONG><LI>%s has a %s exploit (see <a href=\"%s\">%s</a> for more details)</STRONG>\n", $$1, $$2, $$3, $$3) }' \ ${DISTDIR}/vulnerabilities; \ |