Merge ~sergiodj/ubuntu/+source/squid:fix-ftbfs-deprecated-decls into ubuntu/+source/squid:ubuntu/devel

[Sergio Durigan Junior]

This MP fixes the current FTBFS that's happening when running squid's "upstream-test-suite" dep8 test. This failure is causing OpenLDAP to be blocked on -proposed.

The problem happens because we're ignoring C++17's deprecated declarations on d/rules, but not on d/t/upstream-test-suite. Since the dep8 test will compile parts of squid to perform the tests, the compilation fails due to -Werror=deprecated-declarations.

Initially I thought that it would be possible to get rid of the -Wno-error=deprecated-declarations entirely by backporting the two upstream commits that solve the deprecations, but unfortunately we still need to silence this warning because the OpenSSL 3 patch we carry for squid doesn't get rid of all the deprecated declarations for OpenSSL; this has been fixed upstream by their version of OpenSSL 3 patch, but unfortunately the patch is too complex to be backported to 5.6-1 in time.

The easy way out was to export the DEB_*_MAINT_APPEND flags that we use on d/rules inside d/t/upstream-test-suite. This is a temporary solution and I will work with the Debian maintainer to improve things.

PPA with the proposed changes:

https://launchpad.net/~sergiodj/+archive/ubuntu/squid/+packages

autopkgtest now passes:

http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-sergiodj-squid/?format=plain

[Robie Basak (racb)]

This looks reasonable and it sounds like you've covered all your bases.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, racb
Uploaders: sergiodj, racb
MP auto-approved

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Friday, September 02 2022, Robie Basak wrote:

> This looks reasonable and it sounds like you've covered all your bases.

Thanks. Uploaded:

$ dput squid_5.6-1ubuntu2_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/squid/squid_5.6-1ubuntu2_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/squid/squid_5.6-1ubuntu2.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_5.6-1ubuntu2.dsc: done.
  Uploading squid_5.6-1ubuntu2.debian.tar.xz: done.
  Uploading squid_5.6-1ubuntu2_source.buildinfo: done.
  Uploading squid_5.6-1ubuntu2_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/debian/changelog b/debian/changelog
index 724392b..a46bd09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+squid (5.6-1ubuntu2) kinetic; urgency=medium
+
+  * d/t/upstream-test-suite: Also export DEB_*_MAINT_APPEND variables
+    here. (LP: #1988217)
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 30 Aug 2022 19:32:59 -0400
+
 squid (5.6-1ubuntu1) kinetic; urgency=medium
 
   * Merge with Debian unstable (LP: #1971325). Remaining changes:
diff --git a/debian/tests/upstream-test-suite b/debian/tests/upstream-test-suite
index 48b2846..b6c9495 100644
--- a/debian/tests/upstream-test-suite
+++ b/debian/tests/upstream-test-suite
@@ -1,6 +1,9 @@
 #!/bin/sh
 set -e
 
+export DEB_CFLAGS_MAINT_APPEND="-Wno-error=deprecated-declarations"
+export DEB_CXXFLAGS_MAINT_APPEND="-Wno-error=deprecated-declarations"
+
 dpkg-source --before-build `pwd`
 dh_update_autotools_config
 dh_autoreconf