From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFREb-0007IB-SI for guix-patches@gnu.org; Thu, 16 Nov 2017 15:58:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFREY-000544-Mj for guix-patches@gnu.org; Thu, 16 Nov 2017 15:58:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:35260) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eFREY-00052p-HT for guix-patches@gnu.org; Thu, 16 Nov 2017 15:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eFREY-0003a8-0d for guix-patches@gnu.org; Thu, 16 Nov 2017 15:58:02 -0500 Subject: [bug#29221] [PATCH 04/19] licenses: Add cddl1.1. Resent-Message-ID: Date: Thu, 16 Nov 2017 21:54:33 +0100 From: Julien Lepiller Message-ID: <20171116215433.406b2a33@lepiller.eu> In-Reply-To: <877euzh3jq.fsf@gnu.org> References: <20171108231537.34a601cc@lepiller.eu> <20171108225140.6587-1-julien@lepiller.eu> <20171108225140.6587-4-julien@lepiller.eu> <877euzh3jq.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/5WWWMu9kf0sI5kiY_io48DJ" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29221@debbugs.gnu.org --MP_/5WWWMu9kf0sI5kiY_io48DJ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Le Thu, 09 Nov 2017 16:31:21 +0100, ludo@gnu.org (Ludovic Court=C3=A8s) a =C3=A9crit : > Hi Julien, >=20 > julien@lepiller.eu skribis: >=20 > > From: Julien Lepiller > > > > * guix/licenses.scm (cddl1.1): New variable. =20 >=20 > [...] >=20 > > +;; 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) =20 >=20 > I think that=E2=80=99s enough to warrant a distinct object. Yo= u=E2=80=99re > welcome to leave this comment, though! >=20 > Ludo=E2=80=99. Is this correct? CDDL 1.1 is not mentionned on the gnu website nor on the OSI website. --MP_/5WWWMu9kf0sI5kiY_io48DJ Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0004-licenses-Add-cddl1.1.patch >From 16a737384d495a668f1db0f5deeb9f255158e39a Mon Sep 17 00:00:00 2001 From: Julien Lepiller 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 --MP_/5WWWMu9kf0sI5kiY_io48DJ--