diff options
| author | agc <agc@pkgsrc.org> | 2005-02-16 11:01:03 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2005-02-16 11:01:03 +0000 |
| commit | a798d594349d02382bb4704838875e9703ec9e68 (patch) | |
| tree | 7af162183fb5db55d693c61535a83feee500c02c | |
| parent | 2477f3276ca5eae02234b1b7dbf576d7ab2f36d3 (diff) | |
| download | pkgsrc-a798d594349d02382bb4704838875e9703ec9e68.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.
| -rw-r--r-- | mk/bsd.pkg.mk | 3 |
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 |