From bdf502acdbdff44f7caef1968b94abf3eb362ece Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Wed, 16 Feb 2005 11:01:03 +0000
Subject: 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.
---
 mk/bsd.pkg.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'mk')

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
 
-- 
cgit v1.2.3