BUILD.md

@@ -113,7 +113,7 @@ Install Poetry using `pipx`:
 
 ```sh
 pipx install poetry
-pipx inject poetry
+pipx inject poetry poetry-plugin-export
 ```
 
 Clone this repository:
@@ -187,27 +187,27 @@ Overview of the qubes you'll create:
 |--------------|----------|---------|
 | dz           | app qube | Dangerzone development |
 | dz-dvm       | app qube | offline disposable template for performing conversions |
-| fedora-41-dz | template | template for the other two qubes |
+| fedora-40-dz | template | template for the other two qubes |
 
 #### In `dom0`:
 
 The following instructions require typing commands in a terminal in dom0.
 
-1. Create a new Fedora **template** (`fedora-41-dz`) for Dangerzone development:
+1. Create a new Fedora **template** (`fedora-40-dz`) for Dangerzone development:
 
    ```
-   qvm-clone fedora-41 fedora-41-dz
+   qvm-clone fedora-40 fedora-40-dz
    ```
 
    > :bulb: Alternatively, you can use your base Fedora 40 template in the
    > following instructions. In that case, skip this step and replace
-   > `fedora-41-dz` with `fedora-41` in the steps below.
+   > `fedora-40-dz` with `fedora-40` in the steps below.
 
-2. Create an offline disposable template (app qube) called `dz-dvm`, based on the `fedora-41-dz`
+2. Create an offline disposable template (app qube) called `dz-dvm`, based on the `fedora-40-dz`
    template. This will be the qube where the documents will be sanitized:
 
    ```
-   qvm-create --class AppVM --label red --template fedora-41-dz \
+   qvm-create --class AppVM --label red --template fedora-40-dz \
        --prop netvm="" --prop template_for_dispvms=True \
        --prop default_dispvm='' dz-dvm
    ```
@@ -216,7 +216,7 @@ The following instructions require typing commands in a terminal in dom0.
    and initiating the sanitization process:
 
    ```
-   qvm-create --class AppVM --label red --template fedora-41-dz dz
+   qvm-create --class AppVM --label red --template fedora-40-dz dz
    qvm-volume resize dz:private $(numfmt --from=auto 20Gi)
    ```
 
