[src/trunk]: src/external/bsd/pkg_install/dist/lib Merge for pkg_install-2010...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7ebc289a19c0
branches:  trunk
changeset: 755865:7ebc289a19c0
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Jun 26 00:17:13 2010 +0000

description:
Merge for pkg_install-20100616

diffstat:

 external/bsd/pkg_install/dist/lib/lib.h     |  5 +++--
 external/bsd/pkg_install/dist/lib/version.h |  4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 6e8c191c8738 -r 7ebc289a19c0 external/bsd/pkg_install/dist/lib/lib.h
--- a/external/bsd/pkg_install/dist/lib/lib.h   Sat Jun 26 00:14:26 2010 +0000
+++ b/external/bsd/pkg_install/dist/lib/lib.h   Sat Jun 26 00:17:13 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.5 2010/04/23 20:55:31 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.6 2010/06/26 00:17:13 joerg Exp $ */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
@@ -380,7 +380,7 @@
 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);
@@ -430,6 +430,7 @@
 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;
diff -r 6e8c191c8738 -r 7ebc289a19c0 external/bsd/pkg_install/dist/lib/version.h
--- a/external/bsd/pkg_install/dist/lib/version.h       Sat Jun 26 00:14:26 2010 +0000
+++ b/external/bsd/pkg_install/dist/lib/version.h       Sat Jun 26 00:17:13 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.5 2010/04/23 20:55:31 joerg Exp $        */
+/*     $NetBSD: version.h,v 1.6 2010/06/26 00:17:13 joerg Exp $        */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION 20100421
+#define PKGTOOLS_VERSION 20100616
 
 #endif /* _INST_LIB_VERSION_H_ */