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 <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 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 <[email protected]>.
@@ -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
--- src/external/bsd/pkg_install/dist/lib/parse-config.c:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/lib/parse-config.c Sat Apr 6 00:05:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: parse-config.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: parse-config.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 <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: parse-config.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: parse-config.c,v 1.3 2019/04/06 00:05:47 sevan Exp $");
/*-
* Copyright (c) 2008, 2009 Joerg Sonnenberger <[email protected]>.
@@ -83,7 +83,7 @@ const char *pkg_vulnerabilities_dir;
const char *pkg_vulnerabilities_file;
const char *pkg_vulnerabilities_url;
const char *ignore_advisories = NULL;
-const char tnf_vulnerability_base[] = "http://ftp.NetBSD.org/pub/NetBSD/packages/vulns";;
+const char tnf_vulnerability_base[] = "http://cdn.NetBSD.org/pub/NetBSD/packages/vulns";;
const char *acceptable_licenses = NULL;
static struct config_variable {
Index: src/external/bsd/pkg_install/dist/lib/pkcs7.c
diff -u src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.3 src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.4
--- src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.3 Sun Feb 4 09:00:51 2018
+++ src/external/bsd/pkg_install/dist/lib/pkcs7.c Sat Apr 6 00:05:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pkcs7.c,v 1.3 2018/02/04 09:00:51 maya Exp $ */
+/* $NetBSD: pkcs7.c,v 1.4 2019/04/06 00:05:47 sevan Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: pkcs7.c,v 1.3 2018/02/04 09:00:51 maya Exp $");
+__RCSID("$NetBSD: pkcs7.c,v 1.4 2019/04/06 00:05:47 sevan Exp $");
/*-
* Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
@@ -55,7 +55,8 @@ __RCSID("$NetBSD: pkcs7.c,v 1.3 2018/02/
#define NS_ANY_CA (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA)
#endif
-#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+ defined(LIBRESSL_VERSION_NUMBER)
#define X509_get_extended_key_usage(x) x->ex_xkusage
#define X509_get_extension_flags(x) x->ex_flags
#endif
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.13 src/external/bsd/pkg_install/dist/lib/version.h:1.14
--- src/external/bsd/pkg_install/dist/lib/version.h:1.13 Sun Mar 25 04:04:36 2018
+++ src/external/bsd/pkg_install/dist/lib/version.h Sat Apr 6 00:05:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.13 2018/03/25 04:04:36 sevan Exp $ */
+/* $NetBSD: version.h,v 1.14 2019/04/06 00:05:47 sevan 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 20180325
+#define PKGTOOLS_VERSION 20190405
#endif /* _INST_LIB_VERSION_H_ */
