From 2c3ff6bcd3d3deaf5efba32a9f8de8a218082042 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Sun, 26 Jan 2025 14:48:25 +0800 Subject: [PATCH] Adapt to XMLSec refactoring in version 2.3.5 (cherry picked from commit 4b5c2b57ead630786c9a05a9959bdbcc95b45542) --- ...-XMLSec-refactoring-in-version-2.3.5.patch | 25 +++++++++++++++++++ apache-poi.spec | 13 +++++++--- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 Adapt-to-XMLSec-refactoring-in-version-2.3.5.patch diff --git a/Adapt-to-XMLSec-refactoring-in-version-2.3.5.patch b/Adapt-to-XMLSec-refactoring-in-version-2.3.5.patch new file mode 100644 index 0000000..176c53f --- /dev/null +++ b/Adapt-to-XMLSec-refactoring-in-version-2.3.5.patch @@ -0,0 +1,25 @@ +From 2df8c995dd0f50d44dedf10dfa5dc0c7233a4633 Mon Sep 17 00:00:00 2001 +From: starlet-dx <15929766099@163.com> +Date: Sun, 26 Jan 2025 14:37:09 +0800 +Subject: [PATCH 1/1] Adapt to XMLSec refactoring in version 2.3.5 + +--- + .../poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java +index 11a11ee..4f7f35f 100644 +--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java ++++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java +@@ -295,7 +295,7 @@ public class XAdESXLSignatureFacet extends SignatureFacet { + * and will be missing from the c14n resulting nodes. + */ + Canonicalizer c14n = Canonicalizer.getInstance(c14nAlgoId); +- c14nValue.write(c14n.canonicalizeSubtree(node)); ++ c14n.canonicalizeSubtree(node, c14nValue); + } + } catch (RuntimeException e) { + throw e; +-- +2.48.1 + diff --git a/apache-poi.spec b/apache-poi.spec index 5be94f1..34c1b23 100644 --- a/apache-poi.spec +++ b/apache-poi.spec @@ -1,7 +1,7 @@ %global reldate 20170915 Name: apache-poi Version: 3.17 -Release: 6 +Release: 7 Summary: The Java API for Microsoft Documents License: Apache-2.0 and GPL-3.0-only URL: http://poi.apache.org/ @@ -20,6 +20,7 @@ Source8: http://uri.etsi.org/01903/v1.4.1/XAdESv141.xsd Patch1: apache-poi-3.14-compile-xsds.patch Patch2: apache-poi-3.14-build.patch Patch3: Adjust-handling-of-SchemaFactory.patch +Patch4: Adapt-to-XMLSec-refactoring-in-version-2.3.5.patch BuildArch: noarch BuildRequires: jacoco javapackages-local jmh jmh-generator-annprocess BuildRequires: apache-commons-collections4 >= 4.1 apache-commons-codec apache-commons-logging @@ -62,9 +63,10 @@ This package contains the API documentation for %{name}. %prep %setup -q -n poi-%{version} -%patch1 -%patch2 -%patch3 -p1 +%patch -P1 -p0 +%patch -P2 -p0 +%patch -P3 -p1 +%patch -P4 -p1 find -name '*.class' -delete find -name '*.jar' -delete mkdir lib ooxml-lib @@ -140,6 +142,9 @@ done %license LICENSE NOTICE %changelog +* Sun Jan 26 2025 yaoxin <1024769339@qq.com> - 3.17-7 +- Adapt to XMLSec refactoring in version 2.3.5 + * Mon Jun 3 2024 laokz - 3.17-6 - riscv64: fix OOM build failure -- Gitee