summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authoragc <agc>2002-01-28 20:55:26 +0000
committeragc <agc>2002-01-28 20:55:26 +0000
commit4f40adc46b5e9d6a53d6316330ec318dacc4faba (patch)
tree47bf18800ee589f34b60021972140dff41fd87f9 /mk
parente9055c9413b892871dab2953c37e86a2225612fc (diff)
downloadpkgsrc-4f40adc46b5e9d6a53d6316330ec318dacc4faba.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.mk12
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("\<", "\\&lt;", $$1); \
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ if [ -f ${DISTDIR}/vulnerabilities ]; then \
+ ${AWK} '/^${PKGBASE}[-<>]/ { gsub("\<", "\\&lt;", $$1); \
gsub("\>", "\\&gt;", $$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; \