Module Name: src
Committed By: joerg
Date: Fri Apr 23 20:55:31 UTC 2010
Modified Files:
src/external/bsd/pkg_install/dist/lib: lib.h version.h
Removed Files:
src/external/bsd/pkg_install/dist/lib: decompress.c
Log Message:
Merge pkg_install-20100421
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/pkg_install/dist/lib/decompress.c
cvs rdiff -u -r1.4 -r1.5 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.4 src/external/bsd/pkg_install/dist/lib/lib.h:1.5
--- src/external/bsd/pkg_install/dist/lib/lib.h:1.4 Sat Feb 20 04:44:59 2010
+++ src/external/bsd/pkg_install/dist/lib/lib.h Fri Apr 23 20:55:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.4 2010/02/20 04:44:59 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.5 2010/04/23 20:55:31 joerg Exp $ */
/* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
@@ -374,13 +374,10 @@
lpkg_t *find_on_queue(lpkg_head_t *, const char *);
void free_lpkg(lpkg_t *);
-/* Extract input if compressed to NUL terminated buffer (not counted) */
-int decompress_buffer(const char *, size_t, char **, size_t *);
-
-/* Parse NUL terminated inputed, argument is strlen of the input */
-struct pkg_vulnerabilities *parse_pkg_vulnerabilities(const char *, size_t, int);
/* Read pkg_vulnerabilities from file */
-struct pkg_vulnerabilities *read_pkg_vulnerabilities(const char *, int, int);
+struct pkg_vulnerabilities *read_pkg_vulnerabilities_file(const char *, int, int);
+/* Read pkg_vulnerabilities from memory */
+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);
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.4 src/external/bsd/pkg_install/dist/lib/version.h:1.5
--- src/external/bsd/pkg_install/dist/lib/version.h:1.4 Sat Feb 20 04:44:59 2010
+++ src/external/bsd/pkg_install/dist/lib/version.h Fri Apr 23 20:55:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.4 2010/02/20 04:44:59 joerg Exp $ */
+/* $NetBSD: version.h,v 1.5 2010/04/23 20:55:31 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 20100220
+#define PKGTOOLS_VERSION 20100421
#endif /* _INST_LIB_VERSION_H_ */
