Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/pkg_install/dist Fix merge conflicts from pkgsr...
details: https://anonhg.NetBSD.org/src/rev/7c982d1dfd76
branches: trunk
changeset: 998043:7c982d1dfd76
user: sevan <sevan%NetBSD.org@localhost>
date: Sat Apr 06 00:05:47 2019 +0000
description:
Fix merge conflicts from pkgsrc-20190405 import
diffstat:
external/bsd/pkg_install/dist/admin/pkg_admin.1 | 9 +--------
external/bsd/pkg_install/dist/info/main.c | 16 ++++++++++------
external/bsd/pkg_install/dist/lib/license.c | 5 ++++-
external/bsd/pkg_install/dist/lib/parse-config.c | 6 +++---
external/bsd/pkg_install/dist/lib/pkcs7.c | 7 ++++---
external/bsd/pkg_install/dist/lib/version.h | 4 ++--
6 files changed, 24 insertions(+), 23 deletions(-)
diffs (160 lines):
diff -r fa5c4602ccdb -r 7c982d1dfd76 external/bsd/pkg_install/dist/admin/pkg_admin.1
--- a/external/bsd/pkg_install/dist/admin/pkg_admin.1 Fri Apr 05 23:46:04 2019 +0000
+++ b/external/bsd/pkg_install/dist/admin/pkg_admin.1 Sat Apr 06 00:05:47 2019 +0000
@@ -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
diff -r fa5c4602ccdb -r 7c982d1dfd76 external/bsd/pkg_install/dist/info/main.c
--- a/external/bsd/pkg_install/dist/info/main.c Fri Apr 05 23:46:04 2019 +0000
+++ b/external/bsd/pkg_install/dist/info/main.c Sat Apr 06 00:05:47 2019 +0000
@@ -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 @@
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;
}
}
diff -r fa5c4602ccdb -r 7c982d1dfd76 external/bsd/pkg_install/dist/lib/license.c
--- a/external/bsd/pkg_install/dist/lib/license.c Fri Apr 05 23:46:04 2019 +0000
+++ b/external/bsd/pkg_install/dist/lib/license.c Sat Apr 06 00:05:47 2019 +0000
@@ -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 <joerg%NetBSD.org@localhost>.
@@ -51,6 +51,8 @@
"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 @@
"ofl-v1.0 ofl-v1.1 "
"openssl "
"original-bsd modified-bsd 2-clause-bsd "
+ "osl "
"paratype "
"php "
"png-license "
diff -r fa5c4602ccdb -r 7c982d1dfd76 external/bsd/pkg_install/dist/lib/parse-config.c
--- a/external/bsd/pkg_install/dist/lib/parse-config.c Fri Apr 05 23:46:04 2019 +0000
+++ b/external/bsd/pkg_install/dist/lib/parse-config.c Sat Apr 06 00:05:47 2019 +0000
@@ -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 <joerg%NetBSD.org@localhost>.
@@ -83,7 +83,7 @@
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 {
diff -r fa5c4602ccdb -r 7c982d1dfd76 external/bsd/pkg_install/dist/lib/pkcs7.c
--- a/external/bsd/pkg_install/dist/lib/pkcs7.c Fri Apr 05 23:46:04 2019 +0000
+++ b/external/bsd/pkg_install/dist/lib/pkcs7.c Sat Apr 06 00:05:47 2019 +0000
@@ -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 @@
#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
diff -r fa5c4602ccdb -r 7c982d1dfd76 external/bsd/pkg_install/dist/lib/version.h
--- a/external/bsd/pkg_install/dist/lib/version.h Fri Apr 05 23:46:04 2019 +0000
+++ b/external/bsd/pkg_install/dist/lib/version.h Sat Apr 06 00:05:47 2019 +0000
@@ -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_ */
Home |
Main Index |
Thread Index |
Old Index