Control: tags -1 + patch

On Mon, Jun 21, 2021 at 02:45:52PM +0200, Michael Schmeing wrote:
> Version: 7.74.0-1.2

Yes, installation is broken in bullseye. This is bad and should be fixed
via a stable update.

> Severity: normal

I have to say that I concur with Adrian Bunk here. Unpack errors should
be serious.

> In the parameter "-ffile-prefix-map=/build/curl-mSxZiS/curl-7.74.0=.", the
> portion "curl-mSxZiS" is different between architecture versions.

It needs to be removed just like -fdebug-prefix-map=... is removed in
debian/rules. It's quite obvious after you see the diff actually.

> I have not checked whether other libcurl4-???-dev packages (e.g.
> libcurl4-openssl-dev) are affected as well. They may well be.

Yes, they are.

Any objections to NMUing this?

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-09-28 10:16:33.000000000 +0200
@@ -1,3 +1,10 @@
+curl (7.74.0-1.4) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Also remove -ffile-prefix-map from curl-config. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]>  Tue, 28 Sep 2021 10:16:33 +0200
+
 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-09-28 10:16:33.000000000 +0200
@@ -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 via email to