Require pkg_info with ranges support, bump version to 1.36.

Reviewed by wiz.

4 files changed, 67 insertions, 44 deletions

diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile
index 6b0aacaacd0..957e0b70c48 100644
--- a/security/audit-packages/Makefile
+++ b/security/audit-packages/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2005/06/07 19:17:01 dillo Exp $
+# $NetBSD: Makefile,v 1.56 2005/06/09 15:34:52 dillo Exp $
 
-DISTNAME=	audit-packages-1.35
+DISTNAME=	audit-packages-1.36
 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 297eec73fd4..14521ec89ac 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.19 2005/06/07 19:17:01 dillo Exp $
+# $NetBSD: audit-packages,v 1.20 2005/06/09 15:34:52 dillo Exp $
 #
 # Copyright (c) 2000-2003 Alistair Crooks.  All rights reserved.
 #
@@ -33,13 +33,15 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-ERR_DOWNLOAD="Please run download-vulnerability-list"
-ERR_UPGRADE="Please upgrade audit-packages to the newest version"
+ERR_DOWNLOAD="Please run download-vulnerability-list."
+ERR_UPGRADE="Please upgrade security/audit-packages to the newest version."
+ERR_PKGINSTALL="Please upgrade pkgtools/pkg_install to the newest version."
 
 : ${PKGVULNDIR=@PKGVULNDIR@}
 
 FORMAT_MAJOR=1
 FORMAT_MINOR=0
+PKG_INSTALL_REQUIRED=20050530
 
 if [ -r @PKG_SYSCONFDIR@/audit-packages.conf ]; then
 	echo "Reading settings from @PKG_SYSCONFDIR@/audit-packages.conf"
@@ -75,6 +77,16 @@ case "$errmsg" in
 esac
 
 case "$errmsg" in
+"")	# check that pkg_info is new enough (supports ranges)
+	if [ `@PKG_TOOLS_BIN@/pkg_info -V` -lt "$PKG_INSTALL_REQUIRED" ]
+	then
+		errmsg='Installed pkg_info is too old.'
+		errsolution="$ERR_PKGINSTALL"
+	fi
+	;;
+esac
+
+case "$errmsg" in
 "")	# check format version of vulnerabilities file
 	file_major=`@AWK@ '$1 == "#FORMAT" { split($2, a, "\\."); print a[1] }' "$vuls"`
 	file_minor=`@AWK@ '$1 == "#FORMAT" { split($2, a, "\\."); print a[2] }' "$vuls"`
diff --git a/security/audit-packages/files/audit-packages.0 b/security/audit-packages/files/audit-packages.0
index 787eceeab4b..636bf860af7 100644
--- a/security/audit-packages/files/audit-packages.0
+++ b/security/audit-packages/files/audit-packages.0
@@ -25,40 +25,40 @@ DDEESSCCRRIIPPTTIIOONN
      Each line lists the package and vulnerable versions, the type of exploit,
      and an Internet address for further information.  The type of exploit can
      be any text, although some common types of exploits listed are:
