Update audit-packages to 1.32, with fixes for the problems mentioned

in PR 25654 from Hauke Fath.

Take any non-standard values from audit-packages.conf file in
audit-packages as well as download-vulnerability-list.

Fix the pre-formatted documentation so that filenames to be
substituted are not formatted with the bold or underline "overstrikes"
on ttys, so that the correct sed substitutions take place at package
install time.

4 files changed, 27 insertions, 21 deletions

diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile
index ac72f6f8b2f..b5f35c580e5 100644
--- a/security/audit-packages/Makefile
+++ b/security/audit-packages/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2004/05/17 19:28:19 reed Exp $
+# $NetBSD: Makefile,v 1.49 2004/06/06 08:28:54 agc Exp $
 
-DISTNAME=	audit-packages-1.31
+DISTNAME=	audit-packages-1.32
 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 47b7e6ed24c..9e5eb94cd6a 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.16 2004/01/01 23:35:28 agc Exp $
+# $NetBSD: audit-packages,v 1.17 2004/06/06 08:28:54 agc Exp $
 #
 # Copyright (c) 2000-2003 Alistair Crooks.  All rights reserved.
 #
@@ -35,6 +35,11 @@
 
 : ${PKGVULNDIR=@PKGVULNDIR@}
 
+if [ -r @PKG_SYSCONFDIR@/audit-packages.conf ]; then
+	echo "Reading settings from @PKG_SYSCONFDIR@/audit-packages.conf"
+	. @PKG_SYSCONFDIR@/audit-packages.conf
+fi
+
 vuls=${PKGVULNDIR}/pkg-vulnerabilities 
 
 verbose=no
diff --git a/security/audit-packages/files/audit-packages.0 b/security/audit-packages/files/audit-packages.0
index 16fc7f93974..77f1c07df92 100644
--- a/security/audit-packages/files/audit-packages.0
+++ b/security/audit-packages/files/audit-packages.0
@@ -1,4 +1,4 @@
-AUDIT-PACKAGES(8)           System Manager's Manual          AUDIT-PACKAGES(8)
+AUDIT-PACKAGES(8)       NetBSD System Manager's Manual       AUDIT-PACKAGES(8)
 
 NNAAMMEE
      aauuddiitt--ppaacckkaaggeess, ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt - show vulnerabilities in
@@ -60,13 +60,13 @@ DDEESSCCRRIIPPTTIIOONN
            ++oo   weak-encryption
            ++oo   weak-ssl-authentication
 
-     By default, the vulnerabilities file is stored in the _@_P_K_G_V_U_L_N_D_I_R_@ direc-
+     By default, the vulnerabilities file is stored in the @PKGVULNDIR@ direc-
      tory.  This can be changed by defining the environment variable
      PKGVULNDIR to the directory containing the vulnerabilities file.
 
 EENNVVIIRROONNMMEENNTT
-     These variables can also be defined in the
-     _@_P_K_G___S_Y_S_C_O_N_F_D_I_R_@_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s_._c_o_n_f file.
+     These variables can also be defined in the @PKG_SYSCONFDIR@/audit-pack-
+     ages.conf file.
 
      PKGVULNDIR  Specifies the directory containing the _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s
                  file.
@@ -74,9 +74,9 @@ EENNVVIIRROONNMMEENNTT
      FETCH_ARGS  Specifies optional arguments for the ftp client.
 
 FFIILLEESS
-     _@_P_K_G_V_U_L_N_D_I_R_@_/_p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s
+     @PKGVULNDIR@/pkg-vulnerabilities
 
-     _@_P_K_G___S_Y_S_C_O_N_F_D_I_R_@_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s_._c_o_n_f
+     @PKG_SYSCONFDIR@/audit-packages.conf
 
 EEXXAAMMPPLLEESS
      The ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt command can be run via cron(8) to update
