Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts from pkgsrc-20190405 import

This commit is contained in:
sevan 2019-04-06 00:05:47 +00:00
parent 257adeee4a
commit c7785e7255
6 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
external/bsd/pkg_install/dist/admin/pkg_admin.1 vendored
View File

@ -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. .\" Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
.\" All rights reserved. .\" All rights reserved.
@ -14,13 +14,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright .\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the .\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution. .\" 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 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

14
external/bsd/pkg_install/dist/info/main.c vendored
View File

@ -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 #if HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H #if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h> #include <sys/cdefs.h>
#endif #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 $");
/* /*
* *
@ -300,11 +300,15 @@ main(int argc, char **argv)
} }
} else { } else {
const char *dbdir; const char *dbdir;
size_t dbdirlen;
dbdir = pkgdb_get_dir(); dbdir = pkgdb_get_dir();
if (**argv == '/' && strncmp(*argv, dbdir, strlen(dbdir)) == 0) { dbdirlen = strlen(dbdir);
*argv += strlen(dbdir) + 1; if (**argv == '/' &&
if ((*argv)[strlen(*argv) - 1] == '/') { strncmp(*argv, dbdir, dbdirlen) == 0 &&
(*argv)[dbdirlen] == '/') {
*argv += dbdirlen + 1;
if (**argv && (*argv)[strlen(*argv) - 1] == '/') {
(*argv)[strlen(*argv) - 1] = 0; (*argv)[strlen(*argv) - 1] = 0;
} }
} }

5
external/bsd/pkg_install/dist/lib/license.c vendored
View File

@ -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>. * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@ -51,6 +51,8 @@ const char *default_acceptable_licenses =
"artistic artistic-2.0 " "artistic artistic-2.0 "
"boost-license " "boost-license "
"cc-by-sa-v3.0 " "cc-by-sa-v3.0 "
"cc-by-sa-v4.0 "
"cc-by-v4.0 "
"cc0-1.0-universal " "cc0-1.0-universal "
"cddl-1.0 " "cddl-1.0 "
"cecill-2.1 " "cecill-2.1 "
@ -77,6 +79,7 @@ const char *default_acceptable_licenses =
"ofl-v1.0 ofl-v1.1 " "ofl-v1.0 ofl-v1.1 "
"openssl " "openssl "
"original-bsd modified-bsd 2-clause-bsd " "original-bsd modified-bsd 2-clause-bsd "
"osl "
"paratype " "paratype "
"php " "php "
"png-license " "png-license "

6
external/bsd/pkg_install/dist/lib/parse-config.c vendored
View File

@ -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 #if HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H #if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h> #include <sys/cdefs.h>
#endif #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>. * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@ -83,7 +83,7 @@ const char *pkg_vulnerabilities_dir;
const char *pkg_vulnerabilities_file; const char *pkg_vulnerabilities_file;
const char *pkg_vulnerabilities_url; const char *pkg_vulnerabilities_url;
const char *ignore_advisories = NULL; 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; const char *acceptable_licenses = NULL;
static struct config_variable { static struct config_variable {

7
external/bsd/pkg_install/dist/lib/pkcs7.c vendored
View File

@ -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 #if HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@ -7,7 +7,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#endif #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. * Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
@ -55,7 +55,8 @@ __RCSID("$NetBSD: pkcs7.c,v 1.3 2018/02/04 09:00:51 maya Exp $");
#define NS_ANY_CA (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA) #define NS_ANY_CA (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA)
#endif #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_extended_key_usage(x) x->ex_xkusage
#define X509_get_extension_flags(x) x->ex_flags #define X509_get_extension_flags(x) x->ex_flags
#endif #endif

4
external/bsd/pkg_install/dist/lib/version.h vendored
View File

@ -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. * Copyright (c) 2001 Thomas Klausner. All rights reserved.
@ -27,6 +27,6 @@
#ifndef _INST_LIB_VERSION_H_ #ifndef _INST_LIB_VERSION_H_
#define _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_
#define PKGTOOLS_VERSION 20180325 #define PKGTOOLS_VERSION 20190405
#endif /* _INST_LIB_VERSION_H_ */ #endif /* _INST_LIB_VERSION_H_ */