- also find possible listings in {whatever}foo variations

- use PKGVULNDIR from env for correct location of pkg-vulnerabilities
NetBSD · Feb 21, 2007 · b9211a6 · b9211a6
1 parent f9a0056
commit b9211a6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mk/bulk/sort-packages b/mk/bulk/sort-packages
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $NetBSD: sort-packages,v 1.5 2007/02/20 06:46:20 jschauma Exp $
+# $NetBSD: sort-packages,v 1.6 2007/02/21 05:32:30 jschauma Exp $
 
 # This program scans all binary packages in the current directory and
 # creates three lists of files in OUTDIR:
@@ -67,7 +67,7 @@ for pkg in *${PKG_SUFX}; do
 		# Check whether the package is vulnerable or not.
 		pkg_prefix="${pkg%%-*}"
 		category="regular"
-		if grep "^${pkg_prefix}" /usr/pkgsrc/distfiles/pkg-vulnerabilities >/dev/null 2>&1; then
+		if egrep "^({.*${pkg_prefix}.*}|${pkg_prefix}|{.*}${pkg_prefix})" ${PKGVULNDIR}/pkg-vulnerabilities >/dev/null 4>&1; then
 			vuln=`${AUDIT_PACKAGES} -p "${pkg}"`
 			if [ -n "${vuln}" ]; then
 				category="vulnerable"