Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import pkg_install-20070724:

Browse Source 
- 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.
This commit is contained in:
joerg 2009-07-26 22:59:33 +00:00
parent 3a2b6e4519
commit fdc1dac9e9
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
external/bsd/pkg_install/dist/info/perform.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: perform.c,v 1.1.1.9 2009/05/27 22:41:35 joerg Exp $ */
/* $NetBSD: perform.c,v 1.1.1.10 2009/07/26 22:59:33 joerg 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 2009/05/27 22:41:35 joerg Exp $");
__RCSID("$NetBSD: perform.c,v 1.1.1.10 2009/07/26 22:59:33 joerg Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
@ -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);
}
}

9
external/bsd/pkg_install/dist/lib/license.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: license.c,v 1.1.1.3 2009/06/14 23:31:49 joerg Exp $ */
/* $NetBSD: license.c,v 1.1.1.4 2009/07/26 22:59:36 joerg Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@ -56,7 +56,9 @@ const char *default_acceptable_licenses =
"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 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)

6
external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in vendored
View File

@ -1,4 +1,4 @@
.\" $NetBSD: pkg_install.conf.5.in,v 1.1.1.4 2009/04/25 21:38:22 joerg Exp $
.\" $NetBSD: pkg_install.conf.5.in,v 1.1.1.5 2009/07/26 22:59:35 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 ,

4
external/bsd/pkg_install/dist/lib/version.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: version.h,v 1.1.1.16 2009/06/14 23:31:47 joerg Exp $ */
/* $NetBSD: version.h,v 1.1.1.17 2009/07/26 22:59:36 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_ */