mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-05-03 12:11:50 +02:00
Fix installation instructions for Ubuntu Plucky (25.04)
Specifically, the way to handle the trust for a PGP key has changed in recent versions of `apt-secure`. It now requires the use of PGP keys in something different than the internal GPG keybox database.
This commit is contained in:
parent
04096380ff
commit
8061fd4597
2 changed files with 33 additions and 4 deletions
18
.github/workflows/check_repos.yml
vendored
18
.github/workflows/check_repos.yml
vendored
|
@ -34,8 +34,8 @@ jobs:
|
||||||
- distro: debian
|
- distro: debian
|
||||||
version: "11" # bullseye
|
version: "11" # bullseye
|
||||||
steps:
|
steps:
|
||||||
- name: Add packages.freedom.press PGP key (gpg)
|
- name: Add packages.freedom.press PGP key (gpg --keyring)
|
||||||
if: matrix.version != 'trixie'
|
if: matrix.version != 'trixie' && matrix.version != "25.04"
|
||||||
run: |
|
run: |
|
||||||
apt-get update && apt-get install -y gnupg2 ca-certificates
|
apt-get update && apt-get install -y gnupg2 ca-certificates
|
||||||
dirmngr # NOTE: This is a command that's necessary only in containers
|
dirmngr # NOTE: This is a command that's necessary only in containers
|
||||||
|
@ -58,6 +58,20 @@ jobs:
|
||||||
--server hkps://keys.openpgp.org \
|
--server hkps://keys.openpgp.org \
|
||||||
search "DE28 AB24 1FA4 8260 FAC9 B8BA A7C9 B385 2260 4281" \
|
search "DE28 AB24 1FA4 8260 FAC9 B8BA A7C9 B385 2260 4281" \
|
||||||
--output /etc/apt/keyrings/fpf-apt-tools-archive-keyring.gpg
|
--output /etc/apt/keyrings/fpf-apt-tools-archive-keyring.gpg
|
||||||
|
- name: Add packages.freedom.press PGP key (gpg --export)
|
||||||
|
if: matrix.version == '25.04'
|
||||||
|
run: |
|
||||||
|
apt-get update && apt-get install -y gnupg2 ca-certificates
|
||||||
|
dirmngr
|
||||||
|
# Newer versions of apt-secure need an unarmored PGP key as mentionned by
|
||||||
|
# https://manpages.ubuntu.com/manpages/plucky/man8/apt-secure.8.html
|
||||||
|
gpg --keyserver hkps://keys.openpgp.org \
|
||||||
|
--no-default-keyring
|
||||||
|
--recv-keys "DE28 AB24 1FA4 8260 FAC9 B8BA A7C9 B385 2260 4281"
|
||||||
|
mkdir -p /etc/apt/keyrings/
|
||||||
|
gpg --export-options export-minimal --export \
|
||||||
|
> /etc/apt/keyrings/fpf-apt-tools-archive-keyring.gpg
|
||||||
|
|
||||||
- name: Add packages.freedom.press to our APT sources
|
- name: Add packages.freedom.press to our APT sources
|
||||||
run: |
|
run: |
|
||||||
. /etc/os-release
|
. /etc/os-release
|
||||||
|
|
19
INSTALL.md
19
INSTALL.md
|
@ -110,9 +110,10 @@ Dangerzone is available for:
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
First, retrieve the PGP keys.
|
First, retrieve the PGP keys. The instructions differ depending on the specific
|
||||||
|
distribution you are using:
|
||||||
|
|
||||||
Starting with Trixie, follow these instructions to download the PGP keys:
|
For Debian Trixie, follow these instructions to download the PGP keys:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo apt-get update && sudo apt-get install sq -y
|
sudo apt-get update && sudo apt-get install sq -y
|
||||||
|
@ -123,6 +124,20 @@ sq network keyserver \
|
||||||
--output /etc/apt/keyrings/fpf-apt-tools-archive-keyring.gpg
|
--output /etc/apt/keyrings/fpf-apt-tools-archive-keyring.gpg
|
||||||
```
|
```
|
||||||
|
|
||||||
|
For Ubuntu Plucky (25.04), follow these instructions:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
apt-get update && apt-get install -y gnupg2 ca-certificates
|
||||||
|
mkdir -p /etc/apt/keyrings/
|
||||||
|
dirmngr
|
||||||
|
gpg --keyserver hkps://keys.openpgp.org \
|
||||||
|
--no-default-keyring
|
||||||
|
--recv-keys "DE28 AB24 1FA4 8260 FAC9 B8BA A7C9 B385 2260 4281"
|
||||||
|
gpg --export-options export-minimal --export \
|
||||||
|
> /etc/apt/keyrings/fpf-apt-tools-archive-keyring.gpg
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
On other Debian-derivatives:
|
On other Debian-derivatives:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
|
|
Loading…
Reference in a new issue