external/epm/UnpackedTarball_epm.mk | 1 + external/epm/ppc64el.patch.0 | 11 +++++++++++ ucb/source/ucp/webdav-curl/CurlSession.cxx | 9 +++++++++ 3 files changed, 21 insertions(+)
New commits: commit d95ac1c608caba9cabaa503f1a5589285547aed5 Author: Andras Timar <[email protected]> AuthorDate: Thu Jun 30 18:31:14 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 28 19:19:48 2023 +0000 LOK: Allow image upload from WOPI-like host with self-signed cert Change-Id: I28a7de489b06fd5a993b82bb39274eb6f0c373ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146298 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx index 1632881cb824..0f06363ce68f 100644 --- a/ucb/source/ucp/webdav-curl/CurlSession.cxx +++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx @@ -15,6 +15,7 @@ #include "webdavresponseparser.hxx" #include <comphelper/attributelist.hxx> +#include <comphelper/lok.hxx> #include <comphelper/scopeguard.hxx> #include <comphelper/string.hxx> @@ -717,6 +718,14 @@ CurlSession::CurlSession(uno::Reference<uno::XComponentContext> xContext, rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_FORBID_REUSE, 1L); assert(rc == CURLE_OK); } + // If WOPI-like host has self-signed certificate, it's not possible to insert images + // to the document, so here is a compromise. The user has already accepted the self + // signed certificate in the browser, when we get here. + if (comphelper::LibreOfficeKit::isActive()) + { + rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_SSL_VERIFYPEER, 0L); + assert(rc == CURLE_OK); + } } CurlSession::~CurlSession() {} commit fa29398e98f01001c24e7d6856179dbf8124e5b6 Author: Andras Timar <[email protected]> AuthorDate: Mon Aug 1 15:03:21 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 28 19:19:37 2023 +0000 Fix 'Architecture' string on ppc64le platform, Debian uses 'ppc64el' Change-Id: Idb678ac2669914575d3ddb813d35212df26e3d17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146297 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> diff --git a/external/epm/UnpackedTarball_epm.mk b/external/epm/UnpackedTarball_epm.mk index c064a5bacc1e..91d9fbd2b29a 100644 --- a/external/epm/UnpackedTarball_epm.mk +++ b/external/epm/UnpackedTarball_epm.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,epm,$(EPM_TARBALL),,epm)) $(eval $(call gb_UnpackedTarball_add_patches,epm,\ external/epm/epm-3.7.patch \ external/epm/asan.patch.0 \ + external/epm/ppc64el.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/epm/ppc64el.patch.0 b/external/epm/ppc64el.patch.0 new file mode 100644 index 000000000000..2b9416e8d215 --- /dev/null +++ b/external/epm/ppc64el.patch.0 @@ -0,0 +1,11 @@ +--- deb.c.orig 2022-08-01 14:50:38.593375838 +0200 ++++ deb.c 2022-08-01 14:58:08.000000000 +0200 +@@ -163,6 +163,8 @@ + #endif + else if (!strcmp(platform->machine, "ppc")) + fputs("Architecture: powerpc\n", fp); ++ else if (!strcmp(platform->machine, "ppc64le")) ++ fputs("Architecture: ppc64el\n", fp); + else + fprintf(fp, "Architecture: %s\n", platform->machine); +