@@ -261,12 +261,12 @@ test it.
    ./install/linux/build-rpm.py --qubes
    ```
 
-4. Copy the produced `.rpm` file into `fedora-41-dz`
+4. Copy the produced `.rpm` file into `fedora-40-dz`
    ```sh
    qvm-copy dist/*.x86_64.rpm
    ```
 
-#### In the `fedora-41-dz` template
+#### In the `fedora-40-dz` template
 
 1. Install the `.rpm` package you just copied
 
@@ -274,7 +274,7 @@ test it.
    sudo dnf install ~/QubesIncoming/dz/*.rpm
    ```
 
-2. Shutdown the `fedora-41-dz` template
+2. Shutdown the `fedora-40-dz` template
 
 ### Developing Dangerzone
 
@@ -305,7 +305,7 @@ For changes in the server side components, you can simply edit them locally,
 and they will be mirrored to the disposable qube through the `dz.ConvertDev`
 RPC call.
 
-The only reason to build a new Qubes RPM and install it in the `fedora-41-dz`
+The only reason to build a new Qubes RPM and install it in the `fedora-40-dz`
 template for development is if:
 1. The project requires new server-side components.
 2. The code for `qubes/dz.ConvertDev` needs to be updated.
@@ -326,7 +326,7 @@ cd dangerzone
 Install Python dependencies:
 
 ```sh
-python3 -m pip install poetry
+python3 -m pip install poetry poetry-plugin-export
 poetry install
 ```
 
@@ -387,7 +387,7 @@ Install Microsoft Visual C++ 14.0 or greater. Get it with ["Microsoft C++ Build
 Install [poetry](https://python-poetry.org/). Open PowerShell, and run:
 
 ```
-python -m pip install poetry
+python -m pip install poetry poetry-plugin-export
 ```
 
 Install git from [here](https://git-scm.com/download/win), open a Windows terminal (`cmd.exe`) and clone this repository:

CHANGELOG.md

@@ -68,7 +68,6 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or
   Thanks [@jkarasti](https://github.com/jkarasti) for the contribution.
 - Work around a `cx_freeze` build issue ([#974](https://github.com/freedomofpress/dangerzone/issues/974))
 - tests: mark the hancom office suite tests for rerun on failures ([#991](https://github.com/freedomofpress/dangerzone/pull/991))
-- Update reference template for Qubes to Fedora 41 ([#1078](https://github.com/freedomofpress/dangerzone/issues/1078))
 
 ## [0.8.1](https://github.com/freedomofpress/dangerzone/compare/v0.8.1...0.8.0)
 

INSTALL.md

@@ -231,8 +231,8 @@ After confirming that it matches, type `y` (for yes) and the installation should
 
 > [!IMPORTANT]
 > This section will install Dangerzone in your **default template**
-> (`fedora-41` as of writing this). If you want to install it in a different
+> (`fedora-40` as of writing this). If you want to install it in a different
-> one, make sure to replace `fedora-41` with the template of your choice.
+> one, make sure to replace `fedora-40` with the template of your choice.
 
 The following steps must be completed once. Make sure you run them in the
 specified qubes.
@@ -249,7 +249,7 @@ Create a **disposable**, offline app qube (`dz-dvm`), based on your default
 template. This will be the qube where the documents will be sanitized:
 
 ```
-qvm-create --class AppVM --label red --template fedora-41 \
+qvm-create --class AppVM --label red --template fedora-40 \
     --prop netvm="" --prop template_for_dispvms=True \
     --prop default_dispvm='' dz-dvm
 ```
@@ -262,7 +262,7 @@ document, with the following contents:
 dz.Convert         *       @anyvm       @dispvm:dz-dvm  allow
 ```
 
-#### In the `fedora-41` template
+#### In the `fedora-40` template
 
 Install Dangerzone:
 

Makefile

@@ -22,7 +22,7 @@ fix: ## apply all the suggestions from ruff
 	ruff format
 
 .PHONY: test
-test: ## Run the tests
+test:
 	# Make each GUI test run as a separate process, to avoid segfaults due to
 	# shared state.
 	# See more in https://github.com/freedomofpress/dangerzone/issues/493
@@ -47,31 +47,27 @@ test-large: test-large-init  ## Run large test set
 	python -m pytest --tb=no tests/test_large_set.py::TestLargeSet -v $(JUNIT_FLAGS) --junitxml=$(TEST_LARGE_RESULTS)
 	python $(TEST_LARGE_RESULTS)/report.py $(TEST_LARGE_RESULTS)
 
-Dockerfile: Dockerfile.env Dockerfile.in ## Regenerate the Dockerfile from its template
+Dockerfile: Dockerfile.env Dockerfile.in
 	poetry run jinja2 Dockerfile.in Dockerfile.env > Dockerfile
 
-.PHONY: poetry-install
-poetry-install: ## Install project dependencies
-	poetry install
-
 .PHONY: build-clean
 build-clean:
-	poetry run doit clean
+	doit clean
 
 .PHONY: build-macos-intel
-build-macos-intel: build-clean poetry-install ## Build macOS intel package (.dmg)
+build-macos-intel: build-clean
-	poetry run doit -n 8
+	doit -n 8
 
 .PHONY: build-macos-arm
-build-macos-arm: build-clean poetry-install ## Build macOS Apple Silicon package (.dmg)
+build-macos-arm: build-clean
-	poetry run doit -n 8 macos_build_dmg
+	doit -n 8 macos_build_dmg
 
 .PHONY: build-linux
-build-linux: build-clean poetry-install ## Build linux packages (.rpm and .deb)
+build-linux: build-clean
-	poetry run doit -n 8 fedora_rpm debian_deb
+	doit -n 8 fedora_rpm debian_deb
 
 .PHONY: regenerate-reference-pdfs
-regenerate-reference-pdfs: ## Regenerate the reference PDFs
+regenerate-reference-pdfs:
 	pytest tests/test_cli.py -k regenerate --generate-reference-pdfs
 # Makefile self-help borrowed from the securedrop-client project
 # Explaination of the below shell command should it ever break.

README.md

@@ -82,7 +82,3 @@ Dangerzone gets updates to improve its features _and_ to fix problems. So, updat
 1. Check which version of Dangerzone you are currently using: run Dangerzone, then look for a series of numbers to the right of the logo within the app. The format of the numbers will look similar to `0.4.1`
 2. Now find the latest available version of Dangerzone: go to the [download page](https://dangerzone.rocks/#downloads). Look for the version number displayed. The number will be using the same format as in Step 1.
 3. Is the version on the Dangerzone download page higher than the version of your installed app? Go ahead and update.
-
-### Can I use Podman Desktop?
-
-Yes! We've introduced [experimental support for Podman Desktop](https://github.com/freedomofpress/dangerzone/blob/main/docs/podman-desktop.md) on Windows and macOS.

RELEASE.md

@@ -123,7 +123,7 @@ Here is what you need to do:
 
   # In case of a new Python installation or minor version upgrade, e.g., from
   # 3.11 to 3.12, reinstall Poetry
-  python3 -m pip install poetry
+  python3 -m pip install poetry poetry-plugin-export
 
   # You can verify the correct Python version is used
   poetry debug info
@@ -141,7 +141,7 @@ Here is what you need to do:
   poetry env remove --all
 
   # Install the dependencies
-  poetry sync
+  poetry install --sync
   ```
 
 - [ ] Build the container image and the OCR language data
@@ -205,7 +205,7 @@ The Windows release is performed in a Windows 11 virtual machine (as opposed to
   ```bash
   # In case of a new Python installation or minor version upgrade, e.g., from
   # 3.11 to 3.12, reinstall Poetry
-  python3 -m pip install poetry
+  python3 -m pip install poetry poetry-plugin-export
 
   # You can verify the correct Python version is used
   poetry debug info
@@ -223,7 +223,7 @@ The Windows release is performed in a Windows 11 virtual machine (as opposed to
   poetry env remove --all
 
   # Install the dependencies
-  poetry sync
+  poetry install --sync
   ```
 
 - [ ] Copy the container image into the VM

dangerzone/__init__.py

@@ -4,12 +4,6 @@ import sys
 
 logger = logging.getLogger(__name__)
 
-# Call freeze_support() to avoid passing unknown options to the subprocess.
-# See https://github.com/freedomofpress/dangerzone/issues/873
-import multiprocessing
-
-multiprocessing.freeze_support()
-
 
 try:
     from . import vendor  # type: ignore [attr-defined]

dangerzone/cli.py

@@ -52,11 +52,7 @@ def print_header(s: str) -> None:
 @click.option(
     "--set-container-runtime",
     required=False,
-    help=(
+    help="The path to the container runtime you want to set in the settings",
-        "The name or full path of the container runtime you want Dangerzone to use."
-        " You can specify the value 'default' if you want to take back your choice, and"
-        " let Dangerzone use the default runtime for this OS"
-    ),
 )
 @click.version_option(version=get_version(), message="%(version)s")
 @errors.handle_document_errors
@@ -73,16 +69,10 @@ def cli_main(
     display_banner()
     if set_container_runtime:
         settings = Settings()
-        if set_container_runtime == "default":
+        container_runtime = settings.set_custom_runtime(
-            settings.unset_custom_runtime()
+            set_container_runtime, autosave=True
-            click.echo(
+        )
-                "Instructed Dangerzone to use the default container runtime for this OS"
+        click.echo(f"Set the settings container_runtime to {container_runtime}")
-            )
-        else:
-            container_runtime = settings.set_custom_runtime(
-                set_container_runtime, autosave=True
-            )
-            click.echo(f"Set the settings container_runtime to {container_runtime}")
         sys.exit(0)
     elif not filenames:
         raise click.UsageError("Missing argument 'FILENAMES...'")

dangerzone/gui/main_window.py

@@ -3,6 +3,7 @@ import os
 import platform
 import tempfile
 import typing
+from multiprocessing import freeze_support
 from multiprocessing.pool import ThreadPool
 from pathlib import Path
 from typing import List, Optional
@@ -227,9 +228,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 if not is_version_valid:
                     self.handle_docker_desktop_version_check(is_version_valid, version)
             except errors.UnsupportedContainerRuntime as e:
-                pass  # It's caught later in the flow.
+                pass  # It's catched later in the flow.
-            except errors.NoContainerTechException as e:
-                pass  # It's caught later in the flow.
 
         self.show()
 
@@ -1237,6 +1236,9 @@ class DocumentsListWidget(QtWidgets.QListWidget):
     def start_conversion(self) -> None:
         if not self.thread_pool_initized:
             max_jobs = self.dangerzone.isolation_provider.get_max_parallel_conversions()
+            # Call freeze_support() to avoid passing unknown options to the subprocess.
+            # See https://github.com/freedomofpress/dangerzone/issues/873
+            freeze_support()
             self.thread_pool = ThreadPool(max_jobs)
 
         for doc in self.docs_list:

dangerzone/isolation_provider/container.py

@@ -56,14 +56,7 @@ class Container(IsolationProvider):
             security_args = ["--log-driver", "none"]
             security_args += ["--security-opt", "no-new-privileges"]
             if container_utils.get_runtime_version() >= (4, 1):
-                # We perform a platform check to avoid the following Podman Desktop
+                security_args += ["--userns", "nomap"]
-                # error on Windows:
-                #
-                #   Error: nomap is only supported in rootless mode
-                #
-                # See also: https://github.com/freedomofpress/dangerzone/issues/1127
-                if platform.system() != "Windows":
-                    security_args += ["--userns", "nomap"]
         else:
             security_args = ["--security-opt=no-new-privileges:true"]
 
@@ -74,15 +67,7 @@ class Container(IsolationProvider):
         # [1] https://github.com/freedomofpress/dangerzone/issues/846
         # [2] https://github.com/containers/common/blob/d3283f8401eeeb21f3c59a425b5461f069e199a7/pkg/seccomp/seccomp.json
         seccomp_json_path = str(get_resource_path("seccomp.gvisor.json"))
-        # We perform a platform check to avoid the following Podman Desktop
+        security_args += ["--security-opt", f"seccomp={seccomp_json_path}"]
-        # error on Windows:
-        #
-        #   Error: opening seccomp profile failed: open
-        #   C:\[...]\dangerzone\share\seccomp.gvisor.json: no such file or directory
-        #
-        # See also: https://github.com/freedomofpress/dangerzone/issues/1127
-        if runtime.name == "podman" and platform.system() != "Windows":
-            security_args += ["--security-opt", f"seccomp={seccomp_json_path}"]
 
         security_args += ["--cap-drop", "all"]
         security_args += ["--cap-add", "SYS_CHROOT"]

dangerzone/settings.py

@@ -52,10 +52,6 @@ class Settings:
             self.save()
         return container_runtime
 
-    def unset_custom_runtime(self) -> None:
-        self.settings.pop("container_runtime")
-        self.save()
-
     def get(self, key: str) -> Any:
         return self.settings[key]
 

debian/changelog

@@ -2,13 +2,13 @@ dangerzone (0.9.0) unstable; urgency=low
 
   * Released Dangerzone 0.9.0
 
- -- Freedom of the Press Foundation   <info@freedom.press>  Mon, 31 Mar 2025 15:57:18 +0300
+ -- Freedom of the Press Foundation   <info@freedom.press>  Mon, 31 March 2025 15:57:18 +0300
 
 dangerzone (0.8.1) unstable; urgency=low
 
   * Released Dangerzone 0.8.1
 
- -- Freedom of the Press Foundation   <info@freedom.press>  Tue, 22 Dec 2024 22:03:28 +0300
+ -- Freedom of the Press Foundation   <info@freedom.press>  Tue, 22 December 2024 22:03:28 +0300
 
 dangerzone (0.8.0) unstable; urgency=low
 

dev_scripts/qa.py

@@ -331,7 +331,7 @@ Install Poetry using `pipx`:
 
 ```sh
 pipx install poetry
-pipx inject poetry
+pipx inject poetry poetry-plugin-export
 ```
 
 Clone this repository:
@@ -397,7 +397,7 @@ Install Microsoft Visual C++ 14.0 or greater. Get it with ["Microsoft C++ Build
 Install [poetry](https://python-poetry.org/). Open PowerShell, and run:
 
 ```
-python -m pip install poetry
+python -m pip install poetry poetry-plugin-export
 ```
 
 Install git from [here](https://git-scm.com/download/win), open a Windows terminal (`cmd.exe`) and clone this repository:
@@ -835,8 +835,8 @@ class QAWindows(QABase):
         "Install Poetry and the project's dependencies", ref=REF_BUILD, auto=True
     )
     def install_poetry(self):
-        self.run("python", "-m", "pip", "install", "poetry")
+        self.run("python", "-m", "pip", "install", "poetry", "poetry-plugin-export")
-        self.run("poetry", "sync")
+        self.run("poetry", "install", "--sync")
 
     @QABase.task("Build Dangerzone container image", ref=REF_BUILD, auto=True)
     def build_image(self):

docs/developer/doit.md

@@ -42,8 +42,7 @@ doit <task>
 ## Tips and tricks
 
 * You can run `doit list --all -s` to see the full list of tasks, their
-  dependencies, and whether they are up to date (U) or will run (R). Note that
+  dependencies, and whether they are up to date.
-  certain small tasks are always configured to run.
 * You can run `doit info <task>` to see which dependencies are missing.
 * You can pass the following environment variables to the script, in order to
   affect some global parameters:

docs/podman-desktop.md

@@ -1,40 +0,0 @@
-# Podman Desktop support
-
-Starting with Dangerzone 0.9.0, it is possible to use Podman Desktop on
-Windows and macOS. The support for this container runtime is currently only
-experimental. If you try it out and encounter issues, please reach to us, we'll
-be glad to help.
-
-With [Podman Desktop](https://podman-desktop.io/) installed on your machine,
-here are the required steps to change the dangerzone container runtime.
-
-You will be required to open a terminal and follow these steps:
-
-## On macOS
-
-To set the container runtime to podman, use this command:
-
-```bash
-/Applications/Dangerzone.app/Contents/MacOS/dangerzone-cli --set-container-runtime podman
-```
-
-In order to get back to the default behaviour (Docker Desktop on macOS), pass
-the `default` value instead:
-
-```bash
-/Applications/Dangerzone.app/Contents/MacOS/dangerzone-cli --set-container-runtime default
-```
-
-## On Windows
-
-To set the container runtime to podman, use this command:
-
-```bash
-'C:\Program Files\Dangerzone\dangerzone-cli.exe' --set-container-runtime podman
-```
-
-To revert back to the default behavior, pass the `default` value:
-
-```bash
-'C:\Program Files\Dangerzone\dangerzone-cli.exe' --set-container-runtime podman
-```

dodo.py

@@ -8,7 +8,8 @@ from doit.action import CmdAction
 
 ARCH = "arm64" if platform.machine() == "arm64" else "i686"
 VERSION = open("share/version.txt").read().strip()
-FEDORA_VERSIONS = ["40", "41", "42"]
+FEDORA_VERSIONS = ["40", "41"]
+DEBIAN_VERSIONS = ["bullseye", "jammy", "mantic", "noble", "trixie"]
 
 ### Global parameters
 
@@ -43,6 +44,7 @@ def list_language_data():
     tessdata_dir = Path("share") / "tessdata"
     langs = json.loads(open(tessdata_dir.parent / "ocr-languages.json").read()).values()
     targets = [tessdata_dir / f"{lang}.traineddata" for lang in langs]
+    targets.append(tessdata_dir)
     return targets
 
 
@@ -122,7 +124,7 @@ def build_deb(cwd):
 
 def build_rpm(version, cwd, qubes=False):
     """Build an .rpm package on the requested Fedora distro."""
-    return build_linux_pkg(distro="fedora", version=version, cwd=cwd, qubes=qubes)
+    return build_linux_pkg(distro="Fedora", version=version, cwd=cwd, qubes=qubes)
 
 
 ### Tasks
@@ -206,7 +208,7 @@ def task_build_image():
 
 def task_poetry_install():
     """Setup the Poetry environment"""
-    return {"actions": ["poetry sync"], "clean": ["poetry env remove --all"]}
+    return {"actions": ["poetry install --sync"], "clean": ["poetry env remove --all"]}
 
 
 def task_macos_build_dmg():

install/common/build-image.py

@@ -5,7 +5,7 @@ import subprocess
 import sys
 from pathlib import Path
 
-BUILD_CONTEXT = "dangerzone"
+BUILD_CONTEXT = "dangerzone/"
 IMAGE_NAME = "dangerzone.rocks/dangerzone"
 if platform.system() in ["Darwin", "Windows"]:
     CONTAINER_RUNTIME = "docker"
@@ -122,8 +122,7 @@ def main():
 
     subprocess.run(
         [
-            sys.executable,
+            "./dev_scripts/repro-build.py",
-            str(Path("dev_scripts") / "repro-build.py"),
             "build",
             "--runtime",
             args.runtime,

install/common/download-tessdata.py

@@ -51,8 +51,6 @@ def main():
         if files == expected_files:
             logger.info("Skipping tessdata download, language data already exists")
             return
-        elif not files:
-            logger.info("Tesseract dir is empty, proceeding to download language data")
         else:
             logger.info(f"Found {tessdata_dir} but contents do not match")
             return 1

setup-windows.py

@@ -13,7 +13,7 @@ setup(
     description="Dangerzone",
     options={
         "build_exe": {
-            "packages": ["dangerzone", "dangerzone.gui", "pymupdf._wxcolors"],
+            "packages": ["dangerzone", "dangerzone.gui"],
             "excludes": ["test", "tkinter"],
             "include_files": [("share", "share"), ("LICENSE", "LICENSE")],
             "include_msvcr": True,