Bug#1000785: bullseye-pu: package curl/7.74.0-1.3+deb11u1
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: Alessandro Ghedini <ghedo@debian.org>, Samuel Henrique <samueloph@debian.org>, Sergio Durigan Junior <sergiodj@debian.org>
libcurl4-gnutls-dev is not multiarch-coinstallable in bullseye despite
being marked Multi-Arch: same. When attempting to coinstall it, dpkg
issues an unpack error. That's a very bad thing to do.
The issue has been reported as #990128 and has been fixed in unstable.
Reproducible builds added compiler flags that include the build
directory (which varies per build) and those build flags made it into
curl-config. As such, reproducible builds made curl unreproducible. This
issue has been well understood and for a different compiler flag, a
workaround was already in place in debian/rules. The solution was to
extend the workaround in the obvious way (stripping that other flag).
I think that the risk/benefit ratio is good. The only affected piece is
curl-config, the change is fairly obvious and it makes unpack errors
from dpkg go away. It also has been in testing for a while now. buster
is unaffected by this issue.
Note that I am not a curl maintainer, but I provided the solution for
unstable. I intend to NMU this change. I've put the curl maintainers
into X-Debbugs-Cc in case they wish to pick this up.
The full (small) .debdiff is attached.
Helmut
diff --minimal -Nru curl-7.74.0/debian/changelog curl-7.74.0/debian/changelog
--- curl-7.74.0/debian/changelog 2021-06-25 20:59:54.000000000 +0200
+++ curl-7.74.0/debian/changelog 2021-11-28 06:38:09.000000000 +0100
@@ -1,3 +1,10 @@
+curl (7.74.0-1.3+deb11u1) bullseye; urgency=medium
+
+ * Non-maintainer upload.
+ * Also remove -ffile-prefix-map from curl-config. (Closes: #990128)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sun, 28 Nov 2021 06:38:09 +0100
+
curl (7.74.0-1.3) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru curl-7.74.0/debian/rules curl-7.74.0/debian/rules
--- curl-7.74.0/debian/rules 2021-06-25 20:59:54.000000000 +0200
+++ curl-7.74.0/debian/rules 2021-11-28 06:37:57.000000000 +0100
@@ -101,11 +101,13 @@
# 3. Likewise, replace the architecture name used for --build (and
# build_alias) with a literal backquoted call to dpkg-architecture.
# 4. In --configure output, remove
-# -fdebug-prefix-map=/buildd/specific/random/path=.
+# -fdebug-prefix-map=/buildd/specific/random/path=. and
+# -ffile-prefix-map=/buildd/specific/random/path=.
sed -e "/-lcurl /s|`krb5-config --libs gssapi`|\`krb5-config --libs gssapi\`|" \
-e "/--prefix/s|/$(DEB_HOST_MULTIARCH)'|/'\\\\\`dpkg-architecture -qDEB_HOST_MULTIARCH\\\\\`|g" \
-e "/--prefix/s|=$(DEB_BUILD_GNU_TYPE)'|='\\\\\`dpkg-architecture -qDEB_BUILD_GNU_TYPE\\\\\`|g" \
-e "/-fdebug-prefix-map=/s|\(-fdebug-prefix-map=\)/[^ ]*=.||" \
+ -e "/-ffile-prefix-map=/s|\(-ffile-prefix-map=\)/[^ ]*=.||" \
-i `find . -name curl-config`
override_dh_installchangelogs:
Reply to: