summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmar Tumballi <amarts@redhat.com>2018-04-16 13:49:44 +0530
committerAmar Tumballi <amarts@redhat.com>2018-05-25 08:40:13 +0000
commit5055ba5170603cdb2a7f2a884013e49fe36ada5c (patch)
treed0be9c573109ec2e6b7cf9b2e56a860699121097
parentdcccfeb887d777ef77e35271a451f70c7c5222d6 (diff)
add COMMITMENT file as part of GPL cure
This is part of more broader commitment Red Hat along with IBM, Google, and Facebook did in November 2017. More on this can be found in the blog @ https://www.redhat.com/en/blog/fostering-greater-open-source-development & https://www.redhat.com/en/about/gplv3-enforcement-statement fixes: bz#1569345 Change-Id: Ia78023540ab587ebe14048a67413029be309413d Signed-off-by: Amar Tumballi <amarts@redhat.com>
-rw-r--r--.testignore1
-rw-r--r--COMMITMENT46
-rw-r--r--Makefile.am2
-rw-r--r--glusterfs.spec.in2
4 files changed, 49 insertions, 2 deletions
diff --git a/.testignore b/.testignore
index bad9b433a00..83f4316ec34 100644
--- a/.testignore
+++ b/.testignore
@@ -14,6 +14,7 @@ MAINTAINERS
NEWS
README.md
THANKS
+COMMITMENT
api/examples/README
api/examples/getvolfile.py
api/src/README.Symbol_Versions
diff --git a/COMMITMENT b/COMMITMENT
new file mode 100644
index 00000000000..16b75efcf29
--- /dev/null
+++ b/COMMITMENT
@@ -0,0 +1,46 @@
+Common Cure Rights Commitment
+Version 1.0
+
+Before filing or continuing to prosecute any legal proceeding or claim
+(other than a Defensive Action) arising from termination of a Covered
+License, we commit to extend to the person or entity ('you') accused
+of violating the Covered License the following provisions regarding
+cure and reinstatement, taken from GPL version 3. As used here, the
+term 'this License' refers to the specific Covered License being
+enforced.
+
+ However, if you cease all violation of this License, then your
+ license from a particular copyright holder is reinstated (a)
+ provisionally, unless and until the copyright holder explicitly
+ and finally terminates your license, and (b) permanently, if the
+ copyright holder fails to notify you of the violation by some
+ reasonable means prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+ reinstated permanently if the copyright holder notifies you of the
+ violation by some reasonable means, this is the first time you
+ have received notice of violation of this License (for any work)
+ from that copyright holder, and you cure the violation prior to 30
+ days after your receipt of the notice.
+
+We intend this Commitment to be irrevocable, and binding and
+enforceable against us and assignees of or successors to our
+copyrights.
+
+Definitions
+
+'Covered License' means the GNU General Public License, version 2
+(GPLv2), the GNU Lesser General Public License, version 2.1
+(LGPLv2.1), or the GNU Library General Public License, version 2
+(LGPLv2), all as published by the Free Software Foundation.
+
+'Defensive Action' means a legal proceeding or claim that We bring
+against you in response to a prior proceeding or claim initiated by
+you or your affiliate.
+
+'We' means each contributor to this repository as of the date of
+inclusion of this file, including subsidiaries of a corporate
+contributor.
+
+This work is available under a Creative Commons Attribution-ShareAlike
+4.0 International license (https://creativecommons.org/licenses/by-sa/4.0/).
diff --git a/Makefile.am b/Makefile.am
index 7405bf23f42..80faf1abc78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
SOURCES = site.h
EXTRA_DIST = autogen.sh \
- COPYING-GPLV2 COPYING-LGPLV3 \
+ COPYING-GPLV2 COPYING-LGPLV3 COMMITMENT \
INSTALL README.md AUTHORS THANKS NEWS \
glusterfs.spec glusterfs-api.pc.in libgfchangelog.pc.in libgfdb.pc.in \
run-tests.sh \
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index c03577d7695..a749ea37534 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -1046,7 +1046,7 @@ exit 0
## All %%files should be placed here and keep them grouped
##
%files
-%doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README.md THANKS
+%doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README.md THANKS COMMITMENT
%{_mandir}/man8/*gluster*.8*
%if ( 0%{!?_without_server:1} )
%exclude %{_mandir}/man8/gluster.8*