diff options
| author | agc <agc@pkgsrc.org> | 2006-11-25 13:43:42 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2006-11-25 13:43:42 +0000 |
| commit | bd4c2841dc339c3a5918d46bee299efacb78f443 (patch) | |
| tree | e0516ceedcf92ab0c19594e922570113de8c5218 /security | |
| parent | b43caa02822a188c0ff3db7649ab21d505c128d3 (diff) | |
| download | pkgsrc-bd4c2841dc339c3a5918d46bee299efacb78f443.tar.gz | |
Apply the fix in PR 35024 from Jukka Salmi - allow the use of the base name
of the package when specifying package names for the -p (one package) option,
and to make audit-packages more consistent with pkg_info behaviour.
Diffstat (limited to 'security')
| -rw-r--r-- | security/audit-packages/Makefile | 4 | ||||
| -rwxr-xr-x | security/audit-packages/files/audit-packages | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile index 445bb139ebc..088bd5bfbb3 100644 --- a/security/audit-packages/Makefile +++ b/security/audit-packages/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.72 2006/11/07 09:28:09 joerg Exp $ +# $NetBSD: Makefile,v 1.73 2006/11/25 13:43:42 agc Exp $ -DISTNAME= audit-packages-1.44 +DISTNAME= audit-packages-1.45 CATEGORIES= security pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/security/audit-packages/files/audit-packages b/security/audit-packages/files/audit-packages index 5edd318b0c9..89931890299 100755 --- a/security/audit-packages/files/audit-packages +++ b/security/audit-packages/files/audit-packages @@ -1,6 +1,6 @@ #! @SH@ # -# $NetBSD: audit-packages,v 1.28 2006/10/05 14:26:42 joerg Exp $ +# $NetBSD: audit-packages,v 1.29 2006/11/25 13:43:42 agc Exp $ # # Copyright (c) 2000-2003 Alistair Crooks. All rights reserved. # @@ -197,8 +197,9 @@ while read pat type url; do vulnpkgs=`@PKG_TOOLS_BIN@/pkg_info -e "$pat"` else vulnpkgs= - if `@PKG_TOOLS_BIN@/pkg_admin pmatch "$pat" "$one_package"` ; then - vulnpkgs=$one_package + one_pkg=`@PKG_TOOLS_BIN@/pkg_info -e "$one_package"` + if `@PKG_TOOLS_BIN@/pkg_admin pmatch "$pat" "$one_pkg"` ; then + vulnpkgs=$one_pkg fi fi for pkg in $vulnpkgs ; do |