Module Name: src
Committed By: joerg
Date: Sat Jun 26 00:17:13 UTC 2010
Modified Files:
src/external/bsd/pkg_install/dist/lib: lib.h version.h
Log Message:
Merge for pkg_install-20100616
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/lib.h \
src/external/bsd/pkg_install/dist/lib/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pkg_install/dist/lib/lib.h
diff -u src/external/bsd/pkg_install/dist/lib/lib.h:1.5 src/external/bsd/pkg_install/dist/lib/lib.h:1.6
--- src/external/bsd/pkg_install/dist/lib/lib.h:1.5 Fri Apr 23 20:55:31 2010
+++ src/external/bsd/pkg_install/dist/lib/lib.h Sat Jun 26 00:17:13 2010
@@ -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;
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.5 src/external/bsd/pkg_install/dist/lib/version.h:1.6
--- src/external/bsd/pkg_install/dist/lib/version.h:1.5 Fri Apr 23 20:55:31 2010
+++ src/external/bsd/pkg_install/dist/lib/version.h Sat Jun 26 00:17:13 2010
@@ -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_ */
