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

Merge pkg_install-20130420.

This commit is contained in:
wiz 2013-04-20 15:29:22 +00:00
parent ac52c41608
commit 9dc14f8abd
3 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: perform.c,v 1.3 2012/02/21 18:27:05 wiz Exp $ */
/* $NetBSD: perform.c,v 1.4 2013/04/20 15:29:22 wiz 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.3 2012/02/21 18:27:05 wiz Exp $");
__RCSID("$NetBSD: perform.c,v 1.4 2013/04/20 15:29:22 wiz Exp $");
/*-
* Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
@ -156,6 +156,10 @@ compatible_platform(const char *opsys, const char *host, const char *package)
if (strcmp(host, package) == 0)
return 1;
/* accept, if host version is a minor release of package version */
if (strncmp(host, package, strlen(package)) == 0)
return 1;
/* find offset of first difference */
for (i=0; (host[i] != '\0') && (host[i] == package[i]);)
i++;

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

@ -1,4 +1,4 @@
/* $NetBSD: license.c,v 1.3 2012/02/19 17:49:09 tron Exp $ */
/* $NetBSD: license.c,v 1.4 2013/04/20 15:29:23 wiz Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@ -46,32 +46,40 @@
#define HASH_SIZE 521
const char *default_acceptable_licenses =
"public-domain unlicense "
"apache-1.1 apache-2.0 "
"arphic-public "
"artistic artistic-2.0 "
"boost-license "
"cc-by-sa-v3.0 "
"cddl-1.0 "
"cpl-1.0 "
"epl-v1.0 "
"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 "
"original-bsd modified-bsd 2-clause-bsd "
"x11 mit miros "
"apache-1.1 apache-2.0 "
"artistic artistic-2.0 "
"cddl-1.0 "
"cpl-1.0 "
"open-font-license "
"mpl-1.0 mpl-1.1 mpl-2.0 "
"php png-license "
"postgresql-license "
"zlib "
"zpl "
"python-software-foundation "
"ibm-public-license-1.0 "
"ipafont "
"isc "
"info-zip "
"boost-license "
"mplusfont "
"cc-by-sa-v3.0 "
"lppl-1.3c "
"epl-v1.0";
"lucent "
"miros "
"mit "
"mpl-1.0 mpl-1.1 mpl-2.0 "
"mplusfont "
"ofl-v1.0 ofl-v1.1 "
"original-bsd modified-bsd 2-clause-bsd "
"php "
"png-license "
"postgresql-license "
"public-domain "
"python-software-foundation "
"qpl-v1.0 "
"sleepycat-public "
"unlicense "
"x11 "
"zlib "
"zpl";
#ifdef DEBUG
static size_t hash_collisions;

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

@ -1,4 +1,4 @@
/* $NetBSD: version.h,v 1.9 2012/02/21 18:27:05 wiz Exp $ */
/* $NetBSD: version.h,v 1.10 2013/04/20 15:29:23 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 20120221
#define PKGTOOLS_VERSION 20130131
#endif /* _INST_LIB_VERSION_H_ */