CVS commit: src/external/bsd/pkg_install/dist/add
Module Name:src Committed By: wiz Date: Sat Apr 10 22:59:46 UTC 2021 Modified Files: src/external/bsd/pkg_install/dist/add: main.c Log Message: Fix merge bug. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/main.c 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/add/main.c diff -u src/external/bsd/pkg_install/dist/add/main.c:1.3 src/external/bsd/pkg_install/dist/add/main.c:1.4 --- src/external/bsd/pkg_install/dist/add/main.c:1.3 Sat Apr 10 19:49:59 2021 +++ src/external/bsd/pkg_install/dist/add/main.c Sat Apr 10 22:59:46 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */ +/* $NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD"); +__RCSID("$NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $"); /* *
CVS commit: src/external/bsd/pkg_install/dist/add
Module Name:src Committed By: nia Date: Sat Apr 10 20:07:57 UTC 2021 Modified Files: src/external/bsd/pkg_install/dist/add: perform.c Log Message: fix build, sign comparison is an issue here To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/pkg_install/dist/add/perform.c 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/add/perform.c diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.9 src/external/bsd/pkg_install/dist/add/perform.c:1.10 --- src/external/bsd/pkg_install/dist/add/perform.c:1.9 Sat Apr 10 19:49:59 2021 +++ src/external/bsd/pkg_install/dist/add/perform.c Sat Apr 10 20:07:57 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.9 2021/04/10 19:49:59 nia Exp $ */ +/* $NetBSD: perform.c,v 1.10 2021/04/10 20:07:57 nia Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: perform.c,v 1.9 2021/04/10 19:49:59 nia Exp $"); +__RCSID("$NetBSD: perform.c,v 1.10 2021/04/10 20:07:57 nia Exp $"); /*- * Copyright (c) 2003 Grant Beattie @@ -159,7 +159,7 @@ compatible_platform(const char *opsys, c loc = strchr(host, '.'); if (loc != NULL) { majorlen = loc - host; - if (majorlen != (strchr(package, '.') - package)) + if (majorlen != (size_t)(strchr(package, '.') - package)) return 0; if (strncmp(host, package, majorlen) == 0) return 1;
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: nia Date: Sat Apr 10 19:50:00 UTC 2021 Modified Files: src/external/bsd/pkg_install/dist/add: add.h main.c perform.c pkg_add.1 src/external/bsd/pkg_install/dist/admin: audit-packages.8 audit.c check.c download-vulnerability-list.8 pkg_admin.1 src/external/bsd/pkg_install/dist/create: build.c create.h main.c perform.c pkg_create.1 pl.c src/external/bsd/pkg_install/dist/delete: pkg_delete.1 pkg_delete.c src/external/bsd/pkg_install/dist/info: info.h main.c perform.c pkg_info.1 show.c src/external/bsd/pkg_install/dist/lib: automatic.c conflicts.c defs.h dewey.c dewey.h fexec.c file.c global.c gpgsig.c iterate.c lib.h license.c lpkg.c opattern.c parse-config.c pkcs7.c pkg_install.conf.5.in pkg_io.c pkg_signature.c pkg_summary.5 pkgdb.c pkgsrc.7 plist.c remove.c str.c var.c version.c version.h vulnerabilities-file.c xwrapper.c src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf pkgsrc.sh Log Message: merge pkg_install-20210410 - simplified version checking for netbsd, treat 9.0 and 9.1 as compatible - minor man page updates To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/add/add.h \ src/external/bsd/pkg_install/dist/add/main.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/pkg_add.1 cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/pkg_install/dist/admin/audit-packages.8 \ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/admin/audit.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/admin/check.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/admin/pkg_admin.1 cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/create/build.c \ src/external/bsd/pkg_install/dist/create/create.h \ src/external/bsd/pkg_install/dist/create/main.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/create/perform.c \ src/external/bsd/pkg_install/dist/create/pkg_create.1 cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/create/pl.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.1 cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/info.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/info/main.c \ src/external/bsd/pkg_install/dist/info/perform.c \ src/external/bsd/pkg_install/dist/info/pkg_info.1 cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/info/show.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/automatic.c \ src/external/bsd/pkg_install/dist/lib/conflicts.c \ src/external/bsd/pkg_install/dist/lib/dewey.h \ src/external/bsd/pkg_install/dist/lib/fexec.c \ src/external/bsd/pkg_install/dist/lib/file.c \ src/external/bsd/pkg_install/dist/lib/global.c \ src/external/bsd/pkg_install/dist/lib/gpgsig.c \ src/external/bsd/pkg_install/dist/lib/lpkg.c \ src/external/bsd/pkg_install/dist/lib/opattern.c \ src/external/bsd/pkg_install/dist/lib/pkgsrc.7 \ src/external/bsd/pkg_install/dist/lib/remove.c \ src/external/bsd/pkg_install/dist/lib/str.c \ src/external/bsd/pkg_install/dist/lib/version.c \ src/external/bsd/pkg_install/dist/lib/xwrapper.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/defs.h \ src/external/bsd/pkg_install/dist/lib/pkg_summary.5 \ src/external/bsd/pkg_install/dist/lib/pkgdb.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/dewey.c \ src/external/bsd/pkg_install/dist/lib/parse-config.c \ src/external/bsd/pkg_install/dist/lib/pkcs7.c \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in \ src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/iterate.c \ src/external/bsd/pkg_install/dist/lib/pkg_io.c \ src/external/bsd/pkg_install/dist/lib/pkg_signature.c \ src/external/bsd/pkg_install/dist/lib/var.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/lib/lib.h cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/lib/plist.c cvs rdiff -u -r1.19 -r1.20 src/external/bsd/pkg_install/dist/lib/version.h cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf \ src/external/bsd/pkg_install/dist/x509/pkgsrc.sh 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/add/add.h diff -u src/external/bsd/pkg_install/dist/add/add.h:1.2
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: maya Date: Fri Dec 18 20:07:40 UTC 2020 Removed Files: src/external/bsd/pkg_install/dist: Makefile.in README config.guess config.sub configure configure.ac diff install-sh tkpkg src/external/bsd/pkg_install/dist/add: Makefile.in pkg_add.cat src/external/bsd/pkg_install/dist/admin: Makefile.in audit-packages.cat download-vulnerability-list.cat pkg_admin.cat src/external/bsd/pkg_install/dist/create: Makefile.in pkg_create.cat src/external/bsd/pkg_install/dist/delete: Makefile.in pkg_delete.cat src/external/bsd/pkg_install/dist/info: Makefile.in pkg_info.cat src/external/bsd/pkg_install/dist/lib: Makefile.in pkg_install.conf.cat.in pkg_summary.cat pkgsrc.cat Log Message: Merge pkg_install-20201218 To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/Makefile.in \ src/external/bsd/pkg_install/dist/README \ src/external/bsd/pkg_install/dist/config.guess \ src/external/bsd/pkg_install/dist/config.sub \ src/external/bsd/pkg_install/dist/configure \ src/external/bsd/pkg_install/dist/configure.ac \ src/external/bsd/pkg_install/dist/install-sh \ src/external/bsd/pkg_install/dist/tkpkg cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/diff cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/add/Makefile.in cvs rdiff -u -r1.4 -r0 src/external/bsd/pkg_install/dist/add/pkg_add.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/admin/Makefile.in \ src/external/bsd/pkg_install/dist/admin/audit-packages.cat \ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat cvs rdiff -u -r1.5 -r0 src/external/bsd/pkg_install/dist/admin/pkg_admin.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/create/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/create/pkg_create.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/delete/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/info/Makefile.in cvs rdiff -u -r1.4 -r0 src/external/bsd/pkg_install/dist/info/pkg_info.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/lib/Makefile.in cvs rdiff -u -r1.4 -r0 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in \ src/external/bsd/pkg_install/dist/lib/pkg_summary.cat \ src/external/bsd/pkg_install/dist/lib/pkgsrc.cat Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: christos Date: Sat Dec 12 18:19:34 UTC 2020 Modified Files: src/external/bsd/pkg_install/dist/lib: plist.c Log Message: Don't try to memcpy (size_t)-1 bytes! To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/plist.c 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/plist.c diff -u src/external/bsd/pkg_install/dist/lib/plist.c:1.4 src/external/bsd/pkg_install/dist/lib/plist.c:1.5 --- src/external/bsd/pkg_install/dist/lib/plist.c:1.4 Wed Dec 2 08:53:50 2020 +++ src/external/bsd/pkg_install/dist/lib/plist.c Sat Dec 12 13:19:34 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: plist.c,v 1.4 2020/12/02 13:53:50 wiz Exp $ */ +/* $NetBSD: plist.c,v 1.5 2020/12/12 18:19:34 christos Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: plist.c,v 1.4 2020/12/02 13:53:50 wiz Exp $"); +__RCSID("$NetBSD: plist.c,v 1.5 2020/12/12 18:19:34 christos Exp $"); /* * FreeBSD install - a package for the installation and maintainance @@ -637,15 +637,16 @@ delete_package(Boolean ign_err, package_ fail = FAIL; goto pkgdb_cleanup; } - } - memcpy([SymlinkHeaderLen], tmp2, cc); - buf[SymlinkHeaderLen + cc] = 0x0; - if (strcmp(buf, p->next->name) != 0) { -printf("symlink %s is not same as recorded value, %s: %s\n", -buf, Force ? "deleting anyway" : "not deleting", tmp); -if (!Force) { - fail = FAIL; - goto pkgdb_cleanup; + } else { +memcpy([SymlinkHeaderLen], tmp2, cc); +buf[SymlinkHeaderLen + cc] = 0x0; +if (strcmp(buf, p->next->name) != 0) { + printf("symlink %s is not same as recorded value, %s: %s\n", + buf, Force ? "deleting anyway" : "not deleting", tmp); + if (!Force) { + fail = FAIL; + goto pkgdb_cleanup; + } } } }
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Sat Dec 12 11:00:57 UTC 2020 Modified Files: src/external/bsd/pkg_install/dist/add: perform.c src/external/bsd/pkg_install/dist/lib: lib.h parse-config.c pkg_install.conf.5.in version.h Log Message: merge pkg_install-20201212 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/lib/lib.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/parse-config.c \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in cvs rdiff -u -r1.17 -r1.18 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/add/perform.c diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.7 src/external/bsd/pkg_install/dist/add/perform.c:1.8 --- src/external/bsd/pkg_install/dist/add/perform.c:1.7 Wed Dec 2 13:53:50 2020 +++ src/external/bsd/pkg_install/dist/add/perform.c Sat Dec 12 11:00:57 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.7 2020/12/02 13:53:50 wiz Exp $ */ +/* $NetBSD: perform.c,v 1.8 2020/12/12 11:00:57 wiz Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: perform.c,v 1.7 2020/12/02 13:53:50 wiz Exp $"); +__RCSID("$NetBSD: perform.c,v 1.8 2020/12/12 11:00:57 wiz Exp $"); /*- * Copyright (c) 2003 Grant Beattie @@ -151,6 +151,15 @@ compatible_platform(const char *opsys, c { int i = 0; +/* + * If the user has set the CHECK_OS_VERSION variable to "no" then skip any + * uname version checks and assume they know what they are doing. This can + * be useful on OS where the kernel version is not a good indicator of + * userland compatibility, or differs but retains ABI compatibility. + */ +if (strcasecmp(check_os_version, "no") == 0) + return 1; + /* returns 1 if host and package operating system match */ if (strcmp(host, package) == 0) return 1; @@ -1179,6 +1188,10 @@ check_dependencies(struct pkg_task *pkg) continue; best_installed = find_best_matching_installed_pkg(p->name, 0); + if (best_installed == NULL) { + warnx("Expected dependency %s still missing", p->name); + return -1; + } for (i = 0; i < pkg->dep_length; ++i) { if (strcmp(best_installed, pkg->dependencies[i]) == 0) @@ -1225,6 +1238,8 @@ preserve_meta_data_file(struct pkg_task static int start_replacing(struct pkg_task *pkg) { + int result = -1; + if (preserve_meta_data_file(pkg, REQUIRED_BY_FNAME)) return -1; @@ -1241,14 +1256,19 @@ start_replacing(struct pkg_task *pkg) Destdir ? " -P ": "", Destdir ? Destdir : "", pkg->other_version); } - if (!Fake) - fexec_skipempty(BINDIR "/pkg_delete", "-K", pkgdb_get_dir(), + if (!Fake) { + result = fexec_skipempty(BINDIR "/pkg_delete", "-K", pkgdb_get_dir(), "-p", pkg->prefix, Destdir ? "-P": "", Destdir ? Destdir : "", pkg->other_version, NULL); + if (result != 0) { + warnx("command failed: %s/pkg_delete -K %s -p %s %s%s%s", + BINDIR, pkgdb_get_dir(), pkg->prefix, Destdir ? "-P" : " ", + Destdir ? Destdir : "", pkg->other_version); + } + } - /* XXX Check return value and do what? */ - return 0; + return result; } static int check_input(const char *line, size_t len) Index: src/external/bsd/pkg_install/dist/lib/lib.h diff -u src/external/bsd/pkg_install/dist/lib/lib.h:1.10 src/external/bsd/pkg_install/dist/lib/lib.h:1.11 --- src/external/bsd/pkg_install/dist/lib/lib.h:1.10 Wed Dec 2 13:53:50 2020 +++ src/external/bsd/pkg_install/dist/lib/lib.h Sat Dec 12 11:00:57 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: lib.h,v 1.10 2020/12/02 13:53:50 wiz Exp $ */ +/* $NetBSD: lib.h,v 1.11 2020/12/12 11:00:57 wiz Exp $ */ /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */ @@ -447,6 +447,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_os_version; extern const char *check_vulnerabilities; extern const char *config_file; extern const char *config_pkg_dbdir; Index: src/external/bsd/pkg_install/dist/lib/parse-config.c diff -u src/external/bsd/pkg_install/dist/lib/parse-config.c:1.3 src/external/bsd/pkg_install/dist/lib/parse-config.c:1.4 --- src/external/bsd/pkg_install/dist/lib/parse-config.c:1.3 Sat Apr 6 00:05:47 2019 +++ src/external/bsd/pkg_install/dist/lib/parse-config.c Sat Dec 12 11:00:57 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: parse-config.c,v 1.3 2019/04/06 00:05:47 sevan Exp $ */ +/* $NetBSD: parse-config.c,v 1.4 2020/12/12 11:00:57 wiz Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: parse-config.c,v
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: wiz Date: Sat Dec 5 16:21:26 UTC 2020 Modified Files: src/external/bsd/pkg_install/dist/lib: pkgdb.c version.h Log Message: Merge pkg_install-20201205 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/pkgdb.c cvs rdiff -u -r1.16 -r1.17 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/pkgdb.c diff -u src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.3 src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.4 --- src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.3 Wed Dec 2 13:53:50 2020 +++ src/external/bsd/pkg_install/dist/lib/pkgdb.c Sat Dec 5 16:21:26 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pkgdb.c,v 1.3 2020/12/02 13:53:50 wiz Exp $ */ +/* $NetBSD: pkgdb.c,v 1.4 2020/12/05 16:21:26 wiz Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: pkgdb.c,v 1.3 2020/12/02 13:53:50 wiz Exp $"); +__RCSID("$NetBSD: pkgdb.c,v 1.4 2020/12/05 16:21:26 wiz Exp $"); /*- * Copyright (c) 1999-2010 The NetBSD Foundation, Inc. @@ -310,8 +310,9 @@ pkgdb_get_dir(void) stat("/var/db/pkg", ) == 0) { errx(EXIT_FAILURE, "The default PKG_DBDIR has changed, but this installation still uses the old one.\n" - "Please move the database and re-run this command:\n" - "\tmv /var/db/pkg " DEF_LOG_DIR); + "Please move the databases and re-run this command:\n" + "\tmv /var/db/pkg " DEF_LOG_DIR "\n" + "\tmv /var/db/pkg.refcount " DEF_LOG_DIR ".refcount"); } return pkgdb_dir; Index: src/external/bsd/pkg_install/dist/lib/version.h diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.16 src/external/bsd/pkg_install/dist/lib/version.h:1.17 --- src/external/bsd/pkg_install/dist/lib/version.h:1.16 Wed Dec 2 13:53:50 2020 +++ src/external/bsd/pkg_install/dist/lib/version.h Sat Dec 5 16:21:26 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.16 2020/12/02 13:53:50 wiz Exp $ */ +/* $NetBSD: version.h,v 1.17 2020/12/05 16:21:26 wiz 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 20200828 +#define PKGTOOLS_VERSION 20201205 #endif /* _INST_LIB_VERSION_H_ */
CVS commit: src/external/bsd/pkg_install/lib
Module Name:src Committed By: wiz Date: Wed Dec 2 13:54:25 UTC 2020 Modified Files: src/external/bsd/pkg_install/lib: Makefile Log Message: Define PREFIX for pkg_install build. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/lib/Makefile 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/lib/Makefile diff -u src/external/bsd/pkg_install/lib/Makefile:1.10 src/external/bsd/pkg_install/lib/Makefile:1.11 --- src/external/bsd/pkg_install/lib/Makefile:1.10 Fri Oct 4 09:47:28 2019 +++ src/external/bsd/pkg_install/lib/Makefile Wed Dec 2 13:54:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/10/04 09:47:28 mrg Exp $ +# $NetBSD: Makefile,v 1.11 2020/12/02 13:54:25 wiz Exp $ # Original from FreeBSD, no rcs id. LIBISPRIVATE= yes @@ -24,6 +24,7 @@ pkg_install.conf.5: ${DIST}/lib/pkg_inst CLEANFILES+= pkg_install.conf.5 CPPFLAGS+= -DNETBSD +CPPFLAGS+= -DPREFIX=\"/usr/pkg\" COPTS.plist.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=restrict :}
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Wed Dec 2 13:53:50 UTC 2020 Modified Files: src/external/bsd/pkg_install/dist/add: perform.c src/external/bsd/pkg_install/dist/admin: check.c main.c pkg_admin.1 src/external/bsd/pkg_install/dist/create: perform.c pl.c src/external/bsd/pkg_install/dist/info: perform.c src/external/bsd/pkg_install/dist/lib: iterate.c lib.h license.c pkgdb.c plist.c version.h vulnerabilities-file.c Log Message: merge pkg_install after import of 20201202 version To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/admin/check.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/admin/main.c \ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/create/perform.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/create/pl.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/perform.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/iterate.c \ src/external/bsd/pkg_install/dist/lib/pkgdb.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/pkg_install/dist/lib/lib.h \ src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/plist.c \ src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c cvs rdiff -u -r1.15 -r1.16 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/add/perform.c diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.6 src/external/bsd/pkg_install/dist/add/perform.c:1.7 --- src/external/bsd/pkg_install/dist/add/perform.c:1.6 Sun Mar 25 04:04:36 2018 +++ src/external/bsd/pkg_install/dist/add/perform.c Wed Dec 2 13:53:50 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.6 2018/03/25 04:04:36 sevan Exp $ */ +/* $NetBSD: perform.c,v 1.7 2020/12/02 13:53:50 wiz Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: perform.c,v 1.6 2018/03/25 04:04:36 sevan Exp $"); +__RCSID("$NetBSD: perform.c,v 1.7 2020/12/02 13:53:50 wiz Exp $"); /*- * Copyright (c) 2003 Grant Beattie @@ -450,7 +450,7 @@ check_other_installed(struct pkg_task *p return -1; } *iter = '\0'; - pkg->other_version = find_best_matching_installed_pkg(pkgbase); + pkg->other_version = find_best_matching_installed_pkg(pkgbase, 0); free(pkgbase); if (pkg->other_version == NULL) return 0; @@ -505,10 +505,12 @@ check_other_installed(struct pkg_task *p continue; if (pkg_match(p->name, pkg->pkgname) == 1) continue; /* Both match, ok. */ - warnx("Dependency of %s fulfilled by %s, but not by %s", - iter, pkg->other_version, pkg->pkgname); - if (!ForceDepending) + if (!ForceDepending) { +warnx("Dependency of %s fulfilled by %s, " +"but not by %s", iter, pkg->other_version, +pkg->pkgname); status = -1; + } break; } free_plist(); @@ -979,7 +981,8 @@ run_install_script(struct pkg_task *pkg, setenv(PKG_REFCOUNT_DBDIR_VNAME, config_pkg_refcount_dbdir, 1); if (Verbose) - printf("Running install with PRE-INSTALL for %s.\n", pkg->pkgname); + printf("Running install with %s for %s.\n", argument, + pkg->pkgname); if (Fake) return 0; @@ -1102,6 +1105,40 @@ check_implicit_conflict(struct pkg_task return status; } +/* + * Install a required dependency and verify its installation. + */ +static int +install_depend_pkg(const char *dep) +{ + /* XXX check cyclic dependencies? */ + if (Fake || NoRecord) { + if (!Force) { + warnx("Missing dependency %s\n", dep); + return 1; + } + warnx("Missing dependency %s, continuing", dep); + } + + if (pkg_do(dep, 1, 0)) { + if (!ForceDepends) { + warnx("Can't install dependency %s", dep); + return 1; + } + warnx("Can't install dependency %s, continuing", dep); + } + + if (find_best_matching_installed_pkg(dep, 0) == NULL) { + if (!ForceDepends) { + warnx("Just installed dependency %s disappeared", dep); + return 1; + } + warnx("Missing dependency %s ignored", dep); + } + + return 0; +} + static int check_dependencies(struct pkg_task *pkg) { @@ -1112,6 +1149,9 @@ check_dependencies(struct pkg_task *pkg) status = 0; + /* + * Recursively handle dependencies, installing as required. + */ for (p = pkg->plist.head; p != NULL; p = p->next) { if (p->type == PLIST_IGNORE) { p = p->next; @@ -1119,43 +1159,27 @@ check_dependencies(struct pkg_task *pkg) } else if (p->type != PLIST_PKGDEP) continue; - best_installed = find_best_matching_installed_pkg(p->name); - - if (best_installed == NULL) { - /* XXX check cyclic dependencies? */ - if (Fake || NoRecord) { -if
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: christos Date: Mon Sep 7 00:36:53 UTC 2020 Modified Files: src/external/bsd/pkg_install/dist/lib: plist.c Log Message: Avoid strict aliasing issue by using a separate buffer.. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/plist.c 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/plist.c diff -u src/external/bsd/pkg_install/dist/lib/plist.c:1.2 src/external/bsd/pkg_install/dist/lib/plist.c:1.3 --- src/external/bsd/pkg_install/dist/lib/plist.c:1.2 Thu Apr 20 09:18:23 2017 +++ src/external/bsd/pkg_install/dist/lib/plist.c Sun Sep 6 20:36:53 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: plist.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */ +/* $NetBSD: plist.c,v 1.3 2020/09/07 00:36:53 christos Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: plist.c,v 1.2 2017/04/20 13:18:23 joerg Exp $"); +__RCSID("$NetBSD: plist.c,v 1.3 2020/09/07 00:36:53 christos Exp $"); /* * FreeBSD install - a package for the installation and maintainance @@ -627,8 +627,10 @@ delete_package(Boolean ign_err, package_ } buf[SymlinkHeaderLen + cc] = 0x0; if (strcmp(buf, p->next->name) != 0) { - if ((cc = readlink([SymlinkHeaderLen], [SymlinkHeaderLen], - sizeof(buf) - SymlinkHeaderLen)) < 0) { + chartmp2[MaxPathSize]; + + if ((cc = readlink([SymlinkHeaderLen], tmp2, + sizeof(tmp2))) < 0) { printf("symlink %s is not same as recorded value, %s: %s\n", buf, Force ? "deleting anyway" : "not deleting", tmp); if (!Force) { @@ -636,6 +638,7 @@ delete_package(Boolean ign_err, package_ goto pkgdb_cleanup; } } + memcpy([SymlinkHeaderLen], tmp2, cc); buf[SymlinkHeaderLen + cc] = 0x0; if (strcmp(buf, p->next->name) != 0) { printf("symlink %s is not same as recorded value, %s: %s\n",
CVS commit: src/external/bsd/pkg_install
Module Name:src Committed By: christos Date: Sun Jan 12 21:31:04 UTC 2020 Modified Files: src/external/bsd/pkg_install/dist/admin: check.c main.c src/external/bsd/pkg_install/dist/create: pl.c src/external/bsd/pkg_install/lib: config.h Log Message: Handle HAVE_NBTOOL_CONFIG_H To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/admin/check.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/admin/main.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/create/pl.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/lib/config.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/admin/check.c diff -u src/external/bsd/pkg_install/dist/admin/check.c:1.2 src/external/bsd/pkg_install/dist/admin/check.c:1.3 --- src/external/bsd/pkg_install/dist/admin/check.c:1.2 Thu Apr 20 09:18:23 2017 +++ src/external/bsd/pkg_install/dist/admin/check.c Sun Jan 12 16:31:03 2020 @@ -1,5 +1,8 @@ -/* $NetBSD: check.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */ +/* $NetBSD: check.c,v 1.3 2020/01/12 21:31:03 christos Exp $ */ +#ifdef HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#else #if HAVE_CONFIG_H #include "config.h" #endif @@ -7,7 +10,8 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: check.c,v 1.2 2017/04/20 13:18:23 joerg Exp $"); +#endif +__RCSID("$NetBSD: check.c,v 1.3 2020/01/12 21:31:03 christos Exp $"); /*- * Copyright (c) 1999-2008 The NetBSD Foundation, Inc. Index: src/external/bsd/pkg_install/dist/admin/main.c diff -u src/external/bsd/pkg_install/dist/admin/main.c:1.4 src/external/bsd/pkg_install/dist/admin/main.c:1.5 --- src/external/bsd/pkg_install/dist/admin/main.c:1.4 Sun Oct 13 17:56:14 2019 +++ src/external/bsd/pkg_install/dist/admin/main.c Sun Jan 12 16:31:03 2020 @@ -1,5 +1,8 @@ -/* $NetBSD: main.c,v 1.4 2019/10/13 21:56:14 joerg Exp $ */ +/* $NetBSD: main.c,v 1.5 2020/01/12 21:31:03 christos Exp $ */ +#ifdef HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#else #if HAVE_CONFIG_H #include "config.h" #endif @@ -7,7 +10,8 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: main.c,v 1.4 2019/10/13 21:56:14 joerg Exp $"); +#endif +__RCSID("$NetBSD: main.c,v 1.5 2020/01/12 21:31:03 christos Exp $"); /*- * Copyright (c) 1999-2019 The NetBSD Foundation, Inc. Index: src/external/bsd/pkg_install/dist/create/pl.c diff -u src/external/bsd/pkg_install/dist/create/pl.c:1.2 src/external/bsd/pkg_install/dist/create/pl.c:1.3 --- src/external/bsd/pkg_install/dist/create/pl.c:1.2 Thu Apr 20 09:18:23 2017 +++ src/external/bsd/pkg_install/dist/create/pl.c Sun Jan 12 16:31:03 2020 @@ -1,5 +1,8 @@ -/* $NetBSD: pl.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */ +/* $NetBSD: pl.c,v 1.3 2020/01/12 21:31:03 christos Exp $ */ +#ifdef HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#else #if HAVE_CONFIG_H #include "config.h" #endif @@ -7,7 +10,8 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: pl.c,v 1.2 2017/04/20 13:18:23 joerg Exp $"); +#endif +__RCSID("$NetBSD: pl.c,v 1.3 2020/01/12 21:31:03 christos Exp $"); /* * FreeBSD install - a package for the installation and maintainance Index: src/external/bsd/pkg_install/lib/config.h diff -u src/external/bsd/pkg_install/lib/config.h:1.2 src/external/bsd/pkg_install/lib/config.h:1.3 --- src/external/bsd/pkg_install/lib/config.h:1.2 Fri Apr 23 16:56:01 2010 +++ src/external/bsd/pkg_install/lib/config.h Sun Jan 12 16:31:03 2020 @@ -115,6 +115,7 @@ /* Defined when to retain only the numeric OS version */ /* #undef NUMERIC_VERSION_ONLY */ +#ifndef HAVE_NBTOOL_CONFIG_H /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "jo...@netbsd.org" @@ -132,6 +133,7 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "20090911" +#endif /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4
CVS commit: src/external/bsd/pkg_install/sbin/pkg_create
Module Name:src Committed By: pgoyette Date: Sat Apr 6 10:37:57 UTC 2019 Modified Files: src/external/bsd/pkg_install/sbin/pkg_create: Makefile Log Message: revert previkous it isn't needed To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/pkg_install/sbin/pkg_create/Makefile 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/sbin/pkg_create/Makefile diff -u src/external/bsd/pkg_install/sbin/pkg_create/Makefile:1.3 src/external/bsd/pkg_install/sbin/pkg_create/Makefile:1.4 --- src/external/bsd/pkg_install/sbin/pkg_create/Makefile:1.3 Sat Apr 6 10:29:13 2019 +++ src/external/bsd/pkg_install/sbin/pkg_create/Makefile Sat Apr 6 10:37:57 2019 @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2019/04/06 10:29:13 pgoyette Exp $ +# $NetBSD: Makefile,v 1.4 2019/04/06 10:37:57 pgoyette Exp $ # Original from FreeBSD, no rcs id. PROG= pkg_create SRCS= main.c perform.c pl.c util.c build.c -COPTS.main.c+= -Wno-error=implicit-fallthrough - .include .PATH: ${DIST}/create
CVS commit: src/external/bsd/pkg_install/sbin/pkg_create
Module Name:src Committed By: pgoyette Date: Sat Apr 6 10:29:13 UTC 2019 Modified Files: src/external/bsd/pkg_install/sbin/pkg_create: Makefile Log Message: Treat implicit-fallthrough only as a warning To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/pkg_install/sbin/pkg_create/Makefile 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/sbin/pkg_create/Makefile diff -u src/external/bsd/pkg_install/sbin/pkg_create/Makefile:1.2 src/external/bsd/pkg_install/sbin/pkg_create/Makefile:1.3 --- src/external/bsd/pkg_install/sbin/pkg_create/Makefile:1.2 Mon Feb 2 20:47:21 2009 +++ src/external/bsd/pkg_install/sbin/pkg_create/Makefile Sat Apr 6 10:29:13 2019 @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2009/02/02 20:47:21 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2019/04/06 10:29:13 pgoyette Exp $ # Original from FreeBSD, no rcs id. PROG= pkg_create SRCS= main.c perform.c pl.c util.c build.c +COPTS.main.c+= -Wno-error=implicit-fallthrough + .include .PATH: ${DIST}/create
CVS commit: src/external/bsd/pkg_install/dist/create
Module Name:src Committed By: kre Date: Sat Apr 6 08:29:02 UTC 2019 Modified Files: src/external/bsd/pkg_install/dist/create: util.c Log Message: Use __UNCONST() rather than a simple cast to free a const char * while avoiding gcc noise. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/pkg_install/dist/create/util.c 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/create/util.c diff -u src/external/bsd/pkg_install/dist/create/util.c:1.1.1.4 src/external/bsd/pkg_install/dist/create/util.c:1.2 --- src/external/bsd/pkg_install/dist/create/util.c:1.1.1.4 Fri Apr 5 23:41:58 2019 +++ src/external/bsd/pkg_install/dist/create/util.c Sat Apr 6 08:29:01 2019 @@ -147,8 +147,8 @@ void free_memory_file(struct memory_file *file) { if (file != NULL) { - free((char *)file->owner); - free((char *)file->group); + free(__UNCONST(file->owner)); + free(__UNCONST(file->group)); free(file->data); free(file); }
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: sevan Date: Sat Apr 6 00:05:47 UTC 2019 Modified Files: src/external/bsd/pkg_install/dist/admin: pkg_admin.1 src/external/bsd/pkg_install/dist/info: main.c src/external/bsd/pkg_install/dist/lib: license.c parse-config.c pkcs7.c version.h Log Message: Fix merge conflicts from pkgsrc-20190405 import To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/admin/pkg_admin.1 cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/main.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/parse-config.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/pkcs7.c cvs rdiff -u -r1.13 -r1.14 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/admin/pkg_admin.1 diff -u src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.3 src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.4 --- src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.3 Sun Mar 25 04:04:36 2018 +++ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 Sat Apr 6 00:05:47 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_admin.1,v 1.3 2018/03/25 04:04:36 sevan Exp $ +.\" $NetBSD: pkg_admin.1,v 1.4 2019/04/06 00:05:47 sevan Exp $ .\" .\" Copyright (c) 1999-2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -14,13 +14,6 @@ .\" 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. -.\" 3. All advertising materials mentioning features or use of this software -.\"must display the following acknowledgement: -.\"This product includes software developed by the NetBSD -.\"Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\"contributors may be used to endorse or promote products derived -.\"from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Index: src/external/bsd/pkg_install/dist/info/main.c diff -u src/external/bsd/pkg_install/dist/info/main.c:1.2 src/external/bsd/pkg_install/dist/info/main.c:1.3 --- src/external/bsd/pkg_install/dist/info/main.c:1.2 Thu Apr 20 13:18:23 2017 +++ src/external/bsd/pkg_install/dist/info/main.c Sat Apr 6 00:05:47 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */ +/* $NetBSD: main.c,v 1.3 2019/04/06 00:05:47 sevan Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg Exp $"); +__RCSID("$NetBSD: main.c,v 1.3 2019/04/06 00:05:47 sevan Exp $"); /* * @@ -299,12 +299,16 @@ main(int argc, char **argv) errx(EXIT_FAILURE, "Error during search in pkgdb for %s", *argv); } } else { -const char *dbdir; +const char *dbdir; +size_t dbdirlen; dbdir = pkgdb_get_dir(); -if (**argv == '/' && strncmp(*argv, dbdir, strlen(dbdir)) == 0) { - *argv += strlen(dbdir) + 1; - if ((*argv)[strlen(*argv) - 1] == '/') { +dbdirlen = strlen(dbdir); +if (**argv == '/' && +strncmp(*argv, dbdir, dbdirlen) == 0 && +(*argv)[dbdirlen] == '/') { + *argv += dbdirlen + 1; + if (**argv && (*argv)[strlen(*argv) - 1] == '/') { (*argv)[strlen(*argv) - 1] = 0; } } Index: src/external/bsd/pkg_install/dist/lib/license.c diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.7 src/external/bsd/pkg_install/dist/lib/license.c:1.8 --- src/external/bsd/pkg_install/dist/lib/license.c:1.7 Sun Mar 25 04:04:36 2018 +++ src/external/bsd/pkg_install/dist/lib/license.c Sat Apr 6 00:05:47 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: license.c,v 1.7 2018/03/25 04:04:36 sevan Exp $ */ +/* $NetBSD: license.c,v 1.8 2019/04/06 00:05:47 sevan Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger . @@ -51,6 +51,8 @@ const char *default_acceptable_licenses "artistic artistic-2.0 " "boost-license " "cc-by-sa-v3.0 " +"cc-by-sa-v4.0 " +"cc-by-v4.0 " "cc0-1.0-universal " "cddl-1.0 " "cecill-2.1 " @@ -77,6 +79,7 @@ const char *default_acceptable_licenses "ofl-v1.0 ofl-v1.1 " "openssl " "original-bsd modified-bsd 2-clause-bsd " +"osl " "paratype " "php " "png-license " Index: src/external/bsd/pkg_install/dist/lib/parse-config.c diff -u src/external/bsd/pkg_install/dist/lib/parse-config.c:1.2 src/external/bsd/pkg_install/dist/lib/parse-config.c:1.3 ---
CVS commit: src/external/bsd/pkg_install
Module Name:src Committed By: mrg Date: Thu Feb 7 23:53:20 UTC 2019 Modified Files: src/external/bsd/pkg_install: Makefile.inc Log Message: include bsd.own.mk incase it hasn't already been included. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/Makefile.inc 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/Makefile.inc diff -u src/external/bsd/pkg_install/Makefile.inc:1.5 src/external/bsd/pkg_install/Makefile.inc:1.6 --- src/external/bsd/pkg_install/Makefile.inc:1.5 Tue Feb 5 11:37:18 2019 +++ src/external/bsd/pkg_install/Makefile.inc Thu Feb 7 23:53:20 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.5 2019/02/05 11:37:18 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.6 2019/02/07 23:53:20 mrg Exp $ DIST= ${NETBSDSRCDIR}/external/bsd/pkg_install/dist @@ -12,6 +12,8 @@ CPPFLAGS+=-DSYSCONFDIR='"/etc"' WARNS= 4 CWARNFLAGS+= -Wno-missing-noreturn +.include + # show_version() does not return .if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc" COPTS.main.c+= -Wno-error=implicit-fallthrough
CVS commit: src/external/bsd/pkg_install
Module Name:src Committed By: mrg Date: Tue Feb 5 11:37:18 UTC 2019 Modified Files: src/external/bsd/pkg_install: Makefile.inc Log Message: show_version() doesn't return, but fallthru checker doesn't know and coplains. disable the error. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/Makefile.inc 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/Makefile.inc diff -u src/external/bsd/pkg_install/Makefile.inc:1.4 src/external/bsd/pkg_install/Makefile.inc:1.5 --- src/external/bsd/pkg_install/Makefile.inc:1.4 Fri Sep 16 16:41:20 2011 +++ src/external/bsd/pkg_install/Makefile.inc Tue Feb 5 11:37:18 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2011/09/16 16:41:20 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.5 2019/02/05 11:37:18 mrg Exp $ DIST= ${NETBSDSRCDIR}/external/bsd/pkg_install/dist @@ -11,3 +11,9 @@ CPPFLAGS+=-DSYSCONFDIR='"/etc"' WARNS= 4 CWARNFLAGS+= -Wno-missing-noreturn + +# show_version() does not return +.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc" +COPTS.main.c+= -Wno-error=implicit-fallthrough +COPTS.pkg_delete.c+= -Wno-error=implicit-fallthrough +.endif
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Tue Mar 27 23:11:26 UTC 2018 Removed Files: src/external/bsd/pkg_install/dist: Makefile.in README config.guess config.sub configure configure.ac install-sh tkpkg src/external/bsd/pkg_install/dist/add: Makefile.in pkg_add.cat src/external/bsd/pkg_install/dist/admin: Makefile.in audit-packages.cat download-vulnerability-list.cat pkg_admin.cat src/external/bsd/pkg_install/dist/create: Makefile.in pkg_create.cat src/external/bsd/pkg_install/dist/delete: Makefile.in pkg_delete.cat src/external/bsd/pkg_install/dist/info: Makefile.in pkg_info.cat src/external/bsd/pkg_install/dist/lib: Makefile.in pkg_install.conf.cat.in pkg_summary.cat pkgsrc.cat Log Message: Mark all files dead that should never have been imported. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/Makefile.in \ src/external/bsd/pkg_install/dist/README \ src/external/bsd/pkg_install/dist/config.guess \ src/external/bsd/pkg_install/dist/config.sub \ src/external/bsd/pkg_install/dist/configure \ src/external/bsd/pkg_install/dist/configure.ac \ src/external/bsd/pkg_install/dist/install-sh \ src/external/bsd/pkg_install/dist/tkpkg cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/add/Makefile.in cvs rdiff -u -r1.2 -r0 src/external/bsd/pkg_install/dist/add/pkg_add.cat cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/admin/Makefile.in \ src/external/bsd/pkg_install/dist/admin/audit-packages.cat \ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat cvs rdiff -u -r1.3 -r0 src/external/bsd/pkg_install/dist/admin/pkg_admin.cat cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/create/Makefile.in cvs rdiff -u -r1.2 -r0 \ src/external/bsd/pkg_install/dist/create/pkg_create.cat cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/delete/Makefile.in cvs rdiff -u -r1.2 -r0 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.cat cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/info/Makefile.in cvs rdiff -u -r1.2 -r0 src/external/bsd/pkg_install/dist/info/pkg_info.cat cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/lib/Makefile.in cvs rdiff -u -r1.2 -r0 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in \ src/external/bsd/pkg_install/dist/lib/pkg_summary.cat \ src/external/bsd/pkg_install/dist/lib/pkgsrc.cat Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: sevan Date: Tue Mar 27 22:51:44 UTC 2018 Modified Files: src/external/bsd/pkg_install/dist/lib: pkg_install.conf.cat.in Log Message: Import regenerated catalog file To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in 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/pkg_install.conf.cat.in diff -u src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in:1.1.1.1 src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in:1.2 --- src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in:1.1.1.1 Sun Feb 4 08:20:47 2018 +++ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in Tue Mar 27 22:51:43 2018 @@ -1,7 +1,7 @@ PKG_INSTALL.CONF(5) File Formats Manual PKG_INSTALL.CONF(5) NNAAMMEE - ppkkgg__iinnssttaallll..ccoonnff -- configuration file for package installation tools + ppkkgg__iinnssttaallll..ccoonnff - configuration file for package installation tools DDEESSCCRRIIPPTTIIOONN The file ppkkgg__iinnssttaallll..ccoonnff contains system defaults for the package
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: sevan Date: Tue Mar 27 22:47:01 UTC 2018 Modified Files: src/external/bsd/pkg_install/dist/add: pkg_add.cat src/external/bsd/pkg_install/dist/admin: pkg_admin.cat src/external/bsd/pkg_install/dist/create: pkg_create.cat src/external/bsd/pkg_install/dist/delete: pkg_delete.cat src/external/bsd/pkg_install/dist/info: pkg_info.cat src/external/bsd/pkg_install/dist/lib: pkg_summary.cat pkgsrc.cat Log Message: Import regenerated catalog files To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/pkg_install/dist/add/pkg_add.cat cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/pkg_install/dist/admin/pkg_admin.cat cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/pkg_install/dist/create/pkg_create.cat cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.cat cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/pkg_install/dist/info/pkg_info.cat cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/pkg_install/dist/lib/pkg_summary.cat \ src/external/bsd/pkg_install/dist/lib/pkgsrc.cat 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/add/pkg_add.cat diff -u src/external/bsd/pkg_install/dist/add/pkg_add.cat:1.1.1.1 src/external/bsd/pkg_install/dist/add/pkg_add.cat:1.2 --- src/external/bsd/pkg_install/dist/add/pkg_add.cat:1.1.1.1 Sun Feb 4 08:20:43 2018 +++ src/external/bsd/pkg_install/dist/add/pkg_add.cat Tue Mar 27 22:47:00 2018 @@ -1,12 +1,12 @@ PKG_ADD(1) General Commands Manual PKG_ADD(1) NNAAMMEE - ppkkgg__aadddd -- a utility for installing and upgrading software package + ppkkgg__aadddd - a utility for installing and upgrading software package distributions SSYYNNOOPPSSIISS - ppkkgg__aadddd [--AAffIInnRRUUuuVVvv] [--CC _c_o_n_f_i_g] [--KK _p_k_g___d_b_d_i_r] [--mm _m_a_c_h_i_n_e] [--PP _d_e_s_t_d_i_r] - [--pp _p_r_e_f_i_x] + ppkkgg__aadddd [--AAffhhIInnRRUUuuVVvv] [--CC _c_o_n_f_i_g] [--KK _p_k_g___d_b_d_i_r] [--mm _m_a_c_h_i_n_e] + [--PP _d_e_s_t_d_i_r] [--pp _p_r_e_f_i_x] _f_i_l_e _._._. [[ftp|http]://[_u_s_e_r][:_p_a_s_s_w_o_r_d]@]_h_o_s_t[:_p_o_r_t][/_p_a_t_h_/]_p_k_g_-_n_a_m_e _._._. DDEESSCCRRIIPPTTIIOONN @@ -19,9 +19,9 @@ DDEESSCCRRIIPPTTIIOONN WWAARRNNIINNGG _S_i_n_c_e _t_h_e ppkkgg__aadddd _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _c_o_n_t_a_i_n_e_d - _w_i_t_h_i_n _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n - _h_o_r_s_e_s_'_' _o_r _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s - _p_a_c_k_a_g_e _f_i_l_e_s_. + _w_i_t_h_i_n _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _"_T_r_o_j_a_n _h_o_r_s_e_s_" + _o_r _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s _p_a_c_k_a_g_e + _f_i_l_e_s_. _Y_o_u _a_r_e _a_d_v_i_s_e_d _t_o _v_e_r_i_f_y _t_h_e _c_o_m_p_e_t_e_n_c_e _a_n_d _i_d_e_n_t_i_t_y _o_f _t_h_o_s_e _w_h_o _p_r_o_v_i_d_e _i_n_s_t_a_l_l_a_b_l_e _p_a_c_k_a_g_e _f_i_l_e_s_. _F_o_r _e_x_t_r_a _p_r_o_t_e_c_t_i_o_n_, _u_s_e _t_h_e _d_i_g_i_t_a_l @@ -57,6 +57,11 @@ OOPPTTIIOONNSS Read the configuration file from _c_o_n_f_i_g instead of the system default. + --DD Force updating even if the dependencies of depending packages are + not satisfied by the new package. This is used by "make + replace", after which one would typically replace the depending + packages. + --ff Force installation to proceed even if prerequisite packages are not installed or the install script fails. Although ppkkgg__aadddd will still try to find and auto-install missing prerequisite packages, @@ -65,10 +70,7 @@ OOPPTTIIOONNSS architecture the package was built on differ from that of the host. - --DD Force updating even if the
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: sevan Date: Sun Mar 25 04:04:36 UTC 2018 Modified Files: src/external/bsd/pkg_install/dist/add: perform.c pkg_add.1 src/external/bsd/pkg_install/dist/admin: audit.c main.c pkg_admin.1 pkg_admin.cat src/external/bsd/pkg_install/dist/delete: pkg_delete.c src/external/bsd/pkg_install/dist/lib: lib.h license.c version.h vulnerabilities-file.c Log Message: Import pkg_install-20180325. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/add/pkg_add.1 cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/admin/audit.c \ src/external/bsd/pkg_install/dist/admin/main.c \ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/pkg_install/dist/admin/pkg_admin.cat cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/pkg_install/dist/lib/lib.h cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/pkg_install/dist/lib/version.h cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c 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/add/perform.c diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.5 src/external/bsd/pkg_install/dist/add/perform.c:1.6 --- src/external/bsd/pkg_install/dist/add/perform.c:1.5 Thu Apr 20 13:18:23 2017 +++ src/external/bsd/pkg_install/dist/add/perform.c Sun Mar 25 04:04:36 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.5 2017/04/20 13:18:23 joerg Exp $ */ +/* $NetBSD: perform.c,v 1.6 2018/03/25 04:04:36 sevan Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: perform.c,v 1.5 2017/04/20 13:18:23 joerg Exp $"); +__RCSID("$NetBSD: perform.c,v 1.6 2018/03/25 04:04:36 sevan Exp $"); /*- * Copyright (c) 2003 Grant Beattie@@ -1318,7 +1318,7 @@ check_vulnerable(struct pkg_task *pkg) return require_check; } - if (!audit_package(pv, pkg->pkgname, NULL, 2)) + if (!audit_package(pv, pkg->pkgname, NULL, 0, 2)) return 0; if (require_check) Index: src/external/bsd/pkg_install/dist/add/pkg_add.1 diff -u src/external/bsd/pkg_install/dist/add/pkg_add.1:1.2 src/external/bsd/pkg_install/dist/add/pkg_add.1:1.3 --- src/external/bsd/pkg_install/dist/add/pkg_add.1:1.2 Thu Apr 20 13:18:23 2017 +++ src/external/bsd/pkg_install/dist/add/pkg_add.1 Sun Mar 25 04:04:36 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_add.1,v 1.2 2017/04/20 13:18:23 joerg Exp $ +.\" $NetBSD: pkg_add.1,v 1.3 2018/03/25 04:04:36 sevan Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -17,7 +17,7 @@ .\" .\" @(#)pkg_add.1 .\" -.Dd December 27, 2014 +.Dd March 21, 2018 .Dt PKG_ADD 1 .Os .Sh NAME @@ -25,7 +25,7 @@ .Nd a utility for installing and upgrading software package distributions .Sh SYNOPSIS .Nm -.Op Fl AfInRUuVv +.Op Fl AfhInRUuVv .Op Fl C Ar config .Op Fl K Ar pkg_dbdir .Op Fl m Ar machine @@ -119,6 +119,11 @@ removed. Read the configuration file from .Ar config instead of the system default. +.It Fl D +Force updating even if the dependencies of depending packages are not +satisfied by the new package. +This is used by "make replace", after which one would typically +replace the depending packages. .It Fl f Force installation to proceed even if prerequisite packages are not installed or the install script fails. @@ -128,11 +133,8 @@ will still try to find and auto-install a failure to find one will not be fatal. This flag also overrides the fatal error when the operating system or architecture the package was built on differ from that of the host. -.It Fl D -Force updating even if the dependencies of depending packages are not -satisfied by the new package. -This is used by "make replace", after which one would typically -replace the depending packages. +.It Fl h +Display help and exit. .It Fl I If an installation script exists for a given package, do not execute it. .It Fl K Ar pkg_dbdir Index: src/external/bsd/pkg_install/dist/admin/audit.c diff -u src/external/bsd/pkg_install/dist/admin/audit.c:1.2 src/external/bsd/pkg_install/dist/admin/audit.c:1.3 --- src/external/bsd/pkg_install/dist/admin/audit.c:1.2 Thu Apr 20 13:18:23 2017 +++ src/external/bsd/pkg_install/dist/admin/audit.c Sun Mar 25 04:04:36 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: audit.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */ +/* $NetBSD: audit.c,v 1.3 2018/03/25 04:04:36 sevan Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD:
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: maya Date: Sun Feb 4 09:00:51 UTC 2018 Modified Files: src/external/bsd/pkg_install/dist/lib: license.c pkcs7.c pkg_io.c version.h Log Message: Merge pkg_install-20171030 Bump version to 20171030 for netpgpverify fixes. Add zsh to default_acceptable_licenses. Undef bootstrap hack. Fix OpenSSL 1.1.0 build OpenSSL 1.1.0 makes xkusage and ex_flags opaque. Use X509_check_ca rather than a custom and nearly identical implementation. This is available since OpenSSL 0.9.8 (even in RHEL5). This is also done because we cannot implement it identically under OpenSSL 1.1.0 due to missing getters. Test EXFLAG_XKUSAGE rather than zero xkusage test no usage to avoid openssl 1.1.0 getter returning a different code on this case. Use getter for xkusage in the non-zero test case. Provide fallback definitions for getters. PR pkg/52298, PR pkg/52648 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/pkcs7.c \ src/external/bsd/pkg_install/dist/lib/pkg_io.c cvs rdiff -u -r1.11 -r1.12 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/license.c diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.5 src/external/bsd/pkg_install/dist/lib/license.c:1.6 --- src/external/bsd/pkg_install/dist/lib/license.c:1.5 Thu Apr 20 13:18:23 2017 +++ src/external/bsd/pkg_install/dist/lib/license.c Sun Feb 4 09:00:51 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: license.c,v 1.5 2017/04/20 13:18:23 joerg Exp $ */ +/* $NetBSD: license.c,v 1.6 2018/02/04 09:00:51 maya Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger. @@ -92,7 +92,8 @@ const char *default_acceptable_licenses "w3c " "x11 " "zlib " -"zpl-2.0 zpl-2.1"; +"zpl-2.0 zpl-2.1 " +"zsh"; #ifdef DEBUG static size_t hash_collisions; Index: src/external/bsd/pkg_install/dist/lib/pkcs7.c diff -u src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.2 src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.3 --- src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.2 Thu Apr 20 13:18:23 2017 +++ src/external/bsd/pkg_install/dist/lib/pkcs7.c Sun Feb 4 09:00:51 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: pkcs7.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */ +/* $NetBSD: pkcs7.c,v 1.3 2018/02/04 09:00:51 maya Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -7,7 +7,7 @@ #include #endif -__RCSID("$NetBSD: pkcs7.c,v 1.2 2017/04/20 13:18:23 joerg Exp $"); +__RCSID("$NetBSD: pkcs7.c,v 1.3 2018/02/04 09:00:51 maya Exp $"); /*- * Copyright (c) 2004, 2008 The NetBSD Foundation, Inc. @@ -55,25 +55,12 @@ __RCSID("$NetBSD: pkcs7.c,v 1.2 2017/04/ #define NS_ANY_CA (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA) #endif -static const unsigned int pkg_key_usage = XKU_CODE_SIGN | XKU_SMIME; +#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x1010L) +#define X509_get_extended_key_usage(x) x->ex_xkusage +#define X509_get_extension_flags(x) x->ex_flags +#endif -static int -check_ca(X509 *cert) -{ - if ((cert->ex_flags & EXFLAG_KUSAGE) != 0 && - (cert->ex_kusage & KU_KEY_CERT_SIGN) != KU_KEY_CERT_SIGN) - return 0; - if ((cert->ex_flags & EXFLAG_BCONS) != 0) - return (cert->ex_flags & EXFLAG_CA) == EXFLAG_CA; - if ((cert->ex_flags & (EXFLAG_V1|EXFLAG_SS)) == (EXFLAG_V1|EXFLAG_SS)) - return 1; - if ((cert->ex_flags & EXFLAG_KUSAGE) != 0) - return 1; - if ((cert->ex_flags & EXFLAG_NSCERT) != 0 && - (cert->ex_nscert & NS_ANY_CA) != 0) - return 1; - return 0; -} +static const unsigned int pkg_key_usage = XKU_CODE_SIGN | XKU_SMIME; static STACK_OF(X509) * file_to_certs(const char *file) @@ -180,18 +167,18 @@ easy_pkcs7_verify(const char *content, s /* Compute ex_xkusage */ X509_check_purpose(sk_X509_value(signers, i), -1, -1); - if (check_ca(sk_X509_value(signers, i))) { + if (X509_check_ca(sk_X509_value(signers, i))) { warnx("CA keys are not valid for signatures"); goto cleanup; } if (is_pkg) { - if (sk_X509_value(signers, i)->ex_xkusage != pkg_key_usage) { + if (X509_get_extended_key_usage(sk_X509_value(signers, i)) != pkg_key_usage) { warnx("Certificate must have CODE SIGNING " "and EMAIL PROTECTION property"); goto cleanup; } } else { - if (sk_X509_value(signers, i)->ex_xkusage != 0) { + if (X509_get_extension_flags(sk_X509_value(signers, i)) & EXFLAG_XKUSAGE) { warnx("Certificate must not have any property"); goto cleanup; } @@ -271,12 +258,12 @@ easy_pkcs7_sign(const char *content, siz /* Compute ex_kusage */ X509_check_purpose(certificate, -1, 0); - if (check_ca(certificate)) { + if (X509_check_ca(certificate)) { warnx("CA keys are not valid for signatures"); goto cleanup; } - if
CVS commit: src/external/bsd/pkg_install/sbin
Module Name:src Committed By: joerg Date: Fri Apr 21 12:43:22 UTC 2017 Modified Files: src/external/bsd/pkg_install/sbin: Makefile.inc Log Message: Help silly sun2 along. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/sbin/Makefile.inc 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/sbin/Makefile.inc diff -u src/external/bsd/pkg_install/sbin/Makefile.inc:1.4 src/external/bsd/pkg_install/sbin/Makefile.inc:1.5 --- src/external/bsd/pkg_install/sbin/Makefile.inc:1.4 Thu Apr 20 13:18:47 2017 +++ src/external/bsd/pkg_install/sbin/Makefile.inc Fri Apr 21 12:43:22 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2017/04/20 13:18:47 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.5 2017/04/21 12:43:22 joerg Exp $ .include @@ -21,5 +21,5 @@ LDADD+= -larchive DPADD+= ${LIBZ} ${LIBBZ2} LDADD+= -lz -lbz2 -DPADD+= ${LIBLZMA} -LDADD+= -llzma +DPADD+= ${LIBLZMA} ${LIBPTHREAD} +LDADD+= -llzma -lpthread
CVS commit: src/external/bsd/pkg_install/sbin
Module Name:src Committed By: joerg Date: Thu Apr 20 13:18:47 UTC 2017 Modified Files: src/external/bsd/pkg_install/sbin: Makefile.inc src/external/bsd/pkg_install/sbin/pkg_add: Makefile Log Message: Update build system for pkg_install-20170419. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/sbin/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/sbin/pkg_add/Makefile 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/sbin/Makefile.inc diff -u src/external/bsd/pkg_install/sbin/Makefile.inc:1.3 src/external/bsd/pkg_install/sbin/Makefile.inc:1.4 --- src/external/bsd/pkg_install/sbin/Makefile.inc:1.3 Fri Nov 5 09:09:01 2010 +++ src/external/bsd/pkg_install/sbin/Makefile.inc Thu Apr 20 13:18:47 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2010/11/05 09:09:01 he Exp $ +# $NetBSD: Makefile.inc,v 1.4 2017/04/20 13:18:47 joerg Exp $ .include @@ -12,8 +12,8 @@ CPPFLAGS+= -DBINDIR='"${BINDIR}"' DPADD+= ${LIBINSTALL}/libinstall.a LDADD+= -L${LIBINSTALL} -linstall -ltermcap -DPADD+= ${LIBFETCH} ${LIBSSL} ${LIBCRYPTO} -LDADD+= -lfetch -lssl -lcrypto +DPADD+= ${LIBNETPGPVERIFY} ${LIBFETCH} ${LIBSSL} ${LIBCRYPTO} +LDADD+= -lnetpgpverify -lfetch -lssl -lcrypto DPADD+= ${LIBARCHIVE} LDADD+= -larchive Index: src/external/bsd/pkg_install/sbin/pkg_add/Makefile diff -u src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.2 src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.3 --- src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.2 Mon Feb 2 20:47:21 2009 +++ src/external/bsd/pkg_install/sbin/pkg_add/Makefile Thu Apr 20 13:18:47 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2009/02/02 20:47:21 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2017/04/20 13:18:47 joerg Exp $ # Original from FreeBSD, no rcs id. PROG= pkg_add @@ -8,6 +8,6 @@ SRCS= main.c perform.c .PATH: ${DIST}/add -CPPFLAGS+= -DMACHINE_ARCH=\"${MACHINE_ARCH}\" +CPPFLAGS+= -DPKGSRC_MACHINE_ARCH=\"${MACHINE_ARCH}\" .include
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Thu Apr 20 13:18:23 UTC 2017 Modified Files: src/external/bsd/pkg_install/dist/add: add.h main.c perform.c pkg_add.1 src/external/bsd/pkg_install/dist/admin: audit-packages.8 audit.c check.c download-vulnerability-list.8 main.c pkg_admin.1 src/external/bsd/pkg_install/dist/create: build.c create.h main.c perform.c pkg_create.1 pl.c src/external/bsd/pkg_install/dist/delete: pkg_delete.1 pkg_delete.c src/external/bsd/pkg_install/dist/info: info.h main.c perform.c pkg_info.1 show.c src/external/bsd/pkg_install/dist/lib: automatic.c conflicts.c defs.h dewey.c dewey.h fexec.c file.c global.c gpgsig.c iterate.c lib.h license.c lpkg.c opattern.c parse-config.c pkcs7.c pkg_install.conf.5.in pkg_io.c pkg_signature.c pkg_summary.5 pkgdb.c pkgsrc.7 plist.c remove.c str.c var.c version.c version.h vulnerabilities-file.c xwrapper.c src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf pkgsrc.sh Log Message: Merge pkg_install-20170419. To generate a diff of this commit: cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/pkg_install/dist/add/add.h cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/pkg_install/dist/add/main.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.1.1.13 -r1.2 src/external/bsd/pkg_install/dist/add/pkg_add.1 cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/pkg_install/dist/admin/audit-packages.8 \ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/admin/audit.c cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/pkg_install/dist/admin/check.c cvs rdiff -u -r1.1.1.16 -r1.2 src/external/bsd/pkg_install/dist/admin/main.c cvs rdiff -u -r1.1.1.13 -r1.2 \ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/create/build.c cvs rdiff -u -r1.1.1.6 -r1.2 \ src/external/bsd/pkg_install/dist/create/create.h \ src/external/bsd/pkg_install/dist/create/perform.c cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/pkg_install/dist/create/main.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/pkg_install/dist/create/pkg_create.1 cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/pkg_install/dist/create/pl.c cvs rdiff -u -r1.1.1.9 -r1.2 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.1 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.c cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/pkg_install/dist/info/info.h cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/info/main.c cvs rdiff -u -r1.1.1.14 -r1.2 \ src/external/bsd/pkg_install/dist/info/perform.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/pkg_info.1 cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/info/show.c cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/pkg_install/dist/lib/automatic.c \ src/external/bsd/pkg_install/dist/lib/global.c \ src/external/bsd/pkg_install/dist/lib/lpkg.c \ src/external/bsd/pkg_install/dist/lib/remove.c \ src/external/bsd/pkg_install/dist/lib/str.c cvs rdiff -u -r1.1.1.4 -r1.2 \ src/external/bsd/pkg_install/dist/lib/conflicts.c \ src/external/bsd/pkg_install/dist/lib/iterate.c \ src/external/bsd/pkg_install/dist/lib/pkcs7.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/defs.h \ src/external/bsd/pkg_install/dist/lib/license.c \ src/external/bsd/pkg_install/dist/lib/pkg_summary.5 cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/dewey.c cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/pkg_install/dist/lib/dewey.h \ src/external/bsd/pkg_install/dist/lib/pkgsrc.7 \ src/external/bsd/pkg_install/dist/lib/xwrapper.c cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/pkg_install/dist/lib/fexec.c \ src/external/bsd/pkg_install/dist/lib/gpgsig.c \ src/external/bsd/pkg_install/dist/lib/opattern.c \ src/external/bsd/pkg_install/dist/lib/version.c cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/pkg_install/dist/lib/file.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/dist/lib/lib.h cvs rdiff -u -r1.1.1.11 -r1.2 \ src/external/bsd/pkg_install/dist/lib/parse-config.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in \ src/external/bsd/pkg_install/dist/lib/pkg_signature.c \ src/external/bsd/pkg_install/dist/lib/var.c cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/pkg_install/dist/lib/pkg_io.c cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/pkg_install/dist/lib/pkgdb.c cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/pkg_install/dist/lib/plist.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/lib/version.h cvs rdiff -u -r1.1.1.6 -r1.2 \ src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c cvs rdiff -u -r1.1.1.1 -r1.2 \
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: christos Date: Thu Jan 12 22:57:26 UTC 2017 Modified Files: src/external/bsd/pkg_install/dist/lib: defs.h Log Message: need before defining MIN/MAX To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/defs.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/defs.h diff -u src/external/bsd/pkg_install/dist/lib/defs.h:1.3 src/external/bsd/pkg_install/dist/lib/defs.h:1.4 --- src/external/bsd/pkg_install/dist/lib/defs.h:1.3 Tue Feb 21 13:36:17 2012 +++ src/external/bsd/pkg_install/dist/lib/defs.h Thu Jan 12 17:57:26 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.3 2012/02/21 18:36:17 wiz Exp $ */ +/* $NetBSD: defs.h,v 1.4 2017/01/12 22:57:26 christos Exp $ */ /*- * Copyright (c) 1999,2000,2009 The NetBSD Foundation, Inc. @@ -31,6 +31,9 @@ #ifndef DEFS_H_ #define DEFS_H_ +#if HAVE_SYS_PARAM_H +#include +#endif #if HAVE_CONFIG_H #include "config.h" #endif
CVS commit: src/external/bsd/pkg_install/dist/create
Module Name:src Committed By: mbalmer Date: Sat Oct 10 10:08:12 UTC 2015 Modified Files: src/external/bsd/pkg_install/dist/create: pkg_create.1 Log Message: use a verb in the authors section for all entries To generate a diff of this commit: cvs rdiff -u -r1.1.1.8 -r1.2 \ src/external/bsd/pkg_install/dist/create/pkg_create.1 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/create/pkg_create.1 diff -u src/external/bsd/pkg_install/dist/create/pkg_create.1:1.1.1.8 src/external/bsd/pkg_install/dist/create/pkg_create.1:1.2 --- src/external/bsd/pkg_install/dist/create/pkg_create.1:1.1.1.8 Fri Apr 23 20:54:08 2010 +++ src/external/bsd/pkg_install/dist/create/pkg_create.1 Sat Oct 10 10:08:12 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_create.1,v 1.1.1.8 2010/04/23 20:54:08 joerg Exp $ +.\" $NetBSD: pkg_create.1,v 1.2 2015/10/10 10:08:12 mbalmer Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -24,7 +24,7 @@ .\" [jkh] Took John's changes back and made some additional extensions for .\" better integration with FreeBSD's new ports collection. .\" -.Dd January 20, 2010 +.Dd October 10, 2015 .Dt PKG_CREATE 1 .Os .Sh NAME @@ -494,11 +494,12 @@ command first appeared in .Sh AUTHORS .Bl -tag -width indent -compact .It Jordan Hubbard -most of the work +did most of the work. .It John Kohl refined it for -.Nx +.Nx . .It Hubert Feyrer +added .Nx wildcard dependency processing, pkgdb, pkg size recording etc. .El
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: joerg Date: Tue Jan 7 02:15:27 UTC 2014 Modified Files: src/external/bsd/pkg_install/dist/lib: lib.h Log Message: xasprintf uses format strings. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/lib/lib.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.6 src/external/bsd/pkg_install/dist/lib/lib.h:1.7 --- src/external/bsd/pkg_install/dist/lib/lib.h:1.6 Sat Jun 26 00:17:13 2010 +++ src/external/bsd/pkg_install/dist/lib/lib.h Tue Jan 7 02:15:27 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: lib.h,v 1.6 2010/06/26 00:17:13 joerg Exp $ */ +/* $NetBSD: lib.h,v 1.7 2014/01/07 02:15:27 joerg Exp $ */ /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */ @@ -421,7 +421,7 @@ char *xstrdup(const char *); void *xrealloc(void *, size_t); void *xcalloc(size_t, size_t); void *xmalloc(size_t); -char *xasprintf(const char *, ...); +char *xasprintf(const char *, ...) __printflike(1, 2); /* Externs */ extern Boolean Verbose;
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: khorben Date: Wed Sep 11 12:59:19 UTC 2013 Modified Files: src/external/bsd/pkg_install/dist/lib: pkg_signature.c Log Message: Fixed installation of signed packages. Some variables part of struct signature_archive were not initialized properly, therefore randomly failing in the verify_signature_read_cb() callback. Partly closes PR pkg/48194; pkgsrc needs to be updated as well. please commit agc@ XXX pull-up to netbsd-6 To generate a diff of this commit: cvs rdiff -u -r1.1.1.7 -r1.2 \ src/external/bsd/pkg_install/dist/lib/pkg_signature.c 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/pkg_signature.c diff -u src/external/bsd/pkg_install/dist/lib/pkg_signature.c:1.1.1.7 src/external/bsd/pkg_install/dist/lib/pkg_signature.c:1.2 --- src/external/bsd/pkg_install/dist/lib/pkg_signature.c:1.1.1.7 Sat Feb 20 04:41:58 2010 +++ src/external/bsd/pkg_install/dist/lib/pkg_signature.c Wed Sep 11 12:59:19 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pkg_signature.c,v 1.1.1.7 2010/02/20 04:41:58 joerg Exp $ */ +/* $NetBSD: pkg_signature.c,v 1.2 2013/09/11 12:59:19 khorben Exp $ */ #if HAVE_CONFIG_H #include config.h @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include sys/cdefs.h #endif -__RCSID($NetBSD: pkg_signature.c,v 1.1.1.7 2010/02/20 04:41:58 joerg Exp $); +__RCSID($NetBSD: pkg_signature.c,v 1.2 2013/09/11 12:59:19 khorben Exp $); /*- * Copyright (c) 2008 Joerg Sonnenberger jo...@netbsd.org. @@ -325,10 +325,7 @@ pkg_verify_signature(const char *archive *pkgname = NULL; - state = xmalloc(sizeof(*state)); - state-sign_blocks = NULL; - state-sign_buf = NULL; - state-archive = NULL; + state = xcalloc(sizeof(*state), 1); r = read_file_from_archive(archive_name, *archive, entry, HASH_FNAME, hash_file, hash_len);
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: martin Date: Thu May 16 19:19:44 UTC 2013 Modified Files: src/external/bsd/pkg_install/dist/lib: var.c Log Message: var_get_memory(): if no eol is found in the string we set next to NULL, assign it to buf and then check the loop condition by dereferencing it - which does not work well. Change the loop condition to first check for buf == NULL. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/pkg_install/dist/lib/var.c 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/var.c diff -u src/external/bsd/pkg_install/dist/lib/var.c:1.1.1.3 src/external/bsd/pkg_install/dist/lib/var.c:1.2 --- src/external/bsd/pkg_install/dist/lib/var.c:1.1.1.3 Thu Aug 6 16:55:29 2009 +++ src/external/bsd/pkg_install/dist/lib/var.c Thu May 16 19:19:44 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.1.1.3 2009/08/06 16:55:29 joerg Exp $ */ +/* $NetBSD: var.c,v 1.2 2013/05/16 19:19:44 martin Exp $ */ /*- * Copyright (c) 2005, 2008 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ #if HAVE_SYS_CDEFS_H #include sys/cdefs.h #endif -__RCSID($NetBSD: var.c,v 1.1.1.3 2009/08/06 16:55:29 joerg Exp $); +__RCSID($NetBSD: var.c,v 1.2 2013/05/16 19:19:44 martin Exp $); #if HAVE_SYS_STAT_H #include sys/stat.h @@ -156,7 +156,7 @@ var_get_memory(const char *buf, const ch value = NULL; valuelen = 0; - for (; *buf; buf = next) { + for (; buf *buf; buf = next) { if ((eol = strchr(buf, '\n')) != NULL) { next = eol + 1; len = eol - buf;
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Sat Apr 20 15:27:03 UTC 2013 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11015 Log Message: Import pkg_install from current pkgsrc. Licence changes and less warnings when opsys doesn't match build host opsys version, and documentation updates. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20130420 C src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h C src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Sat Apr 20 15:29:23 UTC 2013 Modified Files: src/external/bsd/pkg_install/dist/add: perform.c src/external/bsd/pkg_install/dist/lib: license.c version.h Log Message: Merge pkg_install-20130420. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.9 -r1.10 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/add/perform.c diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.3 src/external/bsd/pkg_install/dist/add/perform.c:1.4 --- src/external/bsd/pkg_install/dist/add/perform.c:1.3 Tue Feb 21 18:27:05 2012 +++ src/external/bsd/pkg_install/dist/add/perform.c Sat Apr 20 15:29:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.3 2012/02/21 18:27:05 wiz Exp $ */ +/* $NetBSD: perform.c,v 1.4 2013/04/20 15:29:22 wiz Exp $ */ #if HAVE_CONFIG_H #include config.h #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include sys/cdefs.h #endif -__RCSID($NetBSD: perform.c,v 1.3 2012/02/21 18:27:05 wiz Exp $); +__RCSID($NetBSD: perform.c,v 1.4 2013/04/20 15:29:22 wiz Exp $); /*- * Copyright (c) 2003 Grant Beattie gr...@netbsd.org @@ -156,6 +156,10 @@ compatible_platform(const char *opsys, c if (strcmp(host, package) == 0) return 1; +/* accept, if host version is a minor release of package version */ +if (strncmp(host, package, strlen(package)) == 0) + return 1; + /* find offset of first difference */ for (i=0; (host[i] != '\0') (host[i] == package[i]);) i++; Index: src/external/bsd/pkg_install/dist/lib/license.c diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.3 src/external/bsd/pkg_install/dist/lib/license.c:1.4 --- src/external/bsd/pkg_install/dist/lib/license.c:1.3 Sun Feb 19 17:49:09 2012 +++ src/external/bsd/pkg_install/dist/lib/license.c Sat Apr 20 15:29:23 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: license.c,v 1.3 2012/02/19 17:49:09 tron Exp $ */ +/* $NetBSD: license.c,v 1.4 2013/04/20 15:29:23 wiz Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger jo...@netbsd.org. @@ -46,32 +46,40 @@ #define HASH_SIZE 521 const char *default_acceptable_licenses = -public-domain unlicense -gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 -gnu-gpl-v1 -gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 -gnu-gpl-v3 gnu-lgpl-v3 -original-bsd modified-bsd 2-clause-bsd -x11 mit miros apache-1.1 apache-2.0 +arphic-public artistic artistic-2.0 +boost-license +cc-by-sa-v3.0 cddl-1.0 cpl-1.0 -open-font-license -mpl-1.0 mpl-1.1 mpl-2.0 -php png-license -postgresql-license -zlib -zpl -python-software-foundation +epl-v1.0 +gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 +gnu-gpl-v1 +gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 +gnu-gpl-v3 gnu-lgpl-v3 +ibm-public-license-1.0 ipafont isc -info-zip -boost-license -mplusfont -cc-by-sa-v3.0 lppl-1.3c -epl-v1.0; +lucent +miros +mit +mpl-1.0 mpl-1.1 mpl-2.0 +mplusfont +ofl-v1.0 ofl-v1.1 +original-bsd modified-bsd 2-clause-bsd +php +png-license +postgresql-license +public-domain +python-software-foundation +qpl-v1.0 +sleepycat-public +unlicense +x11 +zlib +zpl; #ifdef DEBUG static size_t hash_collisions; Index: src/external/bsd/pkg_install/dist/lib/version.h diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.9 src/external/bsd/pkg_install/dist/lib/version.h:1.10 --- src/external/bsd/pkg_install/dist/lib/version.h:1.9 Tue Feb 21 18:27:05 2012 +++ src/external/bsd/pkg_install/dist/lib/version.h Sat Apr 20 15:29:23 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.9 2012/02/21 18:27:05 wiz Exp $ */ +/* $NetBSD: version.h,v 1.10 2013/04/20 15:29:23 wiz 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 20120221 +#define PKGTOOLS_VERSION 20130131 #endif /* _INST_LIB_VERSION_H_ */
CVS commit: src/external/bsd/pkg_install
Module Name:src Committed By: wiz Date: Sat Apr 20 15:30:34 UTC 2013 Modified Files: src/external/bsd/pkg_install: prepare-import.sh Log Message: Fix path. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/prepare-import.sh 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/prepare-import.sh diff -u src/external/bsd/pkg_install/prepare-import.sh:1.3 src/external/bsd/pkg_install/prepare-import.sh:1.4 --- src/external/bsd/pkg_install/prepare-import.sh:1.3 Mon Feb 2 20:47:20 2009 +++ src/external/bsd/pkg_install/prepare-import.sh Sat Apr 20 15:30:34 2013 @@ -1,7 +1,7 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.3 2009/02/02 20:47:20 joerg Exp $ +# $NetBSD: prepare-import.sh,v 1.4 2013/04/20 15:30:34 wiz Exp $ # -# Copy new pkgsrc/pkg_install/files to dist. +# Copy new pkgsrc/pkgtools/pkg_install/files to dist. # Run this script and check for additional files and # directories to prune, only relevant content is included.
CVS commit: src/external/bsd/pkg_install/dist/add
Module Name:src Committed By: wiz Date: Tue Feb 21 13:32:45 UTC 2012 Modified Files: src/external/bsd/pkg_install/dist/add: perform.c Log Message: Fix PR 46068 using the patch by Nicolas Thauvin: pkg_add fails to install a package when subdirectories are missing in the path to package directory in /var/db/pkg. To generate a diff of this commit: cvs rdiff -u -r1.1.1.19 -r1.2 src/external/bsd/pkg_install/dist/add/perform.c 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/add/perform.c diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.1.1.19 src/external/bsd/pkg_install/dist/add/perform.c:1.2 --- src/external/bsd/pkg_install/dist/add/perform.c:1.1.1.19 Sun Feb 19 17:46:46 2012 +++ src/external/bsd/pkg_install/dist/add/perform.c Tue Feb 21 13:32:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.1.1.19 2012/02/19 17:46:46 tron Exp $ */ +/* $NetBSD: perform.c,v 1.2 2012/02/21 13:32:45 wiz Exp $ */ #if HAVE_CONFIG_H #include config.h #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include sys/cdefs.h #endif -__RCSID($NetBSD: perform.c,v 1.1.1.19 2012/02/19 17:46:46 tron Exp $); +__RCSID($NetBSD: perform.c,v 1.2 2012/02/21 13:32:45 wiz Exp $); /*- * Copyright (c) 2003 Grant Beattie gr...@netbsd.org @@ -206,7 +206,7 @@ mkdir_p(const char *path) if (mkdir(p, 0777) == -1) { saved_errno = errno; - if (stat(path, sb) == 0) { + if (stat(p, sb) == 0) { if (S_ISDIR(sb.st_mode)) goto pass; errno = ENOTDIR;
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Tue Feb 21 18:25:20 UTC 2012 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26448 Log Message: Import pkg_install-20120221 for joerg. Bug fix already there, this just bumps version. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20120221 C src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.1.in U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Tue Feb 21 18:27:05 UTC 2012 Modified Files: src/external/bsd/pkg_install/dist/add: perform.c src/external/bsd/pkg_install/dist/lib: version.h Log Message: melt snowflakes To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.8 -r1.9 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/add/perform.c diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.2 src/external/bsd/pkg_install/dist/add/perform.c:1.3 --- src/external/bsd/pkg_install/dist/add/perform.c:1.2 Tue Feb 21 13:32:45 2012 +++ src/external/bsd/pkg_install/dist/add/perform.c Tue Feb 21 18:27:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.2 2012/02/21 13:32:45 wiz Exp $ */ +/* $NetBSD: perform.c,v 1.3 2012/02/21 18:27:05 wiz Exp $ */ #if HAVE_CONFIG_H #include config.h #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include sys/cdefs.h #endif -__RCSID($NetBSD: perform.c,v 1.2 2012/02/21 13:32:45 wiz Exp $); +__RCSID($NetBSD: perform.c,v 1.3 2012/02/21 18:27:05 wiz Exp $); /*- * Copyright (c) 2003 Grant Beattie gr...@netbsd.org Index: src/external/bsd/pkg_install/dist/lib/version.h diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.8 src/external/bsd/pkg_install/dist/lib/version.h:1.9 --- src/external/bsd/pkg_install/dist/lib/version.h:1.8 Sun Feb 19 17:49:09 2012 +++ src/external/bsd/pkg_install/dist/lib/version.h Tue Feb 21 18:27:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.8 2012/02/19 17:49:09 tron Exp $ */ +/* $NetBSD: version.h,v 1.9 2012/02/21 18:27:05 wiz 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 20120128 +#define PKGTOOLS_VERSION 20120221 #endif /* _INST_LIB_VERSION_H_ */
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Tue Feb 21 18:34:05 UTC 2012 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12873 Log Message: Import pkg_install-20120221 after merging changes from here, to simplify next import. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20120221b U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 C src/external/bsd/pkg_install/dist/bpm/bpm.1 C src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 C src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c C src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Tue Feb 21 18:36:17 UTC 2012 Modified Files: src/external/bsd/pkg_install/dist/bpm: bpm.1 bpm.sh.in src/external/bsd/pkg_install/dist/info: show.c src/external/bsd/pkg_install/dist/lib: defs.h Removed Files: src/external/bsd/pkg_install/dist/admin: README src/external/bsd/pkg_install/dist/delete: pkg_delete.1.in Log Message: melt more snowflakes until they all look like pkgsrc To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/admin/README cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/bpm/bpm.1 \ src/external/bsd/pkg_install/dist/bpm/bpm.sh.in cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.1.in cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/show.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/defs.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/bpm/bpm.1 diff -u src/external/bsd/pkg_install/dist/bpm/bpm.1:1.2 src/external/bsd/pkg_install/dist/bpm/bpm.1:1.3 --- src/external/bsd/pkg_install/dist/bpm/bpm.1:1.2 Sun Oct 18 03:53:32 2009 +++ src/external/bsd/pkg_install/dist/bpm/bpm.1 Tue Feb 21 18:36:16 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: bpm.1,v 1.2 2009/10/18 03:53:32 agc Exp $ */ +.\ $NetBSD: bpm.1,v 1.3 2012/02/21 18:36:16 wiz Exp $ */ .\ .\ Copyright (c) 2003,2009 The NetBSD Foundation, Inc. .\ All rights reserved. Index: src/external/bsd/pkg_install/dist/bpm/bpm.sh.in diff -u src/external/bsd/pkg_install/dist/bpm/bpm.sh.in:1.2 src/external/bsd/pkg_install/dist/bpm/bpm.sh.in:1.3 --- src/external/bsd/pkg_install/dist/bpm/bpm.sh.in:1.2 Sun Oct 18 03:53:32 2009 +++ src/external/bsd/pkg_install/dist/bpm/bpm.sh.in Tue Feb 21 18:36:16 2012 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: bpm.sh.in,v 1.2 2009/10/18 03:53:32 agc Exp $ +# $NetBSD: bpm.sh.in,v 1.3 2012/02/21 18:36:16 wiz Exp $ # # Copyright (c) 2003,2009 The NetBSD Foundation, Inc. # All rights reserved. Index: src/external/bsd/pkg_install/dist/info/show.c diff -u src/external/bsd/pkg_install/dist/info/show.c:1.2 src/external/bsd/pkg_install/dist/info/show.c:1.3 --- src/external/bsd/pkg_install/dist/info/show.c:1.2 Tue Aug 16 08:29:15 2011 +++ src/external/bsd/pkg_install/dist/info/show.c Tue Feb 21 18:36:16 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: show.c,v 1.2 2011/08/16 08:29:15 christos Exp $ */ +/* $NetBSD: show.c,v 1.3 2012/02/21 18:36:16 wiz Exp $ */ #if HAVE_CONFIG_H #include config.h @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include sys/cdefs.h #endif -__RCSID($NetBSD: show.c,v 1.2 2011/08/16 08:29:15 christos Exp $); +__RCSID($NetBSD: show.c,v 1.3 2012/02/21 18:36:16 wiz Exp $); /* * FreeBSD install - a package for the installation and maintainance Index: src/external/bsd/pkg_install/dist/lib/defs.h diff -u src/external/bsd/pkg_install/dist/lib/defs.h:1.2 src/external/bsd/pkg_install/dist/lib/defs.h:1.3 --- src/external/bsd/pkg_install/dist/lib/defs.h:1.2 Sun Oct 18 03:53:32 2009 +++ src/external/bsd/pkg_install/dist/lib/defs.h Tue Feb 21 18:36:17 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.2 2009/10/18 03:53:32 agc Exp $ */ +/* $NetBSD: defs.h,v 1.3 2012/02/21 18:36:17 wiz Exp $ */ /*- * Copyright (c) 1999,2000,2009 The NetBSD Foundation, Inc.
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: tron Date: Sun Feb 19 17:46:50 UTC 2012 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14310 Log Message: Update pkg_install to version 20120128: - pkg_install 20120128: - Explicitly stat(2) if mkdir failed. errno detection doesn't work e.g. on Solaris. - Provide a stable order for package names that only differe in the base name, not the version number. - pkg_install 20110805: - Fix for pkg_delete on NFS from Anthony Mallet. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20120128 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h C src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c C src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: tron Date: Sun Feb 19 17:49:09 UTC 2012 Modified Files: src/external/bsd/pkg_install/dist/lib: license.c pkg_summary.5 version.h Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/pkg_summary.5 cvs rdiff -u -r1.7 -r1.8 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/license.c diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.2 src/external/bsd/pkg_install/dist/lib/license.c:1.3 --- src/external/bsd/pkg_install/dist/lib/license.c:1.2 Fri Apr 22 08:19:25 2011 +++ src/external/bsd/pkg_install/dist/lib/license.c Sun Feb 19 17:49:09 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: license.c,v 1.2 2011/04/22 08:19:25 adam Exp $ */ +/* $NetBSD: license.c,v 1.3 2012/02/19 17:49:09 tron Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger jo...@netbsd.org. @@ -46,8 +46,9 @@ #define HASH_SIZE 521 const char *default_acceptable_licenses = -public-domain +public-domain unlicense gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 +gnu-gpl-v1 gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 gnu-gpl-v3 gnu-lgpl-v3 original-bsd modified-bsd 2-clause-bsd @@ -57,15 +58,20 @@ const char *default_acceptable_licenses cddl-1.0 cpl-1.0 open-font-license -mpl-1.0 mpl-1.1 -png-license +mpl-1.0 mpl-1.1 mpl-2.0 +php png-license postgresql-license +zlib zpl python-software-foundation ipafont isc info-zip -boost-license; +boost-license +mplusfont +cc-by-sa-v3.0 +lppl-1.3c +epl-v1.0; #ifdef DEBUG static size_t hash_collisions; Index: src/external/bsd/pkg_install/dist/lib/pkg_summary.5 diff -u src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.3 src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.4 --- src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.3 Sun May 17 21:31:59 2009 +++ src/external/bsd/pkg_install/dist/lib/pkg_summary.5 Sun Feb 19 17:49:09 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: pkg_summary.5,v 1.3 2009/05/17 21:31:59 joerg Exp $ +.\ $NetBSD: pkg_summary.5,v 1.4 2012/02/19 17:49:09 tron Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation .\ @@ -66,6 +66,10 @@ If missing, this package has no dependen .It Ev DESCRIPTION (required) A more detailed description of the package. .\ DIGEST +.It Ev FILE_CKSUM +(optional) A checksum type supported by +.Xr digest 1 +and checksum separated by space character. .It Ev FILE_NAME (optional) The name of the binary package file. If not given, @@ -126,6 +130,7 @@ For example, the following will list thi .Pp .Dl pkg_info -X -a .Sh SEE ALSO +.Xr digest 1 , .Xr pkg_info 1 .Sh HISTORY The Index: src/external/bsd/pkg_install/dist/lib/version.h diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.7 src/external/bsd/pkg_install/dist/lib/version.h:1.8 --- src/external/bsd/pkg_install/dist/lib/version.h:1.7 Fri Feb 18 22:36:00 2011 +++ src/external/bsd/pkg_install/dist/lib/version.h Sun Feb 19 17:49:09 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.7 2011/02/18 22:36:00 aymeric Exp $ */ +/* $NetBSD: version.h,v 1.8 2012/02/19 17:49:09 tron 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 20110215 +#define PKGTOOLS_VERSION 20120128 #endif /* _INST_LIB_VERSION_H_ */
CVS commit: src/external/bsd/pkg_install/dist/info
Module Name:src Committed By: christos Date: Tue Aug 16 08:29:16 UTC 2011 Modified Files: src/external/bsd/pkg_install/dist/info: show.c Log Message: avoid non-literal strings. To generate a diff of this commit: cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/pkg_install/dist/info/show.c 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/info/show.c diff -u src/external/bsd/pkg_install/dist/info/show.c:1.1.1.8 src/external/bsd/pkg_install/dist/info/show.c:1.2 --- src/external/bsd/pkg_install/dist/info/show.c:1.1.1.8 Fri Feb 18 17:32:30 2011 +++ src/external/bsd/pkg_install/dist/info/show.c Tue Aug 16 04:29:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: show.c,v 1.1.1.8 2011/02/18 22:32:30 aymeric Exp $ */ +/* $NetBSD: show.c,v 1.2 2011/08/16 08:29:15 christos Exp $ */ #if HAVE_CONFIG_H #include config.h @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include sys/cdefs.h #endif -__RCSID($NetBSD: show.c,v 1.1.1.8 2011/02/18 22:32:30 aymeric Exp $); +__RCSID($NetBSD: show.c,v 1.2 2011/08/16 08:29:15 christos Exp $); /* * FreeBSD install - a package for the installation and maintainance @@ -77,24 +77,24 @@ * pl_ent_t constants */ static const show_t showv[] = { - {PLIST_FILE, %s, \tFile: %s}, - {PLIST_CWD, @cwd %s, \tCWD to: %s}, - {PLIST_CMD, @exec %s, \tEXEC '%s'}, - {PLIST_CHMOD, @chmod %s, \tCHMOD to %s}, - {PLIST_CHOWN, @chown %s, \tCHOWN to %s}, - {PLIST_CHGRP, @chgrp %s, \tCHGRP to %s}, - {PLIST_COMMENT, @comment %s, \tComment: %s}, + {PLIST_FILE, , \tFile: }, + {PLIST_CWD, @cwd , \tCWD to: }, + {PLIST_CMD, @exec , \tEXEC ''}, + {PLIST_CHMOD, @chmod , \tCHMOD to }, + {PLIST_CHOWN, @chown , \tCHOWN to }, + {PLIST_CHGRP, @chgrp , \tCHGRP to }, + {PLIST_COMMENT, @comment , \tComment: }, {PLIST_IGNORE, @ignore, Ignore next file:}, - {PLIST_NAME, @name %s, \tPackage name: %s}, - {PLIST_UNEXEC, @unexec %s, \tUNEXEC '%s'}, - {PLIST_SRC, @src: %s, \tSRC to: %s}, - {PLIST_DISPLAY, @display %s, \tInstall message file: %s}, - {PLIST_PKGDEP, @pkgdep %s, \tPackage depends on: %s}, - {PLIST_DIR_RM, @dirrm %s, \tObsolete deinstall directory removal hint: %s}, - {PLIST_OPTION, @option %s, \tPackage has option: %s}, - {PLIST_PKGCFL, @pkgcfl %s, \tPackage conflicts with: %s}, - {PLIST_BLDDEP, @blddep %s, \tPackage depends exactly on: %s}, - {PLIST_PKGDIR, @pkgdir %s, \tManaged directory: %s}, + {PLIST_NAME, @name , \tPackage name: }, + {PLIST_UNEXEC, @unexec , \tUNEXEC ''}, + {PLIST_SRC, @src: , \tSRC to: }, + {PLIST_DISPLAY, @display , \tInstall message file: }, + {PLIST_PKGDEP, @pkgdep , \tPackage depends on: }, + {PLIST_DIR_RM, @dirrm , \tObsolete deinstall directory removal hint: }, + {PLIST_OPTION, @option , \tPackage has option: }, + {PLIST_PKGCFL, @pkgcfl , \tPackage conflicts with: }, + {PLIST_BLDDEP, @blddep , \tPackage depends exactly on: }, + {PLIST_PKGDIR, @pkgdir , \tManaged directory: }, {-1, NULL, NULL} }; @@ -163,7 +163,9 @@ if (p-type == type || type == PLIST_SHOW_ALL) { switch (p-type) { case PLIST_FILE: -printf(Quiet ? showv[p-type].sh_quiet : showv[p-type].sh_verbose, p-name); +printf(%s%s, +Quiet ? showv[p-type].sh_quiet : +showv[p-type].sh_verbose, p-name); if (ign) { if (!Quiet) { printf( (ignored)); @@ -174,11 +176,14 @@ case PLIST_CHMOD: case PLIST_CHOWN: case PLIST_CHGRP: -printf(Quiet ? showv[p-type].sh_quiet : showv[p-type].sh_verbose, +printf(%s%s, +Quiet ? showv[p-type].sh_quiet : +showv[p-type].sh_verbose, p-name ? p-name : (clear default)); break; case PLIST_IGNORE: -printf(Quiet ? showv[p-type].sh_quiet : showv[p-type].sh_verbose); +printf(%s, Quiet ? showv[p-type].sh_quiet : +showv[p-type].sh_verbose); ign = TRUE; break; case PLIST_CWD: @@ -194,8 +199,10 @@ case PLIST_PKGCFL: case PLIST_BLDDEP: case PLIST_PKGDIR: -printf(Quiet ? showv[p-type].sh_quiet : showv[p-type].sh_verbose, - (p-name) ? p-name : (null)); +printf(%s%s, +Quiet ? showv[p-type].sh_quiet : +showv[p-type].sh_verbose, +p-name ? p-name : (null)); break; default: warnx(unknown command type %d (%s), p-type, p-name);
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: adam Date: Fri Apr 22 08:19:25 UTC 2011 Modified Files: src/external/bsd/pkg_install/dist/lib: license.c Log Message: Added postgresql-license To generate a diff of this commit: cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/pkg_install/dist/lib/license.c 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/license.c diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.10 src/external/bsd/pkg_install/dist/lib/license.c:1.2 --- src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.10 Fri Feb 18 22:32:30 2011 +++ src/external/bsd/pkg_install/dist/lib/license.c Fri Apr 22 08:19:25 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: license.c,v 1.1.1.10 2011/02/18 22:32:30 aymeric Exp $ */ +/* $NetBSD: license.c,v 1.2 2011/04/22 08:19:25 adam Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger jo...@netbsd.org. @@ -59,6 +59,7 @@ open-font-license mpl-1.0 mpl-1.1 png-license +postgresql-license zpl python-software-foundation ipafont
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: aymeric Date: Fri Feb 18 22:32:34 UTC 2011 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29353 Log Message: Import pkg_install 20110215. --- 20110215: Fix audit-history subcommand to include patterns making use of [x-y] notation. --- 20101212: Don't warn about _ALPHA, _BETA, _PATCH, _RC, _STABLE mismatches when pkg_add'ing on NetBSD. --- 20101122: Fix crash in pkg_info -X on hand-written packages. --- 20100915: Allow https URLs. --- 20100914: Add -D flag to pkg_install, to override the pkg_add -U check that all depending packages have their dependencies satisfied by the new package. Essentially, split off this particular behavior as a special case of -f, so that -f works as before, unforced works as before, and one can give -D to override exactly this check, leaving all other checks intact. The -D flag is in support of make replace, as the workflow for make replace is that inter-package dependencies are sometimes violated (but then one must replace the depending packages, which is what pkg_rolling-replace does via the unsafe_depends flags). Add missing break statement in option parsing of pkg_add -C, riding the version bump. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20110215 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/sbin
Module Name:src Committed By: he Date: Fri Nov 5 09:09:01 UTC 2010 Modified Files: src/external/bsd/pkg_install/sbin: Makefile.inc Log Message: New pkg_install requires -llzma, so to support static linking, be explicit about what libraries are required, and not only depend on shared library inter-dependencies to pull that in. Fixes the build for sun2. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/sbin/Makefile.inc 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/sbin/Makefile.inc diff -u src/external/bsd/pkg_install/sbin/Makefile.inc:1.2 src/external/bsd/pkg_install/sbin/Makefile.inc:1.3 --- src/external/bsd/pkg_install/sbin/Makefile.inc:1.2 Mon Feb 2 20:47:21 2009 +++ src/external/bsd/pkg_install/sbin/Makefile.inc Fri Nov 5 09:09:01 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 2009/02/02 20:47:21 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.3 2010/11/05 09:09:01 he Exp $ .include bsd.own.mk @@ -20,3 +20,6 @@ DPADD+= ${LIBZ} ${LIBBZ2} LDADD+= -lz -lbz2 + +DPADD+= ${LIBLZMA} +LDADD+= -llzma
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Sat Jun 26 00:14:35 UTC 2010 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28981 Log Message: pkg_install-20100616: - Recognize -C for pkg_add like the rest of the tools do - Do the existing check for pkg_add -f, it makes the combination of -f and -U a bit less surprising - Fix option handling for CHECK_VULNERABILITIES (from spz@) - Make end-of-life check the default. pkg_install.conf(5) can be used to override the default. The existing admin -e co continue to work as before. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20100616 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c C src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/dist/lib
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_ */
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Fri Apr 23 20:54:17 UTC 2010 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8316 Log Message: pkg_install-20100421: Fix an off-by-one in the check for properly sized pkgdb entries. It rejected perfectly valid entries. Extract dependencies of libarchive from the pkgconfig file and thereby drop knowledge of the needed libraries. At least some versions of HP-UX are known to not support %zu, add a workaround. This is using the black list approach for now. Recognize xz as compression type for pkg_create. The first time an error is hit while fetching packages, try to reget from the same position. This works around the server closing the connection while fetching dependencies. Try to detect common forms of pkgdb corruption and issue a warning in that case. Refactor the pkg_vulnerabilities logic to use the compression support from libarchive. This reduces the amount zlib/bzip2 interaction to the linkage. Add man pages for audit-packages and download-vulnerability-list which point to pkg_admin and notes that the scripts are obsolete. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20100421 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h N src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c N src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c C src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/dist/lib
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 *); voidfree_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_ */
CVS commit: src/external/bsd/pkg_install/lib
Module Name:src Committed By: joerg Date: Fri Apr 23 20:56:01 UTC 2010 Modified Files: src/external/bsd/pkg_install/lib: Makefile config.h Log Message: Update build glue for pkg_install-20100421 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/pkg_install/lib/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/pkg_install/lib/config.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/lib/Makefile diff -u src/external/bsd/pkg_install/lib/Makefile:1.8 src/external/bsd/pkg_install/lib/Makefile:1.9 --- src/external/bsd/pkg_install/lib/Makefile:1.8 Thu Aug 6 16:57:20 2009 +++ src/external/bsd/pkg_install/lib/Makefile Fri Apr 23 20:56:01 2010 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2009/08/06 16:57:20 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2010/04/23 20:56:01 joerg Exp $ # Original from FreeBSD, no rcs id. LIBISPRIVATE= yes LIB= install -SRCS= automatic.c conflicts.c decompress.c dewey.c \ +SRCS= automatic.c conflicts.c dewey.c \ fexec.c file.c global.c gpgsig.c iterate.c license.c lpkg.c \ opattern.c parse-config.c pkcs7.c pkg_signature.c \ pkgdb.c pkg_io.c plist.c remove.c \ Index: src/external/bsd/pkg_install/lib/config.h diff -u src/external/bsd/pkg_install/lib/config.h:1.1 src/external/bsd/pkg_install/lib/config.h:1.2 --- src/external/bsd/pkg_install/lib/config.h:1.1 Tue Sep 30 19:19:56 2008 +++ src/external/bsd/pkg_install/lib/config.h Fri Apr 23 20:56:01 2010 @@ -4,24 +4,9 @@ /* Define to 1 if you have the assert.h header file. */ #define HAVE_ASSERT_H 1 -/* Define to 1 if you have the `chflags' function. */ -#define HAVE_CHFLAGS 1 - /* Define to 1 if you have the ctype.h header file. */ #define HAVE_CTYPE_H 1 -/* Define to 1 if you have the db1/db.h header file. */ -/* #undef HAVE_DB1_DB_H */ - -/* Define to 1 if you have the `dbopen' function. */ -#define HAVE_DBOPEN 1 - -/* Define to 1 if you have the db_185.h header file. */ -/* #undef HAVE_DB_185_H */ - -/* Define to 1 if you have the db.h header file. */ -#define HAVE_DB_H 1 - /* Define to 1 if you have the dirent.h header file. */ #define HAVE_DIRENT_H 1 @@ -37,9 +22,6 @@ /* Define to 1 if you have the fnmatch.h header file. */ #define HAVE_FNMATCH_H 1 -/* Define to 1 if you have the `getrlimit' function. */ -#define HAVE_GETRLIMIT 1 - /* Define to 1 if you have the glob.h header file. */ #define HAVE_GLOB_H 1 @@ -58,18 +40,9 @@ /* Define to 1 if you have the memory.h header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the netdb.h header file. */ -#define HAVE_NETDB_H 1 - /* Define to 1 if you have the pwd.h header file. */ #define HAVE_PWD_H 1 -/* Define to 1 if you have the regex.h header file. */ -#define HAVE_REGEX_H 1 - -/* Define to 1 if you have the `setrlimit' function. */ -#define HAVE_SETRLIMIT 1 - /* Define to 1 if you have the signal.h header file. */ #define HAVE_SIGNAL_H 1 @@ -103,21 +76,9 @@ /* Define to 1 if you have the sys/param.h header file. */ #define HAVE_SYS_PARAM_H 1 -/* Define to 1 if you have the sys/poll.h header file. */ -#define HAVE_SYS_POLL_H 1 - /* Define to 1 if you have the sys/queue.h header file. */ #define HAVE_SYS_QUEUE_H 1 -/* Define to 1 if you have the sys/resource.h header file. */ -#define HAVE_SYS_RESOURCE_H 1 - -/* Define to 1 if you have the sys/signal.h header file. */ -#define HAVE_SYS_SIGNAL_H 1 - -/* Define to 1 if you have the sys/statvfs.h header file. */ -#define HAVE_SYS_STATVFS_H 1 - /* Define to 1 if you have the sys/stat.h header file. */ #define HAVE_SYS_STAT_H 1 @@ -130,21 +91,9 @@ /* Define to 1 if you have the sys/utsname.h header file. */ #define HAVE_SYS_UTSNAME_H 1 -/* Define to 1 if you have the sys/vfs.h header file. */ -/* #undef HAVE_SYS_VFS_H */ - /* Define to 1 if you have the sys/wait.h header file. */ #define HAVE_SYS_WAIT_H 1 -/* Define to 1 if you have the termcap.h header file. */ -#define HAVE_TERMCAP_H 1 - -/* Define to 1 if you have the termios.h header file. */ -#define HAVE_TERMIOS_H 1 - -/* Define to 1 if you have the `tgetent' function. */ -#define HAVE_TGETENT 1 - /* Define to 1 if you have the time.h header file. */ #define HAVE_TIME_H 1 @@ -157,8 +106,8 @@ /* Define to 1 if you have the vis.h header file. */ #define HAVE_VIS_H 1 -/* Define to 1 if you have the `__db185_open' function. */ -/* #undef HAVE___DB185_OPEN */ +/* Define to 1 if the `z' modifider for printf is missing. */ +/* #undef MISSING_SIZE_T_SUPPORT */ /* Defined when PRIu64 is missing or broken */ /* #undef NEED_PRI_MACRO */ @@ -173,13 +122,16 @@ #define PACKAGE_NAME pkg_install /* Define to the full name and version of this package. */ -#define PACKAGE_STRING pkg_install 20070804 +#define PACKAGE_STRING pkg_install 20090911 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME pkg_install
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Sat Feb 20 04:42:00 UTC 2010 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10033 Log Message: nstall-20100220: Try harder to give the user an idea which file failed. Addresses PR 42223. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20100220 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c C src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: joerg Date: Sat Feb 20 04:44:59 UTC 2010 Modified Files: src/external/bsd/pkg_install/dist/lib: lib.h version.h Log Message: Merge To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 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.3 src/external/bsd/pkg_install/dist/lib/lib.h:1.4 --- src/external/bsd/pkg_install/dist/lib/lib.h:1.3 Wed Feb 3 19:31:49 2010 +++ src/external/bsd/pkg_install/dist/lib/lib.h Sat Feb 20 04:44:59 2010 @@ -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 Index: src/external/bsd/pkg_install/dist/lib/version.h diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.3 src/external/bsd/pkg_install/dist/lib/version.h:1.4 --- src/external/bsd/pkg_install/dist/lib/version.h:1.3 Wed Feb 3 19:31:49 2010 +++ src/external/bsd/pkg_install/dist/lib/version.h Sat Feb 20 04:44:59 2010 @@ -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_ */
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Sat Jan 30 21:33:58 UTC 2010 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23844 Log Message: pkg_install-20100130: - pkg_add -U to rplace an installed version - refactored man pages - PKG_DBDIR / PKG_REFCOUNT_DBDIR as pkg_install.conf options - synced license list - use connection cache from libfetch Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20100130 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c N src/external/bsd/pkg_install/dist/delete/pkg_delete.1.in U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Thu Nov 5 18:39:18 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25874 Log Message: pkg_install-20091115: Completely ignore @src in pkg_create. Silently ignore the -L option. The combination of -I and -p are used by pkgsrc for the same result. Do not overwrite a string with itself using snprintf. This breaks setting the pkgdb directory internally on Linux. Explicitly check if the string is the same and otherwise just use xstrdup. Add support to query arbitrary variables with pkg_admin config-var. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20091115 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: agc Date: Sun Oct 18 03:53:32 UTC 2009 Modified Files: src/external/bsd/pkg_install/dist/bpm: bpm.1 bpm.sh.in src/external/bsd/pkg_install/dist/lib: defs.h Log Message: Move to a 2-clause BSD license To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/pkg_install/dist/bpm/bpm.1 cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/pkg_install/dist/bpm/bpm.sh.in cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/pkg_install/dist/lib/defs.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/bpm/bpm.1 diff -u src/external/bsd/pkg_install/dist/bpm/bpm.1:1.1.1.2 src/external/bsd/pkg_install/dist/bpm/bpm.1:1.2 --- src/external/bsd/pkg_install/dist/bpm/bpm.1:1.1.1.2 Sat Feb 14 17:19:13 2009 +++ src/external/bsd/pkg_install/dist/bpm/bpm.1 Sun Oct 18 03:53:32 2009 @@ -1,7 +1,10 @@ -.\ $NetBSD: bpm.1,v 1.1.1.2 2009/02/14 17:19:13 joerg Exp $ */ +.\ $NetBSD: bpm.1,v 1.2 2009/10/18 03:53:32 agc Exp $ */ .\ +.\ Copyright (c) 2003,2009 The NetBSD Foundation, Inc. +.\ All rights reserved. .\ -.\ Copyright (c) 2003 Alistair G. Crooks. All rights reserved. +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Alistair Crooks (a...@netbsd.org) .\ .\ Redistribution and use in source and binary forms, with or without .\ modification, are permitted provided that the following conditions @@ -11,24 +14,18 @@ .\ 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. -.\ 3. All advertising materials mentioning features or use of this software -.\must display the following acknowledgement: -.\ This product includes software developed by Alistair G. Crooks. -.\ 4. The name of the author may not be used to endorse or promote -.\products derived from this software without specific prior written -.\permission. .\ -.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS -.\ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -.\ WARRANTIES 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. +.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\ 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. .\ .Dd August 3, 2007 .Dt BPM 1 Index: src/external/bsd/pkg_install/dist/bpm/bpm.sh.in diff -u src/external/bsd/pkg_install/dist/bpm/bpm.sh.in:1.1.1.1 src/external/bsd/pkg_install/dist/bpm/bpm.sh.in:1.2 --- src/external/bsd/pkg_install/dist/bpm/bpm.sh.in:1.1.1.1 Tue Sep 30 19:00:26 2008 +++ src/external/bsd/pkg_install/dist/bpm/bpm.sh.in Sun Oct 18 03:53:32 2009 @@ -1,8 +1,12 @@ #! /bin/sh # -# $NetBSD: bpm.sh.in,v 1.1.1.1 2008/09/30 19:00:26 joerg Exp $ +# $NetBSD: bpm.sh.in,v 1.2 2009/10/18 03:53:32 agc Exp $ # -# Copyright (c) 2003 Alistair G. Crooks. All rights reserved. +# Copyright (c) 2003,2009 The NetBSD Foundation, Inc. +# All rights reserved. +# +# This code is derived from software contributed to The NetBSD Foundation +# by Alistair Crooks (a...@netbsd.org) # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -12,24 +16,18 @@ # 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. -# 3. All advertising materials mentioning features or use of this software -#must display the following acknowledgement: -# This product
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Thu Oct 15 13:01:28 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19636 Log Message: pkg_install-20091015: Use directory index caching by default. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20091015 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Thu Oct 8 16:20:06 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27949 Log Message: pkg_install-20091008: - Fix German accent - Don't dereference a null pointer for pkg_admin add Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20091008 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Thu Aug 6 16:55:32 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4128 Log Message: Import pkg_install-20090806: - pkg_add: add support to check license conditions before installation - pkg_delete: add -k option to skip over preserve packages. - WARNS=4 clean, fix some potential uses of uninitialized variables Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20090806 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Sun Jun 14 23:31:51 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14692 Log Message: Update to pkg_install-20090610: Improve diagnostic of the license code. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20090610 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Thu May 28 09:01:02 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11613 Log Message: Import pkg_install-20090528: Reenable extraction of ownership from tarballs. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20090528 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Wed May 27 22:41:39 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12076 Log Message: Import pkg_install-200927: - pkg_info -r provides topological sorting - sync license list with pkgsrc/mk/licenses.mk Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20090527 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Sun May 17 21:21:10 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9098 Log Message: Import pkg_install-20090513: - Make compression type selection in pkg_create optionally explicit. - PREV_PKGPATH / SUPERSEDES Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20090513 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c C src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: joerg Date: Sun May 17 21:31:59 UTC 2009 Modified Files: src/external/bsd/pkg_install/dist/lib: pkg_summary.5 Log Message: Merge for pkg_install-20090513. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/pkg_summary.5 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/pkg_summary.5 diff -u src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.2 src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.3 --- src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.2 Tue Feb 3 05:16:08 2009 +++ src/external/bsd/pkg_install/dist/lib/pkg_summary.5 Sun May 17 21:31:59 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: pkg_summary.5,v 1.2 2009/02/03 05:16:08 wiz Exp $ +.\ $NetBSD: pkg_summary.5,v 1.3 2009/05/17 21:31:59 joerg Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation .\ @@ -27,7 +27,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd August 29, 2007 +.Dd April 11, 2009 .Dt PKG_SUMMARY 5 .Os .Sh NAME @@ -94,6 +94,12 @@ (required) The path of the package directory within pkgsrc. .It Ev PKGTOOLS_VERSION (required) The version of the package tools used to create the package. +.It Ev PREV_PKGPATH +(optional) The previous path of the package directory within pkgsrc when +a package was moved. +(See +.Ev SUPERSEDES +below for a renamed package.) .It Ev PROVIDES (optional) A list of shared libraries provided by the package, including major version number, one per line. @@ -104,6 +110,10 @@ If missing, this package does not require shared libraries. .It Ev SIZE_PKG (required) The size of the package when installed, in bytes. +.It Ev SUPERSEDES +(optional) A list of dewey patterns of previous packages this +package replaces, one per line. +This is used for package renaming. .El .Pp The
CVS commit: src/external/bsd/pkg_install/lib
Module Name:src Committed By: joerg Date: Sun Apr 26 14:18:44 UTC 2009 Modified Files: src/external/bsd/pkg_install/lib: Makefile Log Message: Update build system for pkg_install-20090425. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/lib/Makefile 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/lib/Makefile diff -u src/external/bsd/pkg_install/lib/Makefile:1.6 src/external/bsd/pkg_install/lib/Makefile:1.7 --- src/external/bsd/pkg_install/lib/Makefile:1.6 Sat Feb 28 19:36:32 2009 +++ src/external/bsd/pkg_install/lib/Makefile Sun Apr 26 14:18:44 2009 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2009/02/28 19:36:32 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2009/04/26 14:18:44 joerg Exp $ # Original from FreeBSD, no rcs id. LIBISPRIVATE= yes LIB= install SRCS= automatic.c conflicts.c decompress.c dewey.c \ - fexec.c file.c global.c gpgsig.c iterate.c lpkg.c \ + fexec.c file.c global.c gpgsig.c iterate.c license.c lpkg.c \ opattern.c parse-config.c pkcs7.c pkg_signature.c \ pkgdb.c pkg_io.c plist.c remove.c \ str.c version.c var.c vulnerabilities-file.c xwrapper.c