@@ -84,15 +84,15 @@ EEXXAAMMPPLLEESS
      cron(8) (or with NetBSD's _/_e_t_c_/_s_e_c_u_r_i_t_y_._l_o_c_a_l daily security script).
 
      The ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt command can be forced to use IPv4 with
-     the following setting in _@_P_K_G___S_Y_S_C_O_N_F_D_I_R_@_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s_._c_o_n_f:
+     the following setting in @PKG_SYSCONFDIR@/audit-packages.conf :
 
      export FETCH_ARGS="-4"
 
 SSEEEE AALLSSOO
-     pkg_info(1), mk.conf(5), packages(7), _@_P_K_G_S_R_C_D_I_R_@_/_m_k_/_b_s_d_._p_k_g_._d_e_f_a_u_l_t_s_._m_k
+     pkg_info(1), mk.conf(5), packages(7), @PKGSRCDIR@/mk/bsd.pkg.defaults.mk
      and
 
-     _D_o_c_u_m_e_n_t_a_t_i_o_n _o_n _t_h_e _N_e_t_B_S_D _P_a_c_k_a_g_e _S_y_s_t_e_m.  _@_P_K_G_S_R_C_D_I_R_@_/_P_a_c_k_a_g_e_s_._t_x_t
+     _D_o_c_u_m_e_n_t_a_t_i_o_n _o_n _t_h_e _N_e_t_B_S_D _P_a_c_k_a_g_e _S_y_s_t_e_m.  @PKGSRCDIR@/Packages.txt
 
 HHIISSTTOORRYY
      The aauuddiitt--ppaacckkaaggeess and ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt commands were origi-
@@ -100,4 +100,4 @@ HHIISSTTOORRYY
      September 19, 2000.  The original idea came from Roland Dowdeswell and
      Bill Sommerfeld.
 
-pkgsrc                             May 12, 2004                         pkgsrc
+NetBSD 2.0                       May 12, 2004                       NetBSD 2.0
diff --git a/security/audit-packages/files/audit-packages.8 b/security/audit-packages/files/audit-packages.8
index 9bd99d7af93..984e014ea8e 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.7 2004/05/17 19:28:19 reed Exp $
+.\" $NetBSD: audit-packages.8,v 1.8 2004/06/06 08:28:54 agc Exp $
 .Dd May 12, 2004
 .Os
 .Dt AUDIT-PACKAGES 8
@@ -112,14 +112,14 @@ weak-ssl-authentication
 .El
 .Pp
 By default, the vulnerabilities file is stored in the
-.Pa @PKGVULNDIR@
+@PKGVULNDIR@
 directory.
 This can be changed by defining the environment variable
 .Ev PKGVULNDIR
 to the directory containing the vulnerabilities file.
 .Sh ENVIRONMENT
 These variables can also be defined in the
-.Pa @PKG_SYSCONFDIR@/audit-packages.conf
+@PKG_SYSCONFDIR@/audit-packages.conf
 file.
 .Pp
 .Bl -tag -width PKGVULNDIR
@@ -131,9 +131,10 @@ file.
 Specifies optional arguments for the ftp client.
 .El
 .Sh FILES
-.Pa @PKGVULNDIR@/pkg-vulnerabilities
 .Pp
-.Pa @PKG_SYSCONFDIR@/audit-packages.conf
+@PKGVULNDIR@/pkg-vulnerabilities
+.Pp
+@PKG_SYSCONFDIR@/audit-packages.conf
 .\" .Sh EXAMPLES
 .Sh EXAMPLES
 The
@@ -155,19 +156,19 @@ daily security script).
 The
 .Nm download-vulnerability-list
 command can be forced to use IPv4 with the following setting in
-.Pa @PKG_SYSCONFDIR@/audit-packages.conf :
+@PKG_SYSCONFDIR@/audit-packages.conf :
 .Pp
 export FETCH_ARGS="-4"
 .Sh SEE ALSO
 .Xr pkg_info 1 ,
 .Xr mk.conf 5 ,
 .Xr packages 7 ,
-.Pa @PKGSRCDIR@/mk/bsd.pkg.defaults.mk
+@PKGSRCDIR@/mk/bsd.pkg.defaults.mk
 and
 .Rs
 .%T "Documentation on the NetBSD Package System"
 .Re
-.Pa @PKGSRCDIR@/Packages.txt
+@PKGSRCDIR@/Packages.txt
 .Sh HISTORY
 The
 .Nm