summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2005-02-16 11:01:03 +0000
committeragc <agc@pkgsrc.org>2005-02-16 11:01:03 +0000
commitb10fb63e34839fe2651089e8b1bd5f856a2270d1 (patch)
tree7af162183fb5db55d693c61535a83feee500c02c /mk
parent94c992087d26438b9b2b72a7cbd3ff1296069199 (diff)
downloadpkgsrc-b10fb63e34839fe2651089e8b1bd5f856a2270d1.tar.gz
Fix an anomaly noted by Steve Bellovin in
<20050215182853.AC52D3C03B8@berkshire.machshav.com> The check for a vulnerable package at package fetch time is producing incorrect results when csh-style alternates are used in the pkg-vulnerabilities specification of the vulnerable package - disable the incorrect speed-up that was there previously, at the expense of some machine cycles at build time.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index a42c268be41..ac04662f859 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1589 2005/02/15 16:21:41 tv Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1590 2005/02/16 11:01:03 agc Exp $
#
# This file is in the public domain.
#
@@ -1385,7 +1385,6 @@ check-vulnerable:
PKGBASE="${PKGBASE}" \
${AWK} '/^$$/ { next } \
/^#.*/ { next } \
- $$1 !~ ENVIRON["PKGBASE"] { next } \
{ s = sprintf("${PKG_ADMIN} pmatch \"%s\" %s && ${ECHO} \"*** WARNING - %s vulnerability in %s - see %s for more information ***\"", $$1, ENVIRON["PKGNAME"], $$2, ENVIRON["PKGNAME"], $$3); system(s); }' < ${PKGVULNDIR}/pkg-vulnerabilities || ${FALSE}; \
fi