[pkgsrc/trunk]: pkgsrc/mk Put back the speed-up in the vulnerability checking...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a85f1feedaf3
branches:  trunk
changeset: 490499:a85f1feedaf3
user:      agc <agc%pkgsrc.org@localhost>
date:      Sun Mar 13 09:30:31 2005 +0000

description:
Put back the speed-up in the vulnerability checking when building a package,
but disable this if the package name in the pkg-vulnerabilities file contains
a meta-character. This speeds up the check-vulnerable target from:

[9:28:06] agc@sys3 ...pkgsrc/misc/libutf 11 > time make check-vulnerable
1.821u 1.988s 0:02.57 147.8%    0+0k 0+0io 0pf+0w
[9:28:17] agc@sys3 ...pkgsrc/misc/libutf 12 >

to

[9:28:27] agc@sys3 ...pkgsrc/misc/libutf 13 > time make check-vulnerable
0.273u 0.233s 0:00.33 151.5%    0+0k 0+0io 0pf+0w
[9:28:30] agc@sys3 ...pkgsrc/misc/libutf 14 >

(with caches filled, on a fairly fast machine - P4 2.8 GHz, 2GB RAM).

diffstat:

 mk/bsd.pkg.mk |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 85aa8d246296 -r a85f1feedaf3 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Mar 13 04:46:24 2005 +0000
+++ b/mk/bsd.pkg.mk     Sun Mar 13 09:30:31 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1597 2005/03/02 11:11:36 agc Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1598 2005/03/13 09:30:31 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -1393,6 +1393,7 @@
                          PKGBASE="${PKGBASE}"                          \
                        ${AWK} '/^$$/ { next }                          \
                                /^#.*/ { next }                         \
+                               $$1 !~ ENVIRON["PKGBASE"] && $$1 !~ /\{/ { 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