From 801e7a17d189be28c61ca6ffb9becadd3afeb80b Mon Sep 17 00:00:00 2001 From: Jack Chou Date: Thu, 2 Jul 2020 10:53:59 -0700 Subject: [PATCH 1/8] Updated Bitwarden logo (#1968) * Updated Bitwarden logo in assets/img/svg/3rd-party folder * Updated dimensions in accordance to contributiing guidelines * Optimize SVG in Inkscape Co-authored-by: Daniel Gray --- assets/img/svg/3rd-party/bitwarden.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/img/svg/3rd-party/bitwarden.svg b/assets/img/svg/3rd-party/bitwarden.svg index 8ee9b014..28d315ac 100644 --- a/assets/img/svg/3rd-party/bitwarden.svg +++ b/assets/img/svg/3rd-party/bitwarden.svg @@ -1,2 +1,2 @@ - + -- 2.49.1 From c9079bdd51f9a5c2fdb96a5137c1bc9559741bdb Mon Sep 17 00:00:00 2001 From: Jack Chou Date: Fri, 3 Jul 2020 20:11:57 -0700 Subject: [PATCH 2/8] Added SVG optimization guideline (#1972) --- .github/CONTRIBUTING.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2bda11ec..c987415d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -96,8 +96,12 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details. ## Images - SVG file format is strongly preferred. PNG files can be used as a fallback if images are too complex or otherwise unsuitable as a vector format. +- We like to optimize all SVGs we add to the site. [This](https://github.com/privacytools/privacytools.io/pull/1968#issuecomment-652773633) is a helpful guide as to how we do it with [Inkscape](https://inkscape.org/) + - Some SVGs generated by Illustrator or Sketch are broken, therefore copying the SVG content to a new canvas is sometimes required. (We found this with the Mailcow logo). Looked fine in local builds but was wrong once rendered through netlify preview etc. +- We only have SVGs that have a canvas size of 128x128px or 384x128px. - Provider logo dimensions are 384px x 128px ([example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg)) -- Tool logo dimensions are 120px x 120px ([SVG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.png)) +- Tool logo dimensions are 128px x 128px ([SVG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytools/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.png)) + ## Licensing -- 2.49.1 From 692d891ae21dadf5accc29a72e6e2602036a6593 Mon Sep 17 00:00:00 2001 From: Daniel Nathan Gray Date: Sat, 4 Jul 2020 04:02:20 +0000 Subject: [PATCH 3/8] Add mention of LAED 2020 bill (#1965) --- pages/software/real-time-communication.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pages/software/real-time-communication.html b/pages/software/real-time-communication.html index 4e4481c8..69285c20 100644 --- a/pages/software/real-time-communication.html +++ b/pages/software/real-time-communication.html @@ -14,6 +14,12 @@ description: "Discover secure and private ways to communicate with others online Recent news about breaking E2EE on centralized instant messengers +
June 2020
+ +
March 2020
  • The Graham-Blumenthal Bill: A New Path for DOJ to Finally Break Encryption (EFF)
    • -- 2.49.1 From 8a722843936d83a6a1a7ecc7549e6a119c266062 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Sun, 5 Jul 2020 12:04:29 -0500 Subject: [PATCH 4/8] Update sponsors --- _includes/sponsors/list.html | 1 + pages/sponsors.html | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/_includes/sponsors/list.html b/_includes/sponsors/list.html index eaf17c40..dc4b4ce4 100644 --- a/_includes/sponsors/list.html +++ b/_includes/sponsors/list.html @@ -3,4 +3,5 @@
  • PablO
  • Syfaer
  • the0
    • +
  • Troy Vassalotti
diff --git a/pages/sponsors.html b/pages/sponsors.html index c2d05a92..081c0dd4 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -8,7 +8,7 @@ permalink: /sponsors/

Sponsors of {{ site.name }}

-

A massive thank you to the following organization-level sponsors of {{ site.name }}, who have pledged $250+:

+

A massive thank you to the following organization-level sponsors of {{ site.name }}, who pledge $250+:

{% include sponsors/gold.html %} @@ -25,14 +25,14 @@ permalink: /sponsors/

Advocates

-

These individuals and organizations have pledged $100 - $249 to the organization.

+

These individuals and organizations pledge $100 - $249 to the organization.

{% include sponsors/silver.html %}

Backers

-

These individuals and organizations have pledged $10 - $99 to the organization.

+

These individuals and organizations pledge $10 - $99 to the organization.

{% include sponsors/list.html %}

Why sponsor {{ site.name }}?

-- 2.49.1 From 58885e3426b8ff4235ed0d2e40d3a45065c02aab Mon Sep 17 00:00:00 2001 From: Daniel Nathan Gray Date: Sun, 5 Jul 2020 20:16:54 +0000 Subject: [PATCH 5/8] Remove erroneous NextCloud link from Signal badge (#1979) --- _includes/sections/instant-messenger.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 45b5c350..18c7e63b 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -24,7 +24,7 @@ title="Signal" image="/assets/img/svg/3rd-party/signal.svg" description='Signal is a mobile app developed by Signal Messenger LLC. The app provides instant messaging, as well as voice and video calling. All communications are E2EE unless you choose to send as SMS. Its protocol has also been indepedently audited (PDF)' - labels="color==warning::link==https://github.com/nextcloud/end_to_end_encryption/issues/111::text==Requires phone number::tooltip==Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|text==VoIP" + labels="color==warning::text==Requires phone number::tooltip==Signal requires your phone number as an personal identifier which means anyone you communicate with will see it.|text==VoIP" website="https://signal.org/" privacy-policy="https://signal.org/legal/" forum="https://forum.privacytools.io/t/discussion-signal/664" -- 2.49.1 From a7d90290836234c3f85abdb92c757cf1e9c4cf20 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Thu, 2 Jul 2020 11:15:05 +0000 Subject: [PATCH 6/8] Tidy up operating systems pages --- _includes/nav.html | 2 +- ...ms.html => android-operating-systems.html} | 49 ++----- .../sections/live-operating-systems.html | 33 ----- _includes/sections/operating-systems.html | 120 +++++++++--------- .../other-mobile-operating-systems.html | 11 ++ _includes/sections/router-firmware.html | 40 ------ _includes/sections/tor-operating-systems.html | 23 ++++ assets/img/svg/3rd-party/alpinelinux.svg | 2 + assets/img/svg/3rd-party/archlinux.svg | 2 + assets/img/svg/3rd-party/calyxos.svg | 2 + assets/img/svg/3rd-party/nixos.svg | 2 + assets/img/svg/3rd-party/whonix.svg | 2 + pages/old.html | 6 +- pages/os.html | 35 +---- 14 files changed, 124 insertions(+), 205 deletions(-) rename _includes/sections/{mobile-operating-systems.html => android-operating-systems.html} (57%) delete mode 100644 _includes/sections/live-operating-systems.html create mode 100644 _includes/sections/other-mobile-operating-systems.html create mode 100644 _includes/sections/tor-operating-systems.html create mode 100644 assets/img/svg/3rd-party/alpinelinux.svg create mode 100644 assets/img/svg/3rd-party/archlinux.svg create mode 100644 assets/img/svg/3rd-party/calyxos.svg create mode 100644 assets/img/svg/3rd-party/nixos.svg create mode 100644 assets/img/svg/3rd-party/whonix.svg diff --git a/_includes/nav.html b/_includes/nav.html index a649fe92..cae5cd8f 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -87,7 +87,7 @@ PC OS - PC Live OS + Tor focused distributions Mobile OS Android Privacy Add-ons Router Firmware diff --git a/_includes/sections/mobile-operating-systems.html b/_includes/sections/android-operating-systems.html similarity index 57% rename from _includes/sections/mobile-operating-systems.html rename to _includes/sections/android-operating-systems.html index 1b1de836..6825a1bf 100644 --- a/_includes/sections/mobile-operating-systems.html +++ b/_includes/sections/android-operating-systems.html @@ -1,16 +1,26 @@

Mobile Operating Systems

+

Android-based Operating Systems

+ +{% include cardv2.html + title="CalyxOS" + image="/assets/img/svg/3rd-party/calyxos.svg" + description='CalyxOS is a custom ROM based on the Android Open Source Project with Pixel phones. It aims to be secure and private by default including a number of good choices for default applications. It also supports verified boot.' + badges="info:AOSP" + website="https://calyxos.org" + gitlab="https://gitlab.com/calyxos" +%} + {% include cardv2.html title="GrapheneOS" image="/assets/img/svg/3rd-party/grapheneos.svg" image-dark="/assets/img/svg/3rd-party/grapheneos-dark.svg" description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.' badges="info:AOSP" - labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://grapheneos.org/" github="https://github.com/GrapheneOS/" %} @@ -20,49 +30,14 @@ image="/assets/img/svg/3rd-party/lineageos.svg" description='LineageOS is a custom ROM based on the Android Open Source Project with official support for a wide variety of devices. The project is the successor to the popular CyanogenMod project, focusing on system control and customization, device longevity, and privacy. For security reasons, we do not recommend third-party builds of LineageOS for unsupported devices.' badges="info:AOSP" - labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://www.lineageos.org/" privacy-policy="https://www.lineageos.org/legal/" github="https://github.com/LineageOS" %} -{% include cardv2.html - title="Ubuntu Touch" - image="/assets/img/svg/3rd-party/ubuntu.svg" - description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." - badges="info:GNU/Linux" - labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." - website="https://ubuntu-touch.io/" - privacy-policy="https://ubports.com/privacy" - github="https://github.com/ubports" -%} -

Worth Mentioning

    -
  • Replicant - {% include badge.html - color="info" - text="AOSP" - %} - - An open-source operating system based on Android, aiming to replace all proprietary components with free software. -
    • - -
  • - OmniROM - {% include badge.html - color="info" - text="AOSP" - %} - {% include badge.html - color="warning" - icon="far fa-question-circle" - text="contrib" - tooltip="This software may depend on or recommend non-free software." - %} - - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform. -
    • -
  • MicroG {% include badge.html @@ -72,8 +47,6 @@ {% include badge.html color="warning" icon="far fa-question-circle" - text="contrib" - tooltip="This software may depend on or recommend non-free software." %} - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at Lineage for microG.
    • diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html deleted file mode 100644 index af0a1014..00000000 --- a/_includes/sections/live-operating-systems.html +++ /dev/null @@ -1,33 +0,0 @@ -

    PC Live Operating Systems

    - -{% include cardv2.html - title="Tails" - image="/assets/img/svg/3rd-party/tails.svg" - description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.' - badges="info:GNU/Linux" - labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." - website="https://tails.boum.org/" - git="https://git-tails.immerda.ch/tails/" -%} - -

    Worth Mentioning

    - -
      -
    • - Fedora Workstation - {% include badge.html - color="info" - text="GNU/Linux" - %} - - Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment. -
      • - -
    • - Debian - {% include badge.html - color="info" - text="GNU/Linux" - %} - - Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project. -
      • -
    diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 2fe24f81..6dac095f 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -4,83 +4,83 @@ If you are currently using an operating system like Windows 10, you should pick an alternative here.
-{% include cardv2.html - title="Qubes OS" - image="/assets/img/svg/3rd-party/qubes_os.svg" - description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.' - badges="info:Xen" - labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." - website="https://www.qubes-os.org/" - privacy-policy="https://www.qubes-os.org/privacy/" - github="https://github.com/QubesOS" - tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/" -%} - {% include cardv2.html title="Fedora Workstation" image="/assets/img/svg/3rd-party/fedora.svg" description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.' - badges="info:GNU/Linux" - labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." + badges="info:Linux" website="https://getfedora.org/" privacy-policy="https://fedoraproject.org/wiki/Legal:PrivacyPolicy?rd=Legal/PrivacyPolicy" git="https://src.fedoraproject.org/" %} +{% include cardv2.html + title="Ubuntu" + image="/assets/img/svg/3rd-party/ubuntu.svg" + description='Ubuntu is a linux distribution developed by Canonical Ltd. Ubuntu is a reliable and distribution that is user-friendly and can be run on desktops, servers and IoT devices.' + badges="info:Linux" + website="https://ubuntu.com" + privacy-policy="https://ubuntu.com/legal/data-privacy" + git="https://launchpad.net/ubuntu" +%} + +

Advanced Operating Systems

+ + + +{% include cardv2.html + title="Alpine Linux" + image="/assets/img/svg/3rd-party/alpinelinux.svg" + description='Alpine Linux is a very minimal distribution designed to be secure and very resource efficient. Alpine Linux can run from RAM, and merge configuration files into the system on boot using Alpine local backup. Alpine Linux is often used on servers and in Linux containers.' + badges="info:Linux" + website="https://alpinelinux.org/" + privacy-policy="https://alpinelinux.org/privacy-policy.html" + gitlab="https://gitlab.alpinelinux.org" +%} + +{% include cardv2.html + title="Arch Linux" + image="/assets/img/svg/3rd-party/archlinux.svg" + description='A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement.' + badges="info:Linux" + labels="color==success::link==https://tests.reproducible-builds.org/archlinux/archlinux.html::text==Reproducable builds" + website="https://www.archlinux.org/" + privacy-policy="https://wiki.archlinux.org/index.php/ArchWiki:Privacy_policy" + gitlab="https://gitlab.archlinux.org" +%} + {% include cardv2.html title="Debian" image="/assets/img/svg/3rd-party/debian.svg" description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.' - badges="info:GNU/Linux" + badges="info:Linux" + labels="color==success::link==https://reproducible.debian.net::text==Reproducable builds" website="https://www.debian.org/" privacy-policy="https://www.debian.org/legal/privacy" tor="http://sejnfjrq6szgca7v.onion" gitlab="https://salsa.debian.org/qa/debsources" %} -

Worth Mentioning

+{% include cardv2.html + title="NixOS" + image="/assets/img/svg/3rd-party/nixos.svg" + description='NixOS is a Linux distribution with a unique approach to package and configuration management. Built on top of the Nix package manager, it is completely declarative, makes upgrading systems reliable, and has many other advantages.' + badges="info:Linux" + labels="color==success::link==https://r13y.com::text==Reproducable builds" + website="https://nixos.org" + privacy-policy="https://nixos.wiki/wiki/NixOS_Wiki:Privacy_policy" + github="https://github.com/NixOS" +%} -
    -
  • OpenBSD - {% include badge.html - color="info" - text="BSD" - %} - - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography. -
    • - -
  • - Arch Linux - {% include badge.html - color="info" - text="GNU/Linux" - %} - {% include badge.html - color="warning" - icon="far fa-question-circle" - text="contrib" - tooltip="This software may depend on or recommend non-free software." - %} - - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. Parabola is a - completely open source version of Arch Linux. -
    • - -
  • - Trisquel - {% include badge.html - color="info" - text="GNU/Linux" - %} - - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed. -
    • - -
  • - Whonix - {% include badge.html - color="info" - text="GNU/Linux" - %} - - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" - and a Tor "Gateway". All communication are forced through the Tor network to accomplish this. -
    • -
+{% include cardv2.html + title="Qubes OS" + image="/assets/img/svg/3rd-party/qubes_os.svg" + description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.' + badges="info:Xen" + website="https://www.qubes-os.org/" + privacy-policy="https://www.qubes-os.org/privacy/" + github="https://github.com/QubesOS" + tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/" +%} diff --git a/_includes/sections/other-mobile-operating-systems.html b/_includes/sections/other-mobile-operating-systems.html new file mode 100644 index 00000000..f1cb488d --- /dev/null +++ b/_includes/sections/other-mobile-operating-systems.html @@ -0,0 +1,11 @@ +

Other Mobile Operating Systems

+ +{% include cardv2.html + title="Ubuntu Touch" + image="/assets/img/svg/3rd-party/ubuntu.svg" + description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." + badges="info:Linux" + website="https://ubuntu-touch.io/" + privacy-policy="https://ubports.com/privacy" + github="https://github.com/ubports" +%} diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html index c2dbea93..b8a2c0f0 100644 --- a/_includes/sections/router-firmware.html +++ b/_includes/sections/router-firmware.html @@ -6,7 +6,6 @@ image-dark="/assets/img/svg/3rd-party/openwrt-dark.svg" description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers." badges="info:Linux" - labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://openwrt.org/" git="https://git.openwrt.org/" %} @@ -17,46 +16,7 @@ image-dark="/assets/img/svg/3rd-party/pfsense-dark.svg" description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint." badges="info:BSD" - labels="color==warning::text==contrib::tooltip==This software may depend on or recommend non-free software." website="https://www.pfsense.org/" privacy-policy="https://www.pfsense.org/privacy.html" github="https://github.com/pfsense/" %} - -{% include cardv2.html - title="LibreCMC" - image="/assets/img/svg/3rd-party/librecmc.svg" - image-dark="/assets/img/svg/3rd-party/librecmc-dark.svg" - description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)." - badges="info:GNU/Linux" - website="https://librecmc.org" - git="https://gogs.librecmc.org/libreCMC/libreCMC" -%} - -

Worth Mentioning

- -
    -
  • - OpenBSD - {% include badge.html - color="info" - text="BSD" - %} - - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography. -
    • - -
  • - DD-WRT - {% include badge.html - color="info" - text="GNU/Linux" - %} - {% include badge.html - color="warning" - icon="far fa-question-circle" - text="contrib" - tooltip="This software may depend on or recommend non-free software." - %} - - A Linux-based open-source firmware compatible with several models of routers and access points. -
    • -
diff --git a/_includes/sections/tor-operating-systems.html b/_includes/sections/tor-operating-systems.html new file mode 100644 index 00000000..e5e09d9d --- /dev/null +++ b/_includes/sections/tor-operating-systems.html @@ -0,0 +1,23 @@ +

Tor-Focused Distributions

+ + + +{% include cardv2.html + title="Tails" + image="/assets/img/svg/3rd-party/tails.svg" + description='Tails is a live operating system that can boot on almost any computer from a DVD, USB stick, or SD card you control. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.' + badges="info:Linux" + website="https://tails.boum.org/" + git="https://git-tails.immerda.ch/tails/" + %} + +{% include cardv2.html + title="Whonix" + image="/assets/img/svg/3rd-party/whonix.svg" + description='A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" and a Tor "Gateway". All communication are forced through the Tor network to accomplish this. Whonix is best used in conjunction with Qubes.' + badges="info:Linux" + website="https://www.whonix.org/" + github="https://github.com/Whonix" +%} diff --git a/assets/img/svg/3rd-party/alpinelinux.svg b/assets/img/svg/3rd-party/alpinelinux.svg new file mode 100644 index 00000000..e2aef2d3 --- /dev/null +++ b/assets/img/svg/3rd-party/alpinelinux.svg @@ -0,0 +1,2 @@ + + diff --git a/assets/img/svg/3rd-party/archlinux.svg b/assets/img/svg/3rd-party/archlinux.svg new file mode 100644 index 00000000..4b46a612 --- /dev/null +++ b/assets/img/svg/3rd-party/archlinux.svg @@ -0,0 +1,2 @@ + + diff --git a/assets/img/svg/3rd-party/calyxos.svg b/assets/img/svg/3rd-party/calyxos.svg new file mode 100644 index 00000000..21743c85 --- /dev/null +++ b/assets/img/svg/3rd-party/calyxos.svg @@ -0,0 +1,2 @@ + + diff --git a/assets/img/svg/3rd-party/nixos.svg b/assets/img/svg/3rd-party/nixos.svg new file mode 100644 index 00000000..dacba154 --- /dev/null +++ b/assets/img/svg/3rd-party/nixos.svg @@ -0,0 +1,2 @@ + + diff --git a/assets/img/svg/3rd-party/whonix.svg b/assets/img/svg/3rd-party/whonix.svg new file mode 100644 index 00000000..212ea7db --- /dev/null +++ b/assets/img/svg/3rd-party/whonix.svg @@ -0,0 +1,2 @@ + + diff --git a/pages/old.html b/pages/old.html index c7149c09..8e7e86e3 100644 --- a/pages/old.html +++ b/pages/old.html @@ -73,12 +73,14 @@ permalink: /classic/ {% include sections/operating-systems.html %} -{% include sections/live-operating-systems.html %} +{% include sections/tor-operating-systems.html %} -{% include sections/mobile-operating-systems.html %} +{% include sections/android-operating-systems.html %} {% include sections/android-addons.html %} +{% include sections/other-mobile-operating-systems.html %} + {% include sections/router-firmware.html %} {% include sections/windows10.html %} diff --git a/pages/os.html b/pages/os.html index 08d138da..536f2cf3 100644 --- a/pages/os.html +++ b/pages/os.html @@ -13,41 +13,14 @@ description: "Even your own computer could be compromising your privacy. Discove
  • Don't use Windows 10 - It's a privacy nightmare
    • -

    Remember to check CPU vulnerability mitigations

    +{% include sections/tor-operating-systems.html %} -

    This also affects Windows 10, but it doesn't expose this information or mitigation instructions as easily. MacOS users check How to enable full mitigation for Microarchitectural Data Sampling (MDS) vulnerabilities on Apple Support.

    - -

    When running a recent enough Linux kernel, you can check the CPU vulnerabilities it detects by tail -n +1 /sys/devices/system/cpu/vulnerabilities/*. By using tail -n +1 instead of cat, the file names are also visible.

    - -

    - In case you have an Intel CPU, you may notice "SMT vulnerable" display after running the tail command. To mitigate this, disable hyper-threading from the UEFI/BIOS. You can also take the following mitigation steps below if your system/distribution uses GRUB and supports /etc/default/grub.d/: -

    - -
      -
    1. sudo mkdir /etc/default/grub.d/ to create a directory for additional grub configuration
      2. -
    2. echo GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT l1tf=full,force mds=full,nosmt mitigations=auto,nosmt nosmt=force" | sudo tee /etc/default/grub.d/mitigations.cfg to create a new grub config file source with the echoed content
      3. -
    3. sudo grub-mkconfig -o /boot/grub/grub.cfg to generate a new grub config file including these new kernel boot flags
      4. -
    4. sudo reboot to reboot
      5. -
    5. after the reboot, check tail -n +1 /sys/devices/system/cpu/vulnerabilities/* again to see that everything referring to SMT now says "SMT disabled."
      6. -
    - -
    Further reading
    - - - -{% include sections/live-operating-systems.html %} - -{% include sections/mobile-operating-systems.html %} +{% include sections/android-operating-systems.html %} {% include sections/android-addons.html %} +{% include sections/other-mobile-operating-systems.html %} + {% include sections/router-firmware.html %} {% include sections/windows10.html %} -- 2.49.1 From cb1131d045afae7a0dfb4cc2f5cfa8bbd44ac503 Mon Sep 17 00:00:00 2001 From: Daniel Gray Date: Mon, 6 Jul 2020 08:10:28 +0000 Subject: [PATCH 7/8] Use a onion for Tor focused distributions --- _includes/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/nav.html b/_includes/nav.html index cae5cd8f..5db86462 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -87,7 +87,7 @@ PC OS - Tor focused distributions + Tor focused distributions Mobile OS Android Privacy Add-ons Router Firmware -- 2.49.1 From 342b3a6eade925ff281009ef13edaea2cf3bb6c2 Mon Sep 17 00:00:00 2001 From: Daniel Nathan Gray Date: Tue, 7 Jul 2020 02:27:24 +0000 Subject: [PATCH 8/8] Grammar Co-authored-by: nitrohorse <1514352+nitrohorse@users.noreply.github.com> --- _includes/sections/operating-systems.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 6dac095f..0882ebee 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -17,7 +17,7 @@ {% include cardv2.html title="Ubuntu" image="/assets/img/svg/3rd-party/ubuntu.svg" - description='Ubuntu is a linux distribution developed by Canonical Ltd. Ubuntu is a reliable and distribution that is user-friendly and can be run on desktops, servers and IoT devices.' + description='Ubuntu is a Linux distribution developed by Canonical Ltd. Ubuntu is a reliable and distribution that is user-friendly and can be run on desktops, servers, and IoT devices.' badges="info:Linux" website="https://ubuntu.com" privacy-policy="https://ubuntu.com/legal/data-privacy" -- 2.49.1