 @@ -1,23 +1,23 @@
-/*	$NetBSD: main.c,v 1.25 2010/02/18 13:43:11 joerg Exp $	*/
+/*	$NetBSD: main.c,v 1.26 2010/06/16 23:02:48 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.25 2010/02/18 13:43:11 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.26 2010/06/16 23:02:48 joerg Exp $");
 /*
+ *
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * 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
 @@ -29,27 +29,27 @@ __RCSID("$NetBSD: main.c,v 1.25 2010/02/
  * This is the add module.
+ *
  */
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #include "lib.h"
 #include "add.h"
-static char Options[] = "AIK:LP:RVW:fhm:np:t:Uuvw:";
+static char Options[] = "AC:IK:LP:RVW:fhm:np:t:Uuvw:";
 char   *Destdir = NULL;
 char   *OverrideMachine = NULL;
 char   *Prefix = NULL;
 char   *View = NULL;
 char   *Viewbase = NULL;
 Boolean NoView = FALSE;
 Boolean NoInstall = FALSE;
 Boolean NoRecord = FALSE;
 Boolean Automatic = FALSE;
 Boolean ForceDepends = FALSE;
 int	LicenseCheck = 0;

 @@ -1,22 +1,22 @@
-/*	$NetBSD: perform.c,v 1.96 2010/04/14 18:24:58 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.97 2010/06/16 23:02:48 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.96 2010/04/14 18:24:58 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.97 2010/06/16 23:02:48 joerg Exp $");
 /*-
  * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
  * Copyright (c) 2005 Dieter Baron <dillo@NetBSD.org>
  * Copyright (c) 2007 Roland Illig <rillig@NetBSD.org>
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>
  * All rights reserved.
+ *
  * 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
 @@ -329,49 +329,49 @@ dup_value(const char *line, const char *
 	key = strchr(line, '=');
 	val = xmalloc(eol - key);
 	memcpy(val, key + 1, eol - key - 1);
 	val[eol - key - 1] = '\0';
 	return val;
+}
 static int
 check_already_installed(struct pkg_task *pkg)
+{
 	char *filename;
 	int fd;
 	if (Force)
 		return 1;
 	filename = pkgdb_pkg_file(pkg->pkgname, CONTENTS_FNAME);
 	fd = open(filename, O_RDONLY);
 	free(filename);
 	if (fd == -1)
 		return 1;
 	if (ReplaceSame) {
 		struct stat sb;
 		pkg->install_logdir_real = pkg->install_logdir;
 		pkg->install_logdir = xasprintf("%s.xxxxxx", pkg->install_logdir);
 		if (stat(pkg->install_logdir, &sb) == 0) {
 			warnx("package `%s' already has a temporary update "
 			    "directory `%s', remove it manually",
 			    pkg->pkgname, pkg->install_logdir);
 			return -1;
+		}
 		return 1;
+	}
 	if (Force)
 		return 1;
 	/* We can only arrive here for explicitly requested packages. */
 	if (!Automatic && is_automatic_installed(pkg->pkgname)) {
 		if (Fake ||
 		    mark_as_automatic_installed(pkg->pkgname, 0) == 0)
 			warnx("package `%s' was already installed as "
 			      "dependency, now marked as installed "
 			      "manually", pkg->pkgname);
 	} else {
 		warnx("package `%s' already recorded as installed",
 		      pkg->pkgname);
+	}
 	close(fd);
 	return 0;
 @@ -1259,44 +1259,44 @@ check_signature(struct pkg_task *pkg, in
 	return 1;
+}
 static int
 check_vulnerable(struct pkg_task *pkg)