-           ++oo   cross-site-html
-           ++oo   cross-site-scripting
-           ++oo   denial-of-service
-           ++oo   file-permissions
-           ++oo   local-access
-           ++oo   local-code-execution
-           ++oo   local-file-read
-           ++oo   local-file-removal
-           ++oo   local-file-write
-           ++oo   local-root-file-view
-           ++oo   local-root-shell
-           ++oo   local-symlink-race
-           ++oo   local-user-file-view
-           ++oo   local-user-shell
-           ++oo   privacy-leak
-           ++oo   remote-code-execution
-           ++oo   remote-command-inject
-           ++oo   remote-file-creation
-           ++oo   remote-file-read
-           ++oo   remote-file-view
-           ++oo   remote-file-write
-           ++oo   remote-key-theft
-           ++oo   remote-root-access
-           ++oo   remote-root-shell
-           ++oo   remote-script-inject
-           ++oo   remote-server-admin
-           ++oo   remote-use-of-secret
-           ++oo   remote-user-access
-           ++oo   remote-user-file-view
-           ++oo   remote-user-shell
-           ++oo   unknown
-           ++oo   weak-authentication
-           ++oo   weak-encryption
-           ++oo   weak-ssl-authentication
+           ··   cross-site-html
+           ··   cross-site-scripting
+           ··   denial-of-service
+           ··   file-permissions
+           ··   local-access
+           ··   local-code-execution
+           ··   local-file-read
+           ··   local-file-removal
+           ··   local-file-write
+           ··   local-root-file-view
+           ··   local-root-shell
+           ··   local-symlink-race
+           ··   local-user-file-view
+           ··   local-user-shell
+           ··   privacy-leak
+           ··   remote-code-execution
+           ··   remote-command-inject
+           ··   remote-file-creation
+           ··   remote-file-read
+           ··   remote-file-view
+           ··   remote-file-write
+           ··   remote-key-theft
+           ··   remote-root-access
+           ··   remote-root-shell
+           ··   remote-script-inject
+           ··   remote-server-admin
+           ··   remote-use-of-secret
+           ··   remote-user-access
+           ··   remote-user-file-view
+           ··   remote-user-shell
+           ··   unknown
+           ··   weak-authentication
+           ··   weak-encryption
+           ··   weak-ssl-authentication
 
      By default, the vulnerabilities file is stored in the @PKGVULNDIR@ direc-
      tory.  This can be changed by defining the environment variable
@@ -116,7 +116,11 @@ DDIIAAGGNNOOSSTTIICCSS
      Unsupported file format version
                  The vulnerabilities file is too old or too new.  If it's too
                  old, run ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt.  If it's too new,
-                 update the aauuddiitt--ppaacckkaaggeess package.
+                 update the _s_e_c_u_r_i_t_y_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s package.
+
+     Installed pkg_info too old
+                 aauuddiitt--ppaacckkaaggeess requires a newer version of pkg_info(1).
+                 Update the _p_k_g_t_o_o_l_s_/_p_k_g___i_n_s_t_a_l_l package.
 
 SSEEEE AALLSSOO
      pkg_info(1), mk.conf(5), packages(7), @PKGSRCDIR@/mk/bsd.pkg.defaults.mk
@@ -130,4 +134,4 @@ HHIISSTTOORRYY
      September 19, 2000.  The original idea came from Roland Dowdeswell and
      Bill Sommerfeld.
 
-NetBSD 2.0                       May 27, 2005                       NetBSD 2.0
+NetBSD 2.0.2                     June 9, 2005                     NetBSD 2.0.2
diff --git a/security/audit-packages/files/audit-packages.8 b/security/audit-packages/files/audit-packages.8
index 22ca42d35cb..96ac9da13d5 100644
--- a/security/audit-packages/files/audit-packages.8
+++ b/security/audit-packages/files/audit-packages.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: audit-packages.8,v 1.12 2005/06/09 08:14:08 wiz Exp $
+.\" $NetBSD: audit-packages.8,v 1.13 2005/06/09 15:34:52 dillo Exp $
 .\"
 .\" Copyright (c) 2003 Jeremy C. Reed.  All rights reserved.
 .\"
@@ -30,7 +30,7 @@
 .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd May 27, 2005
+.Dd June 9, 2005
 .Os
 .Dt AUDIT-PACKAGES 8
 .Sh NAME
@@ -221,7 +221,14 @@ The vulnerabilities file is too old or too new.
 If it's too old, run
 .Nm download-vulnerability-list .
 If it's too new, update the
-.Nm audit-packages
+.Pa security/audit-packages
+package.
+.It Installed pkg_info too old
+.Nm
+requires a newer version of 
+.Xr pkg_info 1 .
+Update the
+.Pa pkgtools/pkg_install
 package.
 .El
 .Sh SEE ALSO