[gentoo-commits] proj/devmanual:master commit in: general-concepts/copyright-policy/
commit: fdc98e37df5ab45c00e1ba6347bd619ac623ac9d Author: Ulrich Müller gentoo org> AuthorDate: Thu Jul 25 08:44:31 2024 + Commit: Ulrich Müller gentoo org> CommitDate: Thu Jul 25 08:44:31 2024 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=fdc98e37 general-concepts/copyright-policy: Exceptions are granted by the Council See GLEP 76 update: https://gitweb.gentoo.org/data/glep.git/commit/?id=7f0ce454b2359ed742b84d1d60176fadad15c066 Signed-off-by: Ulrich Müller gentoo.org> general-concepts/copyright-policy/text.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general-concepts/copyright-policy/text.xml b/general-concepts/copyright-policy/text.xml index 5fb9d19..2b97939 100644 --- a/general-concepts/copyright-policy/text.xml +++ b/general-concepts/copyright-policy/text.xml @@ -35,7 +35,7 @@ following licenses: Exceptions for other (GPL-incompatible) free software licenses may be granted -by the Gentoo Foundation on a case-by-case basis. +by the Gentoo Council on a case-by-case basis.
[gentoo-commits] proj/devmanual:master commit in: /, general-concepts/copyright-policy/
commit: bbba1f2dc618c7d937a62474c755e1cd834d4808
Author: Ulrich Müller gentoo org>
AuthorDate: Sat Oct 21 12:03:53 2023 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sun Oct 22 11:35:52 2023 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=bbba1f2d
general-concepts/copyright-policy: Reformat the General guideline section
Use nested ordered lists instead of one description list. Hopefully,
this will make the logic better understandable.
Add a diagram with a flowchart. Also commit the SVG output, so we
don't need Graphviz as build dependency for a single file that isn't
expected to change very often.
Signed-off-by: Ulrich Müller gentoo.org>
Makefile | 3 +
general-concepts/copyright-policy/diagram.dot | 43 ++
general-concepts/copyright-policy/diagram.svg | 107
general-concepts/copyright-policy/text.xml| 113 --
4 files changed, 224 insertions(+), 42 deletions(-)
diff --git a/Makefile b/Makefile
index 054b720..89874ae 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,9 @@ build: $(HTMLS) $(IMAGES)
documents.js: bin/build_search_documents.py $(XMLS)
@python3 bin/build_search_documents.py $(XMLS) > $@ && echo "$@ built"
+%.svg : %.dot
+ dot -T svg -o $@ $<
+
%.png : %.svg
rsvg-convert --output=$@ $<
diff --git a/general-concepts/copyright-policy/diagram.dot
b/general-concepts/copyright-policy/diagram.dot
new file mode 100644
index 000..5b29ab7
--- /dev/null
+++ b/general-concepts/copyright-policy/diagram.dot
@@ -0,0 +1,43 @@
+// Copyright 2023 Gentoo Authors
+// Distributed under the terms of the CC-BY-SA-4.0 license
+
+digraph g {
+ size = "8!,2";
+ node [ penwidth = 2; fontname = "Open Sans" ];
+ edge [ penwidth = 2; fontname = "Open Sans" ];
+
+ start [ width = 1.4; height = 0.9; label = "Start" ];
+
+ signoff [ shape = diamond; width = 2.4; height = 1.3;
+style = filled; fillcolor = "cyan";
+label = "Signed-off-by?" ];
+ size[ shape = diamond; width = 2.4; height = 1.3;
+style = filled; fillcolor = "cyan";
+label = "Tiny\ncontribution?" ];
+ license [ shape = diamond; width = 2.4; height = 1.3;
+style = filled; fillcolor = "cyan";
+label = "Contains\nlicense notice?" ];
+
+ accept4 [ shape = rect; width = 1.6; height = 0.8;
+style = filled; fillcolor = "lime";
+label = "Accept\n(GCO point 4)" ];
+ accept2 [ shape = rect; width = 1.6; height = 0.8;
+style = filled; fillcolor = "lime";
+label = "Accept\n(GCO point 2)" ];
+ reject [ shape = rect; width = 1.6; height = 0.7;
+style = filled; fillcolor = "red";
+label = "Do not accept" ];
+
+ start -> signoff;
+
+ signoff:s -> accept4 [ label = " Yes " ];
+ signoff -> size[ label = " No " ];
+
+ size:s-> accept2 [ label = " Yes " ];
+ size -> license [ label = " No " ];
+
+ license:s -> accept2 [ label = " Yes " ];
+ license -> reject [ label = " No " ];
+
+ { rank = same; start; signoff; size; license; reject; }
+}
diff --git a/general-concepts/copyright-policy/diagram.svg
b/general-concepts/copyright-policy/diagram.svg
new file mode 100644
index 000..3affb30
--- /dev/null
+++ b/general-concepts/copyright-policy/diagram.svg
@@ -0,0 +1,107 @@
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
+
+
+http://www.w3.org/2000/svg;
xmlns:xlink="http://www.w3.org/1999/xlink;>
+
+g
+
+
+
+start
+
+Start
+
+
+
+signoff
+
+Signedoffby?
+
+
+
+startsignoff
+
+
+
+
+
+size
+
+Tiny
+contribution?
+
+
+
+signoffsize
+
+
+ No
+
+
+
+accept4
+
+Accept
+(GCO point 4)
+
+
+
+signoff:saccept4
+
+
+ Yes
+
+
+
+license
+
+Contains
+license notice?
+
+
+
+sizelicense
+
+
+ No
+
+
+
+accept2
+
+Accept
+(GCO point 2)
+
+
+
+size:saccept2
+
+
+ Yes
+
+
+
+license:saccept2
+
+
+ Yes
+
+
+
+reject
+
+Do not accept
+
+
+
+licensereject
+
+
+ No
+
+
+
diff --git a/general-concepts/copyright-policy/text.xml
b/general-concepts/copyright-policy/text.xml
index 7b877f8..c8d6865 100644
--- a/general-concepts/copyright-policy/text.xml
+++ b/general-concepts/copyright-policy/text.xml
@@ -62,54 +62,83 @@ author is, or is not required. The list below serves as a
general guideline.
-Examples for general guideline
+General guideline
-
- A contribution with a Signed-off-by line by its author
-
-Can be accepted, because the author confirmed that it is under a free
-software license. The committer adds another S-o-b line and certifies the
-commit under point 4 of the
+
+
+
+When can a contribution be accepted?
+
+
+
+
+
+When signed off by its author (i.e. with a Signed-off-by line):
+
+
+Can be accepted, because the author has confirmed that it is under a free
+software license. The committer adds another Signed-off-by line and
+certifies the
[gentoo-commits] proj/devmanual:master commit in: general-concepts/copyright-policy/
commit: fda14234ce15ae7aaf07efd55a3ad3c44dcda9a7 Author: Ulrich Müller gentoo org> AuthorDate: Fri Jun 24 16:55:14 2022 + Commit: Ulrich Müller gentoo org> CommitDate: Sat Jun 25 06:16:09 2022 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=fda14234 general-concepts/copyright-policy: Drop a link There is a link to GLEP 76 immediately above and another in the same sentence. Signed-off-by: Ulrich Müller gentoo.org> general-concepts/copyright-policy/text.xml | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/general-concepts/copyright-policy/text.xml b/general-concepts/copyright-policy/text.xml index a4ad96e..60a022d 100644 --- a/general-concepts/copyright-policy/text.xml +++ b/general-concepts/copyright-policy/text.xml @@ -5,7 +5,7 @@ -https://www.gentoo.org/glep/glep-0076.html;>GLEP-76 defines +https://www.gentoo.org/glep/glep-0076.html;>GLEP 76 defines copyright and license policies for Gentoo Linux. @@ -25,9 +25,8 @@ Foundation per-case basis. -Per https://www.gentoo.org/glep/glep-0076.html;>GLEP 76 -(Copyright Policy), you must sign-off all your commits to any -Gentoo-hosted repository with accordance to the +Per GLEP 76, you must sign-off all your commits to any Gentoo-hosted repository +with accordance to the https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin;> copyright policy.
[gentoo-commits] proj/devmanual:master commit in: general-concepts/copyright-policy/
commit: 5edf168127267c3cf2a6bfc4eb42634986feb6c2 Author: Ulrich Müller gentoo org> AuthorDate: Fri Jun 24 16:56:46 2022 + Commit: Ulrich Müller gentoo org> CommitDate: Sat Jun 25 06:16:13 2022 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5edf1681 general-concepts/copyright-policy: List licenses explicitly Signed-off-by: Ulrich Müller gentoo.org> general-concepts/copyright-policy/text.xml | 28 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/general-concepts/copyright-policy/text.xml b/general-concepts/copyright-policy/text.xml index 60a022d..c9cc3fb 100644 --- a/general-concepts/copyright-policy/text.xml +++ b/general-concepts/copyright-policy/text.xml @@ -12,10 +12,30 @@ copyright and license policies for Gentoo Linux. Every Gentoo project must abide by the https://www.gentoo.org/get-started/philosophy/social-contract.html;> -Gentoo Social Contract and release its work under one or more of -https://www.gentoo.org/glep/glep-0076.html#licensing-of-gentoo-projects;> -predetermined licenses. Exceptions may be granted by the Gentoo -Foundation per-case basis. +Gentoo Social Contract and release its work under one or more of the +following licenses: + + + + +The https://www.gnu.org/licenses/gpl-2.0.html;> +GNU General Public License, version 2 or later (GPL-2+) + + +The https://creativecommons.org/licenses/by-sa/4.0/;> +Creative Commons Attribution-ShareAlike 4.0 International License +(CC-BY-SA-4.0), only for documentation + + +Any +https://www.gnu.org/licenses/license-list.en.html#GPLCompatibleLicenses;> +GPL-compatible free software license + + + + +Exceptions for other (GPL-incompatible) free software licenses may be granted +by the Gentoo Foundation on a case-by-case basis.
[gentoo-commits] proj/devmanual:master commit in: general-concepts/copyright-policy/
commit: 95a410bde2def81a15840bb7aa016bc25a0f793c Author: Ulrich Müller gentoo org> AuthorDate: Mon Sep 27 16:52:07 2021 + Commit: Ulrich Müller gentoo org> CommitDate: Mon Sep 27 16:52:07 2021 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=95a410bd general-concepts/copyright-policy: Small touchups Signed-off-by: Ulrich Müller gentoo.org> general-concepts/copyright-policy/text.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/general-concepts/copyright-policy/text.xml b/general-concepts/copyright-policy/text.xml index c8a488b..a4ad96e 100644 --- a/general-concepts/copyright-policy/text.xml +++ b/general-concepts/copyright-policy/text.xml @@ -1,7 +1,7 @@ -Gentoo's copyright policy +Copyright Policy @@ -25,8 +25,8 @@ Foundation per-case basis. -Per Gentoo's https://www.gentoo.org/glep/glep-0076.html;>GLEP 76 -(Copyright Policy GLEP), you must sign-off all your commits to any +Per https://www.gentoo.org/glep/glep-0076.html;>GLEP 76 +(Copyright Policy), you must sign-off all your commits to any Gentoo-hosted repository with accordance to the https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin;> copyright policy. @@ -53,7 +53,7 @@ author is, or is not required. The list below serves as a general guideline. software license. The committer adds another S-o-b line and certifies the commit under point 4 of the https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin;> -GCO. +Certificate of Origin. Use common sense here, especially if you don't know the contributor. If the contribution was taken from somewhere else and the contributor doesn't have @@ -70,7 +70,7 @@ author is, or is not required. The list below serves as a general guideline. Can be accepted. The committer adds a S-o-b line and certifies the commit -under GCO point 2. +under point 2 of the Certificate of Origin. A contribution without a S-o-b line but not @@ -79,7 +79,7 @@ author is, or is not required. The list below serves as a general guideline. Can be accepted. The committer adds a S-o-b line and certifies the commit -under GCO point 2. +under point 2 of the Certificate of Origin. A contribution without a S-o-b line and of significant size, without any
[gentoo-commits] proj/devmanual:master commit in: general-concepts/copyright-policy/, general-concepts/
commit: 4c395f6b1071fee86f0d296df0750958e4a5acca Author: Joonas Niilola gentoo org> AuthorDate: Tue Sep 21 12:51:46 2021 + Commit: Ulrich Müller gentoo org> CommitDate: Sun Sep 26 09:03:18 2021 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=4c395f6b general-concepts/copyright-policy/: new page Signed-off-by: Joonas Niilola gentoo.org> [Delete trailing whitespace.] Signed-off-by: Ulrich Müller gentoo.org> general-concepts/copyright-policy/text.xml | 99 ++ general-concepts/text.xml | 1 + 2 files changed, 100 insertions(+) diff --git a/general-concepts/copyright-policy/text.xml b/general-concepts/copyright-policy/text.xml new file mode 100644 index 000..c8a488b --- /dev/null +++ b/general-concepts/copyright-policy/text.xml @@ -0,0 +1,99 @@ + + + +Gentoo's copyright policy + + + +https://www.gentoo.org/glep/glep-0076.html;>GLEP-76 defines +copyright and license policies for Gentoo Linux. + + + +Every Gentoo project must abide by the +https://www.gentoo.org/get-started/philosophy/social-contract.html;> +Gentoo Social Contract and release its work under one or more of +https://www.gentoo.org/glep/glep-0076.html#licensing-of-gentoo-projects;> +predetermined licenses. Exceptions may be granted by the Gentoo +Foundation per-case basis. + + + + + +Certificate of Origin + + + +Per Gentoo's https://www.gentoo.org/glep/glep-0076.html;>GLEP 76 +(Copyright Policy GLEP), you must sign-off all your commits to any +Gentoo-hosted repository with accordance to the +https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin;> +copyright policy. + + + +When committing work authored by someone else, e.g. a Bugzilla patch, or GitHub +pull request, a sign-off from the original author is always strongly +recommended, in order to indicate that the author acknowledges Gentoo's +copyright policy. However, it is not mandatory for every case. Please refer to +the example list below when determining whether a sign-off from the original +author is, or is not required. The list below serves as a general guideline. + + + + +Examples for general guideline + + + + A contribution with a Signed-off-by line by its author + +Can be accepted, because the author confirmed that it is under a free +software license. The committer adds another S-o-b line and certifies the +commit under point 4 of the +https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin;> +GCO. + +Use common sense here, especially if you don't know the contributor. If the +contribution was taken from somewhere else and the contributor doesn't have +the right to distribute it under a free software license, you as the +committer might get into trouble. So in this situation, do your best to +check repositories for matching code, and whether they hold any special +copyright claims. + + + +A contribution without a S-o-b line and of significant size, but with an +independent indication of its license (e.g. copyright and license notices +in the file's header) + + +Can be accepted. The committer adds a S-o-b line and certifies the commit +under GCO point 2. + + +A contribution without a S-o-b line but not +https://www.gnu.org/prep/maintain/html_node/Legally-Significant.html;> +"legally significant" (by the FSF's 15-lines rule of thumb) + + +Can be accepted. The committer adds a S-o-b line and certifies the commit +under GCO point 2. + + +A contribution without a S-o-b line and of significant size, without any +other indication of its license + + +Can not be accepted. There's no indication that the author has +released their work under a free license, therefore it must not be +distributed by Gentoo. + + + + + + + + diff --git a/general-concepts/text.xml b/general-concepts/text.xml index ace731e..dd7a7c2 100644 --- a/general-concepts/text.xml +++ b/general-concepts/text.xml @@ -22,6 +22,7 @@ writing ebuilds or working with the Gentoo repository. +
