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

merge pkg_install-20210410

Browse Source 
- simplified version checking for netbsd, treat 9.0 and 9.1 as compatible
- minor man page updates
This commit is contained in:
nia 2021-04-10 19:49:59 +00:00
parent c481f3c345
commit f46918ca21
54 changed files with 138 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/bsd/pkg_install/dist/add/add.h vendored
View File

@ -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 */

4
external/bsd/pkg_install/dist/add/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 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");
/*
*

82
external/bsd/pkg_install/dist/add/perform.c vendored
View File

@ -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 <grant@NetBSD.org>
@ -128,54 +128,46 @@ 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;
const char *loc;
size_t majorlen = 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;
/*
* 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;
/* 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;
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

34
external/bsd/pkg_install/dist/add/pkg_add.1 vendored
View File

@ -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 ftp or web site.
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 available.
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 ,

2
external/bsd/pkg_install/dist/admin/audit-packages.8 vendored
View File

@ -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.

4
external/bsd/pkg_install/dist/admin/audit.c vendored
View File

@ -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 <joerg@NetBSD.org>.

4
external/bsd/pkg_install/dist/admin/check.c vendored
View File

@ -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.

2
external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 vendored
View File

@ -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.

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

@ -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.

4
external/bsd/pkg_install/dist/create/build.c vendored
View File

@ -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 <joerg@NetBSD.org>.

2
external/bsd/pkg_install/dist/create/create.h vendored
View File

@ -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 */

4
external/bsd/pkg_install/dist/create/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 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

4
external/bsd/pkg_install/dist/create/perform.c vendored
View File

@ -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

2
external/bsd/pkg_install/dist/create/pkg_create.1 vendored
View File

@ -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.

4
external/bsd/pkg_install/dist/create/pl.c vendored
View File

@ -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

2
external/bsd/pkg_install/dist/delete/pkg_delete.1 vendored
View File

@ -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.

2
external/bsd/pkg_install/dist/delete/pkg_delete.c vendored
View File

@ -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>

2
external/bsd/pkg_install/dist/info/info.h vendored
View File

@ -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 */

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

@ -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 $");
/*
*

4
external/bsd/pkg_install/dist/info/perform.c vendored
View File

@ -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 <joerg@NetBSD.org>.

2
external/bsd/pkg_install/dist/info/pkg_info.1 vendored
View File

@ -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.

4
external/bsd/pkg_install/dist/info/show.c vendored
View File

@ -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

4
external/bsd/pkg_install/dist/lib/automatic.c vendored
View File

@ -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>

4
external/bsd/pkg_install/dist/lib/conflicts.c vendored
View File

@ -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 <rillig@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>

2
external/bsd/pkg_install/dist/lib/defs.h vendored
View File

@ -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.

2
external/bsd/pkg_install/dist/lib/dewey.c vendored
View File

@ -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.

2
external/bsd/pkg_install/dist/lib/dewey.h vendored
View File

@ -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_

4
external/bsd/pkg_install/dist/lib/fexec.c vendored
View File

@ -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);

4
external/bsd/pkg_install/dist/lib/file.c vendored
View File

@ -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

4
external/bsd/pkg_install/dist/lib/global.c vendored
View File

@ -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

4
external/bsd/pkg_install/dist/lib/gpgsig.c vendored
View File

@ -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 <joerg@NetBSD.org>.

2
external/bsd/pkg_install/dist/lib/iterate.c vendored
View File

@ -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 <joerg@NetBSD.org>.

2
external/bsd/pkg_install/dist/lib/lib.h vendored
View File

@ -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 */

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

@ -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 <joerg@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 "

2
external/bsd/pkg_install/dist/lib/lpkg.c vendored
View File

@ -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

4
external/bsd/pkg_install/dist/lib/opattern.c vendored
View File

@ -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

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

@ -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 <joerg@NetBSD.org>.

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

@ -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.

2
external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in vendored
View File

@ -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.

4
external/bsd/pkg_install/dist/lib/pkg_io.c vendored
View File

@ -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 <joerg@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>

4
external/bsd/pkg_install/dist/lib/pkg_signature.c vendored
View File

@ -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 <joerg@NetBSD.org>.

2
external/bsd/pkg_install/dist/lib/pkg_summary.5 vendored
View File

@ -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
.\"

4
external/bsd/pkg_install/dist/lib/pkgdb.c vendored
View File

@ -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.

2
external/bsd/pkg_install/dist/lib/pkgsrc.7 vendored
View File

@ -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.

4
external/bsd/pkg_install/dist/lib/plist.c vendored
View File

@ -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

4
external/bsd/pkg_install/dist/lib/remove.c vendored
View File

@ -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 <joerg@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>

4
external/bsd/pkg_install/dist/lib/str.c vendored
View File

@ -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

4
external/bsd/pkg_install/dist/lib/var.c vendored
View File

@ -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>

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

@ -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.

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

@ -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_ */

4
external/bsd/pkg_install/dist/lib/vulnerabilities-file.c vendored
View File

@ -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 <joerg@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>

4
external/bsd/pkg_install/dist/lib/xwrapper.c vendored
View File

@ -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 <joerg@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>

2
external/bsd/pkg_install/dist/x509/pkgsrc.cnf vendored
View File

@ -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
#

2
external/bsd/pkg_install/dist/x509/pkgsrc.sh vendored
View File

@ -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"