From 5967c1155241156f3e89920be667f81039708e64 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 24 Jul 2009 19:06:45 +0000 Subject: pkg_install-20070724: - 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. --- pkgtools/pkg_install/files/info/perform.c | 8 ++++---- pkgtools/pkg_install/files/lib/license.c | 5 +++-- pkgtools/pkg_install/files/lib/pkg_install.conf.5.in | 6 +++++- pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in | 6 ++++-- pkgtools/pkg_install/files/lib/version.h | 4 ++-- 5 files changed, 18 insertions(+), 11 deletions(-) (limited to 'pkgtools') diff --git a/pkgtools/pkg_install/files/info/perform.c b/pkgtools/pkg_install/files/info/perform.c index c1d8dc1c30d..fb5479bdade 100644 --- a/pkgtools/pkg_install/files/info/perform.c +++ b/pkgtools/pkg_install/files/info/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.57 2009/05/27 20:26:03 joerg Exp $ */ +/* $NetBSD: perform.c,v 1.58 2009/07/24 19:06:45 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -13,7 +13,7 @@ #if HAVE_SYS_WAIT_H #include #endif -__RCSID("$NetBSD: perform.c,v 1.57 2009/05/27 20:26:03 joerg Exp $"); +__RCSID("$NetBSD: perform.c,v 1.58 2009/07/24 19:06:45 joerg Exp $"); /*- * Copyright (c) 2008 Joerg Sonnenberger . @@ -232,7 +232,7 @@ has_entry: } 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(lpkg_head_t *reqby, struct pkg_meta *meta, int limit) 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); } } diff --git a/pkgtools/pkg_install/files/lib/license.c b/pkgtools/pkg_install/files/lib/license.c index 0de7fd441bd..acb4873b22a 100644 --- a/pkgtools/pkg_install/files/lib/license.c +++ b/pkgtools/pkg_install/files/lib/license.c @@ -1,4 +1,4 @@ -/* $NetBSD: license.c,v 1.6 2009/07/15 10:24:13 tron Exp $ */ +/* $NetBSD: license.c,v 1.7 2009/07/24 19:06:45 joerg Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger . @@ -66,7 +66,8 @@ static size_t hash_collisions; 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) diff --git a/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in b/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in index 00f38fe5ccd..2f38101fee0 100644 --- a/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in +++ b/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_install.conf.5.in,v 1.6 2009/04/25 21:31:14 joerg Exp $ +.\" $NetBSD: pkg_install.conf.5.in,v 1.7 2009/07/24 19:06:45 joerg Exp $ .\" .\" Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -50,6 +50,7 @@ The following variables are supported: .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 @@ The user is always asked to confirm installation of vulnerable packages. .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 , diff --git a/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in b/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in index 035dd6a175e..40807c9c10d 100644 --- a/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in +++ b/pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in @@ -15,7 +15,8 @@ DDEESSCCRRIIPPTTIIOONN The following variables are supported: ACCEPTABLE_LICENSES - List of licenses packages are allowed to carry. + List of licenses packages are allowed to carry. License names + are case-sensitive. ACTIVE_FTP Force the use of active FTP. @@ -51,7 +52,8 @@ DDEESSCCRRIIPPTTIIOONN DEFAULT_ACCEPTABLE_LICENSES List of common Free and Open Source licenses packages are allowed - to carry. + to carry. The default value contains all OSI approved licenses + in pkgsrc on the date pkg_install was released. GPG Path to gpg(1), which can be used to verify the signature in the _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s file when running diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 7668fff2875..4f86de4c552 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.131 2009/06/10 20:15:11 joerg Exp $ */ +/* $NetBSD: version.h,v 1.132 2009/07/24 19:06:45 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 "20090610" +#define PKGTOOLS_VERSION "20090724" #endif /* _INST_LIB_VERSION_H_ */ -- cgit v1.2.3