Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, licenses/
Date: Fri, 30 Sep 2016 23:44:06
Message-Id: 1475278959.8144f1f6125282980387978425570e7dc7b26d2f.mjo@gentoo
1 commit: 8144f1f6125282980387978425570e7dc7b26d2f
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 23:04:36 2016 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 23:42:39 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8144f1f6
7
8 licenses: add new Zend-2.0 license as part of the @MISC-FREE group.
9
10 The "Zend Engine License, version 2.00" covers parts of the PHP
11 runtime. The latest version of the Zend license is vanilla BSD:
12
13 https://framework.zend.com/license
14
15 However, all of the sources shipped with dev-lang/php still refer to
16 version 2.00 of the license, so we're including it. Version 2.00 is a
17 modified BSD license with a few more attribution clauses thrown in. It
18 is still a free software license (although not approved, to my
19 knowledge), so it has been added to the @MISC-FREE license group.
20
21 Gentoo-Bug: 595664
22
23 licenses/Zend-2.0 | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
24 profiles/license_groups | 2 +-
25 2 files changed, 57 insertions(+), 1 deletion(-)
26
27 diff --git a/licenses/Zend-2.0 b/licenses/Zend-2.0
28 new file mode 100644
29 index 00000000..5837d7c
30 --- /dev/null
31 +++ b/licenses/Zend-2.0
32 @@ -0,0 +1,56 @@
33 +--------------------------------------------------------------------
34 + The Zend Engine License, version 2.00
35 +Copyright (c) 1999-2002 Zend Technologies Ltd. All rights reserved.
36 +--------------------------------------------------------------------
37 +
38 +Redistribution and use in source and binary forms, with or without
39 +modification, is permitted provided that the following conditions
40 +are met:
41 +
42 + 1. Redistributions of source code must retain the above copyright
43 + notice, this list of conditions and the following disclaimer.
44 +
45 + 2. Redistributions in binary form must reproduce the above
46 + copyright notice, this list of conditions and the following
47 + disclaimer in the documentation and/or other materials provided
48 + with the distribution.
49 +
50 + 3. The names "Zend" and "Zend Engine" must not be used to endorse
51 + or promote products derived from this software without prior
52 + permission from Zend Technologies Ltd. For written permission,
53 + please contact license@××××.com.
54 +
55 + 4. Zend Technologies Ltd. may publish revised and/or new versions
56 + of the license from time to time. Each version will be given a
57 + distinguishing version number.
58 + Once covered code has been published under a particular version
59 + of the license, you may always continue to use it under the
60 + terms of that version. You may also choose to use such covered
61 + code under the terms of any subsequent version of the license
62 + published by Zend Technologies Ltd. No one other than Zend
63 + Technologies Ltd. has the right to modify the terms applicable
64 + to covered code created under this License.
65 +
66 + 5. Redistributions of any form whatsoever must retain the following
67 + acknowledgment:
68 + "This product includes the Zend Engine, freely available at
69 + http://www.zend.com"
70 +
71 + 6. All advertising materials mentioning features or use of this
72 + software must display the following acknowledgment:
73 + "The Zend Engine is freely available at http://www.zend.com"
74 +
75 +THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``AS IS'' AND
76 +ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
77 +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
78 +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ZEND
79 +TECHNOLOGIES LTD. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
80 +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
81 +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
82 +USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
83 +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
84 +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
85 +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
86 +SUCH DAMAGE.
87 +
88 +--------------------------------------------------------------------
89
90 diff --git a/profiles/license_groups b/profiles/license_groups
91 index 146d88a..a95f9c3 100644
92 --- a/profiles/license_groups
93 +++ b/profiles/license_groups
94 @@ -34,7 +34,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
95 # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy
96 # separation?
97 # BSD-4 alikes: dom4j FastCGI icu JDOM
98 -MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CDDL-Schily CeCILL-C CLX CMake CPL-0.5 CRACKLIB Crypt-IDEA cryptopp DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 PIZZA-WARE pngcrush pngnq Princeton psutils qmail-nelson rc regexp-UofT RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL tablelist tcltk tcp_wrappers_license telegram TermReadKey TeX TeX-other-free the-Click-license Time-
99 Format Time-modules tm-align totd UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
100 +MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CDDL-Schily CeCILL-C CLX CMake CPL-0.5 CRACKLIB Crypt-IDEA cryptopp DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freemarker FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 PIZZA-WARE pngcrush pngnq Princeton psutils qmail-nelson rc regexp-UofT RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL tablelist tcltk tcp_wrappers_license telegram TermReadKey TeX TeX-other-free the-Click-license Time-
101 Format Time-modules tm-align totd UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji Zend-2.0 ZSH
102 # The following are NOT valid in @MISC-FREE:
103 # arj - usage restrictions
104 # freedist - Doesn't grant the right to do modifications.