Add man pages for audit-packages and download-vulnerability-list which

point to pkg_admin and notes that the scripts are obsolete.

Bump version to 20100319.

8 files changed, 179 insertions, 5 deletions

diff --git a/pkgtools/pkg_install/PLIST b/pkgtools/pkg_install/PLIST
index 5315493265f..beb48418457 100644
--- a/pkgtools/pkg_install/PLIST
+++ b/pkgtools/pkg_install/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/02/02 12:34:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/03/19 12:49:53 wiz Exp $
 man/cat1/pkg_add.0
 man/cat1/pkg_admin.0
 man/cat1/pkg_create.0
@@ -7,6 +7,8 @@ man/cat1/pkg_info.0
 man/cat5/pkg_install.conf.0
 man/cat5/pkg_summary.0
 man/cat7/pkgsrc.0
+man/cat8/audit-packages.0
+man/cat8/download-vulnerability-list.0
 man/man1/pkg_add.1
 man/man1/pkg_admin.1
 man/man1/pkg_create.1
@@ -15,6 +17,8 @@ man/man1/pkg_info.1
 man/man5/pkg_install.conf.5
 man/man5/pkg_summary.5
 man/man7/pkgsrc.7
+man/man8/audit-packages.8
+man/man8/download-vulnerability-list.8
 sbin/audit-packages
 sbin/download-vulnerability-list
 sbin/pkg_add
diff --git a/pkgtools/pkg_install/files/admin/Makefile.in b/pkgtools/pkg_install/files/admin/Makefile.in
index dbfd1d31cea..1c70bd4b9f2 100644
--- a/pkgtools/pkg_install/files/admin/Makefile.in
+++ b/pkgtools/pkg_install/files/admin/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.18 2010/01/22 13:30:41 joerg Exp $
+# $NetBSD: Makefile.in,v 1.19 2010/03/19 12:49:53 wiz Exp $
 
 srcdir=		@srcdir@
 
@@ -10,6 +10,8 @@ datarootdir=	@datarootdir@
 
 man1dir=	$(mandir)/man1
 cat1dir=	$(mandir)/cat1
+man8dir=	$(mandir)/man8
+cat8dir=	$(mandir)/cat8
 
 BOOTSTRAP=	@bootstrap@
 SSL_SUPPORT=	@ssl_support@
@@ -55,10 +57,16 @@ install:
 	$(INSTALL) -m 755 -d ${DESTDIR}$(sbindir)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(man1dir)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
+	$(INSTALL) -m 755 -d ${DESTDIR}$(man8dir)
+	$(INSTALL) -m 755 -d ${DESTDIR}$(cat8dir)
 	$(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG)
 	$(INSTALL) -m 555 $(SCRIPTS) ${DESTDIR}$(sbindir)
 	$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
+	$(INSTALL) -m 444 audit-packages.8 ${DESTDIR}$(man8dir)/
+	$(INSTALL) -m 444 audit-packages.cat ${DESTDIR}$(cat8dir)/audit-packages.0
+	$(INSTALL) -m 444 download-vulnerability-list.8 ${DESTDIR}$(man8dir)/
+	$(INSTALL) -m 444 download-vulnerability-list.cat ${DESTDIR}$(cat8dir)/download-vulnerability-list.0
 
 audit-packages: audit-packages.sh.in
 	sed -e 's|@PKG_ADMIN@|${sbindir}/pkg_admin|' \
