 @@ -1,347 +1,347 @@
-.\"	$NetBSD: pkg_admin.1,v 1.1.1.6.2.2 2009/06/05 17:01:58 snj Exp $
+.\"	$NetBSD: pkg_admin.1,v 1.1.1.6.2.3 2009/06/21 11:42:52 bouyer Exp $
 .\"
 .\" Copyright (c) 1999-2009 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
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
 .\"        This product includes software developed by the NetBSD
 .\"        Foundation, Inc. and its contributors.
 .\" 4. Neither the name of The NetBSD Foundation nor the names of its
 .\"    contributors may be used to endorse or promote products derived
 .\"    from this software without specific prior written permission.
 .\"
 .\" 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 April 25, 2009
 .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 ...
 .Sh DESCRIPTION
 This command performs various administrative tasks around the
 .Nx
 Packages System.
 .Sh OPTIONS
 The following command-line options are supported:
 .Bl -tag -width indent
 .It Fl b
 Print only the base names when matching package names for
 .Cm lsall
 and
 .Cm lsbest .
 .It Fl C Ar config
 Read the configuration file from
 .Ar config
 instead of the system default.
 .It Fl d Ar lsdir
 Set
 .Ar lsdir
 as the path to the directory in which to find matching package names for
 .Cm lsall
 and
 .Cm lsbest .
 .It Fl K Ar pkg_dbdir
 Set
 .Ar pkg_dbdir
 as the package database directory.
 If this option isn't specified, then the package database directory is
 taken from the value of the environment variable
 .Ev PKG_DBDIR
 if it's set, otherwise it defaults to
 .Pa /var/db/pkg .
 .It Fl q
 Perform checks in a quiet manner.
 In normal operation,
 .Nm
 prints a
 .Sq \&.
 to standard output to indicate progress.
 This option suppresses this progress indicator.
 .It Fl S
 Set the shell glob pattern for package suffixes when matching package
 names for
 .Cm lsall
 and
 .Cm lsbest
 to be the null suffix.
 .It Fl s Ar sfx_pattern
 Set the shell glob pattern for package suffixes when matching package
 names for
 .Cm lsall
 and
 .Cm lsbest .
 The default pattern is ".t[bg]z".
 .It Fl V
 Print version number and exit.
 .It Fl v
 Be more verbose.
 .El
 .Pp
 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.
 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 ,
 but read the package names or patterns one per line from the given files.
 .It Cm audit-history Oo Fl s Oc Oo Fl t Ar type Oc Oo Ar pkgbase Oc ...
 Print all vulnerabilities for the given base package names.
 .It Cm check Op Ar pkg ...
 Use this command to check the files belonging to some or all of the
 packages installed on the local machine against the checksum
 which was recorded in the
 .Pa +CONTENTS
 files at package installation time.
 Symbolic links also have their integrity checked against the recorded
 value at package installation time.
 If no additional argument is given, the files of all installed packages
 are checked, else only the named packages will be checked (wildcards can
 be used here, see
 .Xr pkg_info 1 ) .
 .Pp
 The packages'
 .Pa +CONTENTS
 files will be parsed and the
 checksum will be checked for every file found.
 A warning message is printed if the expected checksum differs from the
 checksum of the file on disk.
 Symbolic links are also checked, ensuring that the targets on disk are
 the same as the contents recorded at package installation time.
 .It Cm check-license Ar condition
 Check if
 .Ar condition
 can be fulfilled with the currently set of accepted licenses.
 Prints either yes or no to stdout if the condition can be parsed,
 otherwise it exits with error.
 .It Cm check-pkg-vulnerabilities Oo Fl s Oc Ar file
 Check format and hashes in the pkg-vulnerabilities file
 .Ar file .
 If
 .Fl s
 is given, also check the embedded signature.
 .It Cm check-signature Ar file ...
 Reports if
 .Ar file
 is a correctly signed package.
