Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 673604 - Updates of GNU licenses (GPL-*, LGPL-*, AGPL-*, FDL-*)
Summary: Updates of GNU licenses (GPL-*, LGPL-*, AGPL-*, FDL-*)
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All All
: Normal trivial (vote)
Assignee: Licenses team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-12-23 05:48 UTC by Arfrever Frehtes Taifersar Arahesis
Modified: 2019-05-24 18:36 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Diff for FDL-1.3 (FDL-1.3.diff,2.53 KB, patch)
2018-12-23 12:50 UTC, Ulrich Müller
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Arfrever Frehtes Taifersar Arahesis 2018-12-23 05:48:36 UTC
I suggest to update GNU licenses (at least GPL-*, LGPL-*, AGPL-*, FDL-*) to versions currently available in https://www.gnu.org/licenses/ page.

Changes are small, usually in URLs or whitespace.

Examples:

--- gentoo/licenses/GPL-3
+++ https://www.gnu.org/licenses/gpl-3.0.txt
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

--- gentoo/licenses/LGPL-3
+++ https://www.gnu.org/licenses/lgpl-3.0.txt
@@ -1,7 +1,7 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -10,7 +10,7 @@
 the terms and conditions of version 3 of the GNU General Public
 License, supplemented by the additional permissions listed below.
 
-  0. Additional Definitions. 
+  0. Additional Definitions.
 
   As used herein, "this License" refers to version 3 of the GNU Lesser
 General Public License, and the "GNU GPL" refers to version 3 of the GNU
@@ -111,7 +111,7 @@
        a copy of the Library already present on the user's computer
        system, and (b) will operate properly with a modified version
        of the Library that is interface-compatible with the Linked
-       Version. 
+       Version.
 
    e) Provide Installation Information, but only if you would otherwise
    be required to provide such information under section 6 of the
Comment 1 Ulrich Müller gentoo-dev 2018-12-23 09:23:38 UTC
I don't think that we should add spurious trailing whitespace to these files.

Rather file a bug upstream so that they fix it there.
Comment 2 Arfrever Frehtes Taifersar Arahesis 2018-12-23 10:08:01 UTC
(In reply to Ulrich Müller from comment #1)
> I don't think that we should add spurious trailing whitespace to these files.
> 
> Rather file a bug upstream so that they fix it there.

You are misreading diffs.
I have not presented any changes made by me, but changes made by upstream.
Upstream has deleted trailing whitespace and changed http to https in URLs, but old contents of these files are still in gentoo repository.
Comment 3 Ulrich Müller gentoo-dev 2018-12-23 12:50:16 UTC
Created attachment 558404 [details, diff]
Diff for FDL-1.3

At least for FDL-1.3 I see some trailing whitespace added, see attachment.
Comment 4 Larry the Git Cow gentoo-dev 2018-12-23 12:50:47 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a1629775398c0b5c4b5444835da3910ecaf998a

commit 6a1629775398c0b5c4b5444835da3910ecaf998a
Author:     Ulrich Müller <ulm@gentoo.org>
AuthorDate: 2018-12-23 12:44:55 +0000
Commit:     Ulrich Müller <ulm@gentoo.org>
CommitDate: 2018-12-23 12:49:56 +0000

    licenses: Sync GNU licenses from upstream.
    
    Not all whitespace changes have been applied, because the new upstream
    versions add spurious end-of-line spaces in some cases.
    
    Bug: https://bugs.gentoo.org/673604
    Signed-off-by: Ulrich Müller <ulm@gentoo.org>

 licenses/AGPL-3                           |  6 ++--
 licenses/FDL-1.1                          |  8 ++---
 licenses/FDL-1.2                          |  6 ++--
 licenses/FDL-1.3                          |  4 +--
 licenses/GPL-1                            | 18 +++++------
 licenses/GPL-2                            | 35 ++++++++++----------
 licenses/GPL-2-with-MySQL-FLOSS-exception | 35 ++++++++++----------
 licenses/GPL-2-with-exceptions            | 35 ++++++++++----------
 licenses/GPL-2-with-font-exception        | 53 ++++++++++++++++---------------
 licenses/GPL-2-with-linking-exception     | 35 ++++++++++----------
 licenses/GPL-3                            |  8 ++---
 licenses/GPL-3-with-font-exception        | 22 +++++++------
 licenses/GPL-3-with-openssl-exception     |  8 ++---
 licenses/LGPL-2                           | 21 ++++++------
 licenses/LGPL-2-with-linking-exception    | 14 ++++----
 licenses/LGPL-2.1                         | 20 ++++++------
 licenses/LGPL-3                           |  8 ++---
 licenses/LGPL-3-with-linking-exception    |  2 +-
 18 files changed, 169 insertions(+), 169 deletions(-)