From 51e8a4571cb94ef7f6038d8a42e0626fd6bed8d9 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 29 May 2026 19:31:21 -0400 Subject: [PATCH] fix: stop pinning libcurl4-gnutls-dev, fixing curl -dev conflict The zoneminder runtime Depends listed libcurl4-gnutls-dev, a build-time -dev package. The curl -dev flavors (gnutls/openssl/nss) are mutually exclusive, so installing zoneminder forced the gnutls dev flavor and conflicted with packages requiring libcurl4-openssl-dev. Remove the explicit curl entries from the runtime Depends: ZoneMinder links libcurl directly, so ${shlibs:Depends} already generates the correct runtime library dependency for the flavor it was built against. Offer libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl4-nss-dev in Build-Depends (matching distros/debian/control) so the build env can satisfy a co-installed package needing libcurl4-openssl-dev. Co-Authored-By: Claude Opus 4.8 (1M context) (cherry picked from commit 428b9d64d02db333ceab302db76a6f31902e38f5) --- distros/beowulf/control | 2 +- distros/ubuntu2004/control | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/distros/beowulf/control b/distros/beowulf/control index fbb35a0f3..36cfd982f 100644 --- a/distros/beowulf/control +++ b/distros/beowulf/control @@ -13,7 +13,7 @@ Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2 ,ffmpeg ,net-tools ,libbz2-dev - ,libcurl4-gnutls-dev + ,libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl4-nss-dev ,libturbojpeg0-dev ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat ,libpcre2-dev diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control index af002893d..4dcb3b486 100644 --- a/distros/ubuntu2004/control +++ b/distros/ubuntu2004/control @@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 11), sphinx-doc, python3-sphinx, python3-sphinx-rtd ,arp-scan ,net-tools, iproute2 ,libbz2-dev - ,libcurl4-gnutls-dev + ,libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl4-nss-dev ,libjpeg-turbo8-dev | libjpeg62-turbo-dev | libjpeg8-dev | libjpeg9-dev ,libturbojpeg0-dev ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat @@ -47,7 +47,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} ,libswscale9|libswscale8|libswscale7|libswscale6|libswscale5|libswscale4 ,libswresample6|libswresample5|libswresample4|libswresample3|libswresample2 ,ffmpeg - ,libcurl4, libcurl4-gnutls-dev ,libdatetime-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl ,libdbd-mysql-perl ,libphp-serialization-perl