almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

dev_scripts: Do not backport conmon in Bullseye

Browse source 
Now that the conmon package with version 2.0.25+ds1-1.1+deb11u1 has been
released [1] for Debian Bullseye, there is no need to install it from
the oldstable-proposed-updates repo any more.

[1]: https://tracker.debian.org/pkg/conmon
This commit is contained in:
Alex Pyrgiotis 2024-02-13 11:25:55 +02:00
parent 3fb797cdd1
commit 0d7b6e8533
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dev_scripts/env.py
View file

@ -115,7 +115,7 @@ DOCKERFILE_UBUNTU_REM_USER = r"""
RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu
""" """
# On Ubuntu Jammy / Debian Bullseye, use a different conmon version, as acquired from # On Ubuntu Jammy, use a different conmon version, as acquired from
# Debian's oldstable proposed updates. For more details, read: # Debian's oldstable proposed updates. For more details, read:
# https://github.com/freedomofpress/dangerzone/issues/685 # https://github.com/freedomofpress/dangerzone/issues/685
DOCKERFILE_CONMON_UPDATE = r""" DOCKERFILE_CONMON_UPDATE = r"""
@ -565,8 +565,8 @@ class Env:
# Ubuntu Jammy misses a dependency to `libxkbcommon-x11-0`, which we can # Ubuntu Jammy misses a dependency to `libxkbcommon-x11-0`, which we can
# install indirectly via `qt6-qpa-plugins`. # install indirectly via `qt6-qpa-plugins`.
qt_deps += " qt6-qpa-plugins" qt_deps += " qt6-qpa-plugins"
# Ubuntu Jammy and Debian Bullseye require a more up-to-date conmon # Ubuntu Jammy requires a more up-to-date conmon package
# package (see https://github.com/freedomofpress/dangerzone/issues/685) # (see https://github.com/freedomofpress/dangerzone/issues/685)
install_deps = ( install_deps = (
DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEV_DEBIAN_DEPS DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEV_DEBIAN_DEPS
) )
@ -582,11 +582,6 @@ class Env:
elif self.distro == "debian" and self.version in ("bullseye-backports",): elif self.distro == "debian" and self.version in ("bullseye-backports",):
# Debian Bullseye misses a dependency to libgl1. # Debian Bullseye misses a dependency to libgl1.
qt_deps += " libgl1" qt_deps += " libgl1"
# Ubuntu Jammy and Debian Bullseye require a more up-to-date conmon
# package (see https://github.com/freedomofpress/dangerzone/issues/685)
install_deps = (
DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEV_DEBIAN_DEPS
)
install_deps = install_deps.format(qt_deps=qt_deps) install_deps = install_deps.format(qt_deps=qt_deps)
@ -604,7 +599,7 @@ class Env:
shutil.copy(git_root() / "pyproject.toml", build_dir) shutil.copy(git_root() / "pyproject.toml", build_dir)
shutil.copy(git_root() / "poetry.lock", build_dir) shutil.copy(git_root() / "poetry.lock", build_dir)
shutil.copy(git_root() / "dev_scripts" / "storage.conf", build_dir) shutil.copy(git_root() / "dev_scripts" / "storage.conf", build_dir)
if self.distro in ("debian", "ubuntu"): if self.distro == "ubuntu":
shutil.copy(git_root() / "dev_scripts" / "oldstable-pu.pref", build_dir) shutil.copy(git_root() / "dev_scripts" / "oldstable-pu.pref", build_dir)
shutil.copy( shutil.copy(
git_root() / "dev_scripts" / f"oldstable-pu-{self.distro}.sources", git_root() / "dev_scripts" / f"oldstable-pu-{self.distro}.sources",
@ -660,10 +655,8 @@ class Env:
install_deps = ( install_deps = (
DOCKERFILE_UBUNTU_2004_DEPS + DOCKERFILE_BUILD_DEBIAN_DEPS DOCKERFILE_UBUNTU_2004_DEPS + DOCKERFILE_BUILD_DEBIAN_DEPS
) )
elif (self.distro == "ubuntu" and self.version in ("22.04", "jammy")) or ( elif self.distro == "ubuntu" and self.version in ("22.04", "jammy"):
self.distro == "debian" and self.version in ("bullseye-backports",) # Ubuntu Jammy requires a more up-to-date conmon
):
# Ubuntu Jammy and Debian Bullseye require a more up-to-date conmon
# package (see https://github.com/freedomofpress/dangerzone/issues/685) # package (see https://github.com/freedomofpress/dangerzone/issues/685)
install_deps = DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEBIAN_DEPS install_deps = DOCKERFILE_CONMON_UPDATE + DOCKERFILE_BUILD_DEBIAN_DEPS
elif self.distro == "ubuntu" and self.version in ( elif self.distro == "ubuntu" and self.version in (
@ -694,7 +687,7 @@ class Env:
# Populate the build context. # Populate the build context.
shutil.copy(package_src, package_dst) shutil.copy(package_src, package_dst)
shutil.copy(git_root() / "dev_scripts" / "storage.conf", build_dir) shutil.copy(git_root() / "dev_scripts" / "storage.conf", build_dir)
if self.distro in ("debian", "ubuntu"): if self.distro == "ubuntu":
shutil.copy(git_root() / "dev_scripts" / "oldstable-pu.pref", build_dir) shutil.copy(git_root() / "dev_scripts" / "oldstable-pu.pref", build_dir)
shutil.copy( shutil.copy(
git_root() / "dev_scripts" / f"oldstable-pu-{self.distro}.sources", git_root() / "dev_scripts" / f"oldstable-pu-{self.distro}.sources",

4
dev_scripts/oldstable-pu-debian.sources
View file

@ -1,4 +0,0 @@
Types: deb
URIs: http://deb.debian.org/debian/
Suites: oldstable-proposed-updates
Components: main