diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2022-10-26 19:36:33 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-10-27 09:38:37 +0200 |
| commit | 19e998aa98d966cffca98bed9408d5758d91d9be (patch) | |
| tree | ca847e1e091a456adb0cdddca471bcb5e7162504 /external/xmlsec | |
| parent | dc85be45c7e2efc0512e823d08e2edba0d4c0e76 (diff) | |
Update libxmlsec to 1.2.35
- backport 2 patches to fix the build
- replace calls to the now deprecated xmlSecBase64Decode()
Change-Id: Ib3254002fff5e49bb6dd4eb1bf62e7d2ee7be83e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141865
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'external/xmlsec')
| -rw-r--r-- | external/xmlsec/UnpackedTarball_xmlsec.mk | 2 | ||||
| -rw-r--r-- | external/xmlsec/fix-size_max-412.patch.1 | 31 | ||||
| -rw-r--r-- | external/xmlsec/remove-unnecessary-macro-417.patch.1 | 24 |
3 files changed, 57 insertions, 0 deletions
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk b/external/xmlsec/UnpackedTarball_xmlsec.mk index 3ad978cdb829..7b4f082bf931 100644 --- a/external/xmlsec/UnpackedTarball_xmlsec.mk +++ b/external/xmlsec/UnpackedTarball_xmlsec.mk @@ -8,6 +8,8 @@ # xmlsec_patches := +xmlsec_patches += remove-unnecessary-macro-417.patch.1 +xmlsec_patches += fix-size_max-412.patch.1 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec)) diff --git a/external/xmlsec/fix-size_max-412.patch.1 b/external/xmlsec/fix-size_max-412.patch.1 new file mode 100644 index 000000000000..5b4e2b69d960 --- /dev/null +++ b/external/xmlsec/fix-size_max-412.patch.1 @@ -0,0 +1,31 @@ +From 3445fbfe1aceb88a255b90ee1c06df2d05c188b0 Mon Sep 17 00:00:00 2001 +From: lsh123 <aleksey@aleksey.com> +Date: Mon, 24 Oct 2022 17:38:59 -0700 +Subject: [PATCH] fix size_max (#412) + +--- + src/cast_helpers.h | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/cast_helpers.h b/src/cast_helpers.h +index 67330822..2b670ad1 100644 +--- a/src/cast_helpers.h ++++ b/src/cast_helpers.h +@@ -17,13 +17,9 @@ + #endif /* XMLSEC_PRIVATE */ + + #include <limits.h> ++#include <stdint.h> + #include "errors_helpers.h" + +-/* if it is missing */ +-#ifndef SIZE_MAX +-#define SIZE_MAX (~(size_t)0) +-#endif /* SIZE_MAX */ +- + /** + * Helpers for printing out enum values (mostly debugging). + */ +-- +2.38.0.rc2 + diff --git a/external/xmlsec/remove-unnecessary-macro-417.patch.1 b/external/xmlsec/remove-unnecessary-macro-417.patch.1 new file mode 100644 index 000000000000..18cd5252b68e --- /dev/null +++ b/external/xmlsec/remove-unnecessary-macro-417.patch.1 @@ -0,0 +1,24 @@ +From 3da1d53fce229d8a72d41b68aacbc115574012e0 Mon Sep 17 00:00:00 2001 +From: lsh123 <aleksey@aleksey.com> +Date: Tue, 25 Oct 2022 05:47:51 -0700 +Subject: [PATCH] remove unnecessary macro (#417) + +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 67c8e50b..bb5d3e4b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -65,7 +65,6 @@ AM_CONDITIONAL(HAS_XSLTPROC, [test x"$XSLTPROC" != x]) + + dnl Checks for header files. + AC_HEADER_DIRENT +-AC_CHECK_INCLUDES_DEFAULT + + + dnl ========================================================================== +-- +2.38.0.rc2 + |