Module Name: src
Committed By: martin
Date: Mon Oct 21 20:09:23 UTC 2019
Modified Files:
src/external/bsd/pkg_install/dist/admin [netbsd-9]: main.c pkg_admin.1
src/external/bsd/pkg_install/dist/lib [netbsd-9]: license.c version.h
Log Message:
Pull up the following revisions, requested by joerg in ticket #352:
external/bsd/pkg_install/dist/admin/main.c up to 1.4
external/bsd/pkg_install/dist/admin/pkg_admin.1 up to 1.5
external/bsd/pkg_install/dist/lib/license.c up to 1.9
external/bsd/pkg_install/dist/lib/version.h up to 1.15
Merge pkg_install-20191008 from pkgsrc.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 src/external/bsd/pkg_install/dist/admin/main.c
cvs rdiff -u -r1.4 -r1.4.2.1 \
src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.8 -r1.8.2.1 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.14 -r1.14.2.1 \
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/main.c
diff -u src/external/bsd/pkg_install/dist/admin/main.c:1.3 src/external/bsd/pkg_install/dist/admin/main.c:1.3.4.1
--- src/external/bsd/pkg_install/dist/admin/main.c:1.3 Sun Mar 25 04:04:36 2018
+++ src/external/bsd/pkg_install/dist/admin/main.c Mon Oct 21 20:09:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.3 2018/03/25 04:04:36 sevan Exp $ */
+/* $NetBSD: main.c,v 1.3.4.1 2019/10/21 20:09:22 martin Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,10 +7,10 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: main.c,v 1.3 2018/03/25 04:04:36 sevan Exp $");
+__RCSID("$NetBSD: main.c,v 1.3.4.1 2019/10/21 20:09:22 martin Exp $");
/*-
- * Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999-2019 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -59,8 +59,10 @@ __RCSID("$NetBSD: main.c,v 1.3 2018/03/2
#endif
#ifndef NETBSD
#include <nbcompat/md5.h>
+#include <nbcompat/sha2.h>
#else
#include <md5.h>
+#include <sha2.h>
#endif
#if HAVE_LIMITS_H
#include <limits.h>
@@ -93,6 +95,7 @@ static const char Options[] = "C:K:SVbd:
int quiet, verbose;
static void set_unset_variable(char **, Boolean);
+static void digest_input(char **);
/* print usage message and exit */
void
@@ -521,6 +524,9 @@ main(int argc, char *argv[])
} else if (strcasecmp(argv[0], "unset") == 0) {
argv++; /* "unset" */
set_unset_variable(argv, TRUE);
+ } else if (strcasecmp(argv[0], "digest") == 0) {
+ argv++; /* "digest" */
+ digest_input(argv);
} else if (strcasecmp(argv[0], "config-var") == 0) {
argv++;
if (argv == NULL || argv[1] != NULL)
@@ -736,3 +742,22 @@ set_unset_variable(char **argv, Boolean
return;
}
+
+static void
+digest_input(char **argv)
+{
+ char digest[SHA256_DIGEST_STRING_LENGTH];
+ int failures = 0;
+
+ while (*argv != NULL) {
+ if (SHA256_File(*argv, digest)) {
+ puts(digest);
+ } else {
+ warn("cannot process %s", *argv);
+ ++failures;
+ }
+ argv++;
+ }
+ if (failures)
+ exit(EXIT_FAILURE);
+}
Index: src/external/bsd/pkg_install/dist/admin/pkg_admin.1
diff -u src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.4 src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.4.2.1
--- src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.4 Sat Apr 6 00:05:47 2019
+++ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 Mon Oct 21 20:09:22 2019
@@ -1,10 +1,11 @@
-.\" $NetBSD: pkg_admin.1,v 1.4 2019/04/06 00:05:47 sevan Exp $
+.\" $NetBSD: pkg_admin.1,v 1.4.2.1 2019/10/21 20:09:22 martin Exp $
.\"
-.\" Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1999-2019 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Hubert Feyrer <hub...@feyrer.de>.
+.\" by Hubert Feyrer <hub...@feyrer.de> and
+.\" by Joerg Sonnenberger <jo...@netbsd.org>.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -27,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd February 25, 2018
+.Dd October 8, 2019
.Dt PKG_ADMIN 1
.Os
.Sh NAME
@@ -182,6 +183,9 @@ otherwise it exits with error.
Print the current value of
.Ar variable
as used after parsing the configuration file.
+.It Cm digest Ar file ...
+Compute a SHA256 message digest of
+.Ar file .
.It Cm dump
Dump the contents of the package database, similar to
.Cm pkg_info -F .
@@ -204,6 +208,11 @@ for packages matching
Print the URL of the best matching package to stdout for each pattern.
If a pattern is not matched, it is skipped and the command will return
a failure.
+.It Cm gpg-sign-package pkg spkg
+Sign the binary package
+.Ar pkg
+using GPG and write the result to
+.Ar spkg .
.It Cm lsall Ar /dir/pkgpattern
.It Cm lsbest Ar /dir/pkgpattern
List all/best package matching pattern in the given directory
@@ -268,11 +277,6 @@ to remove a variable.
Packages that are not installed directly by the user but pulled in as
dependencies are marked by setting
.Dq automatic=YES .
-.It Cm gpg-sign-package pkg spkg
-Sign the binary package
-.Ar pkg
-using GPG and write the result to
-.Ar spkg .
.It Cm x509-sign-package pkg spkg key cert
Sign the binary package
.Ar pkg
Index: src/external/bsd/pkg_install/dist/lib/license.c
diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.8 src/external/bsd/pkg_install/dist/lib/license.c:1.8.2.1
--- src/external/bsd/pkg_install/dist/lib/license.c:1.8 Sat Apr 6 00:05:47 2019
+++ src/external/bsd/pkg_install/dist/lib/license.c Mon Oct 21 20:09:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.8 2019/04/06 00:05:47 sevan Exp $ */
+/* $NetBSD: license.c,v 1.8.2.1 2019/10/21 20:09:22 martin Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -56,6 +56,7 @@ const char *default_acceptable_licenses
"cc0-1.0-universal "
"cddl-1.0 "
"cecill-2.1 "
+ "cecill-b-v1 "
"cpl-1.0 "
"epl-v1.0 "
"eupl-v1.1 "
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.14 src/external/bsd/pkg_install/dist/lib/version.h:1.14.2.1
--- src/external/bsd/pkg_install/dist/lib/version.h:1.14 Sat Apr 6 00:05:47 2019
+++ src/external/bsd/pkg_install/dist/lib/version.h Mon Oct 21 20:09:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.14 2019/04/06 00:05:47 sevan Exp $ */
+/* $NetBSD: version.h,v 1.14.2.1 2019/10/21 20:09:22 martin 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 20190405
+#define PKGTOOLS_VERSION 20191008
#endif /* _INST_LIB_VERSION_H_ */
