Module Name: src
Committed By: joerg
Date: Thu Apr 20 13:18:23 UTC 2017
Modified Files:
src/external/bsd/pkg_install/dist/add: add.h main.c perform.c pkg_add.1
src/external/bsd/pkg_install/dist/admin: audit-packages.8 audit.c
check.c download-vulnerability-list.8 main.c pkg_admin.1
src/external/bsd/pkg_install/dist/create: build.c create.h main.c
perform.c pkg_create.1 pl.c
src/external/bsd/pkg_install/dist/delete: pkg_delete.1 pkg_delete.c
src/external/bsd/pkg_install/dist/info: info.h main.c perform.c
pkg_info.1 show.c
src/external/bsd/pkg_install/dist/lib: automatic.c conflicts.c defs.h
dewey.c dewey.h fexec.c file.c global.c gpgsig.c iterate.c lib.h
license.c lpkg.c opattern.c parse-config.c pkcs7.c
pkg_install.conf.5.in pkg_io.c pkg_signature.c pkg_summary.5
pkgdb.c pkgsrc.7 plist.c remove.c str.c var.c version.c version.h
vulnerabilities-file.c xwrapper.c
src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf pkgsrc.sh
Log Message:
Merge pkg_install-20170419.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/pkg_install/dist/add/add.h
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/pkg_install/dist/add/main.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.1.1.13 -r1.2 src/external/bsd/pkg_install/dist/add/pkg_add.1
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/pkg_install/dist/admin/audit-packages.8 \
src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/admin/audit.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/pkg_install/dist/admin/check.c
cvs rdiff -u -r1.1.1.16 -r1.2 src/external/bsd/pkg_install/dist/admin/main.c
cvs rdiff -u -r1.1.1.13 -r1.2 \
src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/create/build.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/pkg_install/dist/create/create.h \
src/external/bsd/pkg_install/dist/create/perform.c
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/pkg_install/dist/create/main.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/pkg_install/dist/create/pkg_create.1
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/pkg_install/dist/create/pl.c
cvs rdiff -u -r1.1.1.9 -r1.2 \
src/external/bsd/pkg_install/dist/delete/pkg_delete.1 \
src/external/bsd/pkg_install/dist/delete/pkg_delete.c
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/pkg_install/dist/info/info.h
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/info/main.c
cvs rdiff -u -r1.1.1.14 -r1.2 \
src/external/bsd/pkg_install/dist/info/perform.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/pkg_info.1
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/info/show.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/pkg_install/dist/lib/automatic.c \
src/external/bsd/pkg_install/dist/lib/global.c \
src/external/bsd/pkg_install/dist/lib/lpkg.c \
src/external/bsd/pkg_install/dist/lib/remove.c \
src/external/bsd/pkg_install/dist/lib/str.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/pkg_install/dist/lib/conflicts.c \
src/external/bsd/pkg_install/dist/lib/iterate.c \
src/external/bsd/pkg_install/dist/lib/pkcs7.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/defs.h \
src/external/bsd/pkg_install/dist/lib/license.c \
src/external/bsd/pkg_install/dist/lib/pkg_summary.5
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/dewey.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/pkg_install/dist/lib/dewey.h \
src/external/bsd/pkg_install/dist/lib/pkgsrc.7 \
src/external/bsd/pkg_install/dist/lib/xwrapper.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/pkg_install/dist/lib/fexec.c \
src/external/bsd/pkg_install/dist/lib/gpgsig.c \
src/external/bsd/pkg_install/dist/lib/opattern.c \
src/external/bsd/pkg_install/dist/lib/version.c
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/pkg_install/dist/lib/file.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/dist/lib/lib.h
cvs rdiff -u -r1.1.1.11 -r1.2 \
src/external/bsd/pkg_install/dist/lib/parse-config.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in \
src/external/bsd/pkg_install/dist/lib/pkg_signature.c \
src/external/bsd/pkg_install/dist/lib/var.c
cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/pkg_install/dist/lib/pkg_io.c
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/pkg_install/dist/lib/pkgdb.c
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/pkg_install/dist/lib/plist.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/lib/version.h
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf \
src/external/bsd/pkg_install/dist/x509/pkgsrc.sh
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/add.h
diff -u src/external/bsd/pkg_install/dist/add/add.h:1.1.1.7 src/external/bsd/pkg_install/dist/add/add.h:1.2
--- src/external/bsd/pkg_install/dist/add/add.h:1.1.1.7 Fri Feb 18 22:32:27 2011
+++ src/external/bsd/pkg_install/dist/add/add.h Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: add.h,v 1.1.1.7 2011/02/18 22:32:27 aymeric Exp $ */
+/* $NetBSD: add.h,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/* from FreeBSD Id: add.h,v 1.8 1997/02/22 16:09:15 peter Exp */
Index: src/external/bsd/pkg_install/dist/add/main.c
diff -u src/external/bsd/pkg_install/dist/add/main.c:1.1.1.11 src/external/bsd/pkg_install/dist/add/main.c:1.2
--- src/external/bsd/pkg_install/dist/add/main.c:1.1.1.11 Thu Apr 20 13:12:46 2017
+++ src/external/bsd/pkg_install/dist/add/main.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.1.1.11 2017/04/20 13:12:46 joerg Exp $ */
+/* $NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.11 2017/04/20 13:12:46 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
*
Index: src/external/bsd/pkg_install/dist/add/perform.c
diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.4 src/external/bsd/pkg_install/dist/add/perform.c:1.5
--- src/external/bsd/pkg_install/dist/add/perform.c:1.4 Sat Apr 20 15:29:22 2013
+++ src/external/bsd/pkg_install/dist/add/perform.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.4 2013/04/20 15:29:22 wiz Exp $ */
+/* $NetBSD: perform.c,v 1.5 2017/04/20 13:18:23 joerg 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.4 2013/04/20 15:29:22 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.5 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 2003 Grant Beattie <gr...@netbsd.org>
@@ -50,6 +50,7 @@ __RCSID("$NetBSD: perform.c,v 1.4 2013/0
#if HAVE_FCNTL_H
#include <fcntl.h>
#endif
+#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -75,7 +76,6 @@ struct pkg_meta {
char *meta_install;
char *meta_deinstall;
char *meta_preserve;
- char *meta_views;
char *meta_installed_info;
};
@@ -121,7 +121,6 @@ static const struct pkg_meta_desc {
{ offsetof(struct pkg_meta, meta_size_pkg), SIZE_PKG_FNAME, 0, 0444 },
{ offsetof(struct pkg_meta, meta_size_all), SIZE_ALL_FNAME, 0, 0444 },
{ offsetof(struct pkg_meta, meta_preserve), PRESERVE_FNAME, 0, 0444 },
- { offsetof(struct pkg_meta, meta_views), VIEWS_FNAME, 0, 0444 },
{ offsetof(struct pkg_meta, meta_required_by), REQUIRED_BY_FNAME, 0, 0644 },
{ offsetof(struct pkg_meta, meta_installed_info), INSTALLED_INFO_FNAME, 0, 0644 },
{ 0, NULL, 0, 0 },
@@ -413,9 +412,6 @@ check_already_installed(struct pkg_task
return 1;
}
- if (Force)
- return 1;
-
/* We can only arrive here for explicitly requested packages. */
if (!Automatic && is_automatic_installed(pkg->pkgname)) {
if (Fake ||
@@ -832,8 +828,7 @@ extract_files(struct pkg_task *pkg)
out:
if (!NoRecord)
pkgdb_close();
- archive_write_close(writer);
- archive_write_finish(writer);
+ archive_write_free(writer);
return r;
}
@@ -912,7 +907,7 @@ check_platform(struct pkg_task *pkg)
if (OverrideMachine != NULL)
effective_arch = OverrideMachine;
else
- effective_arch = MACHINE_ARCH;
+ effective_arch = PKGSRC_MACHINE_ARCH;
/* If either the OS or arch are different, bomb */
if (strcmp(OPSYS_NAME, pkg->buildinfo[BI_OPSYS]) ||
@@ -1182,30 +1177,6 @@ check_dependencies(struct pkg_task *pkg)
return status;
}
-/*
- * If this package uses pkg_views, register it in the default view.
- */
-static void
-pkg_register_views(struct pkg_task *pkg)
-{
- if (Fake || NoView || pkg->meta_data.meta_views == NULL)
- return;
-
- if (Verbose) {
- printf("%s/pkg_view -d %s %s%s %s%s %sadd %s\n",
- BINDIR, pkgdb_get_dir(),
- View ? "-w " : "", View ? View : "",
- Viewbase ? "-W " : "", Viewbase ? Viewbase : "",
- Verbose ? "-v " : "", pkg->pkgname);
- }
-
- fexec_skipempty(BINDIR "/pkg_view", "-d", pkgdb_get_dir(),
- View ? "-w " : "", View ? View : "",
- Viewbase ? "-W " : "", Viewbase ? Viewbase : "",
- Verbose ? "-v " : "", "add", pkg->pkgname,
- (void *)NULL);
-}
-
static int
preserve_meta_data_file(struct pkg_task *pkg, const char *name)
{
@@ -1275,6 +1246,9 @@ static int check_input(const char *line,
static int
check_signature(struct pkg_task *pkg, int invalid_sig)
{
+#ifdef BOOTSTRAP
+ return 0;
+#else
char *line;
size_t len;
@@ -1311,11 +1285,15 @@ check_signature(struct pkg_task *pkg, in
}
warnx("Unknown value of configuration variable VERIFIED_INSTALLATION");
return 1;
+#endif
}
static int
check_vulnerable(struct pkg_task *pkg)
{
+#ifdef BOOTSTRAP
+ return 0;
+#else
static struct pkg_vulnerabilities *pv;
int require_check;
char *line;
@@ -1354,11 +1332,15 @@ check_vulnerable(struct pkg_task *pkg)
return 1;
}
return 0;
+#endif
}
static int
check_license(struct pkg_task *pkg)
{
+#ifdef BOOTSTRAP
+ return 0;
+#else
if (LicenseCheck == 0)
return 0;
@@ -1382,6 +1364,7 @@ check_license(struct pkg_task *pkg)
warnx("Invalid LICENSE for package `%s'", pkg->pkgname);
return 1;
}
+#endif
}
/*
@@ -1404,8 +1387,12 @@ pkg_do(const char *pkgpath, int mark_aut
goto clean_find_archive;
}
+#ifndef BOOTSTRAP
invalid_sig = pkg_verify_signature(archive_name, &pkg->archive, &pkg->entry,
&pkg->pkgname);
+#else
+ invalid_sig = 0;
+#endif
free(archive_name);
if (pkg->archive == NULL)
@@ -1436,12 +1423,7 @@ pkg_do(const char *pkgpath, int mark_aut
if (pkg->meta_data.meta_mtree != NULL)
warnx("mtree specification in pkg `%s' ignored", pkg->pkgname);
- if (pkg->meta_data.meta_views != NULL) {
- pkg->logdir = xstrdup(pkg->prefix);
- pkgdb_set_dir(dirname_of(pkg->logdir), 4);
- } else {
- pkg->logdir = xasprintf("%s/%s", config_pkg_dbdir, pkg->pkgname);
- }
+ pkg->logdir = xasprintf("%s/%s", config_pkg_dbdir, pkg->pkgname);
if (Destdir != NULL)
pkg->install_logdir = xasprintf("%s/%s", Destdir, pkg->logdir);
@@ -1542,8 +1524,6 @@ pkg_do(const char *pkgpath, int mark_aut
if (pkg->meta_data.meta_display != NULL)
fputs(pkg->meta_data.meta_display, stdout);
- pkg_register_views(pkg);
-
status = 0;
goto clean_memory;
@@ -1559,6 +1539,7 @@ nuke_pkg:
nuke_pkgdb:
if (!Fake) {
+ (void) remove_files(pkg->install_logdir, "+*");
if (recursive_remove(pkg->install_logdir, 1))
warn("Couldn't remove %s", pkg->install_logdir);
free(pkg->install_logdir_real);
@@ -1582,7 +1563,7 @@ clean_memory:
free_plist(&pkg->plist);
free_meta_data(pkg);
if (pkg->archive)
- archive_read_finish(pkg->archive);
+ archive_read_free(pkg->archive);
free(pkg->other_version);
free(pkg->pkgname);
clean_find_archive:
Index: src/external/bsd/pkg_install/dist/add/pkg_add.1
diff -u src/external/bsd/pkg_install/dist/add/pkg_add.1:1.1.1.13 src/external/bsd/pkg_install/dist/add/pkg_add.1:1.2
--- src/external/bsd/pkg_install/dist/add/pkg_add.1:1.1.1.13 Thu Apr 20 13:12:46 2017
+++ src/external/bsd/pkg_install/dist/add/pkg_add.1 Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.1.1.13 2017/04/20 13:12:46 joerg Exp $
+.\" $NetBSD: pkg_add.1,v 1.2 2017/04/20 13:18:23 joerg Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
Index: src/external/bsd/pkg_install/dist/admin/audit-packages.8
diff -u src/external/bsd/pkg_install/dist/admin/audit-packages.8:1.1.1.1 src/external/bsd/pkg_install/dist/admin/audit-packages.8:1.2
--- src/external/bsd/pkg_install/dist/admin/audit-packages.8:1.1.1.1 Fri Apr 23 20:54:06 2010
+++ src/external/bsd/pkg_install/dist/admin/audit-packages.8 Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: audit-packages.8,v 1.1.1.1 2010/04/23 20:54:06 joerg Exp $
+.\" $NetBSD: audit-packages.8,v 1.2 2017/04/20 13:18:23 joerg Exp $
.\"
.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
Index: src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
diff -u src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8:1.1.1.1 src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8:1.2
--- src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8:1.1.1.1 Fri Apr 23 20:54:06 2010
+++ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: download-vulnerability-list.8,v 1.1.1.1 2010/04/23 20:54:06 joerg Exp $
+.\" $NetBSD: download-vulnerability-list.8,v 1.2 2017/04/20 13:18:23 joerg Exp $
.\"
.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
Index: src/external/bsd/pkg_install/dist/admin/audit.c
diff -u src/external/bsd/pkg_install/dist/admin/audit.c:1.1.1.9 src/external/bsd/pkg_install/dist/admin/audit.c:1.2
--- src/external/bsd/pkg_install/dist/admin/audit.c:1.1.1.9 Fri Feb 18 22:32:28 2011
+++ src/external/bsd/pkg_install/dist/admin/audit.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audit.c,v 1.1.1.9 2011/02/18 22:32:28 aymeric Exp $ */
+/* $NetBSD: audit.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.9 2011/02/18 22:32:28 aymeric Exp $");
+__RCSID("$NetBSD: audit.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/admin/check.c
diff -u src/external/bsd/pkg_install/dist/admin/check.c:1.1.1.4 src/external/bsd/pkg_install/dist/admin/check.c:1.2
--- src/external/bsd/pkg_install/dist/admin/check.c:1.1.1.4 Sat Jan 30 21:33:23 2010
+++ src/external/bsd/pkg_install/dist/admin/check.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: check.c,v 1.1.1.4 2010/01/30 21:33:23 joerg Exp $ */
+/* $NetBSD: check.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: check.c,v 1.1.1.4 2010/01/30 21:33:23 joerg Exp $");
+__RCSID("$NetBSD: check.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
Index: src/external/bsd/pkg_install/dist/admin/main.c
diff -u src/external/bsd/pkg_install/dist/admin/main.c:1.1.1.16 src/external/bsd/pkg_install/dist/admin/main.c:1.2
--- src/external/bsd/pkg_install/dist/admin/main.c:1.1.1.16 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/admin/main.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.1.1.16 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.16 2017/04/20 13:12:47 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
Index: src/external/bsd/pkg_install/dist/admin/pkg_admin.1
diff -u src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.13 src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.2
--- src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.1.1.13 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_admin.1,v 1.1.1.13 2017/04/20 13:12:47 joerg Exp $
+.\" $NetBSD: pkg_admin.1,v 1.2 2017/04/20 13:18:23 joerg Exp $
.\"
.\" Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
Index: src/external/bsd/pkg_install/dist/create/build.c
diff -u src/external/bsd/pkg_install/dist/create/build.c:1.1.1.9 src/external/bsd/pkg_install/dist/create/build.c:1.2
--- src/external/bsd/pkg_install/dist/create/build.c:1.1.1.9 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/create/build.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: build.c,v 1.1.1.9 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: build.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.9 2017/04/20 13:12:47 joerg Exp $");
+__RCSID("$NetBSD: build.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/create/create.h
diff -u src/external/bsd/pkg_install/dist/create/create.h:1.1.1.6 src/external/bsd/pkg_install/dist/create/create.h:1.2
--- src/external/bsd/pkg_install/dist/create/create.h:1.1.1.6 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/create/create.h Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: create.h,v 1.1.1.6 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: create.h,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/* from FreeBSD Id: create.h,v 1.13 1997/10/08 07:46:19 charnier Exp */
Index: src/external/bsd/pkg_install/dist/create/perform.c
diff -u src/external/bsd/pkg_install/dist/create/perform.c:1.1.1.6 src/external/bsd/pkg_install/dist/create/perform.c:1.2
--- src/external/bsd/pkg_install/dist/create/perform.c:1.1.1.6 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/create/perform.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.1.1.6 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: perform.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.6 2017/04/20 13:12:47 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/create/main.c
diff -u src/external/bsd/pkg_install/dist/create/main.c:1.1.1.8 src/external/bsd/pkg_install/dist/create/main.c:1.2
--- src/external/bsd/pkg_install/dist/create/main.c:1.1.1.8 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/create/main.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.1.1.8 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.8 2017/04/20 13:12:47 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/create/pkg_create.1
diff -u src/external/bsd/pkg_install/dist/create/pkg_create.1:1.2 src/external/bsd/pkg_install/dist/create/pkg_create.1:1.3
--- src/external/bsd/pkg_install/dist/create/pkg_create.1:1.2 Sat Oct 10 10:08:12 2015
+++ src/external/bsd/pkg_install/dist/create/pkg_create.1 Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.2 2015/10/10 10:08:12 mbalmer Exp $
+.\" $NetBSD: pkg_create.1,v 1.3 2017/04/20 13:18:23 joerg Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -24,7 +24,7 @@
.\" [jkh] Took John's changes back and made some additional extensions for
.\" better integration with FreeBSD's new ports collection.
.\"
-.Dd October 10, 2015
+.Dd December 27, 2014
.Dt PKG_CREATE 1
.Os
.Sh NAME
@@ -32,70 +32,28 @@
.Nd a utility for creating software package distributions
.Sh SYNOPSIS
.Nm
-.Op Fl ElOUVv
-.Bk -words
+.Op Fl lOVv
.Op Fl B Ar build-info-file
-.Ek
-.Bk -words
.Op Fl b Ar build-version-file
-.Ek
-.Bk -words
.Op Fl C Ar cpkgs
-.Ek
-.Bk -words
.Op Fl D Ar displayfile
-.Ek
-.Bk -words
.Op Fl F Ar compression
-.Ek
-.Bk -words
.Op Fl g Ar group
-.Ek
-.Bk -words
.Op Fl I Ar realprefix
-.Ek
-.Bk -words
.Op Fl i Ar iscript
-.Ek
-.Bk -words
.Op Fl K Ar pkg_dbdir
-.Ek
-.Bk -words
.Op Fl k Ar dscript
-.Ek
-.Bk -words
.Op Fl n Ar preserve-file
-.Ek
-.Bk -words
.Op Fl P Ar dpkgs
-.Ek
-.Bk -words
-.Op Fl T Ar buildpkgs
-.Ek
-.Bk -words
.Op Fl p Ar prefix
-.Ek
-.Bk -words
.Op Fl S Ar size-all-file
-.Ek
-.Bk -words
.Op Fl s Ar size-pkg-file
-.Ek
-.Bk -words
+.Op Fl T Ar buildpkgs
.Op Fl t Ar template
-.Ek
-.Bk -words
.Op Fl u Ar owner
-.Ek
-.Bk -words
.Fl c Ar comment
-.Ek
-.Bk -words
.Fl d Ar description
-.Ek
-.Bk -words
.Fl f Ar packlist
-.Ek
.Ar pkg-name
.Sh DESCRIPTION
The
@@ -158,8 +116,6 @@ Fetch long description for package from
or, if preceded by
.Cm - ,
the argument itself.
-.It Fl E
-Add an empty views file to the package.
.It Fl F Ar compression
Use
.Ar compression
@@ -287,8 +243,6 @@ Be sure to leave some number of
characters for
.Xr mktemp 3
to fill in with a unique ID.
-.It Fl U
-Do not update the package file database with any file information.
.It Fl u Ar owner
Make
.Ar owner
@@ -494,12 +448,11 @@ command first appeared in
.Sh AUTHORS
.Bl -tag -width indent -compact
.It Jordan Hubbard
-did most of the work.
+most of the work
.It John Kohl
refined it for
-.Nx .
+.Nx
.It Hubert Feyrer
-added
.Nx
wildcard dependency processing, pkgdb, pkg size recording etc.
.El
Index: src/external/bsd/pkg_install/dist/create/pl.c
diff -u src/external/bsd/pkg_install/dist/create/pl.c:1.1.1.5 src/external/bsd/pkg_install/dist/create/pl.c:1.2
--- src/external/bsd/pkg_install/dist/create/pl.c:1.1.1.5 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/create/pl.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pl.c,v 1.1.1.5 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: pl.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: pl.c,v 1.1.1.5 2017/04/20 13:12:47 joerg Exp $");
+__RCSID("$NetBSD: pl.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/delete/pkg_delete.1
diff -u src/external/bsd/pkg_install/dist/delete/pkg_delete.1:1.1.1.9 src/external/bsd/pkg_install/dist/delete/pkg_delete.1:1.2
--- src/external/bsd/pkg_install/dist/delete/pkg_delete.1:1.1.1.9 Thu Apr 20 13:12:46 2017
+++ src/external/bsd/pkg_install/dist/delete/pkg_delete.1 Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_delete.1,v 1.1.1.9 2017/04/20 13:12:46 joerg Exp $
+.\" $NetBSD: pkg_delete.1,v 1.2 2017/04/20 13:18:23 joerg Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
Index: src/external/bsd/pkg_install/dist/delete/pkg_delete.c
diff -u src/external/bsd/pkg_install/dist/delete/pkg_delete.c:1.1.1.9 src/external/bsd/pkg_install/dist/delete/pkg_delete.c:1.2
--- src/external/bsd/pkg_install/dist/delete/pkg_delete.c:1.1.1.9 Thu Apr 20 13:12:46 2017
+++ src/external/bsd/pkg_install/dist/delete/pkg_delete.c Thu Apr 20 13:18:23 2017
@@ -34,7 +34,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: pkg_delete.c,v 1.1.1.9 2017/04/20 13:12:46 joerg Exp $");
+__RCSID("$NetBSD: pkg_delete.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
#if HAVE_ERR_H
#include <err.h>
Index: src/external/bsd/pkg_install/dist/info/info.h
diff -u src/external/bsd/pkg_install/dist/info/info.h:1.1.1.6 src/external/bsd/pkg_install/dist/info/info.h:1.2
--- src/external/bsd/pkg_install/dist/info/info.h:1.1.1.6 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/info/info.h Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: info.h,v 1.1.1.6 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: info.h,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/* from FreeBSD Id: info.h,v 1.10 1997/02/22 16:09:40 peter Exp */
Index: src/external/bsd/pkg_install/dist/info/main.c
diff -u src/external/bsd/pkg_install/dist/info/main.c:1.1.1.9 src/external/bsd/pkg_install/dist/info/main.c:1.2
--- src/external/bsd/pkg_install/dist/info/main.c:1.1.1.9 Sat Apr 20 15:26:53 2013
+++ src/external/bsd/pkg_install/dist/info/main.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.1.1.9 2013/04/20 15:26:53 wiz Exp $ */
+/* $NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.9 2013/04/20 15:26:53 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
*
Index: src/external/bsd/pkg_install/dist/info/perform.c
diff -u src/external/bsd/pkg_install/dist/info/perform.c:1.1.1.14 src/external/bsd/pkg_install/dist/info/perform.c:1.2
--- src/external/bsd/pkg_install/dist/info/perform.c:1.1.1.14 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/info/perform.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.1.1.14 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: perform.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.14 2017/04/20 13:12:47 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/info/pkg_info.1
diff -u src/external/bsd/pkg_install/dist/info/pkg_info.1:1.2 src/external/bsd/pkg_install/dist/info/pkg_info.1:1.3
--- src/external/bsd/pkg_install/dist/info/pkg_info.1:1.2 Tue Apr 28 09:48:30 2015
+++ src/external/bsd/pkg_install/dist/info/pkg_info.1 Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_info.1,v 1.2 2015/04/28 09:48:30 prlw1 Exp $
+.\" $NetBSD: pkg_info.1,v 1.3 2017/04/20 13:18:23 joerg Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -17,7 +17,7 @@
.\"
.\" @(#)pkg_info.1
.\"
-.Dd December 14, 2012
+.Dd January 11, 2015
.Dt PKG_INFO 1
.Os
.Sh NAME
@@ -226,7 +226,7 @@ The filename is resolved to a package na
The filename must be absolute, as in the output of
.Dl pkg_info -aF .
For example,
-.Dl pkg_info -eF /path/to/file
+.Dl pkg_info -Fe /path/to/file
can be used to display the package the given file belongs to, and
.Dl pkg_info -LF /path/to/file
can be used to display all files belonging to the package the given
Index: src/external/bsd/pkg_install/dist/info/show.c
diff -u src/external/bsd/pkg_install/dist/info/show.c:1.3 src/external/bsd/pkg_install/dist/info/show.c:1.4
--- src/external/bsd/pkg_install/dist/info/show.c:1.3 Tue Feb 21 18:36:16 2012
+++ src/external/bsd/pkg_install/dist/info/show.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: show.c,v 1.3 2012/02/21 18:36:16 wiz Exp $ */
+/* $NetBSD: show.c,v 1.4 2017/04/20 13:18:23 joerg 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.3 2012/02/21 18:36:16 wiz Exp $");
+__RCSID("$NetBSD: show.c,v 1.4 2017/04/20 13:18:23 joerg Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/automatic.c
diff -u src/external/bsd/pkg_install/dist/lib/automatic.c:1.1.1.2 src/external/bsd/pkg_install/dist/lib/automatic.c:1.2
--- src/external/bsd/pkg_install/dist/lib/automatic.c:1.1.1.2 Mon Feb 2 20:44:05 2009
+++ src/external/bsd/pkg_install/dist/lib/automatic.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: automatic.c,v 1.1.1.2 2009/02/02 20:44:05 joerg Exp $ */
+/* $NetBSD: automatic.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.2 2009/02/02 20:44:05 joerg Exp $");
+__RCSID("$NetBSD: automatic.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
#if HAVE_ASSERT_H
#include <assert.h>
Index: src/external/bsd/pkg_install/dist/lib/global.c
diff -u src/external/bsd/pkg_install/dist/lib/global.c:1.1.1.2 src/external/bsd/pkg_install/dist/lib/global.c:1.2
--- src/external/bsd/pkg_install/dist/lib/global.c:1.1.1.2 Mon Feb 2 20:44:06 2009
+++ src/external/bsd/pkg_install/dist/lib/global.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: global.c,v 1.1.1.2 2009/02/02 20:44:06 joerg Exp $ */
+/* $NetBSD: global.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.2 2009/02/02 20:44:06 joerg Exp $");
+__RCSID("$NetBSD: global.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/lpkg.c
diff -u src/external/bsd/pkg_install/dist/lib/lpkg.c:1.1.1.2 src/external/bsd/pkg_install/dist/lib/lpkg.c:1.2
--- src/external/bsd/pkg_install/dist/lib/lpkg.c:1.1.1.2 Mon Feb 2 20:44:06 2009
+++ src/external/bsd/pkg_install/dist/lib/lpkg.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: lpkg.c,v 1.1.1.2 2009/02/02 20:44:06 joerg Exp $ */
+/* $NetBSD: lpkg.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
Index: src/external/bsd/pkg_install/dist/lib/remove.c
diff -u src/external/bsd/pkg_install/dist/lib/remove.c:1.1.1.2 src/external/bsd/pkg_install/dist/lib/remove.c:1.2
--- src/external/bsd/pkg_install/dist/lib/remove.c:1.1.1.2 Thu Aug 6 16:55:29 2009
+++ src/external/bsd/pkg_install/dist/lib/remove.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: remove.c,v 1.1.1.2 2009/08/06 16:55:29 joerg Exp $ */
+/* $NetBSD: remove.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: remove.c,v 1.1.1.2 2009/08/06 16:55:29 joerg Exp $");
+__RCSID("$NetBSD: remove.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
#if HAVE_DIRENT_H
#include <dirent.h>
Index: src/external/bsd/pkg_install/dist/lib/str.c
diff -u src/external/bsd/pkg_install/dist/lib/str.c:1.1.1.2 src/external/bsd/pkg_install/dist/lib/str.c:1.2
--- src/external/bsd/pkg_install/dist/lib/str.c:1.1.1.2 Mon Feb 2 20:44:08 2009
+++ src/external/bsd/pkg_install/dist/lib/str.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.1.1.2 2009/02/02 20:44:08 joerg Exp $ */
+/* $NetBSD: str.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.2 2009/02/02 20:44:08 joerg Exp $");
+__RCSID("$NetBSD: str.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/conflicts.c
diff -u src/external/bsd/pkg_install/dist/lib/conflicts.c:1.1.1.4 src/external/bsd/pkg_install/dist/lib/conflicts.c:1.2
--- src/external/bsd/pkg_install/dist/lib/conflicts.c:1.1.1.4 Sat Jan 30 21:33:43 2010
+++ src/external/bsd/pkg_install/dist/lib/conflicts.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: conflicts.c,v 1.1.1.4 2010/01/30 21:33:43 joerg Exp $ */
+/* $NetBSD: conflicts.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/*-
* Copyright (c) 2007 Roland Illig <ril...@netbsd.org>.
@@ -48,7 +48,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: conflicts.c,v 1.1.1.4 2010/01/30 21:33:43 joerg Exp $");
+__RCSID("$NetBSD: conflicts.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
#if HAVE_ERR_H
#include <err.h>
Index: src/external/bsd/pkg_install/dist/lib/iterate.c
diff -u src/external/bsd/pkg_install/dist/lib/iterate.c:1.1.1.4 src/external/bsd/pkg_install/dist/lib/iterate.c:1.2
--- src/external/bsd/pkg_install/dist/lib/iterate.c:1.1.1.4 Sat Jan 30 21:33:47 2010
+++ src/external/bsd/pkg_install/dist/lib/iterate.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: iterate.c,v 1.1.1.4 2010/01/30 21:33:47 joerg Exp $ */
+/* $NetBSD: iterate.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/lib/pkcs7.c
diff -u src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.1.1.4 src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.2
--- src/external/bsd/pkg_install/dist/lib/pkcs7.c:1.1.1.4 Thu Aug 6 16:55:27 2009
+++ src/external/bsd/pkg_install/dist/lib/pkcs7.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pkcs7.c,v 1.1.1.4 2009/08/06 16:55:27 joerg Exp $ */
+/* $NetBSD: pkcs7.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: pkcs7.c,v 1.1.1.4 2009/08/06 16:55:27 joerg Exp $");
+__RCSID("$NetBSD: pkcs7.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
Index: src/external/bsd/pkg_install/dist/lib/defs.h
diff -u src/external/bsd/pkg_install/dist/lib/defs.h:1.4 src/external/bsd/pkg_install/dist/lib/defs.h:1.5
--- src/external/bsd/pkg_install/dist/lib/defs.h:1.4 Thu Jan 12 22:57:26 2017
+++ src/external/bsd/pkg_install/dist/lib/defs.h Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.4 2017/01/12 22:57:26 christos Exp $ */
+/* $NetBSD: defs.h,v 1.5 2017/04/20 13:18:23 joerg Exp $ */
/*-
* Copyright (c) 1999,2000,2009 The NetBSD Foundation, Inc.
@@ -31,9 +31,6 @@
#ifndef DEFS_H_
#define DEFS_H_
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -41,6 +38,9 @@
#if HAVE_ERR_H
#include <err.h>
#endif
+#if HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
#if HAVE_STDLIB_H
#include <stdlib.h>
#endif
Index: src/external/bsd/pkg_install/dist/lib/license.c
diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.4 src/external/bsd/pkg_install/dist/lib/license.c:1.5
--- src/external/bsd/pkg_install/dist/lib/license.c:1.4 Sat Apr 20 15:29:23 2013
+++ src/external/bsd/pkg_install/dist/lib/license.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.4 2013/04/20 15:29:23 wiz Exp $ */
+/* $NetBSD: license.c,v 1.5 2017/04/20 13:18:23 joerg Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -51,35 +51,48 @@ const char *default_acceptable_licenses
"artistic artistic-2.0 "
"boost-license "
"cc-by-sa-v3.0 "
+ "cc0-1.0-universal "
"cddl-1.0 "
+ "cecill-2.1 "
"cpl-1.0 "
"epl-v1.0 "
+ "eupl-v1.1 "
+ "gfsl "
"gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
"gnu-gpl-v1 "
"gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
"gnu-gpl-v3 gnu-lgpl-v3 "
- "ibm-public-license-1.0 "
+ "hpnd "
+ "info-zip "
"ipafont "
+ "ipl-1.0 "
"isc "
- "lppl-1.3c "
+ "lppl-1.0 lppl-1.2 lppl-1.3c "
"lucent "
"miros "
"mit "
"mpl-1.0 mpl-1.1 mpl-2.0 "
"mplusfont "
"ofl-v1.0 ofl-v1.1 "
+ "openssl "
"original-bsd modified-bsd 2-clause-bsd "
+ "paratype "
"php "
"png-license "
"postgresql-license "
"public-domain "
"python-software-foundation "
"qpl-v1.0 "
+ "sgi-free-software-b-v2.0 "
+ "sissl-1.1 "
"sleepycat-public "
+ "unicode "
"unlicense "
+ "vera-ttf-license "
+ "w3c "
"x11 "
"zlib "
- "zpl";
+ "zpl-2.0 zpl-2.1";
#ifdef DEBUG
static size_t hash_collisions;
Index: src/external/bsd/pkg_install/dist/lib/pkg_summary.5
diff -u src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.4 src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.5
--- src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.4 Sun Feb 19 17:49:09 2012
+++ src/external/bsd/pkg_install/dist/lib/pkg_summary.5 Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_summary.5,v 1.4 2012/02/19 17:49:09 tron Exp $
+.\" $NetBSD: pkg_summary.5,v 1.5 2017/04/20 13:18:23 joerg Exp $
.\"
.\" Copyright (c) 2006 The NetBSD Foundation
.\"
Index: src/external/bsd/pkg_install/dist/lib/dewey.c
diff -u src/external/bsd/pkg_install/dist/lib/dewey.c:1.3 src/external/bsd/pkg_install/dist/lib/dewey.c:1.4
--- src/external/bsd/pkg_install/dist/lib/dewey.c:1.3 Sun Mar 8 14:53:16 2009
+++ src/external/bsd/pkg_install/dist/lib/dewey.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dewey.c,v 1.3 2009/03/08 14:53:16 joerg Exp $ */
+/* $NetBSD: dewey.c,v 1.4 2017/04/20 13:18:23 joerg Exp $ */
/*
* Copyright © 2002 Alistair G. Crooks. All rights reserved.
Index: src/external/bsd/pkg_install/dist/lib/dewey.h
diff -u src/external/bsd/pkg_install/dist/lib/dewey.h:1.1.1.1 src/external/bsd/pkg_install/dist/lib/dewey.h:1.2
--- src/external/bsd/pkg_install/dist/lib/dewey.h:1.1.1.1 Tue Sep 30 19:00:27 2008
+++ src/external/bsd/pkg_install/dist/lib/dewey.h Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dewey.h,v 1.1.1.1 2008/09/30 19:00:27 joerg Exp $ */
+/* $NetBSD: dewey.h,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
#ifndef _INST_LIB_DEWEY_H_
#define _INST_LIB_DEWEY_H_
Index: src/external/bsd/pkg_install/dist/lib/pkgsrc.7
diff -u src/external/bsd/pkg_install/dist/lib/pkgsrc.7:1.1.1.1 src/external/bsd/pkg_install/dist/lib/pkgsrc.7:1.2
--- src/external/bsd/pkg_install/dist/lib/pkgsrc.7:1.1.1.1 Tue Sep 30 19:00:27 2008
+++ src/external/bsd/pkg_install/dist/lib/pkgsrc.7 Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkgsrc.7,v 1.1.1.1 2008/09/30 19:00:27 joerg Exp $
+.\" $NetBSD: pkgsrc.7,v 1.2 2017/04/20 13:18:23 joerg Exp $
.\"
.\" Copyright (c) 2007 The NetBSD Foundation, Inc.
.\" All rights reserved.
Index: src/external/bsd/pkg_install/dist/lib/xwrapper.c
diff -u src/external/bsd/pkg_install/dist/lib/xwrapper.c:1.1.1.1 src/external/bsd/pkg_install/dist/lib/xwrapper.c:1.2
--- src/external/bsd/pkg_install/dist/lib/xwrapper.c:1.1.1.1 Mon Feb 2 20:44:09 2009
+++ src/external/bsd/pkg_install/dist/lib/xwrapper.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xwrapper.c,v 1.1.1.1 2009/02/02 20:44:09 joerg Exp $ */
+/* $NetBSD: xwrapper.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -36,7 +36,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: xwrapper.c,v 1.1.1.1 2009/02/02 20:44:09 joerg Exp $");
+__RCSID("$NetBSD: xwrapper.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
#if HAVE_ERR_H
#include <err.h>
Index: src/external/bsd/pkg_install/dist/lib/fexec.c
diff -u src/external/bsd/pkg_install/dist/lib/fexec.c:1.1.1.3 src/external/bsd/pkg_install/dist/lib/fexec.c:1.2
--- src/external/bsd/pkg_install/dist/lib/fexec.c:1.1.1.3 Thu Aug 6 16:55:26 2009
+++ src/external/bsd/pkg_install/dist/lib/fexec.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fexec.c,v 1.1.1.3 2009/08/06 16:55:26 joerg Exp $ */
+/* $NetBSD: fexec.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include "lib.h"
-__RCSID("$NetBSD: fexec.c,v 1.1.1.3 2009/08/06 16:55:26 joerg Exp $");
+__RCSID("$NetBSD: fexec.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
static int vfcexec(const char *, int, const char *, va_list);
Index: src/external/bsd/pkg_install/dist/lib/gpgsig.c
diff -u src/external/bsd/pkg_install/dist/lib/gpgsig.c:1.1.1.3 src/external/bsd/pkg_install/dist/lib/gpgsig.c:1.2
--- src/external/bsd/pkg_install/dist/lib/gpgsig.c:1.1.1.3 Thu Apr 20 13:12:48 2017
+++ src/external/bsd/pkg_install/dist/lib/gpgsig.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gpgsig.c,v 1.1.1.3 2017/04/20 13:12:48 joerg Exp $ */
+/* $NetBSD: gpgsig.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: gpgsig.c,v 1.1.1.3 2017/04/20 13:12:48 joerg Exp $");
+__RCSID("$NetBSD: gpgsig.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/lib/opattern.c
diff -u src/external/bsd/pkg_install/dist/lib/opattern.c:1.1.1.3 src/external/bsd/pkg_install/dist/lib/opattern.c:1.2
--- src/external/bsd/pkg_install/dist/lib/opattern.c:1.1.1.3 Sun Feb 19 17:46:47 2012
+++ src/external/bsd/pkg_install/dist/lib/opattern.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: opattern.c,v 1.1.1.3 2012/02/19 17:46:47 tron Exp $ */
+/* $NetBSD: opattern.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.3 2012/02/19 17:46:47 tron Exp $");
+__RCSID("$NetBSD: opattern.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/version.c
diff -u src/external/bsd/pkg_install/dist/lib/version.c:1.1.1.3 src/external/bsd/pkg_install/dist/lib/version.c:1.2
--- src/external/bsd/pkg_install/dist/lib/version.c:1.1.1.3 Wed Feb 3 14:24:00 2010
+++ src/external/bsd/pkg_install/dist/lib/version.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: version.c,v 1.1.1.3 2010/02/03 14:24:00 joerg Exp $ */
+/* $NetBSD: version.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.3 2010/02/03 14:24:00 joerg Exp $");
+__RCSID("$NetBSD: version.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
* Copyright (c) 2001 Thomas Klausner. All rights reserved.
Index: src/external/bsd/pkg_install/dist/lib/file.c
diff -u src/external/bsd/pkg_install/dist/lib/file.c:1.1.1.7 src/external/bsd/pkg_install/dist/lib/file.c:1.2
--- src/external/bsd/pkg_install/dist/lib/file.c:1.1.1.7 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/lib/file.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.1.1.7 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: file.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.7 2017/04/20 13:12:47 joerg Exp $");
+__RCSID("$NetBSD: file.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/lib.h
diff -u src/external/bsd/pkg_install/dist/lib/lib.h:1.7 src/external/bsd/pkg_install/dist/lib/lib.h:1.8
--- src/external/bsd/pkg_install/dist/lib/lib.h:1.7 Tue Jan 7 02:15:27 2014
+++ src/external/bsd/pkg_install/dist/lib/lib.h Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.7 2014/01/07 02:15:27 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.8 2017/04/20 13:18:23 joerg Exp $ */
/* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
@@ -29,9 +29,6 @@
#include "config.h"
#endif
#include <nbcompat.h>
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
@@ -116,9 +113,6 @@ enum {
#define SIZE_PKG_FNAME "+SIZE_PKG"
#define SIZE_ALL_FNAME "+SIZE_ALL"
#define PRESERVE_FNAME "+PRESERVE"
-#define VIEWS_FNAME "+VIEWS"
-#define VIEWS_FNAME_TMP "+VIEWS.tmp"
-#define DEPOT_FNAME "+DEPOT"
/* The names of special variables */
#define AUTOMATIC_VARNAME "automatic"
@@ -322,6 +316,7 @@ int has_pkgdir(const char *);
struct archive;
struct archive_entry;
+struct archive *prepare_archive(void);
struct archive *open_archive(const char *, char **);
struct archive *find_archive(const char *, int, char **);
void process_pkg_path(void);
@@ -363,7 +358,6 @@ const char *pkgdb_get_dir(void);
* 1 config file
* 2 environment
* 3 command line
- * 4 destdir/views reset
*/
void pkgdb_set_dir(const char *, int);
char *pkgdb_pkg_dir(const char *);
@@ -404,9 +398,7 @@ int easy_pkcs7_sign(const char *, size_t
const char *);
#endif
-int inline_gpg_verify(const char *, size_t, const char *);
-int detached_gpg_verify(const char *, size_t, const char *, size_t,
- const char *);
+int gpg_verify(const char *, size_t, const char *, const char *, size_t);
int detached_gpg_sign(const char *, size_t, char **, size_t *, const char *,
const char *);
@@ -421,7 +413,12 @@ char *xstrdup(const char *);
void *xrealloc(void *, size_t);
void *xcalloc(size_t, size_t);
void *xmalloc(size_t);
-char *xasprintf(const char *, ...) __printflike(1, 2);
+#if defined(__GNUC__) && __GNUC__ >= 2
+char *xasprintf(const char *, ...)
+ __attribute__((__format__(__printf__, 1, 2)));
+#else
+char *xasprintf(const char *, ...);
+#endif
/* Externs */
extern Boolean Verbose;
Index: src/external/bsd/pkg_install/dist/lib/parse-config.c
diff -u src/external/bsd/pkg_install/dist/lib/parse-config.c:1.1.1.11 src/external/bsd/pkg_install/dist/lib/parse-config.c:1.2
--- src/external/bsd/pkg_install/dist/lib/parse-config.c:1.1.1.11 Sat Jun 26 00:14:31 2010
+++ src/external/bsd/pkg_install/dist/lib/parse-config.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: parse-config.c,v 1.1.1.11 2010/06/26 00:14:31 joerg Exp $ */
+/* $NetBSD: parse-config.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.11 2010/06/26 00:14:31 joerg Exp $");
+__RCSID("$NetBSD: parse-config.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 2008, 2009 Joerg Sonnenberger <jo...@netbsd.org>.
Index: src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
diff -u src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.2 src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.3
--- src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.2 Tue Apr 28 09:48:30 2015
+++ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_install.conf.5.in,v 1.2 2015/04/28 09:48:30 prlw1 Exp $
+.\" $NetBSD: pkg_install.conf.5.in,v 1.3 2017/04/20 13:18:23 joerg Exp $
.\"
.\" Copyright (c) 2008, 2009, 2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd February 22, 2012
+.Dd October 28, 2014
.Dt PKG_INSTALL.CONF 5
.Os
.Sh NAME
@@ -93,6 +93,9 @@ Missing license conditions are considere
During vulnerability checks, consider packages that have reached end-of-life
as vulnerable.
This option is enabled by default.
+.It Dv CHECK_OSABI
+If "no", osabi package does not check OS version.
+The default is "yes".
.It Dv CHECK_VULNERABILITIES
Check for vulnerabilities when installing packages.
Supported values are:
Index: src/external/bsd/pkg_install/dist/lib/pkg_signature.c
diff -u src/external/bsd/pkg_install/dist/lib/pkg_signature.c:1.2 src/external/bsd/pkg_install/dist/lib/pkg_signature.c:1.3
--- src/external/bsd/pkg_install/dist/lib/pkg_signature.c:1.2 Wed Sep 11 12:59:19 2013
+++ src/external/bsd/pkg_install/dist/lib/pkg_signature.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pkg_signature.c,v 1.2 2013/09/11 12:59:19 khorben Exp $ */
+/* $NetBSD: pkg_signature.c,v 1.3 2017/04/20 13:18:23 joerg 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.2 2013/09/11 12:59:19 khorben Exp $");
+__RCSID("$NetBSD: pkg_signature.c,v 1.3 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -47,6 +47,7 @@ __RCSID("$NetBSD: pkg_signature.c,v 1.2
#endif
#include <errno.h>
#include <fcntl.h>
+#include <limits.h>
#include <stdlib.h>
#ifndef NETBSD
#include <nbcompat/sha2.h>
@@ -159,7 +160,7 @@ verify_signature_close_cb(struct archive
{
struct signature_archive *state = cookie;
- archive_read_finish(state->archive);
+ archive_read_free(state->archive);
free_signature_int(state);
return 0;
}
@@ -330,7 +331,7 @@ pkg_verify_signature(const char *archive
r = read_file_from_archive(archive_name, *archive, entry, HASH_FNAME,
&hash_file, &hash_len);
if (r == -1) {
- archive_read_finish(*archive);
+ archive_read_free(*archive);
*archive = NULL;
free(state);
goto no_valid_signature;
@@ -345,7 +346,7 @@ pkg_verify_signature(const char *archive
r = read_file_from_archive(archive_name, *archive, entry, SIGNATURE_FNAME,
&signature_file, &signature_len);
if (r == -1) {
- archive_read_finish(*archive);
+ archive_read_free(*archive);
*archive = NULL;
free(state);
free(hash_file);
@@ -356,7 +357,7 @@ pkg_verify_signature(const char *archive
entry, GPG_SIGNATURE_FNAME,
&signature_file, &signature_len);
if (r == -1) {
- archive_read_finish(*archive);
+ archive_read_free(*archive);
*archive = NULL;
free(state);
free(hash_file);
@@ -366,8 +367,8 @@ pkg_verify_signature(const char *archive
free(state);
goto no_valid_signature;
}
- has_sig = !detached_gpg_verify(hash_file, hash_len,
- signature_file, signature_len, gpg_keyring_verify);
+ has_sig = !gpg_verify(hash_file, hash_len, gpg_keyring_verify,
+ signature_file, signature_len);
free(signature_file);
} else {
@@ -399,13 +400,11 @@ pkg_verify_signature(const char *archive
state->archive = *archive;
- a = archive_read_new();
- archive_read_support_compression_all(a);
- archive_read_support_format_all(a);
+ a = prepare_archive();
if (archive_read_open(a, state, NULL, verify_signature_read_cb,
verify_signature_close_cb)) {
warnx("Can't open signed package file");
- archive_read_finish(a);
+ archive_read_free(a);
goto no_valid_signature;
}
*archive = a;
@@ -448,13 +447,11 @@ extract_pkgname(int fd)
ssize_t len;
int r;
- a = archive_read_new();
- archive_read_support_compression_all(a);
- archive_read_support_format_all(a);
+ a = prepare_archive();
if (archive_read_open_fd(a, fd, 1024)) {
warnx("Cannot open binary package: %s",
archive_error_string(a));
- archive_read_finish(a);
+ archive_read_free(a);
return NULL;
}
@@ -462,17 +459,17 @@ extract_pkgname(int fd)
if (r != ARCHIVE_OK) {
warnx("Cannot extract package name: %s",
r == ARCHIVE_EOF ? "EOF" : archive_error_string(a));
- archive_read_finish(a);
+ archive_read_free(a);
return NULL;
}
if (strcmp(archive_entry_pathname(entry), "+CONTENTS") != 0) {
warnx("Invalid binary package, doesn't start with +CONTENTS");
- archive_read_finish(a);
+ archive_read_free(a);
return NULL;
}
if (archive_entry_size(entry) > SSIZE_MAX - 1) {
warnx("+CONTENTS too large to process");
- archive_read_finish(a);
+ archive_read_free(a);
return NULL;
}
@@ -482,12 +479,12 @@ extract_pkgname(int fd)
if (archive_read_data(a, buf, len) != len) {
warnx("Short read when extracing +CONTENTS");
free(buf);
- archive_read_finish(a);
+ archive_read_free(a);
return NULL;
}
buf[len] = '\0';
- archive_read_finish(a);
+ archive_read_free(a);
parse_plist(&plist, buf);
free(buf);
@@ -579,7 +576,6 @@ pkg_sign_x509(const char *name, const ch
archive_entry_set_size(sign_entry, signature_len);
pkg = archive_write_new();
- archive_write_set_compression_none(pkg);
archive_write_set_format_ar_bsd(pkg);
archive_write_open_filename(pkg, output);
@@ -608,7 +604,7 @@ pkg_sign_x509(const char *name, const ch
archive_write_finish_entry(pkg);
archive_entry_free(entry);
- archive_write_finish(pkg);
+ archive_write_free(pkg);
close(fd);
@@ -673,7 +669,6 @@ pkg_sign_gpg(const char *name, const cha
archive_entry_set_size(sign_entry, signature_len);
pkg = archive_write_new();
- archive_write_set_compression_none(pkg);
archive_write_set_format_ar_bsd(pkg);
archive_write_open_filename(pkg, output);
@@ -702,7 +697,7 @@ pkg_sign_gpg(const char *name, const cha
archive_write_finish_entry(pkg);
archive_entry_free(entry);
- archive_write_finish(pkg);
+ archive_write_free(pkg);
close(fd);
Index: src/external/bsd/pkg_install/dist/lib/var.c
diff -u src/external/bsd/pkg_install/dist/lib/var.c:1.2 src/external/bsd/pkg_install/dist/lib/var.c:1.3
--- src/external/bsd/pkg_install/dist/lib/var.c:1.2 Thu May 16 19:19:44 2013
+++ src/external/bsd/pkg_install/dist/lib/var.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.2 2013/05/16 19:19:44 martin Exp $ */
+/* $NetBSD: var.c,v 1.3 2017/04/20 13:18:23 joerg 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.2 2013/05/16 19:19:44 martin Exp $");
+__RCSID("$NetBSD: var.c,v 1.3 2017/04/20 13:18:23 joerg Exp $");
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -60,7 +60,7 @@ static const char *var_cmp(const char *,
static void var_print(FILE *, const char *, const char *);
/*
- * Copy the specified varibales from the file fname to stdout.
+ * Copy the specified variables from the file fname to stdout.
*/
int
var_copy_list(const char *buf, const char **variables)
@@ -74,8 +74,8 @@ var_copy_list(const char *buf, const cha
next = eol + 1;
len = eol - buf;
} else {
- next = eol;
len = strlen(buf);
+ next = buf + len;
}
for (i=0; variables[i]; i++) {
Index: src/external/bsd/pkg_install/dist/lib/pkg_io.c
diff -u src/external/bsd/pkg_install/dist/lib/pkg_io.c:1.1.1.10 src/external/bsd/pkg_install/dist/lib/pkg_io.c:1.2
--- src/external/bsd/pkg_install/dist/lib/pkg_io.c:1.1.1.10 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/lib/pkg_io.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pkg_io.c,v 1.1.1.10 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: pkg_io.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/*-
* Copyright (c) 2008, 2009 Joerg Sonnenberger <jo...@netbsd.org>.
* All rights reserved.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: pkg_io.c,v 1.1.1.10 2017/04/20 13:12:47 joerg Exp $");
+__RCSID("$NetBSD: pkg_io.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
#include <archive.h>
#include <archive_entry.h>
Index: src/external/bsd/pkg_install/dist/lib/pkgdb.c
diff -u src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.1.1.8 src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.2
--- src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.1.1.8 Fri Apr 23 20:54:11 2010
+++ src/external/bsd/pkg_install/dist/lib/pkgdb.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pkgdb.c,v 1.1.1.8 2010/04/23 20:54:11 joerg Exp $ */
+/* $NetBSD: pkgdb.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.8 2010/04/23 20:54:11 joerg Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*-
* Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
Index: src/external/bsd/pkg_install/dist/lib/plist.c
diff -u src/external/bsd/pkg_install/dist/lib/plist.c:1.1.1.5 src/external/bsd/pkg_install/dist/lib/plist.c:1.2
--- src/external/bsd/pkg_install/dist/lib/plist.c:1.1.1.5 Thu Aug 6 16:55:28 2009
+++ src/external/bsd/pkg_install/dist/lib/plist.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: plist.c,v 1.1.1.5 2009/08/06 16:55:28 joerg Exp $ */
+/* $NetBSD: plist.c,v 1.2 2017/04/20 13:18:23 joerg 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.1.1.5 2009/08/06 16:55:28 joerg Exp $");
+__RCSID("$NetBSD: plist.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.10 src/external/bsd/pkg_install/dist/lib/version.h:1.11
--- src/external/bsd/pkg_install/dist/lib/version.h:1.10 Sat Apr 20 15:29:23 2013
+++ src/external/bsd/pkg_install/dist/lib/version.h Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.10 2013/04/20 15:29:23 wiz Exp $ */
+/* $NetBSD: version.h,v 1.11 2017/04/20 13:18:23 joerg 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 20130131
+#define PKGTOOLS_VERSION 20170419
#endif /* _INST_LIB_VERSION_H_ */
Index: src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
diff -u src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c:1.1.1.6 src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c:1.2
--- src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c:1.1.1.6 Thu Apr 20 13:12:47 2017
+++ src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vulnerabilities-file.c,v 1.1.1.6 2017/04/20 13:12:47 joerg Exp $ */
+/* $NetBSD: vulnerabilities-file.c,v 1.2 2017/04/20 13:18:23 joerg Exp $ */
/*-
* Copyright (c) 2008, 2010 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -38,7 +38,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: vulnerabilities-file.c,v 1.1.1.6 2017/04/20 13:12:47 joerg Exp $");
+__RCSID("$NetBSD: vulnerabilities-file.c,v 1.2 2017/04/20 13:18:23 joerg Exp $");
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf
diff -u src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf:1.1.1.1 src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf:1.2
--- src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf:1.1.1.1 Mon Feb 2 20:44:09 2009
+++ src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf Thu Apr 20 13:18:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: pkgsrc.cnf,v 1.1.1.1 2009/02/02 20:44:09 joerg Exp $
+# $NetBSD: pkgsrc.cnf,v 1.2 2017/04/20 13:18:23 joerg Exp $
#
# OpenSSL sample configuration file for use by pkgsrc.sh
#
Index: src/external/bsd/pkg_install/dist/x509/pkgsrc.sh
diff -u src/external/bsd/pkg_install/dist/x509/pkgsrc.sh:1.1.1.1 src/external/bsd/pkg_install/dist/x509/pkgsrc.sh:1.2
--- src/external/bsd/pkg_install/dist/x509/pkgsrc.sh:1.1.1.1 Mon Feb 2 20:44:09 2009
+++ src/external/bsd/pkg_install/dist/x509/pkgsrc.sh Thu Apr 20 13:18:23 2017
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: pkgsrc.sh,v 1.1.1.1 2009/02/02 20:44:09 joerg Exp $
+# $NetBSD: pkgsrc.sh,v 1.2 2017/04/20 13:18:23 joerg Exp $
#
CA="openssl ca -config pkgsrc.cnf"
