download.lst | 4 ++-- ucb/source/ucp/webdav-curl/CurlSession.cxx | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 761fc702b14ed788c30de339c2192e8e66a065d3 Author: Miklos Vajna <[email protected]> AuthorDate: Fri Jan 9 14:27:53 2026 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 14:08:43 2026 +0100 ucb curl: don't verify peer in the isExemptVerifyHost() case Try to insert a https:// image URL into Writer when the URL's host is meant to be not verified, 'curl -k' works with the URL but insertion in Writer still fails. Turns out this is an expired self-signed certificate (in a local test env). Mechanism for not verifying SSL certs in the curl session was added in commit 2a5c998d4cdfd54ba65b93318292dab542beaabd (allow an exemption to be made for a specific host, 2024-08-23), but that results in an image insertion failure. Fix the problem by adapting the ucb/ code to do what <https://github.com/curl/curl/blob/470e26ff6eb55e8d18d6fa44104834e9d1f71274/src/config2setopts.c#L375> does for 'curl -k', also clear the CURLOPT_SSL_VERIFYPEER option. With this, inserting https:// images from my local test server works again in Writer. Change-Id: I0c52f6c0c0dfd6ebf0b4081a8088b623935a96f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196924 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx index 028ada4a5ad7..dd0158c9f8ed 100644 --- a/ucb/source/ucp/webdav-curl/CurlSession.cxx +++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx @@ -826,6 +826,7 @@ CurlSession::CurlSession(uno::Reference<uno::XComponentContext> xContext, } if (HostFilter::isExemptVerifyHost(m_URI.GetHost())) { + rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_SSL_VERIFYPEER, 0L); rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_SSL_VERIFYHOST, 0L); assert(rc == CURLE_OK); } commit 79e72202a295426b4ca205bfdb245f8237417799 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Mar 31 10:29:29 2025 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Jan 15 14:08:43 2026 +0100 postgresql: upgrade to 15.15 According to https://www.postgresql.org/support/versioning/ the last release of branch 14 is on November 12, 2026 Upgrade master branch to branch 15 to avoid reaching the EOL Downloaded from https://ftp.postgresql.org/pub/source/v15.15/postgresql-15.15.tar.bz2 Change-Id: Iff451dcc6f1f4dfaa763869056e610eee4a946d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193978 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit 1b89a45baa7214977350ea6558b2c2f3af6c4a1a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196908 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index de549a231d11..13d1db0245f2 100644 --- a/download.lst +++ b/download.lst @@ -663,8 +663,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -POSTGRESQL_SHA256SUM := 727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80 -POSTGRESQL_TARBALL := postgresql-14.19.tar.bz2 +POSTGRESQL_SHA256SUM := 5753aaeb8b09cbf61016f78aa69bf5cbdf01b43263f010cbf168c82896213aaa +POSTGRESQL_TARBALL := postgresql-15.15.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts
