download.lst | 4 ++-- xmlsecurity/inc/xmlsec-wrapper.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit 1770d3ba3313f2166153d39be6ae1212c00da6d8 Author: Justin Luth <[email protected]> AuthorDate: Thu Apr 27 17:49:48 2023 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Apr 28 08:05:21 2023 +0200 tdf#155034 Revert "Update libxmlsec to 1.3.0" This reverts commit 26bf26272bf525b59b4a4ce18b3ce14c1febfd7b. Reason for revert: compiled version fails open/create some documents on Ubuntu 20.04, which is still an Ubuntu-supported release. Also fails to compile on 20.04 with built-in system NSS The clinching reason is for running bibisects. There was no compelling reason to make the change, just routine maintenance. So if something breaks or is annoying when doing routine maintenance, then revert it. The previous version is still 1.2.37, released in Nov 2022. So this will likely come up again relatively soon if there is a security fix required. But at least at the end of the 7.6 development cycle, we can avoid the pain. Change-Id: Ife387d6e4058b017ba18cba1fbcb2b2d50f52c12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151118 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/download.lst b/download.lst index 8a75c598af84..fbbbb2ea92d5 100644 --- a/download.lst +++ b/download.lst @@ -334,8 +334,8 @@ LIBWEBP_TARBALL := libwebp-1.3.0.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -XMLSEC_SHA256SUM := df3ad2548288411fc3d44c20879e4c4e90684a1a4fb76a06ae444f957171c9a6 -XMLSEC_TARBALL := xmlsec1-1.3.0.tar.gz +XMLSEC_SHA256SUM := 5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c +XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h index 7c6d267e8b73..e4048de94bf2 100644 --- a/xmlsecurity/inc/xmlsec-wrapper.h +++ b/xmlsecurity/inc/xmlsec-wrapper.h @@ -23,6 +23,11 @@ #include <sal/types.h> +// Cf. xmlsec's configure.in: +#if SAL_TYPES_SIZEOFPOINTER != 4 && !defined SYSTEM_XMLSEC +#define XMLSEC_NO_SIZE_T +#endif + #include <xmlsec/base64.h> #include <xmlsec/bn.h> #include <xmlsec/errors.h>