-.It Cm check-single-license Ar liccense
+.It Cm check-single-license Ar license
 Check if
 .Ar license
 is a valid license name and if it is in the set of acceptable licenses.
 Prints either yes or no to stdout if the condition can be parsed,
 otherwise it exits with error.
 .It Cm config-var Ar variable
 Print the current value of
 .Ar variable
 as used after parsing the configuration file.
 .It Cm delete Ar pkg ...
 For each listed package, remove all file entries in the package database that
 belong to the package.
 This should be used only by
 .Xr pkg_view 1 .
 .It Cm dump
 Dump the contents of the package database, similar to
 .Cm pkg_info -F .
 Columns are printed for the key field used in the pkgdb - the filename -,
 and the data field - the package the file belongs to.
 .It Cm fetch-pkg-vulnerabilities Oo Fl su Oc
 Fetch a new pkg-vulnerabilities file, check the format and if
 .Fl s
 is given the signature.
 If all checks are passed, write it to pkgdb.
 If
 .Fl u
 is given, the fetch is conditional and the file transfer is only done if
 the remote version is newer than the one in pkgdb.
 .It Cm lsall Ar /dir/pkgpattern
 .It Cm lsbest Ar /dir/pkgpattern
 List all/best package matching pattern in the given directory
 .Pa /dir .
 If the
 .Fl d
 flag is given, then that directory path overrides
 .Pa /dir .
 Can be used to work around limitations of /bin/sh and other
 filename globbing mechanisms.
 This option implements matching of
 pkg-wildcards against arbitrary files and directories, useful mainly in
 the build system itself.
 See
 .Xr pkg_info 1
 for a description of the pattern.
 .Pp
 Example:
 .Bd -literal
 yui# cd /usr/pkgsrc/packages/i386ELF/All/
 yui# ls unzip*
 unzip-5.40.tgz  unzip-5.41.tgz
 yui# pkg_admin lsall 'unzip*'
 /usr/pkgsrc/packages/i386ELF/All/unzip-5.40.tgz
 /usr/pkgsrc/packages/i386ELF/All/unzip-5.41.tgz
 yui# pkg_admin lsall 'unzip\*[Ge]5.40'
 /usr/pkgsrc/packages/i386ELF/All/unzip-5.40.tgz
 /usr/pkgsrc/packages/i386ELF/All/unzip-5.41.tgz
 yui# pkg_admin lsall 'unzip\*[Ge]5.41'
 /usr/pkgsrc/packages/i386ELF/All/unzip-5.41.tgz
 yui# pkg_admin lsbest 'unzip\*[Ge]5.40'
 /usr/pkgsrc/packages/i386ELF/All/unzip-5.41.tgz
 yui# pkg_admin lsall /usr/pkgsrc/packages/i386ELF/All/'{mit,unproven}-pthread*'
 /usr/pkgsrc/packages/i386ELF/All/mit-pthreads-1.60b6.tgz
 /usr/pkgsrc/packages/i386ELF/All/unproven-pthreads-0.15.tgz
 .Ed
 .It Cm pmatch Ar pattern Ar pkg
 Returns true if
 .Ar pkg
 matches
 .Ar pattern ,
 otherwise returns false.
 .It Cm rebuild
 Rebuild the package database mapping from scratch, scanning
 subdirectories in
 .Pa /var/db/pkg
 for
 .Pa +CONTENTS
 files, parsing them and writing the resulting absolute pathnames
 together with the package they belong to into the package database.
 .Pp
 This option is intended to be used for upgrading from non-pkgdb-pkg_*
 tools to pkgdb-pkg_* tools, further manipulation of the pkgdb will be
 done by
 .Xr pkg_add 1 ,
 .Xr pkg_delete 1 ,
 and
 .Xr pkg_create 1 .
 .Pp
 Needs to be run as root.
 .It Cm rebuild-tree
 Rebuild the +REQUIRED_BY files from scratch by reresolving all dependencies.
 .Pp
 This option is intended to be used for fixing inconsistencies between
 the records of depending and depended-on packages, such as can arise
 by the use of
 .Cm pkg_delete -f .
 .It Cm set Ar variable=value pkg ...
 Set variable with information about the installed package.
 Use
 .Cm unset
 to remove a variable.
 .Pp
 Packages that are not installed directly by the user but pulled in as
 dependencies are marked by setting
 .Dq automatic=YES .
 .It Cm gpg-sign-package pkg
 Sign the binary package
 .Ar pkg
 using GPG.
 .It Cm x509-sign-package pkg spkg key cert
 Sign the binary package
 .Ar pkg
 using the key
 .Ar key
 and the certificate
 .Ar cert ,
 using
 .Ar spkg
 as output file.
 .It Cm unset Ar variable pkg ...
 Remove an installation variable.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width indent -compact
 .It Ev PKG_DBDIR
 If the
 .Fl K
 flag isn't given, then
 .Ev PKG_DBDIR
 is the location of the package database directory.
 The default package database directory is
 .Pa /var/db/pkg .
 .El
 .Sh CONFIGURATION VARIABLES
 The following variables change the behavior of
 .Nm
 and are described in
 .Xr pkg_install.conf 5 :
 .Bl -tag -width CERTIFICATE_ANCHOR_PKGS
 .It Ev CERTIFICATE_ANCHOR_PKGS
 .It Ev CERTIFICATE_ANCHOR_PKGVULN
 .It Ev CERTIFICATE_CHAIN
 .It Ev GPG
 .It Ev PKGVULNDIR
 .It Ev PKGVULNURL
 .It Ev IGNORE_URL
 .El
 .Sh FILES
 .Bl -tag -width /var/db/pkg/pkgdb.byfile.db -compact
 .It Pa /var/db/pkg/pkgdb.byfile.db
 .It Pa /var/db/pkg/\*[Lt]pkg\*[Gt]/+CONTENTS
 .El
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
 .Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
 .Xr pkg_view 1 ,
 .Xr pkg_install.conf 5 ,
 .Xr pkgsrc 7
 .Sh HISTORY
 The
 .Nm
 command first appeared in
 .Nx 1.4 .
 .Sh AUTHORS
 The
 .Nm
 command was written by Hubert Feyrer.

 @@ -1,277 +1,296 @@
