[bug#29221] [PATCH 04/19] licenses: Add cddl1.1.

[Julien Lepiller <julien@lepiller.eu>]

[-- Attachment #1: Type: text/plain, Size: 691 bytes --]

Le Thu, 09 Nov 2017 16:31:21 +0100,
ludo@gnu.org (Ludovic Courtès) a écrit :

> Hi Julien,
> 
> julien@lepiller.eu skribis:
> 
> > From: Julien Lepiller <julien@lepiller.eu>
> >
> > * guix/licenses.scm (cddl1.1): New variable.  
> 
> [...]
> 
> > +;; CDDL1.1 is the same as 1.0, except that "Oracle" becomes "Sun
> > Microsystems, Inc", +;; "LOSS OF GOODWILL" becomes "LOST PROFITS"
> > and section 6.3 is removed. +(define cddl1.1 cddl1.0)  
> 
> I think that’s enough to warrant a distinct <license> object.  You’re
> welcome to leave this comment, though!
> 
> Ludo’.

Is this correct? CDDL 1.1 is not mentionned on the gnu website nor on
the OSI website.

[-- Attachment #2: 0004-licenses-Add-cddl1.1.patch --]
[-- Type: text/x-patch, Size: 1466 bytes --]

From 16a737384d495a668f1db0f5deeb9f255158e39a Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Sun, 5 Nov 2017 12:39:51 +0100
Subject: [PATCH 04/20] licenses: Add cddl1.1.

* guix/licenses.scm (cddl1.1): New variable.
---
 guix/licenses.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index 6de611da2..fa376750f 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -42,7 +42,7 @@
             cc-by2.0 cc-by3.0 cc-by4.0
             cc-by-sa2.0 cc-by-sa3.0 cc-by-sa4.0
             cc-sampling-plus-1.0
-            cddl1.0
+            cddl1.0 cddl1.1
             cecill cecill-b cecill-c
             artistic2.0 clarified-artistic
             copyleft-next
@@ -217,6 +217,13 @@ at URI, which may be a file:// URI pointing the package's tree."
            "http://directory.fsf.org/wiki/License:CDDLv1.0"
            "https://www.gnu.org/licenses/license-list#CDDL"))
 
+;; CDDL1.1 is the same as 1.0, except that "Oracle" becomes "Sun Microsystems, Inc",
+;; "LOSS OF GOODWILL" becomes "LOST PROFITS" and section 6.3 is removed.
+(define cddl1.1
+  (license "CDDL 1.1"
+           "https://oss.oracle.com/licenses/CDDL+GPL-1.1"
+           "https://www.gnu.org/licenses/license-list#CDDL"))
+
 (define cecill                                    ;copyleft
   (license "CeCILL"
            "http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.html"
-- 
2.15.0