Module Name:src
Committed By: martin
Date: Mon Oct 21 16:57:40 UTC 2019
Modified Files:
src/external/bsd/pkg_install/dist/add [netbsd-8]: perform.c pkg_add.1
src/external/bsd/pkg_install/dist/admin [netbsd-8]: audit.c main.c
pkg_admin.1
src/external/bsd/pkg_install/dist/create [netbsd-8]: util.c
src/external/bsd/pkg_install/dist/delete [netbsd-8]: pkg_delete.c
src/external/bsd/pkg_install/dist/info [netbsd-8]: main.c
src/external/bsd/pkg_install/dist/lib [netbsd-8]: lib.h license.c
parse-config.c pkcs7.c pkg_io.c version.h vulnerabilities-file.c
Log Message:
Pull up the following revisions, requested by joerg in ticket #1409:
external/bsd/pkg_install/dist/add/perform.c up to 1.6
external/bsd/pkg_install/dist/add/pkg_add.1 up to 1.3
external/bsd/pkg_install/dist/admin/audit.c up to 1.3
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/create/util.c up to 1.2
external/bsd/pkg_install/dist/delete/pkg_delete.c up to 1.3
external/bsd/pkg_install/dist/info/main.c up to 1.3
external/bsd/pkg_install/dist/lib/lib.h up to 1.9
external/bsd/pkg_install/dist/lib/license.c up to 1.9
external/bsd/pkg_install/dist/lib/parse-config.c up to 1.3
external/bsd/pkg_install/dist/lib/pkcs7.c up to 1.4
external/bsd/pkg_install/dist/lib/pkg_io.c up to 1.3
external/bsd/pkg_install/dist/lib/version.h up to 1.15
external/bsd/pkg_install/dist/lib/vulnerabilities-file.c up to 1.3
Merge pkg_install-20191008 from pkgsrc.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/bsd/pkg_install/dist/add/pkg_add.1
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/bsd/pkg_install/dist/admin/audit.c \
src/external/bsd/pkg_install/dist/admin/main.c \
src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
src/external/bsd/pkg_install/dist/create/util.c
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/external/bsd/pkg_install/dist/delete/pkg_delete.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/bsd/pkg_install/dist/info/main.c
cvs rdiff -u -r1.8 -r1.8.4.1 src/external/bsd/pkg_install/dist/lib/lib.h
cvs rdiff -u -r1.5 -r1.5.4.1 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/external/bsd/pkg_install/dist/lib/parse-config.c \
src/external/bsd/pkg_install/dist/lib/pkcs7.c \
src/external/bsd/pkg_install/dist/lib/pkg_io.c \
src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
cvs rdiff -u -r1.11 -r1.11.4.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/add/perform.c
diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.5 src/external/bsd/pkg_install/dist/add/perform.c:1.5.4.1
--- src/external/bsd/pkg_install/dist/add/perform.c:1.5 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/add/perform.c Mon Oct 21 16:57:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.5 2017/04/20 13:18:23 joerg Exp $ */
+/* $NetBSD: perform.c,v 1.5.4.1 2019/10/21 16:57:40 martin Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -6,7 +6,7 @@
#if HAVE_SYS_CDEFS_H
#include
#endif
-__RCSID("$NetBSD: perform.c,v 1.5 2017/04/20 13:18:23 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.5.4.1 2019/10/21 16:57:40 martin Exp $");
/*-
* Copyright (c) 2003 Grant Beattie
@@ -1318,7 +1318,7 @@ check_vulnerable(struct pkg_task *pkg)
return require_check;
}
- if (!audit_package(pv, pkg->pkgname, NULL, 2))
+ if (!audit_package(pv, pkg->pkgname, NULL, 0, 2))
return 0;
if (require_check)
Index: src/external/bsd/pkg_install/dist/add/pkg_add.1
diff -u src/external/bsd/pkg_install/dist/add/pkg_add.1:1.2 src/external/bsd/pkg_install/dist/add/pkg_add.1:1.2.4.1
--- src/external/bsd/pkg_install/dist/add/pkg_add.1:1.2 Thu Apr 20 13:18:23 2017
+++ src/external/bsd/pkg_install/dist/add/pkg_add.1 Mon Oct 21 16:57:40 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.2 2017/04/20 13:18:23 joerg Exp $
+.\" $NetBSD: pkg_add.1,v 1.2.4.1 2019/10/21 16:57:40 martin Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -17,7 +17,7 @@
.\"
.\" @(#)pkg_add.1
.\"
-.Dd December 27, 2014
+.Dd March 21, 2018
.Dt PKG_ADD 1
.Os
.Sh NAME
@@ -25,7 +25,7 @@
.Nd a utility for installing and upgrading software package distributions
.Sh SYNOPSIS
.Nm
-.Op Fl AfInRUuVv
+.Op Fl AfhInRUuVv
.Op Fl C Ar config
.Op Fl K Ar pkg_dbdir
.Op Fl m Ar machine
@@ -119,6 +119,11 @@ removed.
Read the