-/*	$NetBSD: license.c,v 1.1.1.2.6.2 2009/06/05 17:02:00 snj Exp $	*/
+/*	$NetBSD: license.c,v 1.1.1.2.6.3 2009/06/21 11:42:52 bouyer Exp $	*/
 /*-
  * Copyright (c) 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
  *    the documentation and/or other materials provided with the
  *    distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
  * COPYRIGHT HOLDERS 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.
  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lib.h"
 #define	HASH_SIZE	521
 const char *default_acceptable_licenses =
     "public-domain "
     "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
     "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
     "gnu-gpl-v3 gnu-lgpl-v3 "
     "original-bsd modified-bsd "
-    "x11 "
+    "x11 mit miros "
     "apache-1.1 apache-2.0 "
     "artistic artistic-2.0 "
     "cddl-1.0 "
     "cpl-1.0 "
     "open-font-license ";
 #ifdef DEBUG
 static size_t hash_collisions;
 #endif
 static char **license_hash[HASH_SIZE];
 static const char license_spaces[] = " \t\n";
 static const char license_chars[] = "abcdefghijklmnopqrstuvwxyz0123456789_-.";
 static size_t
 hash_license(const char *license, size_t len)
+{
 	size_t hash;
 	for (hash = 0; *license && len; ++license, --len)
 		hash = *license + hash * 32;
 	return hash % HASH_SIZE;
+}
 static void
 add_license_internal(const char *license, size_t len)
+{
 	char *new_license;
 	size_t slot, i;
 	slot = hash_license(license, len);
 	new_license = malloc(len + 1);
 	memcpy(new_license, license, len);
 	new_license[len] = '\0';
 	if (license_hash[slot] == NULL) {
 		license_hash[slot] = calloc(sizeof(char *), 2);
 		license_hash[slot][0] = new_license;
 	} else {
 		for (i = 0; license_hash[slot][i]; ++i) {
 			if (!memcmp(license_hash[slot][i], license, len) &&
 			    license_hash[slot][i][len] == '\0') {
 				free(new_license);
 				return;
+			}
+		}
 #ifdef DEBUG
 		++hash_collisions;
 #endif
 		license_hash[slot] = realloc(license_hash[slot],
 		    sizeof(char *) * (i + 2));
 		license_hash[slot][i] = new_license;
 		license_hash[slot][i + 1] = NULL;
+	}
+}
 int
 add_licenses(const char *line)
+{
 	const char *next;
 	if (line == NULL)
 		return 0;
 	for (line += strspn(line, license_spaces); line; ) {
 		next = line + strspn(line, license_chars);
 		if (next == line)
 			return *line ? -1 : 0;
 		add_license_internal(line, next - line);
 		line = next + strspn(next, license_spaces);
 		if (next == line)
 			return *line ? -1 : 0;
+	}
 	return 0;
+}
 static int
 acceptable_license_internal(const char *license, size_t len)
+{
 	size_t slot, i;
 	slot = hash_license(license, len);
 	if (license_hash[slot] == NULL)
 		return 0;
 	for (i = 0; license_hash[slot][i]; ++i) {
 		if (strncmp(license_hash[slot][i], license, len) == 0 &&
 		    license_hash[slot][i][len] == '\0')
 			return 1;
+	}
 	return 0;
+}
 int
 acceptable_license(const char *license)
+{
 	size_t len;
 	len = strlen(license);
-	if (strspn(license, license_chars) != len)
+	if (strspn(license, license_chars) != len) {
 		warnx("Invalid character in license name at position %zu", len);
 		return -1;
+	}
 	return acceptable_license_internal(license, len);
+}
 static int
-acceptable_pkg_license_internal(const char **licensep, int toplevel)
+acceptable_pkg_license_internal(const char **licensep, int toplevel, const char *start)
+{
 	const char *license = *licensep;
 	int need_parenthesis, is_true = 0;
 	int expr_type = 0; /* 0: unset, 1: or, 2: and */
 	size_t len;
 	license += strspn(license, license_spaces);
 	if (*license == '(' && !toplevel) {
 		need_parenthesis = 1;
 		++license;
 		license += strspn(license, license_spaces);
 	} else {
 		need_parenthesis = 0;
+	}
 	for (;;) {
 		if (*license == '(') {
-			switch (acceptable_pkg_license_internal(&license, 0)) {
+			switch (acceptable_pkg_license_internal(&license, 0, start)) {
 			case -1:
 				return -1;
 			case 0:
 				if (expr_type == 2)
 					is_true = 0;
 				break;
 			case 1:
 				is_true = 1;
 				break;
+			}
 			license += strspn(license, license_spaces);
 		} else {
 			len = strspn(license, license_chars);
-			if (len == 0)
+			if (len == 0) {
 				warnx("Invalid character in license name at position %zu", license - start + 1);
 				return -1;
+			}
 			if (acceptable_license_internal(license, len)) {
 				if (expr_type != 2)
 					is_true = 1;
 			} else if (expr_type == 2) {
 				is_true = 0;
+			}
 			license += len;
 			len = strspn(license, license_spaces);
-			if (len == 0 && *license && *license  != ')')
+			if (len == 0 && *license && *license  != ')') {
 				warnx("Missing space at position %zu", license - start + 1);
 				return -1;
+			}
 			license += len;
+		}
 		if (*license == ')') {
-			if (!need_parenthesis)
+			if (!need_parenthesis) {
 				warnx("Missing open parenthesis at position %zu", license - start + 1);
 				return -1;
+			}
 			*licensep = license + 1;
 			return is_true;
+		}
 		if (*license == '\0') {
-			if (need_parenthesis)
+			if (need_parenthesis) {
 				warnx("Unbalanced parenthesis at position %zu", license - start + 1);
 				return -1;
+			}
 			*licensep = license;
 			return is_true;
+		}
 		if (strncmp(license, "AND", 3) == 0) {
-			if (expr_type == 1)
+			if (expr_type == 1) {
 				warnx("Invalid operator in OR expression at position %zu", license - start + 1);
 				return -1;
+			}
 			expr_type = 2;
 			license += 3;
 		} else if (strncmp(license, "OR", 2) == 0) {
-			if (expr_type == 2)
+			if (expr_type == 2) {
 				warnx("Invalid operator in AND expression at position %zu", license - start + 1);
 				return -1;
+			}
 			expr_type = 1;
 			license += 2;
 		} else {
 			warnx("Invalid operator at position %zu", license - start + 1);
 			return -1;
+		}
 		len = strspn(license, license_spaces);
-		if (len == 0 && *license != '(')
+		if (len == 0 && *license != '(') {
 			warnx("Missing space at position %zu", license - start + 1);
 			return -1;
+		}
 		license += len;
+	}
 	return is_true;
+}
 int
 acceptable_pkg_license(const char *license)
