Module Name: src Committed By: yamt Date: Thu May 22 15:51:04 UTC 2014
Modified Files: src/external/bsd/pkg_install [yamt-pagecache]: prepare-import.sh src/external/bsd/pkg_install/dist/add [yamt-pagecache]: perform.c src/external/bsd/pkg_install/dist/admin [yamt-pagecache]: pkg_admin.1 src/external/bsd/pkg_install/dist/bpm [yamt-pagecache]: bpm.1 src/external/bsd/pkg_install/dist/info [yamt-pagecache]: main.c pkg_info.1 src/external/bsd/pkg_install/dist/lib [yamt-pagecache]: lib.h license.c pkg_install.conf.5.in pkg_signature.c var.c version.h Log Message: sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.12.1 src/external/bsd/pkg_install/prepare-import.sh cvs rdiff -u -r1.1.1.18.4.1 -r1.1.1.18.4.2 \ src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.1.1.11 -r1.1.1.11.6.1 \ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/pkg_install/dist/bpm/bpm.1 cvs rdiff -u -r1.1.1.8 -r1.1.1.8.6.1 \ src/external/bsd/pkg_install/dist/info/main.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.6.1 \ src/external/bsd/pkg_install/dist/info/pkg_info.1 cvs rdiff -u -r1.6 -r1.6.6.1 src/external/bsd/pkg_install/dist/lib/lib.h cvs rdiff -u -r1.2.4.1 -r1.2.4.2 \ src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.1.1.12 -r1.1.1.12.4.1 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in cvs rdiff -u -r1.1.1.7 -r1.1.1.7.6.1 \ src/external/bsd/pkg_install/dist/lib/pkg_signature.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.6.1 \ src/external/bsd/pkg_install/dist/lib/var.c cvs rdiff -u -r1.7.4.1 -r1.7.4.2 \ 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/prepare-import.sh diff -u src/external/bsd/pkg_install/prepare-import.sh:1.3 src/external/bsd/pkg_install/prepare-import.sh:1.3.12.1 --- 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 Thu May 22 15:51:03 2014 @@ -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.3.12.1 2014/05/22 15:51:03 yamt 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. Index: src/external/bsd/pkg_install/dist/add/perform.c diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.1.1.18.4.1 src/external/bsd/pkg_install/dist/add/perform.c:1.1.1.18.4.2 --- src/external/bsd/pkg_install/dist/add/perform.c:1.1.1.18.4.1 Tue Apr 17 00:04:06 2012 +++ src/external/bsd/pkg_install/dist/add/perform.c Thu May 22 15:51:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.1.1.18.4.1 2012/04/17 00:04:06 yamt Exp $ */ +/* $NetBSD: perform.c,v 1.1.1.18.4.2 2014/05/22 15:51:03 yamt 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.18.4.1 2012/04/17 00:04:06 yamt Exp $"); +__RCSID("$NetBSD: perform.c,v 1.1.1.18.4.2 2014/05/22 15:51:03 yamt 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/admin/pkg_admin.1 diff -u src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.11 src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.11.6.1 --- src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.11 Sat Jun 26 00:14:27 2010 +++ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 Thu May 22 15:51:03 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_admin.1,v 1.1.1.11 2010/06/26 00:14:27 joerg Exp $ +.\" $NetBSD: pkg_admin.1,v 1.1.1.11.6.1 2014/05/22 15:51:03 yamt Exp $ .\" .\" Copyright (c) 1999-2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 16, 2010 +.Dd December 14, 2012 .Dt PKG_ADMIN 1 .Os .Sh NAME @@ -257,7 +257,9 @@ matches .Ar pattern , otherwise returns false. .It Cm rebuild -Rebuild the package database mapping from scratch. +Rebuild the package database mapping from scratch, using the +.Pa +CONTENTS +files of the installed packages. This option is only intended for recovery after system crashes during package installation and removal. .It Cm rebuild-tree 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.2.6.1 --- 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 Thu May 22 15:51:03 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: bpm.1,v 1.2 2009/10/18 03:53:32 agc Exp $ */ +.\" $NetBSD: bpm.1,v 1.2.6.1 2014/05/22 15:51:03 yamt Exp $ */ .\" .\" Copyright (c) 2003,2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -111,4 +111,4 @@ are valid for The .Nm utility was written by -.An Alistair Crooks Aq a...@netbsd.org . +.An Alistair Crooks Aq Mt a...@netbsd.org . Index: src/external/bsd/pkg_install/dist/info/main.c diff -u src/external/bsd/pkg_install/dist/info/main.c:1.1.1.8 src/external/bsd/pkg_install/dist/info/main.c:1.1.1.8.6.1 --- src/external/bsd/pkg_install/dist/info/main.c:1.1.1.8 Sat Jan 30 21:33:36 2010 +++ src/external/bsd/pkg_install/dist/info/main.c Thu May 22 15:51:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.1.1.8 2010/01/30 21:33:36 joerg Exp $ */ +/* $NetBSD: main.c,v 1.1.1.8.6.1 2014/05/22 15:51:04 yamt Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif -__RCSID("$NetBSD: main.c,v 1.1.1.8 2010/01/30 21:33:36 joerg Exp $"); +__RCSID("$NetBSD: main.c,v 1.1.1.8.6.1 2014/05/22 15:51:04 yamt Exp $"); /* * @@ -55,7 +55,7 @@ static void usage(void) { fprintf(stderr, "%s\n%s\n%s\n%s\n", - "usage: pkg_info [-BbcDdFfhIikLmNnpqrRSsVvX] [-e package] [-E package]", + "usage: pkg_info [-BbcDdFfhIikLmNnpqRrSsVvX] [-E pkg-name] [-e pkg-name]", " [-K pkg_dbdir] [-l prefix] pkg-name ...", " pkg_info [-a | -u] [flags]", " pkg_info [-Q variable] pkg-name ..."); Index: src/external/bsd/pkg_install/dist/info/pkg_info.1 diff -u src/external/bsd/pkg_install/dist/info/pkg_info.1:1.1.1.5 src/external/bsd/pkg_install/dist/info/pkg_info.1:1.1.1.5.6.1 --- src/external/bsd/pkg_install/dist/info/pkg_info.1:1.1.1.5 Fri Apr 23 20:54:09 2010 +++ src/external/bsd/pkg_install/dist/info/pkg_info.1 Thu May 22 15:51:04 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_info.1,v 1.1.1.5 2010/04/23 20:54:09 joerg Exp $ +.\" $NetBSD: pkg_info.1,v 1.1.1.5.6.1 2014/05/22 15:51:04 yamt Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -17,7 +17,7 @@ .\" .\" @(#)pkg_info.1 .\" -.Dd February 27, 2010 +.Dd December 14, 2012 .Dt PKG_INFO 1 .Os .Sh NAME @@ -26,8 +26,8 @@ .Sh SYNOPSIS .Nm .Op Fl BbcDdFfhIikLmNnpqRrSsVvX -.Op Fl e Ar package -.Op Fl E Ar package +.Op Fl E Ar pkg-name +.Op Fl e Ar pkg-name .Op Fl K Ar pkg_dbdir .Op Fl l Ar prefix .Ar pkg-name ... @@ -53,16 +53,21 @@ pattern matching several installed packa section for a description of possible patterns), the pathname to a binary package, a filename belonging to an installed -package (if -.Fl F -is also given), or a URL to an ftp-available package. +package (with +.Fl F ) , +or a URL to an FTP-available package. .Pp -The following command-line options are supported: +The following command line options are available: .Bl -tag -width indent .It Fl a Show information for all currently installed packages. See also .Fl u . +When neither +.Fl a +nor +.Fl u +is given, the former is assumed. .It Fl B Show some of the important definitions used when building the binary package (the @@ -78,7 +83,9 @@ as a dependency of another package. Show the .Nx RCS Id strings from the files used in the construction -of the binary package (the "Build version") for each package. +of the binary package (the +.Dq Build version ) +for each package. These files are the package Makefile, any patch files, any checksum files, and the packing list file. .It Fl c @@ -116,16 +123,21 @@ can contain wildcards (see the .Sx PACKAGE WILDCARDS section below). .It Fl F -Interpret any pkg-name given as filename, and translate it to a -package name using the package database. -This can be used to query information on a per-file basis, e.g. in -conjunction with the -.Fl e -flag to find out which package a file belongs to. +Interpret any +.Ar pkg-name +given as filename, and query information on the package that +file belongs to. +This can be used to query information on a per-file basis. +See the +.Sx TECHNICAL DETAILS +section below for more information. .It Fl f Show the packing list instructions for each package. +.It Fl h +Print usage message and exit. .It Fl I Show the index entry for each package. +This option is assumed when no arguments or relevant flags are specified. .It Fl i Show the install script (if any) for each package. .It Fl K Ar pkg_dbdir @@ -141,11 +153,11 @@ This is different from just viewing the for everything are generated. Files that were created dynamically during installation of the package are not listed. -.It Fl l Ar str +.It Fl l Ar prefix Prefix each information category header (see .Fl q ) shown with -.Ar str . +.Ar prefix . This is primarily of use to front-end programs that want to request a lot of different information fields at once for a package, but don't necessary want the output intermingled in such a way that they can't @@ -159,7 +171,7 @@ Show which packages each package was bui Show which packages each package needs (depends upon), if any. .It Fl p Show the installation prefix for each package. -.It Fl Q +.It Fl Q Ar variable Show the definition of .Ar variable from the build information for each package. @@ -182,8 +194,8 @@ in bytes. Show the size of this package in bytes. The size is calculated by adding up the size of each file of the package. .It Fl u -Show information for all user-installed packages. -Automatically installed packages (as dependencies +Show information for all user-installed packages: +automatically installed packages (as dependencies of other packages) are not displayed. See also .Fl a . @@ -205,18 +217,24 @@ command line, or from already installed in .Pa \*[Lt]PKG_DBDIR\*[Gt]/\*[Lt]pkg-name\*[Gt] . .Pp -A filename can be given instead of a (installed) package name to query -information on the package this file belongs to. -This filename is then resolved to a package name using the package database. -For this translation to take place, the +When the .Fl F -flag must be given. -The filename must be absolute, compare the output of pkg_info -.Fl aF . +option is used, +a filename can be given instead of a package name to query +information on the (installed) package that file belongs to. +The filename is resolved to a package name using the package database. +The filename must be absolute, as in the output of +.Dl pkg_info -aF . +For example, +.Dl pkg_info -eF /path/to/file +can be used to display the package the given file belongs to, and +.Dl pkg_info -LF /path/to/file +can be used to display all files belonging to the package the given +file belongs to. .Sh PACKAGE WILDCARDS -In the places where a package name/version is expected, e.g. for the +In the places where a package name/version is expected, e.g., for the .Fl e -switch, several forms can be used. +option, several forms can be used. Either use a package name with or without version, or specify a package wildcard that gets matched against all installed packages. .Pp @@ -227,40 +245,52 @@ In addition, style {,} alternates have been implemented. Package version numbers can also be matched in a relational manner using the -.Pa \*[Ge] , \*[Le] , \*[Gt] , +.Dq \*[Ge] , +.Dq \*[Le] , +.Dq \*[Gt] , and -.Pa \*[Lt] +.Dq \*[Lt] operators. For example, -.Pa pkg_info -e 'name\*[Ge]1.3' +.Dl pkg_info -e 'name\*[Ge]1.3' will match versions 1.3 and later of the -.Pa name +.Dq name package. -Additionally, ranges can be defined by giving a lower bound with -\*[Gt] or \*[Ge] and an upper bound with \*[Lt] or \*[Le]. +(Make sure to use shell quoting.) +Additionally, ranges can be defined, by giving both a lower bound +.Po with +.Dq \*[Gt] +or +.Dq \*[Ge] +.Pc +as well as an upper bound +.Po with +.Dq \*[Lt] +or +. Dq \*[Le] +.Pc . The lower bound has to come first. For example, -.Pa pkg_info -e 'name\*[Ge]1.3\*[Lt]2.0' -will match versions 1.3 (inclusive) to 2.0 (exclusive) -of package -.Pa name . +.Dl pkg_info -e 'name\*[Ge]1.3\*[Lt]2.0' +will match versions 1.3 (inclusive) to 2.0 (exclusive) of package +.Dq name . .Pp The collating sequence of the various package version numbers is unusual, but strives to be consistent. The magic string .Dq alpha equates to -.Pa alpha version +.Dq alpha version , and sorts before a beta version. The magic string .Dq beta equates to -.Pa beta version +.Dq beta version , and sorts before a release candidate. The magic string .Dq rc equates to -.Pa release candidate +.Dq release candidate , and sorts before a release. The magic string .Dq pre , @@ -269,29 +299,31 @@ short for is a synonym for .Dq rc . For example, -.Pa name-1.3rc3 -will sort before -.Pa name-1.3 -and after -.Pa name-1.2.9 . -Similarly -.Pa name-1.3alpha2 +.Dq name-1.3alpha2 will sort before -.Pa name-1.3beta1 +.Dq name-1.3beta1 , and they both sort before -.Pa name-1.3rc1 . -In addition, alphabetic characters sort in the same place as -their numeric counterparts, so that -.Pa name-1.2e -has the same sorting value as -.Pa name-1.2.5 +.Dq name-1.3rc1 . +Similarly, +.Dq name-1.3rc3 +will sort before +.Dq name-1.3 , +and after +.Dq name-1.2.9 . The magic string .Dq pl -equates to a -.Pa patch level -and has the same value as a dot in the dewey-decimal ordering schemes, +equates to +.Dq patch level , +and has the same value as a dot +.Pq Sq \&. +in the dewey-decimal ordering schemes, as does the underscore -.Sq _ . +.Pq Sq _ . +Additionally, alphabetic characters sort in the same place as +their numeric counterparts, so that +.Dq name-1.2e +has the same sorting value as +.Dq name-1.2.5 . .Sh ENVIRONMENT See .Xr pkg_install.conf 5 @@ -313,5 +345,5 @@ refined it for .It "Hubert Feyrer" .Nx wildcard dependency processing, pkgdb, depends displaying, -pkg size display etc. +pkg size display, and more. .El 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.6.6.1 --- 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 Thu May 22 15:51:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: lib.h,v 1.6 2010/06/26 00:17:13 joerg Exp $ */ +/* $NetBSD: lib.h,v 1.6.6.1 2014/05/22 15:51:04 yamt 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; Index: src/external/bsd/pkg_install/dist/lib/license.c diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.2.4.1 src/external/bsd/pkg_install/dist/lib/license.c:1.2.4.2 --- src/external/bsd/pkg_install/dist/lib/license.c:1.2.4.1 Tue Apr 17 00:04:07 2012 +++ src/external/bsd/pkg_install/dist/lib/license.c Thu May 22 15:51:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: license.c,v 1.2.4.1 2012/04/17 00:04:07 yamt Exp $ */ +/* $NetBSD: license.c,v 1.2.4.2 2014/05/22 15:51:04 yamt 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/pkg_install.conf.5.in diff -u src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.1.1.12 src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.1.1.12.4.1 --- src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.1.1.12 Fri Feb 18 22:32:31 2011 +++ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in Thu May 22 15:51:04 2014 @@ -1,6 +1,6 @@ -.\" $NetBSD: pkg_install.conf.5.in,v 1.1.1.12 2011/02/18 22:32:31 aymeric Exp $ +.\" $NetBSD: pkg_install.conf.5.in,v 1.1.1.12.4.1 2014/05/22 15:51:04 yamt Exp $ .\" -.\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. +.\" Copyright (c) 2008, 2009, 2012 The NetBSD Foundation, Inc. .\" All rights reserved. .\" .\" This code is derived from software contributed to The NetBSD Foundation @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 13, 2010 +.Dd February 22, 2012 .Dt PKG_INSTALL.CONF 5 .Os .Sh NAME @@ -89,7 +89,7 @@ The check is performed if the package ha Passing the license check is required. Missing license conditions are considered an error. .El -.It Dv CHECK_END_OF_FILE +.It Dv CHECK_END_OF_LIFE During vulnerability checks, consider packages that have reached end-of-life as vulnerable. This option is enabled by default. @@ -107,10 +107,10 @@ The user is always asked to confirm inst .El .It Dv CONFIG_CACHE_CONNECTIONS Limit the global connection cache to this value. -For FTP this is the number of sessions without active command. -For HTTP this is the number of connections open with keep-alive. +For FTP, this is the number of sessions without active command. +For HTTP, this is the number of connections open with keep-alive. .It Dv CONFIG_CACHE_CONNECTIONS_HOST -Like +Like .Dv CONFIG_CACHE_CONNECTIONS , but limit the number of connections to the host as well. See @@ -210,7 +210,7 @@ Default location for the file described .El .Sh SEE ALSO .Xr pkg_add 1 , -.Xr pkg_admin 1 +.Xr pkg_admin 1 , .Xr pkg_create 1 , .Xr pkg_delete 1 , .Xr pkg_info 1 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.1.1.7.6.1 --- 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 Thu May 22 15:51:04 2014 @@ -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.1.1.7.6.1 2014/05/22 15:51:04 yamt 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.1.1.7.6.1 2014/05/22 15:51:04 yamt 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); 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.1.1.3.6.1 --- 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 22 15:51:04 2014 @@ -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.1.1.3.6.1 2014/05/22 15:51:04 yamt 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.1.1.3.6.1 2014/05/22 15:51:04 yamt 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; Index: src/external/bsd/pkg_install/dist/lib/version.h diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.7.4.1 src/external/bsd/pkg_install/dist/lib/version.h:1.7.4.2 --- src/external/bsd/pkg_install/dist/lib/version.h:1.7.4.1 Tue Apr 17 00:04:07 2012 +++ src/external/bsd/pkg_install/dist/lib/version.h Thu May 22 15:51:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.7.4.1 2012/04/17 00:04:07 yamt Exp $ */ +/* $NetBSD: version.h,v 1.7.4.2 2014/05/22 15:51:04 yamt 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_ */