configure: make the TLS library choice(s) explicit - #6897
Conversation
|
why? this will break some builds and seems unnecessary |
|
Any kind of auto-detection have to use an order of detecting the libraries that makes us have to choose that order of preference. This way, we remove ourselves from making that decision. Without a change like this, we implicitly say that OpenSSL is to prefer, while I'm not sure that's a good leg to lean on forever. (I also wanted to remove the need for |
7a80beb to
48d6bdd
Compare
|
@mback2k it'd be great if you could update your buildbots' configure invokes to use |
|
This change highlights an existing problem we didn't notice before: the three azure pipelines builds With this change, those configure runs instead return failure. Ie the problem exists since before this change, but now we see it better. @mback2k do you know what we can do to make openssl detected and used in those builds? |
|
The appveyor builds similarly build without TLS enabled (== fail to detect any). I'll try to enable schannel for those. |
efb48f5 to
5a2438b
Compare
configure no longer tries to find a TLS library by default, but all libraries are now equal: the user needs to explicitly ask what TLS library or libraries to use. If no TLS library is selected, configure will error out unless --without-ssl is explicitly used to request a built without TLS (as that is very rare these days). Removes: --with-winssl, --with-darwinssl and all --without-* options for TLS libraries. Closes #6897
c8c6552 to
0937c85
Compare
Done since yesterday evening.
No idea yet, but I will look into this over the weekend. |
configure no longer tries to find a TLS library by default, but all libraries are now equal: the user needs to explicitly ask what TLS library or libraries to use. If no TLS library is selected, configure will error out unless --without-ssl is explicitly used to request a built without TLS (as that is very rare these days). Removes: --with-winssl, --with-darwinssl and all --without-* options for TLS libraries. Closes #6897
0937c85 to
dad89ce
Compare
|
After checking the available packages for classic MinGW, I think there is no native OpenSSL package available. Just the msys1-environment specific msys-openssl package that won't work for native Windows builds and is most likely already present in the build environment due to being a dependency of other packages. So I guess we have 2 options now:
|
|
While option 2 basically restores the previous CI situation. Another option could be to build OpenSSL for these CI variants, but I don't think it's worth the effort. |
|
ok, let's switch off TLS in those builds for now |
configure no longer tries to find a TLS library by default, but all libraries are now equal: the user needs to explicitly ask what TLS library or libraries to use. If no TLS library is selected, configure will error out unless --without-ssl is explicitly used to request a built without TLS (as that is very rare these days). Removes: --with-winssl, --with-darwinssl and all --without-* options for TLS libraries. Closes #6897
dad89ce to
9ecbd08
Compare
Fixes test 1165 when functions are moved from configure.ac to files in m4/
configure no longer tries to find a TLS library by default, but all libraries are now equal: the user needs to explicitly ask what TLS library or libraries to use. If no TLS library is selected, configure will error out unless --without-ssl is explicitly used to request a built without TLS (as that is very rare these days). Removes: --with-winssl, --with-darwinssl and all --without-* options for TLS libraries. Closes #6897
... and put those functions in separate m4 files per TLS library.
48490b2 to
997ed8e
Compare
- Related PR: curl/curl#6897 Co-authored-by: Brayan Henao <bhenao@vmware.com>
Contains fixes for the following vulnerabilities in 7.76.1: * CVE-2021-22897 * CVE-2021-22898 * CVE-2021-22901 Also explicitly use OpenSSL as the TLS library, which is necessary following the merge of curl/curl#6897.
Contains fixes for the following vulnerabilities in 7.76.1: * CVE-2021-22897 * CVE-2021-22898 * CVE-2021-22901 Also explicitly use OpenSSL as the TLS library, which is necessary following the merge of curl/curl#6897.
Contains fixes for the following vulnerabilities in 7.76.1: * CVE-2021-22897 * CVE-2021-22898 * CVE-2021-22901 Also explicitly use OpenSSL as the TLS library, which is necessary following the merge of curl/curl#6897.
It's actually a bit worse: it does not break builds. At least here, I was building Git for Windows' cURL package using |
|
Oh, you mean when you actually wanted schannel and OpenSSL ... I didn't think about case that's true! 😞 |
Not a big deal, but do you think there might be a way to error out upon unhandled |
|
It was similar for me: I had |
|
#7994 should fix the handling of |
See curl/curl#6897 Change-Id: I99013a9b646dbd317a6840c61939f97b256c25a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201447 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Omit checking `OPT_<BACKEND>` against `no` twice. Also: - openssl: drop stray `OPT_OPENSSL=off` check. Follow-up to 68d89f2 curl#6897 - rustls: drop no-op line. Follow-up to 9c42098 curl#13202 - gnutls: fix casing in comment. - merge `if` branches where possible after these changes. Closes curl#21781
This commit contains: curl: no longer necessary to use --without-[TLS library name] options See curl/curl#6897 Change-Id: I99013a9b646dbd317a6840c61939f97b256c25a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201447 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit f946ee2) curl: hyper support was dropped in 8.12 See curl/curl#15120 Change-Id: I78201cc07f5b74b039b78b7c168f2e2fe84766f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201459 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit d881b75) curl: migrate to CMake on Windows it fails to build without WINBUILD_ACKNOWLEDGE_DEPRECATED with WARNING: The winbuild build system is deprecated and will be removed in September 2025 in favor of the CMake build system. curl dropped winbuild support in 8.17. See https://curl.se/ch/8.17.0.html Change-Id: I236414c670d1d62d82c5a430e2abdbf71a50a2ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201470 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 1ec1b40) curl: drop leftover from 1ec1b40 Change-Id: I656a68ad489937baf37fe7d406861827bbff66f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201599 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 437f5e6) use cmake from visual studio extensions in cygwin Change-Id: Id3b895e8833dd65457f4c03791f2aa698c4a27ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201805 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit fd9058c) fix typo from fd9058c Change-Id: I86e5826efb598e61b2ae1d27bd1ec104d9302aac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201848 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 1f6847a) use cmake from VS extensions in WSL too See https://gerrit.libreoffice.org/c/core/+/201805/comment/bc56beb5_4fb2fc27/ Change-Id: I3203d620270035d21b57f1be497d851119c04b40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201890 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins (cherry picked from commit e403e84) curl: upgrade to 8.19.0 --with-secure-transport was dropped in curl 8.15, so replace it with --with-openssl --with-apple-sectrust, which was added in curl 8.17 Remove all patches fixed upstream Downloaded from https://curl.se/download/curl-8.19.0.tar.xz Change-Id: Ic93d8e3ef637d2adf84454c4e0375d1bf4620870 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201850 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins Reviewed-by: Patrick Luby <guibomacdev@gmail.com> (cherry picked from commit 8a9e4e8) curl: upgrade to 8.20.0 Downloaded from https://curl.se/download/curl-8.20.0.tar.xz Change-Id: I3a1e5f316a1d20565bb5da369b280c10ed5c2869 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204563 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit efddae2) curl: upgrade to 8.21.0 Downloaded from https://curl.se/download/curl-8.21.0.tar.xz Change-Id: Idbf678a0e00e2c7a802dbaad8439ec24b253ef57 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207281 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 57d226b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207673 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit contains: curl: no longer necessary to use --without-[TLS library name] options See curl/curl#6897 Change-Id: I99013a9b646dbd317a6840c61939f97b256c25a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201447 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit f946ee2) curl: hyper support was dropped in 8.12 See curl/curl#15120 Change-Id: I78201cc07f5b74b039b78b7c168f2e2fe84766f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201459 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit d881b75) curl: migrate to CMake on Windows it fails to build without WINBUILD_ACKNOWLEDGE_DEPRECATED with WARNING: The winbuild build system is deprecated and will be removed in September 2025 in favor of the CMake build system. curl dropped winbuild support in 8.17. See https://curl.se/ch/8.17.0.html Change-Id: I236414c670d1d62d82c5a430e2abdbf71a50a2ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201470 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 1ec1b40) curl: drop leftover from 1ec1b40 Change-Id: I656a68ad489937baf37fe7d406861827bbff66f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201599 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 437f5e6) use cmake from visual studio extensions in cygwin Change-Id: Id3b895e8833dd65457f4c03791f2aa698c4a27ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201805 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit fd9058c) fix typo from fd9058c Change-Id: I86e5826efb598e61b2ae1d27bd1ec104d9302aac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201848 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 1f6847a) use cmake from VS extensions in WSL too See https://gerrit.libreoffice.org/c/core/+/201805/comment/bc56beb5_4fb2fc27/ Change-Id: I3203d620270035d21b57f1be497d851119c04b40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201890 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins (cherry picked from commit e403e84) curl: upgrade to 8.19.0 --with-secure-transport was dropped in curl 8.15, so replace it with --with-openssl --with-apple-sectrust, which was added in curl 8.17 Remove all patches fixed upstream Downloaded from https://curl.se/download/curl-8.19.0.tar.xz Change-Id: Ic93d8e3ef637d2adf84454c4e0375d1bf4620870 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201850 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins Reviewed-by: Patrick Luby <guibomacdev@gmail.com> (cherry picked from commit 8a9e4e8) curl: upgrade to 8.20.0 Downloaded from https://curl.se/download/curl-8.20.0.tar.xz Change-Id: I3a1e5f316a1d20565bb5da369b280c10ed5c2869 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204563 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit efddae2) curl: upgrade to 8.21.0 Downloaded from https://curl.se/download/curl-8.21.0.tar.xz Change-Id: Idbf678a0e00e2c7a802dbaad8439ec24b253ef57 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207281 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 57d226b) Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207689 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
With this, configure no longer tries to find a TLS library by default, but all libraries are now equal: the user needs to explicitly ask what TLS library or libraries to use.
If no TLS library is selected, configure will error out unless
--without-sslis explicitly used to request a build without TLS (as that is rare these days).Update: this also removes
--with-winssland--with-darwinsslas they've been deprecated since 2019