CVS commit: src/external/bsd/pkg_install/dist
Module Name:src
Committed By: wiz
Date: Mon Aug 26 22:41:39 UTC 2024
Modified Files:
src/external/bsd/pkg_install/dist/add: perform.c
src/external/bsd/pkg_install/dist/lib: version.h
Log Message:
merge pkg_install-20240826
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.22 -r1.23 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.12 src/external/bsd/pkg_install/dist/add/perform.c:1.13
--- src/external/bsd/pkg_install/dist/add/perform.c:1.12 Sun Aug 25 06:49:40 2024
+++ src/external/bsd/pkg_install/dist/add/perform.c Mon Aug 26 22:41:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.12 2024/08/25 06:49:40 wiz Exp $ */
+/* $NetBSD: perform.c,v 1.13 2024/08/26 22:41:39 wiz 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.12 2024/08/25 06:49:40 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.13 2024/08/26 22:41:39 wiz Exp $");
/*-
* Copyright (c) 2003 Grant Beattie
@@ -897,7 +897,7 @@ check_platform(struct pkg_task *pkg)
const char *effective_os_version;
int fatal;
-if (OverrideOpsys != NULL && OverrideOSVersion != NULL) {
+ if (OverrideOpsys != NULL && OverrideOSVersion != NULL) {
effective_opsys = OverrideOpsys;
effective_os_version = OverrideOSVersion;
} else {
@@ -1548,9 +1548,6 @@ pkg_do(const char *pkgpath, int mark_aut
if (check_implicit_conflict(pkg))
goto clean_memory;
- if (check_requires(pkg))
- goto clean_memory;
-
if (pkg->other_version != NULL) {
/*
* Replacing an existing package.
@@ -1572,15 +1569,21 @@ pkg_do(const char *pkgpath, int mark_aut
if (check_dependencies(pkg))
goto nuke_pkgdb;
+
+ if (check_requires(pkg))
+ goto nuke_pkgdb;
} else {
/*
* Normal installation.
* Install/update dependencies first and
* write the current package to disk afterwards.
- */
+ */
if (check_dependencies(pkg))
goto clean_memory;
+ if (check_requires(pkg))
+ goto clean_memory;
+
if (write_meta_data(pkg))
goto nuke_pkgdb;
}
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.22 src/external/bsd/pkg_install/dist/lib/version.h:1.23
--- src/external/bsd/pkg_install/dist/lib/version.h:1.22 Sun Aug 25 06:49:40 2024
+++ src/external/bsd/pkg_install/dist/lib/version.h Mon Aug 26 22:41:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.22 2024/08/25 06:49:40 wiz Exp $ */
+/* $NetBSD: version.h,v 1.23 2024/08/26 22:41:39 wiz 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 20240821
+#define PKGTOOLS_VERSION 20240826
#endif /* _INST_LIB_VERSION_H_ */
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Mon Aug 26 22:41:39 UTC 2024 Modified Files: src/external/bsd/pkg_install/dist/add: perform.c src/external/bsd/pkg_install/dist/lib: version.h Log Message: merge pkg_install-20240826 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.22 -r1.23 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.
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Sun Aug 25 06:49:40 UTC 2024 Modified Files: src/external/bsd/pkg_install/dist/add: perform.c src/external/bsd/pkg_install/dist/lib: license.c version.h Log Message: Fix merge conflicts. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.21 -r1.22 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.
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src
Committed By: wiz
Date: Sun Aug 25 06:49:40 UTC 2024
Modified Files:
src/external/bsd/pkg_install/dist/add: perform.c
src/external/bsd/pkg_install/dist/lib: license.c version.h
Log Message:
Fix merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.21 -r1.22 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.11 src/external/bsd/pkg_install/dist/add/perform.c:1.12
--- src/external/bsd/pkg_install/dist/add/perform.c:1.11 Tue Jun 11 09:26:57 2024
+++ src/external/bsd/pkg_install/dist/add/perform.c Sun Aug 25 06:49:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.11 2024/06/11 09:26:57 wiz Exp $ */
+/* $NetBSD: perform.c,v 1.12 2024/08/25 06:49:40 wiz 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.11 2024/06/11 09:26:57 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.12 2024/08/25 06:49:40 wiz Exp $");
/*-
* Copyright (c) 2003 Grant Beattie
@@ -1115,6 +1115,41 @@ check_implicit_conflict(struct pkg_task
return status;
}
+/* check if all REQUIRES files (usually libraries) are installed */
+static int
+check_requires(struct pkg_task *pkg)
+{
+ const char *data, *eol, *next_line;
+ int ret = 0;
+
+ data = pkg->meta_data.meta_build_info;
+
+ for (; data != NULL && *data != '\0'; data = next_line) {
+ if ((eol = strchr(data, '\n')) == NULL) {
+ eol = data + strlen(data);
+ next_line = eol;
+ } else
+ next_line = eol + 1;
+
+ if (strncmp(data, "REQUIRES=", 9) == 0) {
+ char *library_name = dup_value(data, eol);
+ struct stat sb;
+ if (stat(library_name, &sb) != 0 || !S_ISREG(sb.st_mode)) {
+warnx("Missing required library: %s", library_name);
+#ifdef __NetBSD__
+if (strncmp(library_name, "/usr/X11R7", 10) == 0) {
+ warnx("Please make sure to install the X sets");
+}
+#endif
+ret = 1;
+ }
+ free(library_name);
+ }
+ }
+
+ return ret;
+}
+
/*
* Install a required dependency and verify its installation.
*/
@@ -1124,7 +1159,7 @@ install_depend_pkg(const char *dep)
/* XXX check cyclic dependencies? */
if (Fake || NoRecord) {
if (!Force) {
- warnx("Missing dependency %s\n", dep);
+ warnx("Missing dependency %s", dep);
return 1;
}
warnx("Missing dependency %s, continuing", dep);
@@ -1513,6 +1548,9 @@ pkg_do(const char *pkgpath, int mark_aut
if (check_implicit_conflict(pkg))
goto clean_memory;
+ if (check_requires(pkg))
+ goto clean_memory;
+
if (pkg->other_version != NULL) {
/*
* Replacing an existing package.
Index: src/external/bsd/pkg_install/dist/lib/license.c
diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.12 src/external/bsd/pkg_install/dist/lib/license.c:1.13
--- src/external/bsd/pkg_install/dist/lib/license.c:1.12 Tue Jun 11 09:26:57 2024
+++ src/external/bsd/pkg_install/dist/lib/license.c Sun Aug 25 06:49:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.12 2024/06/11 09:26:57 wiz Exp $ */
+/* $NetBSD: license.c,v 1.13 2024/08/25 06:49:40 wiz Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger .
@@ -102,6 +102,7 @@ const char *default_acceptable_licenses
"unicode "
"unicode-v3 "
"unlicense "
+"upl-1.0 "
"vera-ttf-license "
"w3c "
"x11 "
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.21 src/external/bsd/pkg_install/dist/lib/version.h:1.22
--- src/external/bsd/pkg_install/dist/lib/version.h:1.21 Tue Jun 11 09:26:57 2024
+++ src/external/bsd/pkg_install/dist/lib/version.h Sun Aug 25 06:49:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.21 2024/06/11 09:26:57 wiz Exp $ */
+/* $NetBSD: version.h,v 1.22 2024/08/25 06:49:40 wiz 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 20240307
+#define PKGTOOLS_VERSION 20240821
#endif /* _INST_LIB_VERSION_H_ */
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Sun Aug 25 06:47:19 UTC 2024 Removed Files: src/external/bsd/pkg_install/dist: Makefile Makefile.inc prepare-import.sh src/external/bsd/pkg_install/dist/dist/add: add.h main.c parse_cross.c perform.c pkg_add.1 src/external/bsd/pkg_install/dist/dist/admin: admin.h audit-packages.8 audit-packages.sh.in audit.c check.c download-vulnerability-list.8 download-vulnerability-list.sh.in main.c pkg_admin.1 src/external/bsd/pkg_install/dist/dist/create: build.c create.h main.c perform.c pkg_create.1 pl.c util.c src/external/bsd/pkg_install/dist/dist/delete: pkg_delete.1 pkg_delete.c src/external/bsd/pkg_install/dist/dist/info: info.h main.c perform.c pkg_info.1 show.c src/external/bsd/pkg_install/dist/dist/lib: automatic.c config.h.in 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/dist/x509: pkgsrc.cnf pkgsrc.sh signing.txt src/external/bsd/pkg_install/dist/lib: Makefile config.h nbcompat.h src/external/bsd/pkg_install/dist/sbin: Makefile Makefile.inc src/external/bsd/pkg_install/dist/sbin/pkg_add: Makefile src/external/bsd/pkg_install/dist/sbin/pkg_admin: Makefile src/external/bsd/pkg_install/dist/sbin/pkg_create: Makefile src/external/bsd/pkg_install/dist/sbin/pkg_delete: Makefile src/external/bsd/pkg_install/dist/sbin/pkg_info: Makefile Log Message: Clean up after misimport. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/Makefile \ src/external/bsd/pkg_install/dist/Makefile.inc \ src/external/bsd/pkg_install/dist/prepare-import.sh cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/dist/add/add.h \ src/external/bsd/pkg_install/dist/dist/add/main.c \ src/external/bsd/pkg_install/dist/dist/add/parse_cross.c \ src/external/bsd/pkg_install/dist/dist/add/perform.c \ src/external/bsd/pkg_install/dist/dist/add/pkg_add.1 cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/dist/admin/admin.h \ src/external/bsd/pkg_install/dist/dist/admin/audit-packages.8 \ src/external/bsd/pkg_install/dist/dist/admin/audit-packages.sh.in \ src/external/bsd/pkg_install/dist/dist/admin/audit.c \ src/external/bsd/pkg_install/dist/dist/admin/check.c \ src/external/bsd/pkg_install/dist/dist/admin/download-vulnerability-list.8 \ src/external/bsd/pkg_install/dist/dist/admin/download-vulnerability-list.sh.in \ src/external/bsd/pkg_install/dist/dist/admin/main.c \ src/external/bsd/pkg_install/dist/dist/admin/pkg_admin.1 cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/dist/create/build.c \ src/external/bsd/pkg_install/dist/dist/create/create.h \ src/external/bsd/pkg_install/dist/dist/create/main.c \ src/external/bsd/pkg_install/dist/dist/create/perform.c \ src/external/bsd/pkg_install/dist/dist/create/pkg_create.1 \ src/external/bsd/pkg_install/dist/dist/create/pl.c \ src/external/bsd/pkg_install/dist/dist/create/util.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/dist/delete/pkg_delete.1 \ src/external/bsd/pkg_install/dist/dist/delete/pkg_delete.c cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/dist/info/info.h \ src/external/bsd/pkg_install/dist/dist/info/main.c \ src/external/bsd/pkg_install/dist/dist/info/perform.c \ src/external/bsd/pkg_install/dist/dist/info/pkg_info.1 \ src/external/bsd/pkg_install/dist/dist/info/show.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/dist/lib/automatic.c \ src/external/bsd/pkg_install/dist/dist/lib/config.h.in \ src/external/bsd/pkg_install/dist/dist/lib/conflicts.c \ src/external/bsd/pkg_install/dist/dist/lib/defs.h \ src/external/bsd/pkg_install/dist/dist/lib/dewey.c \ src/external/bsd/pkg_install/dist/dist/lib/dewey.h \ src/external/bsd/pkg_install/dist/dist/lib/fexec.c \ src/external/bsd/pkg_install/dist/dist/lib/file.c \ src/external/bsd/pkg_install/dist/dist/lib/global.c \ src/external/bsd/pkg_install/dist/dist/lib/gpgsig.c \ src/external/bsd/pkg_install/dist/dist/lib/iterate.c \ src/external/bsd/pkg_install/dist/dist/lib/lib.h \ src/external/bsd/pkg_install/dist/dist/lib/license.c \ src/external/bsd/pkg_install/dist/dist/lib/lpkg.c \ src/external/bsd/pkg_install/dist/dist/lib/opattern.c \ src/external/bsd/pkg_install/dist/dist/lib/parse-config.c \ src/external/bsd/pkg_install/dist/dist/lib
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Sun Aug 25 06:47:19 UTC 2024 Removed Files: src/external/bsd/pkg_install/dist: Makefile Makefile.inc prepare-import.sh src/external/bsd/pkg_install/dist/dist/add: add.h main.c parse_cross.c perform.c pkg_add.1 src/external/bsd/pkg_install/dist/dist/admin: admin.h audit-packages.8 audit-packages.sh.in audit.c check.c download-vulnerability-list.8 download-vulnerability-list.sh.in main.c pkg_admin.1 src/external/bsd/pkg_install/dist/dist/create: build.c create.h main.c perform.c pkg_create.1 pl.c util.c src/external/bsd/pkg_install/dist/dist/delete: pkg_delete.1 pkg_delete.c src/external/bsd/pkg_install/dist/dist/info: info.h main.c perform.c pkg_info.1 show.c src/external/bsd/pkg_install/dist/dist/lib: automatic.c config.h.in 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/dist/x509: pkgsrc.cnf pkgsrc.sh signing.txt src/external/bsd/pkg_install/dist/lib: Makefile config.h nbcompat.h src/external/bsd/pkg_install/dist/sbin: Makefile Makefile.inc src/external/bsd/pkg_install/dist/sbin/pkg_add: Makefile src/external/bsd/pkg_install/dist/sbin/pkg_admin: Makefile src/external/bsd/pkg_install/dist/sbin/pkg_create: Makefile src/external/bsd/pkg_install/dist/sbin/pkg_delete: Makefile src/external/bsd/pkg_install/dist/sbin/pkg_info: Makefile Log Message: Clean up after misimport. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/Makefile \ src/external/bsd/pkg_install/dist/Makefile.inc \ src/external/bsd/pkg_install/dist/prepare-import.sh cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/dist/add/add.h \ src/external/bsd/pkg_install/dist/dist/add/main.c \ src/external/bsd/pkg_install/dist/dist/add/parse_cross.c \ src/external/bsd/pkg_install/dist/dist/add/perform.c \ src/external/bsd/pkg_install/dist/dist/add/pkg_add.1 cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/dist/admin/admin.h \ src/external/bsd/pkg_install/dist/dist/admin/audit-packages.8 \ src/external/bsd/pkg_install/dist/dist/admin/audit-packages.sh.in \ src/external/bsd/pkg_install/dist/dist/admin/audit.c \ src/external/bsd/pkg_install/dist/dist/admin/check.c \ src/external/bsd/pkg_install/dist/dist/admin/download-vulnerability-list.8 \ src/external/bsd/pkg_install/dist/dist/admin/download-vulnerability-list.sh.in \ src/external/bsd/pkg_install/dist/dist/admin/main.c \ src/external/bsd/pkg_install/dist/dist/admin/pkg_admin.1 cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/dist/create/build.c \ src/external/bsd/pkg_install/dist/dist/create/create.h \ src/external/bsd/pkg_install/dist/dist/create/main.c \ src/external/bsd/pkg_install/dist/dist/create/perform.c \ src/external/bsd/pkg_install/dist/dist/create/pkg_create.1 \ src/external/bsd/pkg_install/dist/dist/create/pl.c \ src/external/bsd/pkg_install/dist/dist/create/util.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/dist/delete/pkg_delete.1 \ src/external/bsd/pkg_install/dist/dist/delete/pkg_delete.c cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/dist/info/info.h \ src/external/bsd/pkg_install/dist/dist/info/main.c \ src/external/bsd/pkg_install/dist/dist/info/perform.c \ src/external/bsd/pkg_install/dist/dist/info/pkg_info.1 \ src/external/bsd/pkg_install/dist/dist/info/show.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pkg_install/dist/dist/lib/automatic.c \ src/external/bsd/pkg_install/dist/dist/lib/config.h.in \ src/external/bsd/pkg_install/dist/dist/lib/conflicts.c \ src/external/bsd/pkg_install/dist/dist/lib/defs.h \ src/external/bsd/pkg_install/dist/dist/lib/dewey.c \ src/external/bsd/pkg_install/dist/dist/lib/dewey.h \ src/external/bsd/pkg_install/dist/dist/lib/fexec.c \ src/external/bsd/pkg_install/dist/dist/lib/file.c \ src/external/bsd/pkg_install/dist/dist/lib/global.c \ src/external/bsd/pkg_install/dist/dist/lib/gpgsig.c \ src/external/bsd/pkg_install/dist/dist/lib/iterate.c \ src/external/bsd/pkg_install/dist/dist/lib/lib.h \ src/external/bsd/pkg_install/dist/dist/lib/license.c \ src/external/bsd/pkg_install/dist/dist/lib/lpkg.c \ src/external/bsd/pkg_install/dist/dist/lib/opattern.c \ src/external/bsd/pkg_install/dist/dist/lib/parse-config.c \ src/external/bsd/pkg_install/dist/dist/lib
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src
Committed By: wiz
Date: Tue Jun 11 09:26:58 UTC 2024
Modified Files:
src/external/bsd/pkg_install/dist/add: add.h main.c perform.c
src/external/bsd/pkg_install/dist/admin: main.c
src/external/bsd/pkg_install/dist/create: util.c
src/external/bsd/pkg_install/dist/lib: dewey.c fexec.c license.c
pkg_install.conf.5.in pkg_io.c version.h
src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf
Log Message:
Merge pkg_install-20240307
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/add.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/add/main.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/admin/main.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/create/util.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/dewey.c \
src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/fexec.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/pkg_io.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/pkg_install/dist/lib/version.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf
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.3 src/external/bsd/pkg_install/dist/add/add.h:1.4
--- src/external/bsd/pkg_install/dist/add/add.h:1.3 Sat Apr 10 19:49:59 2021
+++ src/external/bsd/pkg_install/dist/add/add.h Tue Jun 11 09:26:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: add.h,v 1.3 2021/04/10 19:49:59 nia Exp $ */
+/* $NetBSD: add.h,v 1.4 2024/06/11 09:26:57 wiz Exp $ */
/* from FreeBSD Id: add.h,v 1.8 1997/02/22 16:09:15 peter Exp */
@@ -27,6 +27,8 @@
extern char *Destdir;
extern char *OverrideMachine;
+extern char *OverrideOpsys;
+extern char *OverrideOSVersion;
extern char *Prefix;
extern char *View;
extern char *Viewbase;
@@ -42,6 +44,8 @@ extern int ReplaceSame;
extern Boolean ForceDepends;
extern Boolean ForceDepending;
+void parse_cross(const char *, char **, char **, char **);
+
int make_hierarchy(char *);
voidapply_perms(char *, char **, int);
Index: src/external/bsd/pkg_install/dist/add/main.c
diff -u src/external/bsd/pkg_install/dist/add/main.c:1.4 src/external/bsd/pkg_install/dist/add/main.c:1.5
--- src/external/bsd/pkg_install/dist/add/main.c:1.4 Sat Apr 10 22:59:46 2021
+++ src/external/bsd/pkg_install/dist/add/main.c Tue Jun 11 09:26:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $ */
+/* $NetBSD: main.c,v 1.5 2024/06/11 09:26:57 wiz Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include
#endif
-__RCSID("$NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.5 2024/06/11 09:26:57 wiz Exp $");
/*
*
@@ -40,6 +40,8 @@ static char Options[] = "AC:DIK:P:RVfhm:
char *Destdir = NULL;
char *OverrideMachine = NULL;
+char *OverrideOpsys = NULL;
+char *OverrideOSVersion = NULL;
char *Prefix = NULL;
Boolean NoInstall = FALSE;
Boolean NoRecord = FALSE;
@@ -110,7 +112,8 @@ main(int argc, char **argv)
break;
case 'm':
- OverrideMachine = optarg;
+ parse_cross(optarg, &OverrideMachine, &OverrideOpsys,
+ &OverrideOSVersion);
break;
case 'n':
Index: src/external/bsd/pkg_install/dist/add/perform.c
diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.10 src/external/bsd/pkg_install/dist/add/perform.c:1.11
--- src/external/bsd/pkg_install/dist/add/perform.c:1.10 Sat Apr 10 20:07:57 2021
+++ src/external/bsd/pkg_install/dist/add/perform.c Tue Jun 11 09:26:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.10 2021/04/10 20:07:57 nia Exp $ */
+/* $NetBSD: perform.c,v 1.11 2024/06/11 09:26:57 wiz 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.10 2021/04/10 20:07:57 nia Exp $");
+__RCSID("$NetBSD: perform.c,v 1.11 2024/06/11 09:26:57 wiz Exp $");
/*-
* Copyright (c) 2003 Grant Beattie
@@ -893,19 +893,28 @@ check_platform(struct pkg_task *pkg)
{
struct utsname host_uname;
const char *effective_arch;
+ const char *effective_opsys;
+ const char *effective_os_version;
int fatal;
- if (uname(&host_uname) < 0) {
- if (Force) {
- warnx("uname() failed, continuing.");
- return 0;
- } else {
- warnx("uname() failed, aborting.");
- return -1;
+if (OverrideOpsys != NULL && OverrideOSVersion != NULL) {
+ effective_opsys = OverrideOpsys;
+ effective_os_version = OverrideOSVersion;
+ } else {
+ if (uname(&host_uname) < 0) {
+ if (Fo
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: wiz Date: Tue Jun 11 09:26:58 UTC 2024 Modified Files: src/external/bsd/pkg_install/dist/add: add.h main.c perform.c src/external/bsd/pkg_install/dist/admin: main.c src/external/bsd/pkg_install/dist/create: util.c src/external/bsd/pkg_install/dist/lib: dewey.c fexec.c license.c pkg_install.conf.5.in pkg_io.c version.h src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf Log Message: Merge pkg_install-20240307 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/add.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/add/main.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/admin/main.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/create/util.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/dewey.c \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/fexec.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/pkg_io.c cvs rdiff -u -r1.20 -r1.21 src/external/bsd/pkg_install/dist/lib/version.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src
Committed By: joerg
Date: Sun Oct 13 21:56:14 UTC 2019
Modified Files:
src/external/bsd/pkg_install/dist/admin: main.c pkg_admin.1
src/external/bsd/pkg_install/dist/lib: license.c version.h
Log Message:
Merge pkg_install-20191008
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/admin/main.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.14 -r1.15 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/admin/main.c
diff -u src/external/bsd/pkg_install/dist/admin/main.c:1.3 src/external/bsd/pkg_install/dist/admin/main.c:1.4
--- src/external/bsd/pkg_install/dist/admin/main.c:1.3 Sun Mar 25 04:04:36 2018
+++ src/external/bsd/pkg_install/dist/admin/main.c Sun Oct 13 21:56:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.3 2018/03/25 04:04:36 sevan Exp $ */
+/* $NetBSD: main.c,v 1.4 2019/10/13 21:56:14 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,10 +7,10 @@
#if HAVE_SYS_CDEFS_H
#include
#endif
-__RCSID("$NetBSD: main.c,v 1.3 2018/03/25 04:04:36 sevan Exp $");
+__RCSID("$NetBSD: main.c,v 1.4 2019/10/13 21:56:14 joerg Exp $");
/*-
- * Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999-2019 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -59,8 +59,10 @@ __RCSID("$NetBSD: main.c,v 1.3 2018/03/2
#endif
#ifndef NETBSD
#include
+#include
#else
#include
+#include
#endif
#if HAVE_LIMITS_H
#include
@@ -93,6 +95,7 @@ static const char Options[] = "C:K:SVbd:
int quiet, verbose;
static void set_unset_variable(char **, Boolean);
+static void digest_input(char **);
/* print usage message and exit */
void
@@ -521,6 +524,9 @@ main(int argc, char *argv[])
} else if (strcasecmp(argv[0], "unset") == 0) {
argv++; /* "unset" */
set_unset_variable(argv, TRUE);
+ } else if (strcasecmp(argv[0], "digest") == 0) {
+ argv++; /* "digest" */
+ digest_input(argv);
} else if (strcasecmp(argv[0], "config-var") == 0) {
argv++;
if (argv == NULL || argv[1] != NULL)
@@ -736,3 +742,22 @@ set_unset_variable(char **argv, Boolean
return;
}
+
+static void
+digest_input(char **argv)
+{
+ char digest[SHA256_DIGEST_STRING_LENGTH];
+ int failures = 0;
+
+ while (*argv != NULL) {
+ if (SHA256_File(*argv, digest)) {
+ puts(digest);
+ } else {
+ warn("cannot process %s", *argv);
+ ++failures;
+ }
+ argv++;
+ }
+ if (failures)
+ exit(EXIT_FAILURE);
+}
Index: src/external/bsd/pkg_install/dist/admin/pkg_admin.1
diff -u src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.4 src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.5
--- src/external/bsd/pkg_install/dist/admin/pkg_admin.1:1.4 Sat Apr 6 00:05:47 2019
+++ src/external/bsd/pkg_install/dist/admin/pkg_admin.1 Sun Oct 13 21:56:14 2019
@@ -1,10 +1,11 @@
-.\" $NetBSD: pkg_admin.1,v 1.4 2019/04/06 00:05:47 sevan Exp $
+.\" $NetBSD: pkg_admin.1,v 1.5 2019/10/13 21:56:14 joerg Exp $
.\"
-.\" Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1999-2019 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Hubert Feyrer .
+.\" by Hubert Feyrer and
+.\" by Joerg Sonnenberger .
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -27,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd February 25, 2018
+.Dd October 8, 2019
.Dt PKG_ADMIN 1
.Os
.Sh NAME
@@ -182,6 +183,9 @@ otherwise it exits with error.
Print the current value of
.Ar variable
as used after parsing the configuration file.
+.It Cm digest Ar file ...
+Compute a SHA256 message digest of
+.Ar file .
.It Cm dump
Dump the contents of the package database, similar to
.Cm pkg_info -F .
@@ -204,6 +208,11 @@ for packages matching
Print the URL of the best matching package to stdout for each pattern.
If a pattern is not matched, it is skipped and the command will return
a failure.
+.It Cm gpg-sign-package pkg spkg
+Sign the binary package
+.Ar pkg
+using GPG and write the result to
+.Ar spkg .
.It Cm lsall Ar /dir/pkgpattern
.It Cm lsbest Ar /dir/pkgpattern
List all/best package matching pattern in the given directory
@@ -268,11 +277,6 @@ to remove a variable.
Packages that are not installed directly by the user but pulled in as
dependencies are marked by setting
.Dq automatic=YES .
-.It Cm gpg-sign-package pkg spkg
-Sign the binary package
-.Ar pkg
-using GPG and write the result to
-.Ar sp
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Sun Oct 13 21:56:14 UTC 2019 Modified Files: src/external/bsd/pkg_install/dist/admin: main.c pkg_admin.1 src/external/bsd/pkg_install/dist/lib: license.c version.h Log Message: Merge pkg_install-20191008 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/admin/main.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/admin/pkg_admin.1 cvs rdiff -u -r1.8 -r1.9 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.14 -r1.15 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.
Re: CVS commit: src/external/bsd/pkg_install/dist/create
Date:Sat, 6 Apr 2019 08:29:02 + From:"Robert Elz" Message-ID: <20190406082902.1da38f...@cvs.netbsd.org> | Module Name:src | Committed By: kre | Date: Sat Apr 6 08:29:02 UTC 2019 | | Modified Files: | src/external/bsd/pkg_install/dist/create: util.c | | Log Message: | Use __UNCONST() rather than a simple cast to free a const char * | while avoiding gcc noise. Note that a better fix for this would probably be to remove the const from the fields in the struct definition (in create.h) As far as I can see, nothing needs (even conceptually) that they be there - the data is always assigned as ptr->owner = xstrdup(whatever); where xstrdup() is just strdup() + error check, and strdup() is the canonical way to correctly (if slowly) convert a const char * into a char * ... making it be const char * again just seems wrong. However, I will leave it for someone else to determine if that really is a preferred solution. kre
Re: CVS commit: src/external/bsd/pkg_install/dist/lib
On 28/03/2018 00:01, Joerg Sonnenberger wrote: > Could you please stop randomly taking files off the vendor branch and > do an actual IMPORT?! Sorry. Sevan
Re: CVS commit: src/external/bsd/pkg_install/dist/lib
On Tue, Mar 27, 2018 at 10:51:44PM +, Sevan Janiyan wrote: > Module Name: src > Committed By: sevan > Date: Tue Mar 27 22:51:44 UTC 2018 > > Modified Files: > src/external/bsd/pkg_install/dist/lib: pkg_install.conf.cat.in > > Log Message: > Import regenerated catalog file Could you please stop randomly taking files off the vendor branch and do an actual IMPORT?! Joerg
Re: CVS commit: src/external/bsd/pkg_install/dist
On Sun, Mar 25, 2018 at 04:04:36AM +, Sevan Janiyan wrote: > Module Name: src > Committed By: sevan > Date: Sun Mar 25 04:04:36 UTC 2018 > > Modified Files: > src/external/bsd/pkg_install/dist/add: perform.c pkg_add.1 > src/external/bsd/pkg_install/dist/admin: audit.c main.c pkg_admin.1 > pkg_admin.cat > src/external/bsd/pkg_install/dist/delete: pkg_delete.c > src/external/bsd/pkg_install/dist/lib: lib.h license.c version.h > vulnerabilities-file.c > > Log Message: > Import pkg_install-20180325. This is *not* an import. Joerg
Re: CVS commit: src/external/bsd/pkg_install/dist/lib
I'm intentionally verbose in the hopes that someone has a second look at
it, it's important to get right.
On Sun, Feb 04, 2018 at 09:00:51AM +, Maya Rashish wrote:
> Fix OpenSSL 1.1.0 build
> OpenSSL 1.1.0 makes xkusage and ex_flags opaque.
> Use X509_check_ca rather than a custom and nearly identical implementation.
> This is available since OpenSSL 0.9.8 (even in RHEL5).
> This is also done because we cannot implement it identically under
> OpenSSL 1.1.0 due to missing getters.
> Test EXFLAG_XKUSAGE rather than zero xkusage test no usage to avoid openssl
> 1.1.0 getter returning a different code on this case.
> Use getter for xkusage in the non-zero test case.
> Provide fallback definitions for getters.
>
> PR pkg/52298, PR pkg/52648
>
> @@ -55,25 +55,12 @@ __RCSID("$NetBSD: pkcs7.c,v 1.2 2017/04/
> #define NS_ANY_CA(NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA)
> #endif
>
> -static const unsigned int pkg_key_usage = XKU_CODE_SIGN | XKU_SMIME;
> +#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER <
> 0x1010L)
> +#define X509_get_extended_key_usage(x) x->ex_xkusage
> +#define X509_get_extension_flags(x) x->ex_flags
> +#endif
>
> -static int
> -check_ca(X509 *cert)
> -{
> - if ((cert->ex_flags & EXFLAG_KUSAGE) != 0 &&
> - (cert->ex_kusage & KU_KEY_CERT_SIGN) != KU_KEY_CERT_SIGN)
> - return 0;
> - if ((cert->ex_flags & EXFLAG_BCONS) != 0)
> - return (cert->ex_flags & EXFLAG_CA) == EXFLAG_CA;
> - if ((cert->ex_flags & (EXFLAG_V1|EXFLAG_SS)) == (EXFLAG_V1|EXFLAG_SS))
> - return 1;
> - if ((cert->ex_flags & EXFLAG_KUSAGE) != 0)
> - return 1;
> - if ((cert->ex_flags & EXFLAG_NSCERT) != 0 &&
> - (cert->ex_nscert & NS_ANY_CA) != 0)
> - return 1;
> - return 0;
> -}
> +static const unsigned int pkg_key_usage = XKU_CODE_SIGN | XKU_SMIME;
>
> static STACK_OF(X509) *
> file_to_certs(const char *file)
> @@ -180,18 +167,18 @@ easy_pkcs7_verify(const char *content, s
> /* Compute ex_xkusage */
> X509_check_purpose(sk_X509_value(signers, i), -1, -1);
>
> - if (check_ca(sk_X509_value(signers, i))) {
> + if (X509_check_ca(sk_X509_value(signers, i))) {
> warnx("CA keys are not valid for signatures");
> goto cleanup;
> }
> if (is_pkg) {
> - if (sk_X509_value(signers, i)->ex_xkusage !=
> pkg_key_usage) {
> + if (X509_get_extended_key_usage(sk_X509_value(signers,
> i)) != pkg_key_usage) {
> warnx("Certificate must have CODE SIGNING "
> "and EMAIL PROTECTION property");
> goto cleanup;
> }
> } else {
> - if (sk_X509_value(signers, i)->ex_xkusage != 0) {
> + if (X509_get_extension_flags(sk_X509_value(signers, i))
> & EXFLAG_XKUSAGE) {
> warnx("Certificate must not have any property");
> goto cleanup;
> }
> @@ -271,12 +258,12 @@ easy_pkcs7_sign(const char *content, siz
> /* Compute ex_kusage */
> X509_check_purpose(certificate, -1, 0);
>
> - if (check_ca(certificate)) {
> + if (X509_check_ca(certificate)) {
> warnx("CA keys are not valid for signatures");
> goto cleanup;
> }
>
> - if (certificate->ex_xkusage != pkg_key_usage) {
> + if (X509_get_extended_key_usage(certificate) != pkg_key_usage) {
> warnx("Certificate must have CODE SIGNING "
> "and EMAIL PROTECTION property");
> goto cleanup;
Re: CVS commit: src/external/bsd/pkg_install/dist/lib
On Wed, Sep 11, 2013 at 12:59:19PM +, Pierre Pronchery wrote: > Module Name: src > Committed By: khorben > Date: Wed Sep 11 12:59:19 UTC 2013 > > Modified Files: > src/external/bsd/pkg_install/dist/lib: pkg_signature.c > > Log Message: > Fixed installation of signed packages. Some variables part of struct > signature_archive were not initialized properly, therefore randomly failing > in the verify_signature_read_cb() callback. > > Partly closes PR pkg/48194; pkgsrc needs to be updated as well. > > "please commit" agc@ > > XXX pull-up to netbsd-6 Please do NOT commit to src/external, commit to pkgsrc and import the new version. Joerg
Re: CVS commit: src/external/bsd/pkg_install/dist
On Tue, Feb 21, 2012 at 10:45:14PM +0100, Marc Balmer wrote: > bump date for previous. The bump's already in the commit: > > -#define PKGTOOLS_VERSION 20120128 > > +#define PKGTOOLS_VERSION 20120221 Thomas
Re: CVS commit: src/external/bsd/pkg_install/dist
Am 21.02.12 19:27, schrieb Thomas Klausner:
> Module Name: src
> Committed By: wiz
> Date: Tue Feb 21 18:27:05 UTC 2012
>
> Modified Files:
> src/external/bsd/pkg_install/dist/add: perform.c
> src/external/bsd/pkg_install/dist/lib: version.h
>
> Log Message:
> melt snowflakes
What does that mean? Please explain and bump date for previous.
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/add/perform.c
> cvs rdiff -u -r1.8 -r1.9 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.2
> src/external/bsd/pkg_install/dist/add/perform.c:1.3
> --- src/external/bsd/pkg_install/dist/add/perform.c:1.2 Tue Feb 21
> 13:32:45 2012
> +++ src/external/bsd/pkg_install/dist/add/perform.c Tue Feb 21 18:27:05 2012
> @@ -1,4 +1,4 @@
> -/* $NetBSD: perform.c,v 1.2 2012/02/21 13:32:45 wiz Exp $ */
> +/* $NetBSD: perform.c,v 1.3 2012/02/21 18:27:05 wiz 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.2 2012/02/21 13:32:45 wiz Exp $");
> +__RCSID("$NetBSD: perform.c,v 1.3 2012/02/21 18:27:05 wiz Exp $");
>
> /*-
> * Copyright (c) 2003 Grant Beattie
>
> Index: src/external/bsd/pkg_install/dist/lib/version.h
> diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.8
> src/external/bsd/pkg_install/dist/lib/version.h:1.9
> --- src/external/bsd/pkg_install/dist/lib/version.h:1.8 Sun Feb 19
> 17:49:09 2012
> +++ src/external/bsd/pkg_install/dist/lib/version.h Tue Feb 21 18:27:05 2012
> @@ -1,4 +1,4 @@
> -/* $NetBSD: version.h,v 1.8 2012/02/19 17:49:09 tron Exp $ */
> +/* $NetBSD: version.h,v 1.9 2012/02/21 18:27:05 wiz 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 20120128
> +#define PKGTOOLS_VERSION 20120221
>
> #endif /* _INST_LIB_VERSION_H_ */
>
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: joerg Date: Sat Feb 20 04:44:59 UTC 2010 Modified Files: src/external/bsd/pkg_install/dist/lib: lib.h version.h Log Message: Merge To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/lib.h \ 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.
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Sat Feb 20 04:42:00 UTC 2010 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10033 Log Message: nstall-20100220: Try harder to give the user an idea which file failed. Addresses PR 42223. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20100220 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c C src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: joerg Date: Wed Feb 3 19:31:49 UTC 2010 Modified Files: src/external/bsd/pkg_install/dist/lib: lib.h version.h Log Message: Merge To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/lib.h \ 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.
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Wed Feb 3 19:29:16 UTC 2010 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5409 Log Message: Correctly reimport pkg_install-20100204 Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20100204 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c C src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 C src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: joerg Date: Wed Feb 3 19:27:01 UTC 2010 Modified Files: src/external/bsd/pkg_install/dist/lib: lib.h version.h Log Message: Fix enum to prevent crash (PR 42734) To generate a diff of this commit: cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/pkg_install/dist/lib/lib.h cvs rdiff -u -r1.1.1.25 -r1.2 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.
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Wed Feb 3 14:24:04 UTC 2010 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27342 Log Message: pkg_install-20100203: - Restore PKG_PREFIX in pkg_delete (PR 42731) - Ensure that the current pkg_install version is at least as new as the version used to build the package Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20100203 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Sat Jan 30 21:33:58 UTC 2010 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23844 Log Message: pkg_install-20100130: - pkg_add -U to rplace an installed version - refactored man pages - PKG_DBDIR / PKG_REFCOUNT_DBDIR as pkg_install.conf options - synced license list - use connection cache from libfetch Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20100130 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c N src/external/bsd/pkg_install/dist/delete/pkg_delete.1.in U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
