Module Name: src
Committed By: bouyer
Date: Sat Sep 5 13:37:42 UTC 2009
Modified Files:
src/external/bsd/pkg_install/dist/info [netbsd-4-0]: perform.c
src/external/bsd/pkg_install/dist/lib [netbsd-4-0]: license.c
pkg_install.conf.5.in version.h
Log Message:
Pull up the following revisions (requested by joerg in ticket #1346):
external/bsd/pkg_install/dist/info/perform.c 1.1.1.10
external/bsd/pkg_install/dist/lib/license.c 1.1.1.4
external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in 1.1.1.5
external/bsd/pkg_install/dist/lib/version.h 1.1.1.17
Import pkg_install-20090724:
- license handling: accept upper case letters. Keep license checks
case-sensitive as done in the older pkgsrc logic. Document this.
OK dillo@, schmonz@, wiz@
- pkg_info:
- fix handling of non-packages, that are valid archives
- invert order of pkg_info -r to better match the expectations of
make update.' external/bsd/pkg_install
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.9.2.2 -r1.1.1.9.2.3 \
src/external/bsd/pkg_install/dist/info/perform.c
cvs rdiff -u -r1.1.1.2.6.3 -r1.1.1.2.6.4 \
src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.1.1.4.8.2 -r1.1.1.4.8.3 \
src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
cvs rdiff -u -r1.1.1.15.2.3 -r1.1.1.15.2.4 \
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/info/perform.c
diff -u src/external/bsd/pkg_install/dist/info/perform.c:1.1.1.9.2.2 src/external/bsd/pkg_install/dist/info/perform.c:1.1.1.9.2.3
--- src/external/bsd/pkg_install/dist/info/perform.c:1.1.1.9.2.2 Fri Jun 5 17:01:59 2009
+++ src/external/bsd/pkg_install/dist/info/perform.c Sat Sep 5 13:37:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.1.1.9.2.2 2009/06/05 17:01:59 snj Exp $ */
+/* $NetBSD: perform.c,v 1.1.1.9.2.3 2009/09/05 13:37:41 bouyer Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -13,7 +13,7 @@
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
-__RCSID("$NetBSD: perform.c,v 1.1.1.9.2.2 2009/06/05 17:01:59 snj Exp $");
+__RCSID("$NetBSD: perform.c,v 1.1.1.9.2.3 2009/09/05 13:37:41 bouyer Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -232,7 +232,7 @@
}
meta->is_installed = 0;
- if (found_required != 0 && r != ARCHIVE_OK && r != ARCHIVE_EOF) {
+ if (found_required != 0 || (r != ARCHIVE_OK && r != ARCHIVE_EOF)) {
free_pkg_meta(meta);
meta = NULL;
}
@@ -326,7 +326,7 @@
build_full_reqby(reqby, meta_dep, limit + 1);
free_pkg_meta(meta_dep);
- TAILQ_INSERT_TAIL(reqby, lpp, lp_link);
+ TAILQ_INSERT_HEAD(reqby, lpp, lp_link);
}
}
Index: src/external/bsd/pkg_install/dist/lib/license.c
diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.6.3 src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.6.4
--- src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.2.6.3 Sun Jun 21 11:42:52 2009
+++ src/external/bsd/pkg_install/dist/lib/license.c Sat Sep 5 13:37:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.1.1.2.6.3 2009/06/21 11:42:52 bouyer Exp $ */
+/* $NetBSD: license.c,v 1.1.1.2.6.4 2009/09/05 13:37:42 bouyer Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -56,7 +56,9 @@
"artistic artistic-2.0 "
"cddl-1.0 "
"cpl-1.0 "
- "open-font-license ";
+ "open-font-license "
+ "mpl-1.1 "
+ "zpl";
#ifdef DEBUG
static size_t hash_collisions;
@@ -64,7 +66,8 @@
static char **license_hash[HASH_SIZE];
static const char license_spaces[] = " \t\n";
-static const char license_chars[] = "abcdefghijklmnopqrstuvwxyz0123456789_-.";
+static const char license_chars[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-.";
static size_t
hash_license(const char *license, size_t len)
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.1.1.4.8.2 src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.1.1.4.8.3
--- src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in:1.1.1.4.8.2 Fri Jun 5 17:02:00 2009
+++ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in Sat Sep 5 13:37:42 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_install.conf.5.in,v 1.1.1.4.8.2 2009/06/05 17:02:00 snj Exp $
+.\" $NetBSD: pkg_install.conf.5.in,v 1.1.1.4.8.3 2009/09/05 13:37:42 bouyer Exp $
.\"
.\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -50,6 +50,7 @@
.Bl -tag -width indent
.It Dv ACCEPTABLE_LICENSES
List of licenses packages are allowed to carry.
+License names are case-sensitive.
.It Dv ACTIVE_FTP
Force the use of active FTP.
.It Dv CERTIFICATE_ANCHOR_PKGS
@@ -83,6 +84,9 @@
.El
.It Dv DEFAULT_ACCEPTABLE_LICENSES
List of common Free and Open Source licenses packages are allowed to carry.
+The default value contains all OSI approved licenses in pkgsrc on the date
+pkg_install was released.
+License names are case-sensitive.
.It Dv GPG
Path to
.Xr gpg 1 ,
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.1.1.15.2.3 src/external/bsd/pkg_install/dist/lib/version.h:1.1.1.15.2.4
--- src/external/bsd/pkg_install/dist/lib/version.h:1.1.1.15.2.3 Sun Jun 21 11:42:52 2009
+++ src/external/bsd/pkg_install/dist/lib/version.h Sat Sep 5 13:37:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.1.1.15.2.3 2009/06/21 11:42:52 bouyer Exp $ */
+/* $NetBSD: version.h,v 1.1.1.15.2.4 2009/09/05 13:37:42 bouyer 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 "20090610"
+#define PKGTOOLS_VERSION "20090724"
#endif /* _INST_LIB_VERSION_H_ */