+{
 	static struct pkg_vulnerabilities *pv;
 	int require_check;
 	char *line;
 	size_t len;
 	if (strcasecmp(check_vulnerabilities, "never") == 0)
 		return 0;
-	else if (strcasecmp(check_vulnerabilities, "always"))
+	else if (strcasecmp(check_vulnerabilities, "always") == 0)
 		require_check = 1;
-	else if (strcasecmp(check_vulnerabilities, "interactive"))
+	else if (strcasecmp(check_vulnerabilities, "interactive") == 0)
 		require_check = 0;
 	else {
 		warnx("Unknown value of the configuration variable"
 		    "CHECK_VULNERABILITIES");
 		return 1;
+	}
 	if (pv == NULL) {
 		pv = read_pkg_vulnerabilities_file(pkg_vulnerabilities_file,
 		    require_check, 0);
 		if (pv == NULL)
 			return require_check;
+	}
-	if (!audit_package(pv, pkg->pkgname, NULL, 0, 2))
+	if (!audit_package(pv, pkg->pkgname, NULL, 2))
 		return 0;
 	if (require_check)
 		return 1;
 	fprintf(stderr, "Do you want to proceed with the installation of %s"
 	    " [y/n]?\n", pkg->pkgname);
 	line = fgetln(stdin, &len);
 	if (check_input(line, len)) {
 		fprintf(stderr, "Cancelling installation\n");
 		return 1;
+	}
 	return 0;

 @@ -1,41 +1,42 @@
-.\" $NetBSD: pkg_add.1,v 1.43 2010/02/18 13:43:11 joerg Exp $
+.\" $NetBSD: pkg_add.1,v 1.44 2010/06/16 23:02:48 joerg Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
 .\"
 .\" 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.
 .\"
 .\" Jordan K. Hubbard
 .\"
 .\"
 .\"     @(#)pkg_add.1
 .\"
-.Dd February 18, 2010
+.Dd June 16, 2010
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
 .Nm pkg_add
 .Nd a utility for installing and upgrading software package distributions
 .Sh SYNOPSIS
 .Nm
 .Op Fl AfILnRUuVv
 .Op Fl C Ar config
 .Op Fl K Ar pkg_dbdir
 .Op Fl m Ar machine
 .Op Fl P Ar destdir
 .Op Fl p Ar prefix
 .Op Fl W Ar viewbase
 .Op Fl w Ar view
 .Ar Oo Oo Li ftp|http Oc Ns Li :// Ns Oo Ar user Oc Ns \
 Oo Li \&: Ns Ar password Oc \
 Ns Li @ Oc Ns Ar host Ns Oo Li \&: Ns Ar port Oc Ns \
 Oo Li / Ns Ar path/ Oc Ns Ar pkg-name ...
 .Sh DESCRIPTION
 The
 .Nm
 @@ -106,26 +107,30 @@ variable are searched using the wildcard
 Mark package as installed automatically, as dependency of another
 package.
 You can use
 .Dl Ic pkg_admin set automatic=YES
 to mark packages this way after installation, and
 .Dl Ic pkg_admin unset automatic
 to remove the mark.
 If you
 .Nm
 a package without specifying
 .Fl A
 after it had already been automatically installed, the mark is
 removed.
 .It Fl C Ar config
 Read the configuration file from
 .Ar config
 instead of the system default.
 .It Fl f
 Force installation to proceed even if prerequisite packages are not
 installed or the install script fails.
 Although
 .Nm
 will still try to find and auto-install missing prerequisite packages,
 a failure to find one will not be fatal.
 This flag also overrides the fatal error when the operating system or
 architecture the package was built on differ from that of the host.
 .It Fl I
 If an installation script exists for a given package, do not execute it.
 .It Fl K Ar pkg_dbdir
 Override the value of the

 @@ -1,22 +1,22 @@
 PKG_ADD(1)              NetBSD General Commands Manual              PKG_ADD(1)
 NNAAMMEE
      ppkkgg__aadddd -- a utility for installing and upgrading software package dis-
      tributions
 SSYYNNOOPPSSIISS
-     ppkkgg__aadddd [--AAffIILLnnRRUUuuVVvv] [--KK _p_k_g___d_b_d_i_r] [--mm _m_a_c_h_i_n_e] [--PP _d_e_s_t_d_i_r]
+     ppkkgg__aadddd [--AAffIILLnnRRUUuuVVvv] [--CC _c_o_n_f_i_g] [--KK _p_k_g___d_b_d_i_r] [--mm _m_a_c_h_i_n_e]
-             [--pp _p_r_e_f_i_x] [--WW _v_i_e_w_b_a_s_e] [--ww _v_i_e_w] _f_i_l_e _._._.
+             [--PP _d_e_s_t_d_i_r] [--pp _p_r_e_f_i_x] [--WW _v_i_e_w_b_a_s_e] [--ww _v_i_e_w] _f_i_l_e _._._.
              [[ftp|http]://[_u_s_e_r][:_p_a_s_s_w_o_r_d]@]_h_o_s_t[:_p_o_r_t][/_p_a_t_h_/]_p_k_g_-_n_a_m_e _._._.
 DDEESSCCRRIIPPTTIIOONN
      The ppkkgg__aadddd command is used to extract and upgrade packages that have
      been previously created with the pkg_create(1) command.  Packages are
      prepared collections of pre-built binaries, documentation, configura-
      tions, installation instructions and/or other files.  ppkkgg__aadddd can recur-
      sively install other packages that the current package depends on or
      requires from both local disk and via FTP or HTTP.
 WWAARRNNIINNGG
      _S_i_n_c_e _t_h_e ppkkgg__aadddd _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _c_o_n_t_a_i_n_e_d
      _w_i_t_h_i_n _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n
 @@ -43,26 +43,30 @@ OOPPTTIIOONNSS
              wildcard processing.  If that fails as well and _p_k_g_-_n_a_m_e does not
              contain any /, the entries of the PKG_PATH variable are searched
              using the wildcard processing rules.
      --AA      Mark package as installed automatically, as dependency of another
              package.  You can use
                    ppkkgg__aaddmmiinn sseett aauuttoommaattiicc==YYEESS
              to mark packages this way after installation, and
                    ppkkgg__aaddmmiinn uunnsseett aauuttoommaattiicc
              to remove the mark.  If you ppkkgg__aadddd a package without specifying
              --AA after it had already been automatically installed, the mark is
              removed.
      --CC _c_o_n_f_i_g
              Read the configuration file from _c_o_n_f_i_g instead of the system
              default.
      --ff      Force installation to proceed even if prerequisite packages are
              not installed or the install script fails.  Although ppkkgg__aadddd will
              still try to find and auto-install missing prerequisite packages,
              a failure to find one will not be fatal.  This flag also over-
              rides the fatal error when the operating system or architecture
              the package was built on differ from that of the host.
      --II      If an installation script exists for a given package, do not exe-
              cute it.
      --KK _p_k_g___d_b_d_i_r
              Override the value of the PKG_DBDIR configuration option with the
              value _p_k_g___d_b_d_i_r.
 @@ -252,14 +256,14 @@ AAUUTTHHOORRSS
              NetBSD refinements.
      Hubert Feyrer
              NetBSD wildcard dependency processing, pkgdb, upgrading, etc.
      Thomas Klausner
              HTTP support.
      Joerg Sonnenberger
              Rewrote most of the code base to work without external commands.
 BBUUGGSS
      Package upgrading needs a lot more work to be really universal.
      Sure to be others.
-NetBSD 5.0                     February 18, 2010                    NetBSD 5.0
+NetBSD 5.0                       June 16, 2010                      NetBSD 5.0

 @@ -1,23 +1,23 @@
-/*	$NetBSD: audit.c,v 1.15 2010/04/14 18:24:58 joerg Exp $	*/
+/*	$NetBSD: audit.c,v 1.16 2010/06/16 23:02:48 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: audit.c,v 1.15 2010/04/14 18:24:58 joerg Exp $");
+__RCSID("$NetBSD: audit.c,v 1.16 2010/06/16 23:02:48 joerg Exp $");
 /*-
  * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * 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
 @@ -63,78 +63,76 @@ __RCSID("$NetBSD: audit.c,v 1.15 2010/04
 #include <string.h>
 #endif
 #ifdef NETBSD
 #include <unistd.h>
 #else
 #include <nbcompat/unistd.h>
 #endif
 #include <fetch.h>
 #include "admin.h"
 #include "lib.h"
 static int check_eol = 0;
 static int check_signature = 0;
 static const char *limit_vul_types = NULL;
 static int update_pkg_vuln = 0;
 static struct pkg_vulnerabilities *pv;
 static const char audit_options[] = "est:";
 static void
 parse_options(int argc, char **argv, const char *options)
+{
 	int ch;
 	optreset = 1;
 	/*
 	 * optind == 0 is interpreted as partial reset request
 	 * by GNU getopt, so compensate against this and cleanup
 	 * at the end.
 	 */
 	optind = 1;
 	++argc;
 	--argv;
 	while ((ch = getopt(argc, argv, options)) != -1) {
 		switch (ch) {
 		case 'e':
-			check_eol = 1;
+			check_eol = "yes";
 			break;
 		case 's':
 			check_signature = 1;
 			break;
 		case 't':
 			limit_vul_types = optarg;
 			break;
 		case 'u':
 			update_pkg_vuln = 1;
 			break;
 		default:
 			usage();
 			/* NOTREACHED */
+		}
+	}
 	--optind; /* See above comment. */
+}
 static int
 check_exact_pkg(const char *pkg)
+{
-	return audit_package(pv, pkg, limit_vul_types, check_eol,
+	return audit_package(pv, pkg, limit_vul_types, quiet ? 0 : 1);
 	    quiet ? 0 : 1);
+}
 static int
 check_batch_exact_pkgs(const char *fname)
+{
 	FILE *f;
 	char buf[4096], *line, *eol;
 	int ret;
 	ret = 0;
 	if (strcmp(fname, "-") == 0)
 		f = stdin;
 	else {

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: pkg_admin.1,v 1.31 2010/01/22 13:30:41 joerg Exp $
+.\"	$NetBSD: pkg_admin.1,v 1.32 2010/06/16 23:02:48 joerg Exp $
 .\"
 .\" Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Hubert Feyrer <hubert@feyrer.de>.
 .\"
 .\" 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
 @@ -24,27 +24,27 @@
 .\"
 .\" 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 January 22, 2010
+.Dd June 16, 2010
 .Dt PKG_ADMIN 1
 .Os
 .Sh NAME
 .Nm pkg_admin
 .Nd perform various administrative tasks to the pkg system
 .Sh SYNOPSIS
 .Nm
 .Op Fl bqSVv
 .Op Fl C Ar config
 .Op Fl d Ar lsdir
 .Op Fl K Ar pkg_dbdir
 .Op Fl s Ar sfx_pattern
 .Ar command Op args ...
 @@ -108,27 +108,32 @@ The following commands are supported:
 .Bl -tag -width indent
 .It Cm add Ar pkg ...
 For each listed package, write the absolute pathnames of the files listed in
 its
 .Pa +CONTENTS
 file together with the package they belong to into the package database.
 This should be used only by
 .Xr pkg_view 1 .
 .It Cm audit Oo Fl es Oc Oo Fl t Ar type Oc Oo Ar pkg Oc ...
 Check the listed installed packages for vulnerabilities.
 If no package is given, check all installed packages.
 If
 .Fl e
-is given, also include end-of-life information.
+is given, override the
 .Dv CHECK_END_OF_LIFE
 option from
 .Xr pkg_install.conf 5
 with
 .Qq Li yes .
 If
 .Fl s
 is given, check the signature of the pkg-vulnerabilities file before using it.
 .Fl t
 restricts the reported vulnerabilities to type
 .Ar type .
 .It Cm audit-pkg Oo Fl es Oc Oo Fl t Ar type Oc Oo Ar pkg Oc ...
 Like
 .Cm audit ,
 but check only the given package names or patterns.
 .It Cm audit-batch Oo Fl es Oc Oo Fl t Ar type Oc Oo Ar pkg-list Oc ...
 Like
 .Cm audit-pkg ,

 @@ -46,29 +46,30 @@ OOPPTTIIOONNSS
      --vv      Be more verbose.
      The following commands are supported:
      aadddd _p_k_g _._._.
              For each listed package, write the absolute pathnames of the
              files listed in its _+_C_O_N_T_E_N_T_S file together with the package they
              belong to into the package database.  This should be used only by
              pkg_view(1).
      aauuddiitt [--eess] [--tt _t_y_p_e] [_p_k_g] ...
              Check the listed installed packages for vulnerabilities.  If no
              package is given, check all installed packages.  If --ee is given,
-             also include end-of-life information.  If --ss is given, check the
+             override the CHECK_END_OF_LIFE option from pkg_install.conf(5)
-             signature of the pkg-vulnerabilities file before using it.  --tt
+             with "yes".  If --ss is given, check the signature of the pkg-vul-
-             restricts the reported vulnerabilities to type _t_y_p_e.
+             nerabilities file before using it.  --tt restricts the reported
              vulnerabilities to type _t_y_p_e.
      aauuddiitt--ppkkgg [--eess] [--tt _t_y_p_e] [_p_k_g] ...
              Like aauuddiitt, but check only the given package names or patterns.
      aauuddiitt--bbaattcchh [--eess] [--tt _t_y_p_e] [_p_k_g_-_l_i_s_t] ...
              Like aauuddiitt--ppkkgg, but read the package names or patterns one per
              line from the given files.
      aauuddiitt--hhiissttoorryy [--ss] [--tt _t_y_p_e] [_p_k_g_b_a_s_e] ...
              Print all vulnerabilities for the given base package names.
      cchheecckk [_p_k_g _._._.]
              Use this command to check the files belonging to some or all of

 @@ -1,14 +1,14 @@
-/* $NetBSD: lib.h,v 1.63 2010/04/14 18:24:58 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.64 2010/06/16 23:02:49 joerg Exp $ */
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * 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
 @@ -370,27 +370,27 @@ char   *pkgdb_pkg_dir(const char *);
 char   *pkgdb_pkg_file(const char *, const char *);
 /* List of packages functions */
 lpkg_t *alloc_lpkg(const char *);
 lpkg_t *find_on_queue(lpkg_head_t *, const char *);
 void    free_lpkg(lpkg_t *);
 /* Read pkg_vulnerabilities from file */
 struct pkg_vulnerabilities *read_pkg_vulnerabilities_file(const char *, int, int);
 /* Read pkg_vulnerabilities from memory */
 struct pkg_vulnerabilities *read_pkg_vulnerabilities_memory(void *, size_t, int);
 void free_pkg_vulnerabilities(struct pkg_vulnerabilities *);
 int audit_package(struct pkg_vulnerabilities *, const char *, const char *,
-    int, int);
+    int);
 /* Parse configuration file */
 void pkg_install_config(void);
 /* Print configuration variable */
 void pkg_install_show_variable(const char *);
 /* Package signature creation and validation */
 int pkg_verify_signature(const char *, struct archive **, struct archive_entry **, char **);
 int pkg_full_signature_check(const char *, struct archive **);
 #ifdef HAVE_SSL
 void pkg_sign_x509(const char *, const char *, const char *, const char *);
 #endif
 @@ -420,26 +420,27 @@ void load_license_lists(void);
 char *xstrdup(const char *);
 void *xrealloc(void *, size_t);
 void *xcalloc(size_t, size_t);
 void *xmalloc(size_t);
 char *xasprintf(const char *, ...);
 /* Externs */
 extern Boolean Verbose;
 extern Boolean Fake;
 extern Boolean Force;
 extern const char *cert_chain_file;
 extern const char *certs_packages;
 extern const char *certs_pkg_vulnerabilities;
 extern const char *check_eol;
 extern const char *check_vulnerabilities;
 extern const char *config_file;
 extern const char *config_pkg_dbdir;
 extern const char *config_pkg_path;
 extern const char *config_pkg_refcount_dbdir;
 extern const char *do_license_check;
 extern const char *verified_installation;
 extern const char *gpg_cmd;
 extern const char *gpg_keyring_pkgvuln;
 extern const char *gpg_keyring_sign;
 extern const char *gpg_keyring_verify;
 extern const char *gpg_sign_as;
 extern char fetch_flags[];

 @@ -1,23 +1,23 @@
-/*	$NetBSD: parse-config.c,v 1.14 2010/01/22 13:30:42 joerg Exp $	*/
+/*	$NetBSD: parse-config.c,v 1.15 2010/06/16 23:02:49 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: parse-config.c,v 1.14 2010/01/22 13:30:42 joerg Exp $");
+__RCSID("$NetBSD: parse-config.c,v 1.15 2010/06/16 23:02:49 joerg Exp $");
 /*-
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * 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
 @@ -55,26 +55,27 @@ __RCSID("$NetBSD: parse-config.c,v 1.14
 static int cache_connections = 16;
 static int cache_connections_host = 4;
 const char     *config_file = SYSCONFDIR"/pkg_install.conf";
 char fetch_flags[10] = ""; /* Workaround Mac OS X linker issues with BSS */
 static const char *active_ftp;
 static const char *verbose_netio;
 static const char *ignore_proxy;
 const char *cache_index = "yes";
 const char *cert_chain_file;
 const char *certs_packages;
 const char *certs_pkg_vulnerabilities;
 const char *check_eol = "yes";
 const char *check_vulnerabilities;
 static const char *config_cache_connections;
 static const char *config_cache_connections_host;
 const char *config_pkg_dbdir;
 const char *config_pkg_path;
 const char *config_pkg_refcount_dbdir;
 const char *do_license_check;
 const char *verified_installation;
 const char *gpg_cmd;
 const char *gpg_keyring_pkgvuln;
 const char *gpg_keyring_sign;
 const char *gpg_keyring_verify;
 const char *gpg_sign_as;
 @@ -88,26 +89,27 @@ const char *acceptable_licenses = NULL;
 static struct config_variable {
 	const char *name;
 	const char **var;
 } config_variables[] = {
 	{ "ACCEPTABLE_LICENSES", &acceptable_licenses },
 	{ "ACTIVE_FTP", &active_ftp },
 	{ "CACHE_INDEX", &cache_index },
 	{ "CACHE_CONNECTIONS", &config_cache_connections },
 	{ "CACHE_CONNECTIONS_HOST", &config_cache_connections_host },
 	{ "CERTIFICATE_ANCHOR_PKGS", &certs_packages },
 	{ "CERTIFICATE_ANCHOR_PKGVULN", &certs_pkg_vulnerabilities },
 	{ "CERTIFICATE_CHAIN", &cert_chain_file },
 	{ "CHECK_LICENSE", &do_license_check },
 	{ "CHECK_END_OF_LIFE", &check_eol },
 	{ "CHECK_VULNERABILITIES", &check_vulnerabilities },
 	{ "DEFAULT_ACCEPTABLE_LICENSES", &default_acceptable_licenses },
 	{ "GPG", &gpg_cmd },
 	{ "GPG_KEYRING_PKGVULN", &gpg_keyring_pkgvuln },
 	{ "GPG_KEYRING_SIGN", &gpg_keyring_sign },
 	{ "GPG_KEYRING_VERIFY", &gpg_keyring_verify },
 	{ "GPG_SIGN_AS", &gpg_sign_as },
 	{ "IGNORE_PROXY", &ignore_proxy },
 	{ "IGNORE_URL", &ignore_advisories },
 	{ "PKG_DBDIR", &config_pkg_dbdir },
 	{ "PKG_PATH", &config_pkg_path },
 	{ "PKG_REFCOUNT_DBDIR", &config_pkg_refcount_dbdir },
 	{ "PKGVULNDIR", &pkg_vulnerabilities_dir },

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: pkg_install.conf.5.in,v 1.13 2010/01/22 13:30:42 joerg Exp $
+.\"	$NetBSD: pkg_install.conf.5.in,v 1.14 2010/06/16 23:02:49 joerg Exp $
 .\"
 .\" Copyright (c) 2008, 2009 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
 @@ -17,27 +17,27 @@
 .\"
 .\" 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 January 22, 2010
+.Dd June 16, 2010
 .Dt PKG_INSTALL.CONF 5
 .Os
 .Sh NAME
 .Nm pkg_install.conf
 .Nd configuration file for package installation tools
 .Sh DESCRIPTION
 The file
 .Nm
 contains system defaults for the package installation tools
 as a list of variable-value pairs.
 Each line has the format
 .Ev VARIABLE=VALUE .
 If the value consists of more than one line, each line is prefixed with
 @@ -79,26 +79,30 @@ for completing certificate chains when v
 pkg-vulnerabilities files.
 .It Dv CHECK_LICENSE
 Check the license conditions of packages before installing them.
 Supported values are:
 .Bl -tag -width interactiveXX
 .It Dv no
 The check is not performed.
 .It Dv yes
 The check is performed if the package has license conditions set.
 .It Dv always
 Passing the license check is required.
 Missing license conditions are considered an error.
 .El
 .It Dv CHECK_END_OF_FILE
 During vulnerability checks, consider packages that have reached end-of-life
 as vulnerable.
 This option is enabled by default.
 .It Dv CHECK_VULNERABILITIES
 Check for vulnerabilities when installing packages.
 Supported values are:
 .Bl -tag -width interactiveXX
 .It Dv never
 No check is performed.
 .It Dv always
 Passing the vulnerability check is required.
 A missing pkg-vulnerabilities file is considered an error.
 .It Dv interactive
 The user is always asked to confirm installation of vulnerable packages.
 .El
 .It Dv CONFIG_CACHE_CONNECTIONS

 @@ -46,26 +46,30 @@ DDEESSCCRRIIPPTTIIOONN
      CHECK_LICENSE
              Check the license conditions of packages before installing them.
              Supported values are:
              no             The check is not performed.
              yes            The check is performed if the package has license
                             conditions set.
              always         Passing the license check is required.  Missing
                             license conditions are considered an error.
      CHECK_END_OF_FILE
              During vulnerability checks, consider packages that have reached
              end-of-life as vulnerable.  This option is enabled by default.
      CHECK_VULNERABILITIES
              Check for vulnerabilities when installing packages.  Supported
              values are:
              never          No check is performed.
              always         Passing the vulnerability check is required.  A
                             missing pkg-vulnerabilities file is considered an
                             error.
              interactive    The user is always asked to confirm installation
                             of vulnerable packages.
 @@ -156,14 +160,14 @@ DDEESSCCRRIIPPTTIIOONN
                             package can not be verified, the user is asked
                             interactively.
              interactive    The user is always asked interactively when
                             installing a package.
 FFIILLEESS
      @SYSCONFDIR@/pkg_install.conf  Default location for the file described in
                                     this manual page.
 SSEEEE AALLSSOO
      pkg_add(1), pkg_admin(1) pkg_create(1), pkg_delete(1), pkg_info(1)
-NetBSD 5.0                     January 22, 2010                     NetBSD 5.0
+NetBSD 5.0                       June 16, 2010                      NetBSD 5.0

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.155 2010/04/20 21:22:38 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.156 2010/06/16 23:02:49 joerg Exp $	*/
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
+ *
  * 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.
+ *
 @@ -17,16 +17,16 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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.
  */
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION 20100421
+#define PKGTOOLS_VERSION 20100616
 #endif /* _INST_LIB_VERSION_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vulnerabilities-file.c,v 1.6 2010/04/14 18:24:58 joerg Exp $	*/
+/*	$NetBSD: vulnerabilities-file.c,v 1.7 2010/06/16 23:02:49 joerg Exp $	*/
 /*-
  * Copyright (c) 2008, 2010 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * 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
 @@ -28,27 +28,27 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: vulnerabilities-file.c,v 1.6 2010/04/14 18:24:58 joerg Exp $");
+__RCSID("$NetBSD: vulnerabilities-file.c,v 1.7 2010/06/16 23:02:49 joerg Exp $");
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
 #ifndef BOOTSTRAP
 #include <archive.h>
 #endif
 #include <ctype.h>
 #if HAVE_ERR_H
 #include <err.h>
 @@ -597,45 +597,48 @@ check_ignored_entry(struct pkg_vulnerabi
 			entry_len = next - iter;
 			++next;
+		}
 		if (url_len != entry_len)
 			continue;
 		if (strncmp(pv->advisory[i], iter, entry_len) == 0)
 			return 1;
+	}
 	return 0;
+}
 int
 audit_package(struct pkg_vulnerabilities *pv, const char *pkgname,
-    const char *limit_vul_types, int check_eol, int output_type)
+    const char *limit_vul_types, int output_type)
+{
 	FILE *output = output_type == 1 ? stdout : stderr;
 	size_t i;
-	int retval;
+	int retval, do_eol;
 	retval = 0;
 	do_eol = (strcasecmp(check_eol, "yes") == 0);
 	for (i = 0; i < pv->entries; ++i) {
 		if (check_ignored_entry(pv, i))
 			continue;
 		if (limit_vul_types != NULL &&
 		    strcmp(limit_vul_types, pv->classification[i]))
 			continue;
 		if (!pkg_match(pv->vulnerability[i], pkgname))
 			continue;
 		if (strcmp("eol", pv->classification[i]) == 0) {
-			if (!check_eol)
+			if (!do_eol)
 				continue;
 			retval = 1;
 			if (output_type == 0) {
 				puts(pkgname);
 				continue;
+			}
 			fprintf(output,
 			    "Package %s has reached end-of-life (eol), "
 			    "see %s/eol-packages\n", pkgname,
 			    tnf_vulnerability_base);
 			continue;
+		}
 		retval = 1;
 		if (output_type == 0) {
 			puts(pkgname);