[src/trunk]: src/external/bsd/pkg_install/dist/lib Merge

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

details:   https://anonhg.NetBSD.org/src/rev/f6255ff6e109
branches:  trunk
changeset: 752227:f6255ff6e109
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Feb 20 04:44:59 2010 +0000

description:
Merge

diffstat:

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

diffs (48 lines):

diff -r 5d7bcdaf7860 -r f6255ff6e109 external/bsd/pkg_install/dist/lib/lib.h
--- a/external/bsd/pkg_install/dist/lib/lib.h   Sat Feb 20 04:41:52 2010 +0000
+++ b/external/bsd/pkg_install/dist/lib/lib.h   Sat Feb 20 04:44:59 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.3 2010/02/03 19:31:49 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.4 2010/02/20 04:44:59 joerg Exp $ */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
@@ -322,8 +322,8 @@
 struct archive;
 struct archive_entry;
 
-struct archive *open_archive(const char *);
-struct archive *find_archive(const char *, int);
+struct archive *open_archive(const char *, char **);
+struct archive *find_archive(const char *, int, char **);
 void   process_pkg_path(void);
 struct url *find_best_package(const char *, const char *, int);
 
@@ -391,8 +391,8 @@
 void pkg_install_show_variable(const char *);
 
 /* Package signature creation and validation */
-int pkg_verify_signature(struct archive **, struct archive_entry **, char **);
-int pkg_full_signature_check(struct archive **);
+int pkg_verify_signature(const char *, struct archive **, struct archive_entry **, char **);
+int pkg_full_signature_check(const char *, struct archive **);
 #ifdef HAVE_SSL
 void pkg_sign_x509(const char *, const char *, const char *, const char *);
 #endif
diff -r 5d7bcdaf7860 -r f6255ff6e109 external/bsd/pkg_install/dist/lib/version.h
--- a/external/bsd/pkg_install/dist/lib/version.h       Sat Feb 20 04:41:52 2010 +0000
+++ b/external/bsd/pkg_install/dist/lib/version.h       Sat Feb 20 04:44:59 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.3 2010/02/03 19:31:49 joerg Exp $        */
+/*     $NetBSD: version.h,v 1.4 2010/02/20 04:44:59 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 20100204
+#define PKGTOOLS_VERSION 20100220
 
 #endif /* _INST_LIB_VERSION_H_ */