Merge ~athos-ribeiro/ubuntu/+source/squid:dont-default-to-openssl into ubuntu/+source/squid:ubuntu/devel

[Athos Ribeiro]

This is a proposal fix for LP: #1968200. It consists of dropping an specific patch in Ubuntu delta which makes --with-openssl a default option during configuration. This was proposed by an upstream review at https://github.com/squid-cache/squid/pull/694/files#r793839271.

A PPA with the proposed changes is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/squid-no-openssl-default/+packages

[Bryce Harrington (bryce)]

This LGTM, after checking the LP bug and upstream bug.
I would suggest in the changelog not just specify "what" changed but also mention "why":
I.e., that --with-openssl is no longer necessary since the build auto-detects openssl, and having this option present causes a build error.
With that changelog addition, this is +1 to go, no need for re-review.

review: Approve

[Utkarsh Gupta (utkarsh)]

+1 with exactly what Bryce said. \o/

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks Bryce, Utkarsh :)

I added a snipped in the changelog (and commit msg) to say that having -with-openssl by default "hinders packaging since we ship squid in two different flavours (gnutls and openssl)".

[Athos Ribeiro (athos-ribeiro)]

Uploaded.

$ dput ubuntu ../squid_5.2-1ubuntu4_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../squid_5.2-1ubuntu4_source.changes: Valid signature from 033C4CA276024834
Checking signature on .dsc
gpg: ../squid_5.2-1ubuntu4.dsc: Valid signature from 033C4CA276024834
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_5.2-1ubuntu4.dsc: done.
  Uploading squid_5.2-1ubuntu4.debian.tar.xz: done.
  Uploading squid_5.2-1ubuntu4_source.buildinfo: done.
  Uploading squid_5.2-1ubuntu4_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index e321cb3..54ee3af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+squid (5.2-1ubuntu4) jammy; urgency=medium
+
+  * Do not enable openssl as a default. This hinders packaging since we ship
+    squid in two different flavours (gnutls and openssl). Drop
+    d/p/openssl3-Detect-and-default-enable-OpenSSL-3.patch. (LP: #1968200)
+
+ -- Athos Ribeiro <[e-mail]>  Tue, 12 Apr 2022 23:41:41 -0300
+
 squid (5.2-1ubuntu3) jammy; urgency=medium
 
   * Fix FTBFS with OpenSSL 3.0 (LP: #1946205).  The following new
diff --git a/debian/patches/openssl3-Detect-and-default-enable-OpenSSL-3.patch b/debian/patches/openssl3-Detect-and-default-enable-OpenSSL-3.patch
deleted file mode 100644
index 194e249..0000000
--- a/debian/patches/openssl3-Detect-and-default-enable-OpenSSL-3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Amos Jeffries <[e-mail]>
-Date: Fri, 15 Oct 2021 04:34:23 +1300
-Subject: Detect and default-enable OpenSSL 3+
-
----
- configure.ac | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-Forwarded: yes, https://github.com/squid-cache/squid/pull/694
-Bug: https://bugs.squid-cache.org/show_bug.cgi?id=5133
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/squid/+bug/1946205
-Last-Updated: 2022-02-08
-
-diff --git a/configure.ac b/configure.ac
-index 4556a9e..14af6be 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1326,7 +1326,14 @@ case "$with_openssl" in
-   esac
- ])
- AH_TEMPLATE(USE_OPENSSL,[OpenSSL support is available])
--## OpenSSL is default disable due to licensing issues on some OS
-+AS_IF([test "x$with_openssl" != "xno"],[
-+  SQUID_STATE_SAVE(squid_openssl3_state)
-+  CPPFLAGS="$LIBOPENSSL_CFLAGS $CPPFLAGS"
-+  LIBS="$LIBS $LIBOPENSSL_PATH"
-+  PKG_CHECK_MODULES([LIBOPENSSL],[openssl >= 3],[with_openssl="yes"],[:])
-+  SQUID_STATE_ROLLBACK(squid_openssl3_state)
-+])
-+## OpenSSL < 3 is default disable due to licensing issues on some OS
- if test "x$with_openssl" = "xyes"; then
-   AC_CHECK_HEADERS( \
-     openssl/asn1.h \
diff --git a/debian/patches/series b/debian/patches/series
index 6d13126..6097469 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,5 +17,4 @@ openssl3-Initial-DH-conversion-to-EVP_PKEY.patch
 openssl3-Switch-to-BN_rand.patch
 openssl3-SSL_OP_-macro-definitions-changed-in-3.0.patch
 openssl3-Update-ECDH-key-settings.patch
-openssl3-Detect-and-default-enable-OpenSSL-3.patch
 openssl3-Remove-stale-TODO-and-comment.patch