 @@ -1,23 +1,23 @@
-/*	$NetBSD: audit.c,v 1.16 2010/06/16 23:02:48 joerg Exp $	*/
+/*	$NetBSD: audit.c,v 1.16.6.1 2011/02/20 21:41:59 spz 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.16 2010/06/16 23:02:48 joerg Exp $");
+__RCSID("$NetBSD: audit.c,v 1.16.6.1 2011/02/20 21:41:59 spz 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
 @@ -374,28 +374,35 @@ fetch_pkg_vulnerabilities(int argc, char
 	if (close(fd) == -1)
 		err(EXIT_FAILURE, "Cannot close pkg-vulnerability file after write");
 	free(buf);
 	exit(EXIT_SUCCESS);
+}
 static int
 check_pkg_history_pattern(const char *pkg, const char *pattern)
+{
 	const char *delim, *end_base;
-	if ((delim = strchr(pattern, '*')) != NULL) {
+	if (strpbrk(pattern, "*[") != NULL) {
-		if ((end_base = strrchr(pattern, '-')) == NULL)
+		end_base = NULL;
 		for (delim = pattern;
 				*delim != '\0' && *delim != '['; delim++) {
 			if (*delim == '-')
 				end_base = delim;
+		}
 		if (end_base == NULL)
 			errx(EXIT_FAILURE, "Missing - in wildcard pattern %s",
 			    pattern);
 		if ((delim = strchr(pattern, '>')) != NULL ||
 		    (delim = strchr(pattern, '<')) != NULL)
 			errx(EXIT_FAILURE,
 			    "Mixed relational and wildcard patterns in %s",
 			    pattern);
 	} else if ((delim = strchr(pattern, '>')) != NULL) {
 		end_base = delim;
 		if ((delim = strchr(pattern, '<')) != NULL && delim < end_base)
 			errx(EXIT_FAILURE, "Inverted operators in %s",
 			    pattern);
 	} else if ((delim = strchr(pattern, '<')) != NULL) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.160 2010/12/12 13:18:38 wiz Exp $	*/
+/*	$NetBSD: version.h,v 1.160.2.1 2011/02/20 21:41:59 spz 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 20101212
+#define PKGTOOLS_VERSION 20110215
 #endif /* _INST_LIB_VERSION_H_ */