From 2703448d60f88be042af705aa5a04f7605b268a4 Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Tue, 13 Feb 2024 12:33:57 +0200 Subject: [PATCH] Update Jammy build instructions regarding conmon Update the build instructions for Ubuntu Jammy regarding conmon, now that oldstable-proposed-updates no longer offers a patched conmon package. Propose instead to install conmon from our apt-tools-prod repo. --- BUILD.md | 8 ++++---- dev_scripts/qa.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BUILD.md b/BUILD.md index 323ca12..c3fa94d 100644 --- a/BUILD.md +++ b/BUILD.md @@ -12,12 +12,12 @@ Install dependencies: that gets triggered by Dangerzone (more details in https://github.com/freedomofpress/dangerzone/issues/685). If you want to run Dangerzone from source, you are advised to install a - patched `conmon` version. A simple way to do so is to enable the Debian - Bullseye Proposed Updates repo, just for the `conmon` package: + patched `conmon` version. A simple way to do so is to enable our + apt-tools-prod repo, just for the `conmon` package: ```bash - sudo cp ./dev_scripts/oldstable-pu-ubuntu.sources /etc/apt/sources.list.d/ - sudo cp ./dev_scripts/oldstable-pu.pref /etc/apt/preferences.d/ + sudo cp ./dev_scripts/apt-tools-prod.sources /etc/apt/sources.list.d/ + sudo cp ./dev_scripts/apt-tools-prod.pref /etc/apt/preferences.d/ ``` Alternatively, you can install a `conmon` version higher than `v2.0.25` from diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py index 810efc0..c52d026 100755 --- a/dev_scripts/qa.py +++ b/dev_scripts/qa.py @@ -206,12 +206,12 @@ Install dependencies: that gets triggered by Dangerzone (more details in https://github.com/freedomofpress/dangerzone/issues/685). If you want to run Dangerzone from source, you are advised to install a - patched `conmon` version. A simple way to do so is to enable the Debian - Bullseye Proposed Updates repo, just for the `conmon` package: + patched `conmon` version. A simple way to do so is to enable our + apt-tools-prod repo, just for the `conmon` package: ```bash - sudo cp ./dev_scripts/oldstable-pu-ubuntu.sources /etc/apt/sources.list.d/ - sudo cp ./dev_scripts/oldstable-pu.pref /etc/apt/preferences.d/ + sudo cp ./dev_scripts/apt-tools-prod.sources /etc/apt/sources.list.d/ + sudo cp ./dev_scripts/apt-tools-prod.pref /etc/apt/preferences.d/ ``` Alternatively, you can install a `conmon` version higher than `v2.0.25` from