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 src/external/bsd/pkg_install/dist/add/add.h:1.3
--- src/external/bsd/pkg_install/dist/add/add.h:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/add/add.h Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: add.h,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: add.h,v 1.3 2021/04/10 19:49:59 nia Exp $ */
/* from FreeBSD Id: add.h,v 1.8 1997/02/22 16:09:15 peter Exp */
Index: src/external/bsd/pkg_install/dist/add/main.c
diff -u src/external/bsd/pkg_install/dist/add/main.c:1.2 src/external/bsd/pkg_install/dist/add/main.c:1.3
--- src/external/bsd/pkg_install/dist/add/main.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/add/main.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: main.c,v 1.3 2021/04/10 19:49:59 nia 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.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD");
/*
*
Index: src/external/bsd/pkg_install/dist/add/perform.c
diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.8 src/external/bsd/pkg_install/dist/add/perform.c:1.9
--- src/external/bsd/pkg_install/dist/add/perform.c:1.8 Sat Dec 12 11:00:57 2020
+++ src/external/bsd/pkg_install/dist/add/perform.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.8 2020/12/12 11:00:57 wiz Exp $ */
+/* $NetBSD: perform.c,v 1.9 2021/04/10 19:49:59 nia 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.8 2020/12/12 11:00:57 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.9 2021/04/10 19:49:59 nia Exp $");
/*-
* Copyright (c) 2003 Grant Beattie <gr...@netbsd.org>
@@ -129,53 +129,45 @@ static const struct pkg_meta_desc {
static int pkg_do(const char *, int, int);
static int
-end_of_version(const char *opsys, const char *version_end)
-{
- if (*version_end == '\0')
- return 1;
-
- if (strcmp(opsys, "NetBSD") == 0) {
- if (strncmp(version_end, "_ALPHA", 6) == 0
- || strncmp(version_end, "_BETA", 5) == 0
- || strncmp(version_end, "_RC", 3) == 0
- || strncmp(version_end, "_STABLE", 7) == 0
- || strncmp(version_end, "_PATCH", 6) == 0)
- return 1;
- }
-
- return 0;
-}
-
-static int
compatible_platform(const char *opsys, const char *host, const char *package)
{
- 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;
-
- /* accept, if host version is a minor release of package version */
- if (strncmp(host, package, strlen(package)) == 0)
- return 1;
+ const char *loc;
+ size_t majorlen = 0;
- /* find offset of first difference */
- for (i=0; (host[i] != '\0') && (host[i] == package[i]);)
- i++;
-
- if (end_of_version(opsys, host+i) && end_of_version(opsys, package+i))
- return 1;
+ /*
+ * 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;
- return 0;
+ /* returns 1 if host and package operating system match */
+ if (strcmp(opsys, "NetBSD") == 0) {
+ /*
+ * warn about -current package on a stable release and
+ * the reverse
+ */
+ if ((strstr(host, ".99.") != NULL &&
+ strstr(package, ".99.") == NULL) ||
+ (strstr(package, ".99.") != NULL &&
+ strstr(host, ".99.") == NULL)) {
+ return 0;
+ }
+ /* compare the major version only */
+ loc = strchr(host, '.');
+ if (loc != NULL) {
+ majorlen = loc - host;
+ if (majorlen != (strchr(package, '.') - package))
+ return 0;
+ if (strncmp(host, package, majorlen) == 0)
+ return 1;
+ }
+ }
+ if (strcmp(host, package) == 0)
+ return 1;
+ return 0;
}
static int
Index: src/external/bsd/pkg_install/dist/add/pkg_add.1
diff -u src/external/bsd/pkg_install/dist/add/pkg_add.1:1.3 src/external/bsd/pkg_install/dist/add/pkg_add.1:1.4
--- src/external/bsd/pkg_install/dist/add/pkg_add.1:1.3 Sun Mar 25 04:04:36 2018
+++ src/external/bsd/pkg_install/dist/add/pkg_add.1 Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.3 2018/03/25 04:04:36 sevan Exp $
+.\" $NetBSD: pkg_add.1,v 1.4 2021/04/10 19:49:59 nia Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -17,7 +17,7 @@
.\"
.\" @(#)pkg_add.1
.\"
-.Dd March 21, 2018
+.Dd March 8, 2021
.Dt PKG_ADD 1
.Os
.Sh NAME
@@ -189,7 +189,7 @@ URL pointing at a file available on an f
Thus you may extract files directly from their anonymous ftp or WWW
locations (e.g.,
.Nm
-ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/shells/bash-3.2.9.tgz
+http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/x86_64/9.0/All/bash-5.0.18.tgz
or
.Nm
http://www.example.org/packages/screen-4.0.tbz).
@@ -376,7 +376,20 @@ In all cases,
.Nm
will try to install binary packages listed in dependencies list.
.Pp
-You can specify a compiled binary package explicitly on the command line.
+You can grab a compiled binary package from remote location by specifying
+a URL:
+.Bd -literal
+# pkg_add http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/x86_64/9.0/All/firefox-84.0.tgz
+.Ed
+.Pp
+The base URL can also be provided by the configuration variable,
+.Dv PKG_PATH :
+.Bd -literal
+# export PKG_PATH=http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/x86_64/9.0/All
+# pkg_add firefox
+.Ed
+.Pp
+You can also specify a compiled binary package by filesystem path:
.Bd -literal
# pkg_add /usr/pkgsrc/packages/All/tcsh-6.14.00.tgz
.Ed
@@ -387,21 +400,10 @@ will install the latest version availabl
With
.Fl v ,
.Nm
-emits more messages to terminal.
+emits more messages to terminal:
.Bd -literal
# pkg_add -v /usr/pkgsrc/packages/All/unzip
.Ed
-.Pp
-You can grab a compiled binary package from remote location by specifying
-a URL.
-The base URL can also be provided by the configuration variable,
-.Dv PKG_PATH .
-.Bd -literal
-# pkg_add -v ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/All/firefox-2.0.0.4.tgz
-
-# export PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/All
-# pkg_add -v firefox
-.Ed
.Sh SEE ALSO
.Xr pkg_admin 1 ,
.Xr pkg_create 1 ,
Index: src/external/bsd/pkg_install/dist/admin/audit-packages.8
diff -u src/external/bsd/pkg_install/dist/admin/audit-packages.8:1.2 src/external/bsd/pkg_install/dist/admin/audit-packages.8:1.3
--- src/external/bsd/pkg_install/dist/admin/audit-packages.8:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/admin/audit-packages.8 Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: audit-packages.8,v 1.2 2017/04/20 13:18:23 joerg Exp $
+.\" $NetBSD: audit-packages.8,v 1.3 2021/04/10 19:49:59 nia Exp $
.\"
.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
Index: src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
diff -u src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8:1.2 src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8:1.3
--- src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: download-vulnerability-list.8,v 1.2 2017/04/20 13:18:23 joerg Exp $
+.\" $NetBSD: download-vulnerability-list.8,v 1.3 2021/04/10 19:49:59 nia Exp $
.\"
.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
Index: src/external/bsd/pkg_install/dist/admin/audit.c
diff -u src/external/bsd/pkg_install/dist/admin/audit.c:1.3 src/external/bsd/pkg_install/dist/admin/audit.c:1.4
--- src/external/bsd/pkg_install/dist/admin/audit.c:1.3 Sun Mar 25 04:04:36 2018
+++ src/external/bsd/pkg_install/dist/admin/audit.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: audit.c,v 1.3 2018/03/25 04:04:36 sevan Exp $ */
+/* $NetBSD: audit.c,v 1.4 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: audit.c,v 1.3 2018/03/25 04:04:36 sevan Exp $");
+__RCSID("$NetBSD: audit.c,v 1.4 2021/04/10 19:49:59 nia Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/admin/check.c
diff -u src/external/bsd/pkg_install/dist/admin/check.c:1.4 src/external/bsd/pkg_install/dist/admin/check.c:1.5
--- src/external/bsd/pkg_install/dist/admin/check.c:1.4 Wed Dec 2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/admin/check.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: check.c,v 1.4 2020/12/02 13:53:50 wiz Exp $ */
+/* $NetBSD: check.c,v 1.5 2021/04/10 19:49:59 nia Exp $ */
#ifdef HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
@@ -11,7 +11,7 @@
#include <sys/cdefs.h>
#endif
#endif
-__RCSID("$NetBSD: check.c,v 1.4 2020/12/02 13:53:50 wiz Exp $");
+__RCSID("$NetBSD: check.c,v 1.5 2021/04/10 19:49:59 nia Exp $");
/*-
* Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
Index: src/external/bsd/pkg_install/dist/admin/pkg_admin.1
diff -u src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.6 src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.7
--- src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.6 Wed Dec 2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_admin.1,v 1.6 2020/12/02 13:53:50 wiz Exp $
+.\" $NetBSD: pkg_admin.1,v 1.7 2021/04/10 19:49:59 nia Exp $
.\"
.\" Copyright (c) 1999-2019 The NetBSD Foundation, Inc.
.\" All rights reserved.
Index: src/external/bsd/pkg_install/dist/create/build.c
diff -u src/external/bsd/pkg_install/dist/create/build.c:1.2 src/external/bsd/pkg_install/dist/create/build.c:1.3
--- src/external/bsd/pkg_install/dist/create/build.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/create/build.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: build.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: build.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: build.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: build.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
/*-
* Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/create/create.h
diff -u src/external/bsd/pkg_install/dist/create/create.h:1.2 src/external/bsd/pkg_install/dist/create/create.h:1.3
--- src/external/bsd/pkg_install/dist/create/create.h:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/create/create.h Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: create.h,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: create.h,v 1.3 2021/04/10 19:49:59 nia Exp $ */
/* from FreeBSD Id: create.h,v 1.13 1997/10/08 07:46:19 charnier Exp */
Index: src/external/bsd/pkg_install/dist/create/main.c
diff -u src/external/bsd/pkg_install/dist/create/main.c:1.2 src/external/bsd/pkg_install/dist/create/main.c:1.3
--- src/external/bsd/pkg_install/dist/create/main.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/create/main.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: main.c,v 1.3 2021/04/10 19:49:59 nia 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.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/create/perform.c
diff -u src/external/bsd/pkg_install/dist/create/perform.c:1.3 src/external/bsd/pkg_install/dist/create/perform.c:1.4
--- src/external/bsd/pkg_install/dist/create/perform.c:1.3 Wed Dec 2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/create/perform.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.3 2020/12/02 13:53:50 wiz Exp $ */
+/* $NetBSD: perform.c,v 1.4 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: perform.c,v 1.3 2020/12/02 13:53:50 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.4 2021/04/10 19:49:59 nia Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/create/pkg_create.1
diff -u src/external/bsd/pkg_install/dist/create/pkg_create.1:1.3 src/external/bsd/pkg_install/dist/create/pkg_create.1:1.4
--- src/external/bsd/pkg_install/dist/create/pkg_create.1:1.3 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/create/pkg_create.1 Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.3 2017/04/20 13:18:23 joerg Exp $
+.\" $NetBSD: pkg_create.1,v 1.4 2021/04/10 19:49:59 nia Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
Index: src/external/bsd/pkg_install/dist/create/pl.c
diff -u src/external/bsd/pkg_install/dist/create/pl.c:1.4 src/external/bsd/pkg_install/dist/create/pl.c:1.5
--- src/external/bsd/pkg_install/dist/create/pl.c:1.4 Wed Dec 2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/create/pl.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pl.c,v 1.4 2020/12/02 13:53:50 wiz Exp $ */
+/* $NetBSD: pl.c,v 1.5 2021/04/10 19:49:59 nia Exp $ */
#ifdef HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
@@ -11,7 +11,7 @@
#include <sys/cdefs.h>
#endif
#endif
-__RCSID("$NetBSD: pl.c,v 1.4 2020/12/02 13:53:50 wiz Exp $");
+__RCSID("$NetBSD: pl.c,v 1.5 2021/04/10 19:49:59 nia Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/delete/pkg_delete.1
diff -u src/external/bsd/pkg_install/dist/delete/pkg_delete.1:1.2 src/external/bsd/pkg_install/dist/delete/pkg_delete.1:1.3
--- src/external/bsd/pkg_install/dist/delete/pkg_delete.1:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/delete/pkg_delete.1 Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_delete.1,v 1.2 2017/04/20 13:18:23 joerg Exp $
+.\" $NetBSD: pkg_delete.1,v 1.3 2021/04/10 19:49:59 nia Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
Index: src/external/bsd/pkg_install/dist/delete/pkg_delete.c
diff -u src/external/bsd/pkg_install/dist/delete/pkg_delete.c:1.3 src/external/bsd/pkg_install/dist/delete/pkg_delete.c:1.4
--- src/external/bsd/pkg_install/dist/delete/pkg_delete.c:1.3 Sun Mar 25 04:04:36 2018
+++ src/external/bsd/pkg_install/dist/delete/pkg_delete.c Sat Apr 10 19:49:59 2021
@@ -34,7 +34,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: pkg_delete.c,v 1.3 2018/03/25 04:04:36 sevan Exp $");
+__RCSID("$NetBSD: pkg_delete.c,v 1.4 2021/04/10 19:49:59 nia Exp $");
#if HAVE_ERR_H
#include <err.h>
Index: src/external/bsd/pkg_install/dist/info/info.h
diff -u src/external/bsd/pkg_install/dist/info/info.h:1.2 src/external/bsd/pkg_install/dist/info/info.h:1.3
--- src/external/bsd/pkg_install/dist/info/info.h:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/info/info.h Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: info.h,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: info.h,v 1.3 2021/04/10 19:49:59 nia Exp $ */
/* from FreeBSD Id: info.h,v 1.10 1997/02/22 16:09:40 peter Exp */
Index: src/external/bsd/pkg_install/dist/info/main.c
diff -u src/external/bsd/pkg_install/dist/info/main.c:1.3 src/external/bsd/pkg_install/dist/info/main.c:1.4
--- src/external/bsd/pkg_install/dist/info/main.c:1.3 Sat Apr 6 00:05:47 2019
+++ src/external/bsd/pkg_install/dist/info/main.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.3 2019/04/06 00:05:47 sevan Exp $ */
+/* $NetBSD: main.c,v 1.4 2021/04/10 19:49:59 nia 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.3 2019/04/06 00:05:47 sevan Exp $");
+__RCSID("$NetBSD: main.c,v 1.4 2021/04/10 19:49:59 nia Exp $");
/*
*
Index: src/external/bsd/pkg_install/dist/info/perform.c
diff -u src/external/bsd/pkg_install/dist/info/perform.c:1.3 src/external/bsd/pkg_install/dist/info/perform.c:1.4
--- src/external/bsd/pkg_install/dist/info/perform.c:1.3 Wed Dec 2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/info/perform.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.3 2020/12/02 13:53:50 wiz Exp $ */
+/* $NetBSD: perform.c,v 1.4 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: perform.c,v 1.3 2020/12/02 13:53:50 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.4 2021/04/10 19:49:59 nia Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/info/pkg_info.1
diff -u src/external/bsd/pkg_install/dist/info/pkg_info.1:1.3 src/external/bsd/pkg_install/dist/info/pkg_info.1:1.4
--- src/external/bsd/pkg_install/dist/info/pkg_info.1:1.3 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/info/pkg_info.1 Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_info.1,v 1.3 2017/04/20 13:18:23 joerg Exp $
+.\" $NetBSD: pkg_info.1,v 1.4 2021/04/10 19:49:59 nia Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
Index: src/external/bsd/pkg_install/dist/info/show.c
diff -u src/external/bsd/pkg_install/dist/info/show.c:1.4 src/external/bsd/pkg_install/dist/info/show.c:1.5
--- src/external/bsd/pkg_install/dist/info/show.c:1.4 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/info/show.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: show.c,v 1.4 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: show.c,v 1.5 2021/04/10 19:49:59 nia 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.4 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: show.c,v 1.5 2021/04/10 19:49:59 nia Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/automatic.c
diff -u src/external/bsd/pkg_install/dist/lib/automatic.c:1.2 src/external/bsd/pkg_install/dist/lib/automatic.c:1.3
--- src/external/bsd/pkg_install/dist/lib/automatic.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/automatic.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: automatic.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: automatic.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: automatic.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: automatic.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
#if HAVE_ASSERT_H
#include <assert.h>
Index: src/external/bsd/pkg_install/dist/lib/conflicts.c
diff -u src/external/bsd/pkg_install/dist/lib/conflicts.c:1.2 src/external/bsd/pkg_install/dist/lib/conflicts.c:1.3
--- src/external/bsd/pkg_install/dist/lib/conflicts.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/conflicts.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: conflicts.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: conflicts.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
/*-
* Copyright (c) 2007 Roland Illig <ril...@netbsd.org>.
@@ -48,7 +48,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: conflicts.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: conflicts.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
#if HAVE_ERR_H
#include <err.h>
Index: src/external/bsd/pkg_install/dist/lib/dewey.h
diff -u src/external/bsd/pkg_install/dist/lib/dewey.h:1.2 src/external/bsd/pkg_install/dist/lib/dewey.h:1.3
--- src/external/bsd/pkg_install/dist/lib/dewey.h:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/dewey.h Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dewey.h,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: dewey.h,v 1.3 2021/04/10 19:49:59 nia Exp $ */
#ifndef _INST_LIB_DEWEY_H_
#define _INST_LIB_DEWEY_H_
Index: src/external/bsd/pkg_install/dist/lib/fexec.c
diff -u src/external/bsd/pkg_install/dist/lib/fexec.c:1.2 src/external/bsd/pkg_install/dist/lib/fexec.c:1.3
--- src/external/bsd/pkg_install/dist/lib/fexec.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/fexec.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fexec.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: fexec.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include "lib.h"
-__RCSID("$NetBSD: fexec.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: fexec.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
static int vfcexec(const char *, int, const char *, va_list);
Index: src/external/bsd/pkg_install/dist/lib/file.c
diff -u src/external/bsd/pkg_install/dist/lib/file.c:1.2 src/external/bsd/pkg_install/dist/lib/file.c:1.3
--- src/external/bsd/pkg_install/dist/lib/file.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/file.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: file.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -10,7 +10,7 @@
#if HAVE_SYS_QUEUE_H
#include <sys/queue.h>
#endif
-__RCSID("$NetBSD: file.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: file.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/global.c
diff -u src/external/bsd/pkg_install/dist/lib/global.c:1.2 src/external/bsd/pkg_install/dist/lib/global.c:1.3
--- src/external/bsd/pkg_install/dist/lib/global.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/global.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: global.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: global.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: global.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: global.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/gpgsig.c
diff -u src/external/bsd/pkg_install/dist/lib/gpgsig.c:1.2 src/external/bsd/pkg_install/dist/lib/gpgsig.c:1.3
--- src/external/bsd/pkg_install/dist/lib/gpgsig.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/gpgsig.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpgsig.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: gpgsig.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: gpgsig.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: gpgsig.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/lib/lpkg.c
diff -u src/external/bsd/pkg_install/dist/lib/lpkg.c:1.2 src/external/bsd/pkg_install/dist/lib/lpkg.c:1.3
--- src/external/bsd/pkg_install/dist/lib/lpkg.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/lpkg.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lpkg.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: lpkg.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
Index: src/external/bsd/pkg_install/dist/lib/opattern.c
diff -u src/external/bsd/pkg_install/dist/lib/opattern.c:1.2 src/external/bsd/pkg_install/dist/lib/opattern.c:1.3
--- src/external/bsd/pkg_install/dist/lib/opattern.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/opattern.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: opattern.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: opattern.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: opattern.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: opattern.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/pkgsrc.7
diff -u src/external/bsd/pkg_install/dist/lib/pkgsrc.7:1.2 src/external/bsd/pkg_install/dist/lib/pkgsrc.7:1.3
--- src/external/bsd/pkg_install/dist/lib/pkgsrc.7:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/pkgsrc.7 Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkgsrc.7,v 1.2 2017/04/20 13:18:23 joerg Exp $
+.\" $NetBSD: pkgsrc.7,v 1.3 2021/04/10 19:49:59 nia Exp $
.\"
.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
.\" All rights reserved.
Index: src/external/bsd/pkg_install/dist/lib/remove.c
diff -u src/external/bsd/pkg_install/dist/lib/remove.c:1.2 src/external/bsd/pkg_install/dist/lib/remove.c:1.3
--- src/external/bsd/pkg_install/dist/lib/remove.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/remove.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: remove.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: remove.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: remove.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: remove.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
#if HAVE_DIRENT_H
#include <dirent.h>
Index: src/external/bsd/pkg_install/dist/lib/str.c
diff -u src/external/bsd/pkg_install/dist/lib/str.c:1.2 src/external/bsd/pkg_install/dist/lib/str.c:1.3
--- src/external/bsd/pkg_install/dist/lib/str.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/str.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: str.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: str.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: str.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/version.c
diff -u src/external/bsd/pkg_install/dist/lib/version.c:1.2 src/external/bsd/pkg_install/dist/lib/version.c:1.3
--- src/external/bsd/pkg_install/dist/lib/version.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/version.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: version.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: version.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: version.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: version.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
/*
* Copyright (c) 2001 Thomas Klausner. All rights reserved.
Index: src/external/bsd/pkg_install/dist/lib/xwrapper.c
diff -u src/external/bsd/pkg_install/dist/lib/xwrapper.c:1.2 src/external/bsd/pkg_install/dist/lib/xwrapper.c:1.3
--- src/external/bsd/pkg_install/dist/lib/xwrapper.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/xwrapper.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xwrapper.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: xwrapper.c,v 1.3 2021/04/10 19:49:59 nia Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -36,7 +36,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: xwrapper.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: xwrapper.c,v 1.3 2021/04/10 19:49:59 nia Exp $");
#if HAVE_ERR_H
#include <err.h>
Index: src/external/bsd/pkg_install/dist/lib/defs.h
diff -u src/external/bsd/pkg_install/dist/lib/defs.h:1.5 src/external/bsd/pkg_install/dist/lib/defs.h:1.6
--- src/external/bsd/pkg_install/dist/lib/defs.h:1.5 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/defs.h Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.5 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: defs.h,v 1.6 2021/04/10 19:49:59 nia Exp $ */
/*-
* Copyright (c) 1999,2000,2009 The NetBSD Foundation, Inc.
Index: src/external/bsd/pkg_install/dist/lib/pkg_summary.5
diff -u src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.5 src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.6
--- src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.5 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/pkg_summary.5 Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_summary.5,v 1.5 2017/04/20 13:18:23 joerg Exp $
+.\" $NetBSD: pkg_summary.5,v 1.6 2021/04/10 19:49:59 nia Exp $
.\"
.\" Copyright (c) 2006 The NetBSD Foundation
.\"
Index: src/external/bsd/pkg_install/dist/lib/pkgdb.c
diff -u src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.5 src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.6
--- src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.5 Fri Dec 18 17:32:42 2020
+++ src/external/bsd/pkg_install/dist/lib/pkgdb.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pkgdb.c,v 1.5 2020/12/18 17:32:42 maya Exp $ */
+/* $NetBSD: pkgdb.c,v 1.6 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: pkgdb.c,v 1.5 2020/12/18 17:32:42 maya Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.6 2021/04/10 19:49:59 nia Exp $");
/*-
* Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
Index: src/external/bsd/pkg_install/dist/lib/dewey.c
diff -u src/external/bsd/pkg_install/dist/lib/dewey.c:1.4 src/external/bsd/pkg_install/dist/lib/dewey.c:1.5
--- src/external/bsd/pkg_install/dist/lib/dewey.c:1.4 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/dewey.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dewey.c,v 1.4 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: dewey.c,v 1.5 2021/04/10 19:49:59 nia Exp $ */
/*
* Copyright © 2002 Alistair G. Crooks. All rights reserved.
Index: src/external/bsd/pkg_install/dist/lib/parse-config.c
diff -u src/external/bsd/pkg_install/dist/lib/parse-config.c:1.4 src/external/bsd/pkg_install/dist/lib/parse-config.c:1.5
--- src/external/bsd/pkg_install/dist/lib/parse-config.c:1.4 Sat Dec 12 11:00:57 2020
+++ src/external/bsd/pkg_install/dist/lib/parse-config.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse-config.c,v 1.4 2020/12/12 11:00:57 wiz Exp $ */
+/* $NetBSD: parse-config.c,v 1.5 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: parse-config.c,v 1.4 2020/12/12 11:00:57 wiz Exp $");
+__RCSID("$NetBSD: parse-config.c,v 1.5 2021/04/10 19:49:59 nia Exp $");
/*-
* Copyright (c) 2008, 2009 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/lib/pkcs7.c
diff -u src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.4 src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.5
--- src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.4 Sat Apr 6 00:05:47 2019
+++ src/external/bsd/pkg_install/dist/lib/pkcs7.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pkcs7.c,v 1.4 2019/04/06 00:05:47 sevan Exp $ */
+/* $NetBSD: pkcs7.c,v 1.5 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: pkcs7.c,v 1.4 2019/04/06 00:05:47 sevan Exp $");
+__RCSID("$NetBSD: pkcs7.c,v 1.5 2021/04/10 19:49:59 nia Exp $");
/*-
* Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
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.4 src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.5
--- src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.4 Sat Dec 12 11:00:57 2020
+++ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_install.conf.5.in,v 1.4 2020/12/12 11:00:57 wiz Exp $
+.\" $NetBSD: pkg_install.conf.5.in,v 1.5 2021/04/10 19:49:59 nia Exp $
.\"
.\" Copyright (c) 2008, 2009, 2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
Index: src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
diff -u src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c:1.4 src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c:1.5
--- src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c:1.4 Wed Dec 2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vulnerabilities-file.c,v 1.4 2020/12/02 13:53:50 wiz Exp $ */
+/* $NetBSD: vulnerabilities-file.c,v 1.5 2021/04/10 19:49:59 nia Exp $ */
/*-
* Copyright (c) 2008, 2010 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -38,7 +38,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: vulnerabilities-file.c,v 1.4 2020/12/02 13:53:50 wiz Exp $");
+__RCSID("$NetBSD: vulnerabilities-file.c,v 1.5 2021/04/10 19:49:59 nia Exp $");
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: src/external/bsd/pkg_install/dist/lib/iterate.c
diff -u src/external/bsd/pkg_install/dist/lib/iterate.c:1.3 src/external/bsd/pkg_install/dist/lib/iterate.c:1.4
--- src/external/bsd/pkg_install/dist/lib/iterate.c:1.3 Wed Dec 2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/lib/iterate.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: iterate.c,v 1.3 2020/12/02 13:53:50 wiz Exp $ */
+/* $NetBSD: iterate.c,v 1.4 2021/04/10 19:49:59 nia Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/lib/pkg_io.c
diff -u src/external/bsd/pkg_install/dist/lib/pkg_io.c:1.3 src/external/bsd/pkg_install/dist/lib/pkg_io.c:1.4
--- src/external/bsd/pkg_install/dist/lib/pkg_io.c:1.3 Sun Feb 4 09:00:51 2018
+++ src/external/bsd/pkg_install/dist/lib/pkg_io.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pkg_io.c,v 1.3 2018/02/04 09:00:51 maya Exp $ */
+/* $NetBSD: pkg_io.c,v 1.4 2021/04/10 19:49:59 nia Exp $ */
/*-
* Copyright (c) 2008, 2009 Joerg Sonnenberger <jo...@netbsd.org>.
* All rights reserved.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: pkg_io.c,v 1.3 2018/02/04 09:00:51 maya Exp $");
+__RCSID("$NetBSD: pkg_io.c,v 1.4 2021/04/10 19:49:59 nia Exp $");
#include <archive.h>
#include <archive_entry.h>
Index: src/external/bsd/pkg_install/dist/lib/pkg_signature.c
diff -u src/external/bsd/pkg_install/dist/lib/pkg_signature.c:1.3 src/external/bsd/pkg_install/dist/lib/pkg_signature.c:1.4
--- src/external/bsd/pkg_install/dist/lib/pkg_signature.c:1.3 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/pkg_signature.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pkg_signature.c,v 1.3 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: pkg_signature.c,v 1.4 2021/04/10 19:49:59 nia 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.3 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: pkg_signature.c,v 1.4 2021/04/10 19:49:59 nia Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/lib/var.c
diff -u src/external/bsd/pkg_install/dist/lib/var.c:1.3 src/external/bsd/pkg_install/dist/lib/var.c:1.4
--- src/external/bsd/pkg_install/dist/lib/var.c:1.3 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/var.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.3 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: var.c,v 1.4 2021/04/10 19:49:59 nia 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.3 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: var.c,v 1.4 2021/04/10 19:49:59 nia Exp $");
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: src/external/bsd/pkg_install/dist/lib/lib.h
diff -u src/external/bsd/pkg_install/dist/lib/lib.h:1.11 src/external/bsd/pkg_install/dist/lib/lib.h:1.12
--- src/external/bsd/pkg_install/dist/lib/lib.h:1.11 Sat Dec 12 11:00:57 2020
+++ src/external/bsd/pkg_install/dist/lib/lib.h Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.11 2020/12/12 11:00:57 wiz Exp $ */
+/* $NetBSD: lib.h,v 1.12 2021/04/10 19:49:59 nia Exp $ */
/* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
Index: src/external/bsd/pkg_install/dist/lib/license.c
diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.10 src/external/bsd/pkg_install/dist/lib/license.c:1.11
--- src/external/bsd/pkg_install/dist/lib/license.c:1.10 Wed Dec 2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/lib/license.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.10 2020/12/02 13:53:50 wiz Exp $ */
+/* $NetBSD: license.c,v 1.11 2021/04/10 19:49:59 nia Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -78,6 +78,7 @@ const char *default_acceptable_licenses
"mit "
"mpl-1.0 mpl-1.1 mpl-2.0 "
"mplusfont "
+ "odbl-v1 "
"ofl-v1.0 ofl-v1.1 "
"openssl "
"original-bsd modified-bsd 2-clause-bsd "
Index: src/external/bsd/pkg_install/dist/lib/plist.c
diff -u src/external/bsd/pkg_install/dist/lib/plist.c:1.6 src/external/bsd/pkg_install/dist/lib/plist.c:1.7
--- src/external/bsd/pkg_install/dist/lib/plist.c:1.6 Fri Dec 18 17:32:42 2020
+++ src/external/bsd/pkg_install/dist/lib/plist.c Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: plist.c,v 1.6 2020/12/18 17:32:42 maya Exp $ */
+/* $NetBSD: plist.c,v 1.7 2021/04/10 19:49:59 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: plist.c,v 1.6 2020/12/18 17:32:42 maya Exp $");
+__RCSID("$NetBSD: plist.c,v 1.7 2021/04/10 19:49:59 nia Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.19 src/external/bsd/pkg_install/dist/lib/version.h:1.20
--- src/external/bsd/pkg_install/dist/lib/version.h:1.19 Fri Dec 18 17:32:42 2020
+++ src/external/bsd/pkg_install/dist/lib/version.h Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.19 2020/12/18 17:32:42 maya Exp $ */
+/* $NetBSD: version.h,v 1.20 2021/04/10 19:49:59 nia 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 20201218
+#define PKGTOOLS_VERSION 20210410
#endif /* _INST_LIB_VERSION_H_ */
Index: src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf
diff -u src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf:1.2 src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf:1.3
--- src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf Sat Apr 10 19:49:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: pkgsrc.cnf,v 1.2 2017/04/20 13:18:23 joerg Exp $
+# $NetBSD: pkgsrc.cnf,v 1.3 2021/04/10 19:49:59 nia Exp $
#
# OpenSSL sample configuration file for use by pkgsrc.sh
#
Index: src/external/bsd/pkg_install/dist/x509/pkgsrc.sh
diff -u src/external/bsd/pkg_install/dist/x509/pkgsrc.sh:1.2 src/external/bsd/pkg_install/dist/x509/pkgsrc.sh:1.3
--- src/external/bsd/pkg_install/dist/x509/pkgsrc.sh:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/x509/pkgsrc.sh Sat Apr 10 19:49:59 2021
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: pkgsrc.sh,v 1.2 2017/04/20 13:18:23 joerg Exp $
+# $NetBSD: pkgsrc.sh,v 1.3 2021/04/10 19:49:59 nia Exp $
#
CA="openssl ca -config pkgsrc.cnf"
