From: Sage Weil <sage@redhat.com>
Date: Tue, 13 Mar 2018 21:07:50 +0000 (-0500)
Subject: "Correct" license from LGPL2 to LGPL2.1
X-Git-Tag: v13.1.0~551^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20880%2Fhead;p=ceph.git

"Correct" license from LGPL2 to LGPL2.1

Back in commit 7469f26a33c072169d6ed929352eda06562ffe3f when the COPYING
file was added to the repository and the project was "licensed," the
license file was

                     GNU LESSER GENERAL PUBLIC LICENSE
                          Version 2.1, February 1999

However, the license was abbreviated as LGPL2 in various places (pretty
much everywhere, actually), due to my own ignorance/carelessness.  (I was
distinguishing it from shiny new version 3, released 6 months earlier.)

Version 2 of LGPL is the "Library General Public License," published in
June 1991: https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html

Note that this ambiguity persists for most of the project's lifetime.  For
example, the original debian/copyright in 8adc9dac1d61f34ce85e3cbad1478e3e6ffe2b8e
said "LGPL2" bug in 4545f8b929cc562a1231c0ceb067e9d8e58a0de7 (2009, a year
later) it is changed to LGPL2.1 to satisfy Debian's lintian checks.  (It's
remained LGPL2.1 ever since.)

"Correct" the record by changing LGPL2 references to LGPL2.1.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/CodingStyle b/CodingStyle
index 870c0ce5d39d..05c63b6a4a4b 100644
--- a/CodingStyle
+++ b/CodingStyle
@@ -70,7 +70,7 @@ by section.
 * Comments > File Comments:
 
    Don't sweat it, unless the license varies from that of the project
-   (LGPL2) or the code origin isn't reflected by the git history.
+   (LGPL2.1) or the code origin isn't reflected by the git history.
 
 * Formatting > Tabs:
   Indent width is two spaces.  When runs of 8 spaces can be compressed
diff --git a/debian/copyright b/debian/copyright
index 994d676073ae..13ffa964c867 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -102,7 +102,7 @@ License:
 
 Files: src/test/common/Throttle.cc src/test/filestore/chain_xattr.cc
 Copyright: Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
-License: LGPL2 or later
+License: LGPL2.1 or later
 
 Files: src/osd/ErasureCodePluginJerasure/*.{c,h}
 Copyright: Copyright (c) 2011, James S. Plank <plank@cs.utk.edu>
diff --git a/src/crush/crush.h b/src/crush/crush.h
index e5bdba2d791e..ff78656e2af2 100644
--- a/src/crush/crush.h
+++ b/src/crush/crush.h
@@ -17,7 +17,7 @@
  *
  *     http://www.ssrc.ucsc.edu/Papers/weil-sc06.pdf
  *
- * LGPL2
+ * LGPL2.1
  */
 
 
diff --git a/src/crush/mapper.h b/src/crush/mapper.h
index b397070bef29..e76be7672124 100644
--- a/src/crush/mapper.h
+++ b/src/crush/mapper.h
@@ -5,7 +5,7 @@
  * CRUSH functions for find rules and then mapping an input to an
  * output set.
  *
- * LGPL2
+ * LGPL2.1
  */
 
 #include "crush.h"
diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 9542a887ea3b..6f755fbdee81 100644
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -6,7 +6,7 @@
  * primarily intended to describe data structures that pass over the
  * wire or that are stored on disk.
  *
- * LGPL2
+ * LGPL2.1
  */
 
 #ifndef CEPH_FS_H
diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py
index 5d587b4ed4b4..ef5b002eabb1 100644
--- a/src/pybind/ceph_argparse.py
+++ b/src/pybind/ceph_argparse.py
@@ -7,7 +7,7 @@ daemon.
 
 Copyright (C) 2013 Inktank Storage, Inc.
 
-LGPL2.  See file COPYING.
+LGPL2.1.  See file COPYING.
 """
 from __future__ import print_function
 import copy
diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
index fb71bcd58171..8e21e13fffa6 100644
--- a/src/pybind/ceph_volume_client.py
+++ b/src/pybind/ceph_volume_client.py
@@ -1,7 +1,7 @@
 """
 Copyright (C) 2015 Red Hat, Inc.
 
-LGPL2.  See file COPYING.
+LGPL2.1.  See file COPYING.
 """
 
 from contextlib import contextmanager