[gentoo-commits] data/glep:glep-0076 commit in: /

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     55a36d9c54a85e08bdbf56f3f510dc652b2bfeb9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 19:33:55 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 19:33:55 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=55a36d9c

glep-0076: Use Roman numerals in the list of DCO changes.

Avoid possible confusion, because the enumeration's items refer to
numeric and alpha items of other lists.

 glep-0076.rst | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index aa02146..985130f 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -10,7 +10,7 @@ Type: Informational
 Status: Draft
 Version: 1
 Created: 2013-04-23
-Last-Modified: 2018-06-23
+Last-Modified: 2018-08-24
 Post-History: 2018-06-10, 2018-06-19
 Content-Type: text/x-rst
 ---
@@ -269,21 +269,21 @@ The Gentoo DCO rev. 1 has been based on Linux Kernel DCO 1.1
 [#OSDL-DCO]_.  It features the following modifications from
 the original:
 
-1. The enumeration has been modified to use numeric points.
+i.   The enumeration has been modified to use numeric points.
 
-2. Additional point (3) has been inserted::
+ii.  Additional point (3) has been inserted::
 
-       (3) The contribution is a license text (or a file of similar nature),
-       and verbatim distribution is allowed; or
+         (3) The contribution is a license text (or a file of similar nature),
+         and verbatim distribution is allowed; or
 
-3. The original point (c) has shifted to become point (4), and has been
-   updated to account for the additional point (3).
+iii. The original point (c) has shifted to become point (4), and has
+     been updated to account for the additional point (3).
 
-4. The original point (d) has been transformed into a stand-alone
-   paragraph following the enumeration.
+iv.  The original point (d) has been transformed into a stand-alone
+     paragraph following the enumeration.
 
-5. The term "open source" has been replaced by "free software"
-   throughout.
+v.   The term "open source" has been replaced by "free software"
+     throughout.
 
 The new point was deemed necessary to allow committing license files
 into the Gentoo repository, since those files usually do not permit

[gentoo-commits] data/glep:master commit in: /

[Ulrich Müller]

commit:     2c4ee9591a6c6d0d086534638a6959df29f8a8d7
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  3 14:44:34 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 13:41:12 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=2c4ee959

glep-0076: Add another reference to the Linux DCO.

Explicitly refer to https://developercertificate.org/, because
different wordings of DCO version 1.1 exist.

Slightly reword the last paragraph in the "Certificate of Origin"
section, as discussed with K_F.

 glep-0076.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 0604b43..5bb66ad 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -10,7 +10,7 @@ Type: Informational
 Status: Draft
 Version: 1
 Created: 2013-04-23
-Last-Modified: 2018-08-31
+Last-Modified: 2018-09-03
 Post-History: 2018-06-10, 2018-06-19, 2018-08-31
 Content-Type: text/x-rst
 ---
@@ -170,11 +170,10 @@ Attribution-ShareAlike 3.0 Unported License [#CC-BY-SA-3.0]_.
 It is based on the Linux Kernel DCO [#OSDL-DCO]_, released by Open
 Source Development Labs, Inc. in 2005 under a CC-BY-SA-2.5 License.
 
-Alternatively, and if it is applicable, committers are allowed to
-certify their commits with the Linux Kernel DCO 1.1.  This shall be
-clearly indicated by adding ``(Linux DCO 1.1)`` at the end of the
-``Signed-off-by`` line.  Using the Gentoo Certificate of Origin is
-strongly preferred, though.
+Alternatively, and if it is applicable, committers can certify their
+commits with the Linux Kernel DCO 1.1 [#DCO-1.1]_.  This shall be
+indicated by adding ``(DCO-1.1)`` at the end of the ``Signed-off-by``
+line.  Using the Gentoo Certificate of Origin is strongly preferred.
 
 
 Copyright Attribution
@@ -360,6 +359,9 @@ References
    Developer's Certificate of Origin 1.1,
    https://web.archive.org/web/20060524185355/http://www.osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html
 
+.. [#DCO-1.1] Developer's Certificate of Origin 1.1,
+   https://developercertificate.org/
+
 .. [#FLA] FSFE Legal: Fiduciary Licence Agreement (FLA),
    https://fsfe.org/activities/ftf/fla.en.html
 

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     2c4ee9591a6c6d0d086534638a6959df29f8a8d7
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  3 14:44:34 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  8 13:41:12 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=2c4ee959

glep-0076: Add another reference to the Linux DCO.

Explicitly refer to https://developercertificate.org/, because
different wordings of DCO version 1.1 exist.

Slightly reword the last paragraph in the "Certificate of Origin"
section, as discussed with K_F.

 glep-0076.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 0604b43..5bb66ad 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -10,7 +10,7 @@ Type: Informational
 Status: Draft
 Version: 1
 Created: 2013-04-23
-Last-Modified: 2018-08-31
+Last-Modified: 2018-09-03
 Post-History: 2018-06-10, 2018-06-19, 2018-08-31
 Content-Type: text/x-rst
 ---
@@ -170,11 +170,10 @@ Attribution-ShareAlike 3.0 Unported License [#CC-BY-SA-3.0]_.
 It is based on the Linux Kernel DCO [#OSDL-DCO]_, released by Open
 Source Development Labs, Inc. in 2005 under a CC-BY-SA-2.5 License.
 
-Alternatively, and if it is applicable, committers are allowed to
-certify their commits with the Linux Kernel DCO 1.1.  This shall be
-clearly indicated by adding ``(Linux DCO 1.1)`` at the end of the
-``Signed-off-by`` line.  Using the Gentoo Certificate of Origin is
-strongly preferred, though.
+Alternatively, and if it is applicable, committers can certify their
+commits with the Linux Kernel DCO 1.1 [#DCO-1.1]_.  This shall be
+indicated by adding ``(DCO-1.1)`` at the end of the ``Signed-off-by``
+line.  Using the Gentoo Certificate of Origin is strongly preferred.
 
 
 Copyright Attribution
@@ -360,6 +359,9 @@ References
    Developer's Certificate of Origin 1.1,
    https://web.archive.org/web/20060524185355/http://www.osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html
 
+.. [#DCO-1.1] Developer's Certificate of Origin 1.1,
+   https://developercertificate.org/
+
 .. [#FLA] FSFE Legal: Fiduciary Licence Agreement (FLA),
    https://fsfe.org/activities/ftf/fla.en.html
 

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     c2869b90c4697a2aa9fec5567b51eef0da272e10
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  3 14:44:34 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  3 14:44:34 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=c2869b90

glep-0076: Add another reference to the Linux DCO.

Explicitly refer to https://developercertificate.org/, because
different wordings of DCO version 1.1 exist.

Slightly reword the last paragraph in the "Certificate of Origin"
section, as discussed with K_F.

 glep-0076.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 0604b43..5bb66ad 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -10,7 +10,7 @@ Type: Informational
 Status: Draft
 Version: 1
 Created: 2013-04-23
-Last-Modified: 2018-08-31
+Last-Modified: 2018-09-03
 Post-History: 2018-06-10, 2018-06-19, 2018-08-31
 Content-Type: text/x-rst
 ---
@@ -170,11 +170,10 @@ Attribution-ShareAlike 3.0 Unported License [#CC-BY-SA-3.0]_.
 It is based on the Linux Kernel DCO [#OSDL-DCO]_, released by Open
 Source Development Labs, Inc. in 2005 under a CC-BY-SA-2.5 License.
 
-Alternatively, and if it is applicable, committers are allowed to
-certify their commits with the Linux Kernel DCO 1.1.  This shall be
-clearly indicated by adding ``(Linux DCO 1.1)`` at the end of the
-``Signed-off-by`` line.  Using the Gentoo Certificate of Origin is
-strongly preferred, though.
+Alternatively, and if it is applicable, committers can certify their
+commits with the Linux Kernel DCO 1.1 [#DCO-1.1]_.  This shall be
+indicated by adding ``(DCO-1.1)`` at the end of the ``Signed-off-by``
+line.  Using the Gentoo Certificate of Origin is strongly preferred.
 
 
 Copyright Attribution
@@ -360,6 +359,9 @@ References
    Developer's Certificate of Origin 1.1,
    https://web.archive.org/web/20060524185355/http://www.osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html
 
+.. [#DCO-1.1] Developer's Certificate of Origin 1.1,
+   https://developercertificate.org/
+
 .. [#FLA] FSFE Legal: Fiduciary Licence Agreement (FLA),
    https://fsfe.org/activities/ftf/fla.en.html
 

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     e6ea349705cb25f90acbc32698a19b1537a287cf
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 14:55:54 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 14:55:54 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=e6ea3497

glep-0076: Update Post-History.

 glep-0076.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 515a20d..0604b43 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -10,8 +10,8 @@ Type: Informational
 Status: Draft
 Version: 1
 Created: 2013-04-23
-Last-Modified: 2018-08-28
-Post-History: 2018-06-10, 2018-06-19
+Last-Modified: 2018-08-31
+Post-History: 2018-06-10, 2018-06-19, 2018-08-31
 Content-Type: text/x-rst
 ---
 

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     77f5047ca5d02030deb65bca3a5937f52f04b250
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 16:54:24 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 16:54:24 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=77f5047c

fixup! glep-0076: Rename the DCO to "Gentoo Certificate of Origin".

 glep-0076.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index fa8cfe1..515a20d 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -131,7 +131,7 @@ that the contribution can be modified and redistributed in accordance
 with the project's license.
 
 For commits made using a VCS, the committer shall certify agreement to
-the certificate of origin by adding ``Signed-off-by: Name <e-mail>``
+the Certificate of Origin by adding ``Signed-off-by: Name <e-mail>``
 to the commit message as a separate line.  Committers must use their
 real name, i.e., the name that would appear in an official document
 like a passport.
@@ -295,7 +295,7 @@ The new point was deemed necessary to allow committing license files
 into the Gentoo repository, since those files usually do not permit
 modification.  It has been established that adding a clear provision
 for this case is better than excluding those commits from compliance
-with the certificate of origin.  Debian was facing a similar problem
+with the Certificate of Origin.  Debian was facing a similar problem
 [#DEBIAN-LICENSE]_.
 
 The update of point (c) was necessary to allow the new clause being

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     7438a865397e4e72df5ac91f11f29df14b2b17b4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 16:54:06 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 16:54:06 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=7438a865

fixup! glep-0076: Require CC-BY-SA-4.0 for new projects.

 glep-0076.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index ec54bcd..fa8cfe1 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -250,7 +250,7 @@ The Social Contract mentions GPL-2 and CC-BY-SA-2.0, both with the
 option to use them in a later version ("at our discretion").  In order
 to facilitate interchange of software between different projects, we
 aim for uniformity of their licensing.  Therefore, items a) and b)
-explicitly recommend the use of GPL-2+ and CC-BY-SA-3.0.  The latter
+explicitly recommend the use of GPL-2+ and CC-BY-SA-4.0.  The latter
 is restricted to be used for documentation, because Creative Commons
 themselves recommend against using their licenses for software
 [#CC-SOFTWARE]_.

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     170e90e82b292ac58399a86901a76b3bd4200a80
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 19:54:18 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 19:54:18 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=170e90e8

glep-0076: Rename the DCO to "Gentoo Certificate of Origin".

We cannot name it DCO, because the license conditions of OSDL's
DCO 1.1 say:

If you modify you must use a name or title distinguishable from
"Developer's Certificate of Origin" or "DCO" or any confusingly
similar name.

 glep-0076.rst | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index a53f5b5..9429d97 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -130,14 +130,13 @@ certificate of origin.  The purpose of the certificate is to declare
 that the contribution can be modified and redistributed in accordance
 with the project's license.
 
-For commits made using a VCS, the committer shall certify agreement
-to the Gentoo DCO by adding ``Signed-off-by: Name <e-mail>`` to the
-commit message as a separate line.  Committers must use their real
-name, i.e., the name that would appear in an official document like
-a passport.
+For commits made using a VCS, the committer shall certify agreement to
+the certificate of origin by adding ``Signed-off-by: Name <e-mail>``
+to the commit message as a separate line.  Committers must use their
+real name, i.e., the name that would appear in an official document
+like a passport.
 
-The following is the current Gentoo Developer's Certificate of Origin,
-revision 1:
+The following is the current Gentoo Certificate of Origin, revision 1:
 
     By making a contribution to this project, I certify that:
 
@@ -166,7 +165,7 @@ revision 1:
     maintained indefinitely and may be redistributed consistent with
     this project or the free software license(s) involved.
 
-The Gentoo DCO is licensed under a Creative Commons
+The Gentoo Certificate of Origin is licensed under a Creative Commons
 Attribution-ShareAlike 3.0 Unported License [#CC-BY-SA-3.0]_.
 It is based on the Linux Kernel DCO [#OSDL-DCO]_, released by Open
 Source Development Labs, Inc. in 2005 under a CC-BY-SA-2.5 License.
@@ -266,8 +265,8 @@ source license.
 DCO Changes
 -----------
 
-The Gentoo DCO rev. 1 has been based on Linux Kernel DCO 1.1
-[#OSDL-DCO]_.  It features the following modifications from
+The Gentoo Certificate of Origin rev. 1 has been based on Linux Kernel
+DCO 1.1 [#OSDL-DCO]_.  It features the following modifications from
 the original:
 
 i.   The enumeration has been modified to use numeric points.
@@ -289,8 +288,9 @@ v.   The term "open source" has been replaced by "free software"
 The new point was deemed necessary to allow committing license files
 into the Gentoo repository, since those files usually do not permit
 modification.  It has been established that adding a clear provision
-for this case is better than excluding those commits from DCO
-compliance.  Debian was facing a similar problem [#DEBIAN-LICENSE]_.
+for this case is better than excluding those commits from compliance
+with the certificate of origin.  Debian was facing a similar problem
+[#DEBIAN-LICENSE]_.
 
 The update of point (c) was necessary to allow the new clause being
 certified by the person providing the contribution.
@@ -345,7 +345,8 @@ References
 .. [#PROJECTS] Licensing of Gentoo projects,
    https://wiki.gentoo.org/wiki/Project:Licenses/Licensing_of_Gentoo_projects
 
-.. [#OSDL-DCO] Developer's Certificate of Origin 1.1,
+.. [#OSDL-DCO] Open Source Development Labs, Inc.,
+   Developer's Certificate of Origin 1.1,
    https://web.archive.org/web/20060524185355/http://www.osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html
 
 .. [#FLA] FSFE Legal: Fiduciary Licence Agreement (FLA),

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     b40260d4fc67ee95b61440cf34c9f6bf1756bb1a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 19:43:57 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 19:43:57 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=b40260d4

glep-0076: Reformat the certificate of origin.

For better readability, format as a block quote instead of a literal
block. Use same format for items as will appear in the HTML output,
i.e., 1. instead of (1).

 glep-0076.rst | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 985130f..a53f5b5 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -136,34 +136,35 @@ commit message as a separate line.  Committers must use their real
 name, i.e., the name that would appear in an official document like
 a passport.
 
-The following is the current Gentoo DCO::
-
-    Gentoo Developer's Certificate of Origin, revision 1
+The following is the current Gentoo Developer's Certificate of Origin,
+revision 1:
 
     By making a contribution to this project, I certify that:
 
-    (1) The contribution was created in whole or in part by me, and I have
-        the right to submit it under the free software license indicated
-        in the file; or
+    1. The contribution was created in whole or in part by me, and I
+       have the right to submit it under the free software license
+       indicated in the file; or
 
-    (2) The contribution is based upon previous work that, to the best
-        of my knowledge, is covered under an appropriate free software
-        license, and I have the right under that license to submit that
-        work with modifications, whether created in whole or in part by
-        me, under the same free software license (unless I am permitted
-        to submit under a different license), as indicated in the file; or
+    2. The contribution is based upon previous work that, to the best
+       of my knowledge, is covered under an appropriate free software
+       license, and I have the right under that license to submit that
+       work with modifications, whether created in whole or in part by
+       me, under the same free software license (unless I am permitted
+       to submit under a different license), as indicated in the file;
+       or
 
-    (3) The contribution is a license text (or a file of similar nature),
-        and verbatim distribution is allowed; or
+    3. The contribution is a license text (or a file of similar nature),
+       and verbatim distribution is allowed; or
 
-    (4) The contribution was provided directly to me by some other person
-        who certified (1), (2), (3), or (4), and I have not modified it.
+    4. The contribution was provided directly to me by some other
+       person who certified 1., 2., 3., or 4., and I have not modified
+       it.
 
-    I understand and agree that this project and the contribution are
-    public and that a record of the contribution (including all personal
-    information I submit with it, including my sign-off) is maintained
-    indefinitely and may be redistributed consistent with this project or
-    the free software license(s) involved.
+    I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the free software license(s) involved.
 
 The Gentoo DCO is licensed under a Creative Commons
 Attribution-ShareAlike 3.0 Unported License [#CC-BY-SA-3.0]_.
@@ -271,13 +272,13 @@ the original:
 
 i.   The enumeration has been modified to use numeric points.
 
-ii.  Additional point (3) has been inserted::
+ii.  Additional point 3. has been inserted:
 
-         (3) The contribution is a license text (or a file of similar nature),
-         and verbatim distribution is allowed; or
+         3. The contribution is a license text (or a file of similar
+            nature), and verbatim distribution is allowed; or
 
-iii. The original point (c) has shifted to become point (4), and has
-     been updated to account for the additional point (3).
+iii. The original point (c) has shifted to become point 4., and has
+     been updated to account for the additional point 3.
 
 iv.  The original point (d) has been transformed into a stand-alone
      paragraph following the enumeration.

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     ca17a75ac3d7ab48459009a5945f460c21c43493
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 20:07:46 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 20:07:46 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=ca17a75a

glep-0076: Allow the Linux DCO as an alternative.

 glep-0076.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/glep-0076.rst b/glep-0076.rst
index 9429d97..fadf1bf 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -170,6 +170,11 @@ Attribution-ShareAlike 3.0 Unported License [#CC-BY-SA-3.0]_.
 It is based on the Linux Kernel DCO [#OSDL-DCO]_, released by Open
 Source Development Labs, Inc. in 2005 under a CC-BY-SA-2.5 License.
 
+Alternatively, committers are allowed to certify their commits with
+the Linux Kernel DCO 1.1.  This shall be clearly indicated by adding
+``(Linux DCO 1.1)`` at the end of the ``Signed-off-by`` line.  Using
+the Gentoo Certificate of Origin is strongly preferred, though.
+
 
 Copyright Attribution
 ---------------------

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     83bf928a55f676721a733cfaf8d52c7495a60e2e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 23 20:40:10 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 20:40:10 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=83bf928a

glep-0076: Minor fixes.

- Delete redundant phrase "to anyone's satisfaction" from Purpose/Scope.
- Say "Gentoo Authors" (without "The") in the copyright notice.
- Spelling and typographic fixes.
- Update URLs to https.

 glep-0076.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 4dca610..1072a9e 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -10,7 +10,7 @@ Type: Informational
 Status: Draft
 Version: 1
 Created: 2013-04-23
-Last-Modified: 2018-06-17
+Last-Modified: 2018-06-23
 Post-History: 2018-06-10, 2018-06-19
 Content-Type: text/x-rst
 ---
@@ -92,10 +92,10 @@ infrastructure or to any official Gentoo project (independently
 of hosting) must comply with this policy.  Unofficial Gentoo projects
 are also recommended to use this policy.
 
-Questions regarding this policy should be directed to the trustees or
-the -project list.  Any concerns over possible copyright violations
-should be directed to the Trustees if they cannot be worked out to
-anyone's satisfaction with the appropriate maintainer.
+Questions regarding this policy should be directed to the Trustees
+or the ``gentoo-project`` mailing list.  Any concerns over possible
+copyright violations should be directed to the Trustees if they cannot
+be worked out with the appropriate maintainer.
 
 
 Licensing of Gentoo Projects
@@ -206,7 +206,7 @@ Simplified Attribution
 Alternatively, projects are welcome to use a simplified form of the
 copyright notice, which reads::
 
-    Copyright YEARS The Gentoo Authors
+    Copyright YEARS Gentoo Authors
 
 Projects using this scheme must track authorship in a VCS, unless they
 list all authors of copyrightable contributions in an ``AUTHORS`` file.
@@ -330,10 +330,10 @@ References
    https://www.gentoo.org/get-started/philosophy/social-contract.html
 
 .. [#GPL-2] GNU General Public License, version 2 or later,
-   http://www.gnu.org/licenses/gpl-2.0.html
+   https://www.gnu.org/licenses/gpl-2.0.html
 
 .. [#CC-BY-SA-3.0] Creative Commons Attribution-ShareAlike 3.0
-   Unported License, http://creativecommons.org/licenses/by-sa/3.0/
+   Unported License, https://creativecommons.org/licenses/by-sa/3.0/
 
 .. [#GPL-COMPAT] GPL-compatible free software licenses,
    https://www.gnu.org/licenses/license-list.en.html#GPLCompatibleLicenses

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     09e2670391eb145e9a580c02ce093acd29ecf0ab
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 23 21:32:16 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 21:32:16 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=09e26703

glep-0076: Require CC-BY-SA-4.0 for new projects.

 glep-0076.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 1072a9e..aa02146 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -108,9 +108,9 @@ following:
 a) The GNU General Public License, version 2 or later (GPL-2+)
    [#GPL-2]_.
 
-b) The Creative Commons Attribution-ShareAlike 3.0 License
-   (CC-BY-SA-3.0, only for documentation) [#CC-BY-SA-3.0]_.
-   *[Note: or version 4.0, to be decided]*
+b) The Creative Commons Attribution-ShareAlike 4.0 License
+   (CC-BY-SA-4.0, only for documentation) [#CC-BY-SA-4.0]_.
+   Existing projects may also stay with CC-BY-SA-3.0 [#CC-BY-SA-3.0]_.
 
 c) A license approved as GPL compatible by the Free Software
    Foundation [#GPL-COMPAT]_.
@@ -332,6 +332,9 @@ References
 .. [#GPL-2] GNU General Public License, version 2 or later,
    https://www.gnu.org/licenses/gpl-2.0.html
 
+.. [#CC-BY-SA-4.0] Creative Commons Attribution-ShareAlike 4.0
+   International License, https://creativecommons.org/licenses/by-sa/4.0/
+
 .. [#CC-BY-SA-3.0] Creative Commons Attribution-ShareAlike 3.0
    Unported License, https://creativecommons.org/licenses/by-sa/3.0/
 

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     c6e0c803eb4f56cb74fa4f44390c4efe3266492b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 19 17:12:10 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 17:12:10 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=c6e0c803

glep-0076: Update Post-History.

 glep-0076.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 7ac5006..4dca610 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -11,7 +11,7 @@ Status: Draft
 Version: 1
 Created: 2013-04-23
 Last-Modified: 2018-06-17
-Post-History: 2018-06-10
+Post-History: 2018-06-10, 2018-06-19
 Content-Type: text/x-rst
 ---
 

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     69de39bdd38f60a246bdbc00cc7101137ea5b3c9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 19:22:50 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 19:22:50 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=69de39bd

glep-0076: Require real name for Signed-off-by.

 glep-0076.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index ddbfd05..292ebec 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -127,7 +127,9 @@ with the project's license.
 
 For commits made using a VCS, the committer shall certify agreement
 to the Gentoo DCO by adding ``Signed-off-by: Name <e-mail>`` to the
-commit message as a separate line.
+commit message as a separate line.  Committers must use their real
+name, i.e., the name that would appear in an official document like
+a passport.
 
 The following is the current Gentoo DCO::
 
@@ -203,7 +205,9 @@ to protect the Gentoo infrastructure owners and improve consistency.
 
 The copyright model is built on the DCO model used by the Linux kernel
 and requires all contributors to certify the legitimacy of their
-contributions.
+contributions.  This also requires that they use their real name for
+signing; an anonymous certification or one under a pseudonym would not
+mean anything.
 
 In the future, a second stage of this policy may use a combination of
 the DCO model and an FLA model as it is used by different open source

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     8d006aebf1bb063ae6fb79710f3f1325b599f134
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 18:37:55 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 18:37:55 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=8d006aeb

glep-0076: Remove history section.

Requested by rich0.

 glep-0076.rst | 74 -----------------------------------------------------------
 1 file changed, 74 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 58bed23..ddbfd05 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -55,9 +55,6 @@ policy, and continues to exist to this day.  Some files also still
 contain or have in the past contained additional copyright headers,
 attributing ownership to other parties.
 
-A detailed historical timeline is provided in the `key dates in Gentoo
-copyright history`_ section.
-
 The policy to have copyright notices ascribing copyright ownership to
 the Gentoo Foundation caused an issue when Gentoo developers forked
 another project and hosted the fork on Gentoo infrastructure.  To
@@ -255,77 +252,6 @@ more appropriate to separate it from the enumeration by putting it
 in a separate paragraph.
 
 
-Key dates in Gentoo copyright history
-=====================================
-
-* 2000-01-03: *Gentoo Technologies, Inc.* established in New Mexico.
-
-* 2000-07-28: `Earliest known CVS commit
-  <https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/header.txt?revision=1.1&view=markup>`_
-  in the Gentoo CVS repositories.  Made by Daniel Robbins to
-  ``gentoo-x86/header.txt``
-  ::
-
-    # Copyright 1999-2000 Gentoo Technologies, Inc.
-    # Distributed under the terms of the GNU General Public License, v2 or later
-    # $header$
-
-
-* 2000-10-09: `Earliest known version of the ebuild skeleton
-  <https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/skel.ebuild?revision=1.1&view=markup>`_.
-  (``skel.ebuild``) in CVS
-
-* 2003-12-09: Copyright assignment document added to CVS, with an
-  assignee of *Gentoo Technologies, Inc.*, in `text
-  <https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/xml/htdocs/proj/en/devrel/assignment.txt?hideattic=0&view=log>`_
-  format.  Later the document was `moved
-  <https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/xml/htdocs/proj/en/devrel/copyright/assignment.txt?hideattic=0&view=log>`_
-  and a version in `PDF
-  <https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/xml/htdocs/proj/en/devrel/copyright/assignment.pdf?hideattic=0&view=log>`_
-  format was added.  A related GuideXML page is `included
-  <https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/xml/htdocs/proj/en/devrel/copyright-assignment/index.xml?hideattic=0&view=log>`_.
-
-* 2004-05-28: *Gentoo Foundation, Inc.* established in New Mexico.
-
-* 2004-06-24: First CVS commit `changing
-  <https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-accessibility/at-poke/at-poke-0.2.1.ebuild?hideattic=0&revision=1.3&view=markup>`_
-  copyright header to *Gentoo Foundation*.
-
-* 2004-07-01: The recruiters `stopped requiring the assignment form
-  <https://archives.gentoo.org/gentoo-trustees/message/d860d16f85dc6cea23077b0ff8b979c0>`_
-  after discussion in the ``gentoo-trustees`` mailing list.
-
-* 2005-05-19: Gentoo Technologies, Inc. files an **Assignment of
-  Copyright** document, signed by Daniel Robbins, which transfers any
-  copyrights held by *Gentoo Technologies, Inc.* over `All files to
-  which Gentoo Technologies, Inc. may hold the copyright that existed
-  in the Gentoo Concurrent Versions System (CVS) Repositories as of 25
-  June 2004`.
-
-* 2005-06-13: *Gentoo Technologies, Inc.* files a **recordation of
-  copyright** with the United States Copyright Office, signed by
-  Daniel Robbins, President.  The copyright is asserted over `Gentoo
-  Concurrent Versions System (CVS) Repositories as of 25 June 2004`.
-
-* 2005-06-13: *Gentoo Technologies, Inc.* provides a **Release from
-  Contract Requirements** document, signed by Daniel Robbins.  The
-  complete body of the document is as follows:
-
-    Gentoo Technologies, Inc. does hereby release all individuals who
-    have signed the contract known as the "Gentoo Technologies, Inc.
-    Copyright Assignment Form" from any future duties and obligations
-    of these individuals associated with that contract.  As of this
-    date any provision of that contract requiring any future duties is
-    hereby nullified.
-
-* 2006-08-23: Copyright assignment document assignee `updated
-  <https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/xml/htdocs/proj/en/devrel/copyright/assignment.txt?hideattic=0&r1=1.1&r2=1.2>`_
-  to *Gentoo Foundation, Inc.*
-
-* 2007-01-27: Copyright assignment document `removed
-  <https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/xml/htdocs/proj/en/devrel/copyright/assignment.txt?view=log&hideattic=0>`_.
-
-
 References
 ==========
 

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     53a2e981509d66dbff15cb48cac467a20d943731
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 18:33:28 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 18:33:28 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=53a2e981

glep-0076: Remove FLA section.

Therefore simplifying the policy, as discussed in #gentoo-council.

 glep-0076.rst | 51 +++++++++++----------------------------------------
 1 file changed, 11 insertions(+), 40 deletions(-)

diff --git a/glep-0076.rst b/glep-0076.rst
index 9fc4605..58bed23 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -10,7 +10,7 @@ Type: Informational
 Status: Draft
 Version: 1
 Created: 2013-04-23
-Last-Modified: 2018-06-03
+Last-Modified: 2018-06-07
 Post-History: 
 Content-Type: text/x-rst
 ---
@@ -72,10 +72,9 @@ License Agreement [#FLA]_, which takes a copyleft approach to
 copyright licensing, while also better complying with copyright laws
 in nations that have author's rights.
 
-The goal here was to create a policy that was both flexible enough to
-cover forks and situations where Gentoo would not own the majority of
-the copyright in a file, while also preserving our ability to formally
-own copyrights on as much of our works as possible.
+The goal here was to create a policy that was flexible enough to cover
+forks and situations where Gentoo would not own the majority of the
+copyright in a file.
 
 
 Specification
@@ -192,28 +191,6 @@ Any concerns not addressed by a maintainer can be appealed to the
 Trustees.
 
 
-Licensing to the Gentoo Foundation
-----------------------------------
-
-All are welcome and encouraged (but *not* required) to assign copyright
-for their contributions to the Gentoo Foundation.  Doing so makes
-compliance with this policy easier (fewer copyright holders to list),
-and allows the Foundation to enforce copyrights and re-license content
-if appropriate (this will only be done in accordance with the social
-contract and the Gentoo FLA).
-
-Copyright is assigned to the Foundation by electronically signing the
-Gentoo Fiduciary License Agreement (FLA) [#GFLA]_.
-
-The agreement may be signed BY **TODO...**  If the scope of the signed
-agreement included future contributions, the contributor may document
-their wish to stop assigning copyright by **TODO...**
-
-A list of those who have signed this agreement and the scope of their
-assignments may be found at **LINK**.  This list may be useful when
-attributing copyright.
-
-
 Rationale
 =========
 
@@ -227,17 +204,14 @@ including its contributors, developers and users.  Additionally, it is
 enforced for all other projects hosted on Gentoo infrastructure in order
 to protect the Gentoo infrastructure owners and improve consistency.
 
-The copyright model is built on a combination of DCO model used
-by the Linux kernel with FLA model used by different open source
-projects.  It requires all contributors to certify the legitimacy
-of their contributions; however, they can freely choose whether to
-assign the copyright to Gentoo, or not.
+The copyright model is built on the DCO model used by the Linux kernel
+and requires all contributors to certify the legitimacy of their
+contributions.
 
-Ideally, all major contributors to Gentoo would choose to sign the FLA.
-However, enforcing it for all contributors would only create unnecessary
-bureaucracy for trivial contributions and discourage a number of users
-from actually contributing to Gentoo.  The mixed model allows users to
-choose a way of contributing that is appropriate to them.
+In the future, a second stage of this policy may use a combination of
+the DCO model and an FLA model as it is used by different open source
+projects.  Contributors would be able to freely choose whether they
+sign the FLA document or not.
 
 
 DCO changes
@@ -376,9 +350,6 @@ References
 .. [#FLA] FSFE Legal: Fiduciary Licence Agreement (FLA),
    https://fsfe.org/activities/ftf/fla.en.html
 
-.. [#GFLA] Gentoo Fiduciary License Agreement,
-   https://dev.gentoo.org/~rich0/fla.pdf
-
 .. [#DEBIAN-LICENSE] [debian-legal] License of the GPL license,
    https://lists.debian.org/debian-legal/2018/04/msg00006.html
 

[gentoo-commits] data/glep:glep-0076 commit in: /

[Ulrich Müller]

commit:     2b976218b6717575cc647852ac1e80acc165cf76
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 19:23:19 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 19:23:19 2018 +0000
URL:        https://gitweb.gentoo.org/data/glep.git/commit/?id=2b976218

glep-0076: Short abstract.

 glep-0076.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/glep-0076.rst b/glep-0076.rst
index 292ebec..b51f0bc 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -26,6 +26,11 @@ for discussion, not final versions.
 Abstract
 ========
 
+This GLEP introduces a copyright and licensing policy for Gentoo
+projects.  It requires all contributions of software or documentation
+to be released under a free license, and to be accompagnied by a
+certificate of origin.
+
 
 Motivation
 ==========