Add GPL2/LGPL2 exception to the new CUPS license.

Esse commit está contido em:
Michael R Sweet
2019-08-20 15:45:12 -04:00
commit 7b6d49eec9
2 arquivos alterados com 20 adições e 4 exclusões
+2 -3
Ver Arquivo
@@ -1,4 +1,4 @@
CHANGES - 2.3.0 - 2019-08-16
CHANGES - 2.3.0 - 2019-08-20
============================
@@ -6,6 +6,7 @@ Changes in CUPS v2.3.0
----------------------
- CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows (rdar://51685251)
- Added a GPL2/LGPL2 exception to the new CUPS license terms.
- Documentation updates (Issue #5604)
- Fixed a bug in the scheduler job cleanup code (Issue #5588)
- Fixed builds when there is no TLS library (Issue #5590)
@@ -42,8 +43,6 @@ Changes in CUPS v2.3.0
- Fixed a memory leak in `ppdOpen`.
Changes in CUPS v2.3rc1
-----------------------
+18 -1
Ver Arquivo
@@ -1,6 +1,6 @@
CUPS
Copyright © 2007-2018 by Apple Inc.
Copyright © 2007-2019 by Apple Inc.
Copyright © 1997-2007 by Easy Software Products.
CUPS and the CUPS logo are trademarks of Apple Inc.
@@ -32,3 +32,20 @@ the following restrictions:
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
-- CUPS Exceptions to the Apache 2.0 License --
As an exception, if, as a result of your compiling your source code, portions
of this Software are embedded into an Object form of such source code, you
may redistribute such embedded portions in such Object form without complying
with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
In addition, if you combine or link compiled forms of this Software with
software that is licensed under the GPLv2 ("Combined Software") and if a
court of competent jurisdiction determines that the patent provision (Section
3), the indemnity provision (Section 9) or other Section of the License
conflicts with the conditions of the GPLv2, you may retroactively and
prospectively choose to deem waived or otherwise exclude such Section(s) of
the License, but only in their entirety and only with respect to the Combined
Software.