[gentoo-project] [PATCH v2 1/4] Social contract: Licenses must be free but not necessarily OSI-approved

[gentoo-project] [PATCH v2 1/4] Social contract: Licenses must be free but not necessarily OSI-approved

[Ulrich Müller]

Rationale:
- The Creative Commons Attribution-ShareAlike License is not approved
  by the OSI.
- The OSI has approved some dubious licenses (e.g. Watcom-1.0) which
  we do not want.
- For a usable Gentoo operating system (e.g. installation media or
  stages) more licenses than those approved by FSF or OSI are needed.
  In practice we maintain our own list of licenses in the FREE license
  group.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 get-started/philosophy/social-contract.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/get-started/philosophy/social-contract.md b/get-started/philosophy/social-contract.md
index 6972245..92ece1c 100644
--- a/get-started/philosophy/social-contract.md
+++ b/get-started/philosophy/social-contract.md
@@ -31,12 +31,10 @@ We will release our contributions to Gentoo as free software, metadata or docume
 under the GNU General Public License version 2 (or later, at our discretion) or the Creative Commons - Attribution / Share Alike version 2 (or later, at our discretion).
 Any external contributions to Gentoo (in the form of freely-distributable sources, binaries, metadata or documentation) may be incorporated into Gentoo
 provided that we are legally entitled to do so.
-However, Gentoo will never depend upon a piece of software or metadata unless it conforms to the GNU General Public License, the GNU Lesser General Public License,
-the Creative Commons - Attribution/Share Alike or some other license approved by the Open Source Initiative ([OSI](https://www.opensource.org/licenses)).
+However, Gentoo will never depend upon a piece of software or metadata unless it conforms to the GNU General Public License, the GNU Lesser General Public License, the Creative Commons - Attribution/Share Alike or some other license that fulfills the [Free Software Definition](https://www.gnu.org/philosophy/free-sw.html#fs-definition) or the [Definition of Free Cultural Works](https://freedomdefined.org/).
 
 <div class="alert alert-success">
-Note: We are considering extending the above clause to require that all core Gentoo components must conform
-to a license approved by the OSI and Free Software Foundation (<a href="https://www.gnu.org/">FSF</a>).
+Note: The Gentoo Licenses Project maintains a list of conforming licenses in the ``FREE`` license group, in line with the [GLEP 23](https://www.gentoo.org/glep/glep-0023.html) specification.
 </div>
 
 ## We will give back to the free software community
-- 
2.45.2

[gentoo-project] [PATCH v2 2/4] Social contract: Exceptions to the public bug policy

[Ulrich Müller]

After Gentoo Linux has become an associated project of SPI, the
Council is the obvious entity to be responsible for the tasks
previously assigned to the Trustees.

Also reinstate the sentence that was previously deleted in
commit b48c808 / bug 536668.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 get-started/philosophy/social-contract.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/get-started/philosophy/social-contract.md b/get-started/philosophy/social-contract.md
index 92ece1c..04ae1b5 100644
--- a/get-started/philosophy/social-contract.md
+++ b/get-started/philosophy/social-contract.md
@@ -45,4 +45,4 @@ We will establish relationships with free software authors and collaborate with
 
 We will keep our [bug report database](https://bugs.gentoo.org/) open for public view at all times; reports that users file online will immediately become visible to others.
 
-Exceptions may be made at the discretion of the Trustees.
+Exceptions may be made for security-related information with the request not to publicize before a certain deadline, community-relations information, or at the discretion of the Council.
-- 
2.45.2

[gentoo-project] [PATCH v2 3/4] Social contract: Update spelling of CC-BY-SA license

[Ulrich Müller]

Its official name is "Creative Commons Attribution-ShareAlike License".
Change version to 2.0 because there never was a version 2.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 get-started/philosophy/social-contract.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/get-started/philosophy/social-contract.md b/get-started/philosophy/social-contract.md
index 04ae1b5..b608e7f 100644
--- a/get-started/philosophy/social-contract.md
+++ b/get-started/philosophy/social-contract.md
@@ -28,10 +28,10 @@ A Gentoo project does not need to produce a Gentoo operating system in order to
 ## Gentoo is and will remain free software
 
 We will release our contributions to Gentoo as free software, metadata or documentation,
-under the GNU General Public License version 2 (or later, at our discretion) or the Creative Commons - Attribution / Share Alike version 2 (or later, at our discretion).
+under the GNU General Public License version 2 (or later, at our discretion) or the Creative Commons Attribution-ShareAlike License version 2.0 (or later, at our discretion).
 Any external contributions to Gentoo (in the form of freely-distributable sources, binaries, metadata or documentation) may be incorporated into Gentoo
 provided that we are legally entitled to do so.
-However, Gentoo will never depend upon a piece of software or metadata unless it conforms to the GNU General Public License, the GNU Lesser General Public License, the Creative Commons - Attribution/Share Alike or some other license that fulfills the [Free Software Definition](https://www.gnu.org/philosophy/free-sw.html#fs-definition) or the [Definition of Free Cultural Works](https://freedomdefined.org/).
+However, Gentoo will never depend upon a piece of software or metadata unless it conforms to the GNU General Public License, the GNU Lesser General Public License, the Creative Commons Attribution-ShareAlike License or some other license that fulfills the [Free Software Definition](https://www.gnu.org/philosophy/free-sw.html#fs-definition) or the [Definition of Free Cultural Works](https://freedomdefined.org/).
 
 <div class="alert alert-success">
 Note: The Gentoo Licenses Project maintains a list of conforming licenses in the ``FREE`` license group, in line with the [GLEP 23](https://www.gentoo.org/glep/glep-0023.html) specification.
-- 
2.45.2

[gentoo-project] [PATCH v2 4/4] Social contract: Restore Gentoo metastructure link

[Ulrich Müller]

This had existed in the GuideXML version before:
https://gitweb.gentoo.org/archive/proj/gentoo.git/tree/xml/htdocs/main/en/contract.xml#n66
Presumably, the link was dropped when migrating to Markdown.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 get-started/philosophy/social-contract.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/get-started/philosophy/social-contract.md b/get-started/philosophy/social-contract.md
index b608e7f..c3b4b59 100644
--- a/get-started/philosophy/social-contract.md
+++ b/get-started/philosophy/social-contract.md
@@ -22,7 +22,7 @@ A Gentoo operating system should satisfy the self-hosting requirement.
 In other words, the operating system should be able to build itself from scratch using the aforementioned tools and metadata.
 If a product associated with an official Gentoo project does not satisfy these requirements, the product does not qualify as a Gentoo operating system.
 
-An official list of Gentoo projects is listed under the Gentoo Metastructure.
+An official list of Gentoo projects is listed under the [Gentoo metastructure](https://wiki.gentoo.org/wiki/Project:Gentoo).
 A Gentoo project does not need to produce a Gentoo operating system in order to be officially recognized.
 
 ## Gentoo is and will remain free software
-- 
2.45.2