 @@ -1,14 +1,14 @@
-.\"	$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
 @@ -166,27 +166,27 @@ Check if
 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

 @@ -1,14 +1,14 @@
-/*	$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
 @@ -41,27 +41,27 @@
 #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_-.";
 @@ -146,130 +146,149 @@ acceptable_license_internal(const char *
 		    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))

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
 @@ -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 "20090528"
+#define PKGTOOLS_VERSION "20090610"
 #endif /* _INST_LIB_VERSION_H_ */