+{
 	int ret;
-	ret = acceptable_pkg_license_internal(&license, 1);
+	ret = acceptable_pkg_license_internal(&license, 1, license);
 	if (ret == -1)
 		return -1;
 	license += strspn(license, license_spaces);
-	if (*license)
+	if (*license) {
 		warnx("Trailing garbage in license specification");
 		return -1;
+	}
 	return ret;
+}
 void
 load_license_lists(void)
+{
 	if (add_licenses(getenv("PKGSRC_ACCEPTABLE_LICENSES")))
 		errx(EXIT_FAILURE, "syntax error in PKGSRC_ACCEPTABLE_LICENSES");
 	if (add_licenses(acceptable_licenses))
 		errx(EXIT_FAILURE, "syntax error in ACCEPTABLE_LICENSES");
 	if (add_licenses(getenv("PKGSRC_DEFAULT_ACCEPTABLE_LICENSES")))
 		errx(EXIT_FAILURE, "syntax error in PKGSRC_DEFAULT_ACCEPTABLE_LICENSES");
 	if (add_licenses(default_acceptable_licenses))
 		errx(EXIT_FAILURE, "syntax error in DEFAULT_ACCEPTABLE_LICENSES");
+}

 @@ -1,32 +1,32 @@
-/*	$NetBSD: version.h,v 1.1.1.15.2.2 2009/06/05 17:02:01 snj Exp $	*/
+/*	$NetBSD: version.h,v 1.1.1.15.2.3 2009/06/21 11:42:52 bouyer 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 "20090528"
+#define PKGTOOLS_VERSION "20090610"
 #endif /* _INST_LIB_VERSION_H_ */