diff options
| -rw-r--r-- | _data/sponsors.yaml | 19 | ||||
| -rw-r--r-- | _includes/downloads/hppa.html | 4 | ||||
| -rw-r--r-- | downloads/signatures/index.html | 21 | ||||
| -rw-r--r-- | get-started/philosophy/social-contract.md | 12 | ||||
| -rw-r--r-- | inside-gentoo/stores/index.md | 5 |
5 files changed, 36 insertions, 25 deletions
diff --git a/_data/sponsors.yaml b/_data/sponsors.yaml index 2d3b650..b7c5ee0 100644 --- a/_data/sponsors.yaml +++ b/_data/sponsors.yaml @@ -112,13 +112,18 @@ hosting: id: "cdn77" link: "https://cdn77.com/" blurb: | - [CDN77](https://cdn77.com/), one of the leading global providers of content delivery network - services, helps the world’s most demanded and widely accessed websites - and apps deliver the best possible online experience to more than a - billion users. 45+ Tbps network spread across six continents, latency-based routing, - multi-layered caching systems, proprietary DDoS protection, and a - client-focused approach are just a few reasons why customers, - including Udemy, ESET, or European Space Agency, rely on CDN77. + [CDN77](https://cdn77.com/)'s network is a powerful + mixture of strategically located PoPs and cache servers + deployed directly inside the networks of every major and + hard-to-reach ISP, all interconnected with a global private + backbone built upon 100G and 400G infrastructure. The + network topology consists of upstreams to 15 TIER 1 transit + providers, more than 300 PNIs, and direct local access to + 3000+ ISPs. The massive network scale, together with + cutting-edge video engineering and stellar client service, + make CDN77 a CDN of choice for many highly trafficked global + websites and applications, such as Udemy, ESL Gaming, + European Space Agency and many others. [CDN77](https://cdn77.com/) provides Gentoo with CDN services for multiple web properties. diff --git a/_includes/downloads/hppa.html b/_includes/downloads/hppa.html index 353b67d..e689587 100644 --- a/_includes/downloads/hppa.html +++ b/_includes/downloads/hppa.html @@ -8,14 +8,14 @@ <h4>HPPA 1.1 stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="hppa" id="hppa1.1-openrc" title="Stage 3" tag="HPPA 1.1 | openrc" %} - {% include partials/download-link.html type="stage3" arch="hppa" id="hppa1.1-systemd-mergedusr" title="Stage 3" tag="HPPA 1.1 | systemd | merged usr" %} + {% include partials/download-link.html type="stage3" arch="hppa" id="hppa1.1-systemd" title="Stage 3" tag="HPPA 1.1 | systemd" %} </div> </div> <div class="col-xs-12 col-md-6"> <h4>HPPA 2.0 stage archives</h4> <div class="list-group"> {% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0-openrc" title="Stage 3" tag="HPPA 2.0 | openrc" %} - {% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0-systemd-mergedusr" title="Stage 3" tag="HPPA 2.0 | systemd | merged usr" %} + {% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0-systemd" title="Stage 3" tag="HPPA 2.0 | systemd" %} </div> <h4>Details (contents, hashes, and signatures)</h4> <ul> diff --git a/downloads/signatures/index.html b/downloads/signatures/index.html index 807d38c..c53482e 100644 --- a/downloads/signatures/index.html +++ b/downloads/signatures/index.html @@ -24,24 +24,24 @@ nav2-show: true <td>sec-keys/openpgp-keys-gentoo-release</td> <td>Gentoo Linux Release Engineering (Automated Weekly Release Key)</td> <td>2009-08-25</td> - <td>2024-07-01</td> + <td>2026-07-01</td> </tr> <tr> <td><kbd>DCD05B71EAB94199527F44ACDB6B8C1F96D8BF6D</kbd></td> <td>sec-keys/openpgp-keys-gentoo-release</td> <td>Gentoo ebuild repository signing key (Automated Signing Key)</td> <td>2011-11-25</td> - <td>2024-07-01</td> + <td>2026-07-01</td> </tr> <tr> <td><kbd>EF9538C9E8E64311A52CDEDFA13D0EF1914E7A72</kbd></td> <td>sec-keys/openpgp-keys-gentoo-release</td> <td><a rel='external' href='https://github.com/gentoo-mirror/'>Gentoo repository mirrors (GitHub)</a> (automated git signing key)</td> <td>2018-05-28</td> - <td>2024-07-01</td> + <td>2026-07-01</td> </tr> <tr> - <td><kbd>D99EAC7379A850BCE47DA5F29E6438C817072058</kbd></td> + <td><kbd>D99EAC7379A850BCE47DA5F29E6438C817072058</kbd></td> <!-- TODO: not in L2 path --> <td>sec-keys/openpgp-keys-gentoo-release</td> <td>Gentoo Linux Release Engineering (Gentoo Linux Release Signing Key)</td> <td>2004-07-20</td> @@ -52,21 +52,28 @@ nav2-show: true <td>sec-keys/openpgp-keys-gentoo-auth</td> <td>Gentoo Authority Key L1</td> <td>2019-04-01</td> - <td>2024-07-01</td> + <td>2026-07-01</td> </tr> <tr> <td><kbd>18F703D702B1B9591373148C55D3238EC050396E</kbd></td> <td>sec-keys/openpgp-keys-gentoo-auth</td> <td>Gentoo Authority Key L2 for Services</td> <td>2019-04-01</td> - <td>2024-07-01</td> + <td>2026-07-01</td> </tr> <tr> <td><kbd>2C13823B8237310FA213034930D132FF0FF50EEB</kbd></td> <td>sec-keys/openpgp-keys-gentoo-auth</td> <td>Gentoo Authority Key L2 for Developers</td> <td>2019-04-01</td> - <td>2024-07-01</td> + <td>2026-07-01</td> + </tr> + <tr> + <td><kbd>ABA5E4E7F4E407ABE9CA7EC7422C9066E21F705A</kbd></td> + <td /> <!-- <td>sec-keys/openpgp-keys-gentoo-auth</td> <!-- coming soon --> + <td>Gentoo Authority Key L2 for Infrastructure</td> + <td>2024-04-19</td> + <td>2026-07-01</td> </tr> </table> diff --git a/get-started/philosophy/social-contract.md b/get-started/philosophy/social-contract.md index 6972245..5dc8d73 100644 --- a/get-started/philosophy/social-contract.md +++ b/get-started/philosophy/social-contract.md @@ -22,21 +22,19 @@ 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 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 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-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: 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 <tt>@FREE</tt> license group, in line with the <a href="https://www.gentoo.org/glep/glep-0023.html">GLEP 23</a> specification. </div> ## We will give back to the free software community @@ -47,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. diff --git a/inside-gentoo/stores/index.md b/inside-gentoo/stores/index.md index 9073368..4a1290c 100644 --- a/inside-gentoo/stores/index.md +++ b/inside-gentoo/stores/index.md @@ -19,12 +19,13 @@ Approved Vendors make a small contribution to Gentoo from sales of Gentoo relate ### Americas -* [Offical Gentoo Cafepress store](http://www.cafepress.com/officialgentoo/) - Clothing and schwag. Located in the USA. +* [Offical Gentoo Cafepress store](https://store.gentoo.org/) - Clothing and schwag. Located in the USA. * [Techiant, LLC](https://www.case-badges.com/gentoo-logo-3d-domed-computer-case-badges-p-212.html) - Case badges (stickers). Located in the USA ### Europe -* [Offical Friends of Gentoo e.V store](https://shop.spreadshirt.de/22258/) - Tee shirts, keychains, and mugs. Located in Germany. +* [Offical Friends of Gentoo e.V. store](https://shop.spreadshirt.de/22258/) - Tee shirts, keychains, and mugs. Located in Germany. +* Evelin Logo's ([Etsy](https://www.etsy.com/shop/BadgeShopArt), [eBay](https://www.ebay.com/str/5starbadgeshop), [Amazon](https://www.amazon.com/s?me=A2572FU4YZ28PJ&marketplaceID=ATVPDKIKX0DER)) - Badges (stickers). Located in Romania. If you buy something from a licenced vendor and you like it, tell all your friends. |