download.lst | 4 +-
external/xmlsec/UnpackedTarball_xmlsec.mk | 3 -
external/xmlsec/fix-size_max-412.patch.1 | 31 -------------------
external/xmlsec/old-nss.patch.1 | 13 -------
external/xmlsec/remove-unnecessary-macro-417.patch.1 | 24 --------------
5 files changed, 2 insertions(+), 73 deletions(-)
New commits:
commit 34c7d169a248578d953661217144f2dda9831cb4
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Nov 7 20:14:26 2022 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Nov 8 08:06:44 2022 +0100
Update libxmlsec to 1.2.36
- remove the fix-size_max-412.patch.1 and
remove-unnecessary-macro-417.patch.1 backports
- drop old-nss.patch.1, which is now upstream
Change-Id: I4b668d4949d8831cffbe87ac6b16a20ba8698128
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142395
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/download.lst b/download.lst
index 71ee55b138c4..98b46b17eb59 100644
--- a/download.lst
+++ b/download.lst
@@ -158,8 +158,8 @@ export LIBTOMMATH_SHA256SUM :=
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
export LIBTOMMATH_TARBALL := ltm-1.0.zip
export LIBWEBP_SHA256SUM :=
7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df
export LIBWEBP_TARBALL := libwebp-1.2.4.tar.gz
-export XMLSEC_SHA256SUM :=
a39f86f6fe8e8cdc998b9a911ef1fae03f57a9ef99c2b704cd492007a52ac223
-export XMLSEC_TARBALL := xmlsec1-1.2.35.tar.gz
+export XMLSEC_SHA256SUM :=
f0d97e008b211d85808f038326d42e7f5cf46648e176f07406a323e7e8d41c80
+export XMLSEC_TARBALL := xmlsec1-1.2.36.tar.gz
export LIBXML_SHA256SUM :=
5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
export LIBXML_VERSION_MICRO := 3
export LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk
b/external/xmlsec/UnpackedTarball_xmlsec.mk
index b64fe48e6161..3ad978cdb829 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -8,9 +8,6 @@
#
xmlsec_patches :=
-xmlsec_patches += remove-unnecessary-macro-417.patch.1
-xmlsec_patches += fix-size_max-412.patch.1
-xmlsec_patches += old-nss.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
deleted file mode 100644
index 5b4e2b69d960..000000000000
--- a/external/xmlsec/fix-size_max-412.patch.1
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3445fbfe1aceb88a255b90ee1c06df2d05c188b0 Mon Sep 17 00:00:00 2001
-From: lsh123 <alek...@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/old-nss.patch.1 b/external/xmlsec/old-nss.patch.1
deleted file mode 100644
index 2fc16f30f2ae..000000000000
--- a/external/xmlsec/old-nss.patch.1
+++ /dev/null
@@ -1,13 +0,0 @@
---- xmlsec/configure.ac.orig 2022-10-28 11:49:10.461643631 +0200
-+++ xmlsec/configure.ac 2022-10-28 11:49:23.637626991 +0200
-@@ -948,8 +948,8 @@
- dnl 2 overrides 1
- dnl
- dnl ==========================================================================
--NSS_MIN_VERSION="3.50.1"
--NSPR_MIN_VERSION="4.25.1"
-+NSS_MIN_VERSION="3.49"
-+NSPR_MIN_VERSION="4.25.0"
- SEAMONKEY_MIN_VERSION="1.0"
- MOZILLA_MIN_VERSION="1.4"
- NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
diff --git a/external/xmlsec/remove-unnecessary-macro-417.patch.1
b/external/xmlsec/remove-unnecessary-macro-417.patch.1
deleted file mode 100644
index 18cd5252b68e..000000000000
--- a/external/xmlsec/remove-unnecessary-macro-417.patch.1
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3da1d53fce229d8a72d41b68aacbc115574012e0 Mon Sep 17 00:00:00 2001
-From: lsh123 <alek...@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
-
