diff mbox

base64: Restore original license header (license compliance issue)

Message ID 87eg5b8et9.fsf@dustycloud.org
State New
Headers show

Commit Message

Christopher Allan Webber Aug. 26, 2016, 8:18 p.m. UTC
When incorporating a copyleft licensed program with a lax licensed program,
it is correct to preserve the original license notice.  See also:
  https://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html

base64.scm did not do this.  This is important, because it is part of
the license that the copyright header be preserved, so we must do this
to comply correctly.

(This is a common confusion: adding a stronger copyleft does not
"relicense" the original work.)

 - Chris

Comments

Ricardo Wurmus Aug. 27, 2016, 7:55 a.m. UTC | #1
Christopher Allan Webber <cwebber@dustycloud.org> writes:

> When incorporating a copyleft licensed program with a lax licensed program,
> it is correct to preserve the original license notice.  See also:
>   https://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html
>
> base64.scm did not do this.  This is important, because it is part of
> the license that the copyright header be preserved, so we must do this
> to comply correctly.
>
> (This is a common confusion: adding a stronger copyleft does not
> "relicense" the original work.)

Thank you for this patch.  I’m not familiar with these licensing details
but what you write looks plausible to me.

~~ Ricardo
Christopher Allan Webber Aug. 27, 2016, 1:48 p.m. UTC | #2
Ricardo Wurmus writes:

> Christopher Allan Webber <cwebber@dustycloud.org> writes:
>
>> When incorporating a copyleft licensed program with a lax licensed program,
>> it is correct to preserve the original license notice.  See also:
>>   https://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html
>>
>> base64.scm did not do this.  This is important, because it is part of
>> the license that the copyright header be preserved, so we must do this
>> to comply correctly.
>>
>> (This is a common confusion: adding a stronger copyleft does not
>> "relicense" the original work.)
>
> Thank you for this patch.  I’m not familiar with these licensing details
> but what you write looks plausible to me.
>
> ~~ Ricardo

Ok cool, pushed!
diff mbox

Patch

From 84ea1d9a21098ac37414ec15d5a32e6488509779 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 26 Aug 2016 15:14:20 -0500
Subject: [PATCH] base64: Restore original license header.

When incorporating a copyleft licensed program with a lax licensed program,
it is correct to preserve the original license notice.  See also:
  https://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html

* guix/base64.scm: Restored original license header.
---
 guix/base64.scm | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/guix/base64.scm b/guix/base64.scm
index e4d2ec5..4bd5dc5 100644
--- a/guix/base64.scm
+++ b/guix/base64.scm
@@ -6,8 +6,6 @@ 
 ;;
 ;; Some optimizations made by Ludovic Courtès <ludo@gnu.org>, 2015.
 ;;
-;; Copyright © 2009, 2010 Göran Weinholt <goran@weinholt.se>
-;;
 ;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -20,6 +18,30 @@ 
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;
+;; This file incorporates work covered by the following copyright and  
+;; permission notice:
+;;
+;;   Copyright © 2009, 2010 Göran Weinholt <goran@weinholt.se>
+;;
+;;   Permission is hereby granted, free of charge, to any person obtaining a
+;;   copy of this software and associated documentation files (the "Software"),
+;;   to deal in the Software without restriction, including without limitation
+;;   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+;;   and/or sell copies of the Software, and to permit persons to whom the
+;;   Software is furnished to do so, subject to the following conditions:
+;;
+;;   The above copyright notice and this permission notice shall be included in
+;;   all copies or substantial portions of the Software.
+;;
+;;   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;;   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;;   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+;;   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+;;   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+;;   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+;;   DEALINGS IN THE SOFTWARE.
+
 #!r6rs
 
 ;; RFC 4648 Base-N Encodings
-- 
2.9.3