diff --git a/pkgtools/pkg_install/files/admin/audit-packages.8 b/pkgtools/pkg_install/files/admin/audit-packages.8
new file mode 100644
index 00000000000..b91c4163183
--- /dev/null
+++ b/pkgtools/pkg_install/files/admin/audit-packages.8
@@ -0,0 +1,66 @@
+.\" $NetBSD: audit-packages.8,v 1.1 2010/03/19 12:49:53 wiz Exp $
+.\"
+.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Thomas Klausner.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd March 18, 2010
+.Dt AUDIT-PACKAGES 8
+.Os
+.Sh NAME
+.Nm audit-packages
+.Nd report vulnerabilities for the installed packages
+.Sh SYNOPSIS
+.Nm
+.Op Fl deqsVv
+.Op Fl c Ar config_file
+.Op Fl F Ar file
+.Op Fl g Ar file
+.Op Fl h Ar file
+.Op Fl K Ar pkg_dbdir
+.Op Fl n Ar package
+.Op Fl p Ar package
+.Op Fl Q Ar varname
+.Op Fl t Ar type
+.Sh DESCRIPTION
+.Nm
+is deprecated.
+Please use the
+.Cm audit ,
+.Cm audit-pkg ,
+.Cm audit-batch ,
+and
+.Cm fetch-pkg-vulnerabilities
+commands of
+.Xr pkg_admin 1
+instead.
+.Pp
+The
+.Nm
+script is installed for backwards compatibility only and will
+eventually be removed.
+.Sh SEE ALSO
+.Xr pkg_admin 1
diff --git a/pkgtools/pkg_install/files/admin/audit-packages.cat b/pkgtools/pkg_install/files/admin/audit-packages.cat
new file mode 100644
index 00000000000..d65ac9f14ab
--- /dev/null
+++ b/pkgtools/pkg_install/files/admin/audit-packages.cat
@@ -0,0 +1,22 @@
+AUDIT-PACKAGES(8)       NetBSD System Manager's Manual       AUDIT-PACKAGES(8)
+
+NNAAMMEE
+     aauuddiitt--ppaacckkaaggeess -- report vulnerabilities for the installed packages
+
+SSYYNNOOPPSSIISS
+     aauuddiitt--ppaacckkaaggeess [--ddeeqqssVVvv] [--cc _c_o_n_f_i_g___f_i_l_e] [--FF _f_i_l_e] [--gg _f_i_l_e] [--hh _f_i_l_e]
+                    [--KK _p_k_g___d_b_d_i_r] [--nn _p_a_c_k_a_g_e] [--pp _p_a_c_k_a_g_e] [--QQ _v_a_r_n_a_m_e]
+                    [--tt _t_y_p_e]
+
+DDEESSCCRRIIPPTTIIOONN
+     aauuddiitt--ppaacckkaaggeess is deprecated.  Please use the aauuddiitt, aauuddiitt--ppkkgg,
+     aauuddiitt--bbaattcchh, and ffeettcchh--ppkkgg--vvuullnneerraabbiilliittiieess commands of pkg_admin(1)
+     instead.
+
+     The aauuddiitt--ppaacckkaaggeess script is installed for backwards compatibility only
+     and will eventually be removed.
+
+SSEEEE AALLSSOO
+     pkg_admin(1)
+
+NetBSD 5.0                      March 18, 2010                      NetBSD 5.0
diff --git a/pkgtools/pkg_install/files/admin/download-vulnerability-list.8 b/pkgtools/pkg_install/files/admin/download-vulnerability-list.8
new file mode 100644
index 00000000000..af6f9c27d39
--- /dev/null
+++ b/pkgtools/pkg_install/files/admin/download-vulnerability-list.8
@@ -0,0 +1,54 @@
+.\" $NetBSD: download-vulnerability-list.8,v 1.1 2010/03/19 12:49:53 wiz Exp $
+.\"
+.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Thomas Klausner.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd March 18, 2010
+.Dt DOWNLOAD-VULNERABILITY-LIST 8
+.Os
+.Sh NAME
+.Nm download-vulnerability-list
+.Nd download vulnerability list used for checking installed packages
+.Sh SYNOPSIS
+.Nm
+.Op Fl hs
+.Op Fl c Ar config_file
+.Sh DESCRIPTION
+.Nm
+is deprecated.
+Please use the
+.Cm fetch-pkg-vulnerabilities
+command of
+.Xr pkg_admin 1
+instead.
+.Pp
+The
+.Nm
+script is installed for backwards compatibility only and will
+eventually be removed.
+.Sh SEE ALSO
+.Xr pkg_admin 1
diff --git a/pkgtools/pkg_install/files/admin/download-vulnerability-list.cat b/pkgtools/pkg_install/files/admin/download-vulnerability-list.cat
new file mode 100644
index 00000000000..70e0d3a3763
--- /dev/null
+++ b/pkgtools/pkg_install/files/admin/download-vulnerability-list.cat
@@ -0,0 +1,20 @@
+DOWNLOAD-VULNERABILI... NetBSD System Manager's Manual DOWNLOAD-VULNERABILI...
+
+NNAAMMEE
+     ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt -- download vulnerability list used for
+     checking installed packages
+
+SSYYNNOOPPSSIISS
+     ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt [--hhss] [--cc _c_o_n_f_i_g___f_i_l_e]
+
+DDEESSCCRRIIPPTTIIOONN
+     ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt is deprecated.  Please use the
+     ffeettcchh--ppkkgg--vvuullnneerraabbiilliittiieess command of pkg_admin(1) instead.
+
+     The ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt script is installed for backwards compat-
+     ibility only and will eventually be removed.
+
+SSEEEE AALLSSOO
+     pkg_admin(1)
+
+NetBSD 5.0                      March 18, 2010                      NetBSD 5.0
diff --git a/pkgtools/pkg_install/files/admin/download-vulnerability-list.sh.in b/pkgtools/pkg_install/files/admin/download-vulnerability-list.sh.in
index 1038c0d293c..c2e5184f459 100644
--- a/pkgtools/pkg_install/files/admin/download-vulnerability-list.sh.in
+++ b/pkgtools/pkg_install/files/admin/download-vulnerability-list.sh.in
@@ -3,7 +3,7 @@
 pkg_admin=@PKG_ADMIN@
 
 usage() {
-	echo 'Usage: download-vulnerability-list -hs [-c config_file]' >& $2
+	echo 'Usage: download-vulnerability-list [-hs] [-c config_file]' >& $2
 	echo "Please use \`\`pkg_admin fetch-pkg-vulnerabilities'' instead." >& $2
 	exit $1
 }
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index 75e7a662202..f45b14cddd1 100644
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.151 2010/02/20 04:40:03 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.152 2010/03/19 12:49:53 wiz Exp $	*/
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION 20100220
+#define PKGTOOLS_VERSION 20100319
 
 #endif /* _INST_LIB_VERSION_H_ */