xmlsec1: upgrade 1.3.9 -> 1.3.11

Refresh the remaining patches and drop the ones now upstreamed. libxml2
2.15 removed the tree-debug module (LIBXML_DEBUG_ENABLED off), so guard
the xmlDebugDumpDocument() call that otherwise fails to compile the
transform-helpers unit test.

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Khem Raj
2026-06-09 21:17:24 -07:00
parent fcfaa5b479
commit ee3047d8f9
5 changed files with 57 additions and 1241 deletions
@@ -6,34 +6,44 @@ Subject: [PATCH] xmlsec1: add new recipe
This enables the building of the examples directory This enables the building of the examples directory
and it's installed as ptest. and it's installed as ptest.
Also allow the examples to be built from a separate build directory
by honoring top_srcdir/top_builddir so that the include and library
paths point at the cross build tree instead of the host.
Upstream-Status: Inappropriate [ OE ptest specific ] Upstream-Status: Inappropriate [ OE ptest specific ]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
examples/Makefile | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
Refreshed for xmlsec1 1.3.11 (examples/Makefile rewritten upstream).
---
diff --git a/examples/Makefile b/examples/Makefile diff --git a/examples/Makefile b/examples/Makefile
index c6a25f09..3da1cb33 100644 index dfba58e..f6f4d51 100644
--- a/examples/Makefile --- a/examples/Makefile
+++ b/examples/Makefile +++ b/examples/Makefile
@@ -12,9 +12,17 @@ PROGRAMS = \ @@ -12,6 +12,12 @@ PROGRAMS = \
$(PROGRAMS_DEC) \ $(PROGRAMS_DEC)
xmldsigverify
+ifndef CC # try to find pkg-config, if available
CC = gcc +# OE: allow building from a separate build dir against the cross build tree
-CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS -Wall -Wextra +top_srcdir ?= ..
-LDLIBS += -g $(shell xmlsec1-config --libs) +top_builddir ?= ..
+endif +CFLAGS += -I$(top_srcdir)/include
+ +LDLIBS += -L$(top_builddir)/src/.libs
+CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra
+LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 )
+ +
XMLSEC_PKG_CONFIG = "xmlsec1"
PKG_CONFIG := $(shell command -v pkg-config 2> /dev/null)
XMLSEC_CHECK := $(shell $(PKG_CONFIG) --exists $(XMLSEC_PKG_CONFIG) 2> /dev/null && echo "found")
@@ -40,6 +46,11 @@ endif
# rules
all: $(PROGRAMS)
+DESTDIR = /usr/share/xmlsec1 +DESTDIR = /usr/share/xmlsec1
+install-ptest: +install-ptest:
+ if [ ! -d $(DESTDIR) ]; then mkdir -p $(DESTDIR); fi + if [ ! -d $(DESTDIR) ]; then mkdir -p $(DESTDIR); fi
+ cp * $(DESTDIR) + cp * $(DESTDIR)
+
clean:
rm -rf $(PROGRAMS)
all: $(PROGRAMS) --
2.34.1
@@ -1,29 +0,0 @@
From fab6503dca2046d32fa186c33c566c58110334a5 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Tue, 30 Dec 2014 11:18:17 +0800
Subject: [PATCH] examples: allow build in separate dir
Upstream-Status: Inappropriate [ OE specific ]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
examples/Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/examples/Makefile b/examples/Makefile
index 3da1cb33..ff44cb7b 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -16,8 +16,10 @@ ifndef CC
CC = gcc
endif
-CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra
-LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 )
+top_srcdir = ..
+top_builddir = ..
+CFLAGS += -I$(top_srcdir)/include -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra
+LDLIBS += -L$(top_builddir)/src/.libs -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --libs xmlsec1 )
DESTDIR = /usr/share/xmlsec1
install-ptest:
@@ -0,0 +1,26 @@
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 24 Jun 2026 00:00:00 +0000
Subject: [PATCH] unit_tests: guard xmlDebugDumpDocument with LIBXML_DEBUG_ENABLED
libxml2 2.14 removed the tree-debugging module; in 2.15 LIBXML_DEBUG_ENABLED
is no longer defined and xmlDebugDumpDocument() is not declared. The transform
helpers unit test called it unconditionally, which fails to compile with a
strict compiler (-Werror=implicit-function-declaration). Only emit the debug
dump when the libxml2 debug module is available.
Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/issues]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
--- a/apps/unit_tests/transform_helpers_unit_tests.c
+++ b/apps/unit_tests/transform_helpers_unit_tests.c
@@ -288,7 +288,9 @@
nonceContent = xmlNodeGetContent(nonceNode);
if((nonceContent == NULL) || (xmlStrcmp(nonceContent, BAD_CAST "000102030405060708090a0b") != 0)) {
testLog("Error: ChaCha20-Poly1305 params write serialized unexpected nonce\n");
+#ifdef LIBXML_DEBUG_ENABLED
xmlDebugDumpDocument(stdout, doc);
+#endif /* LIBXML_DEBUG_ENABLED */
xmlFree(nonceContent);
xmlFreeDoc(doc);
@@ -16,14 +16,13 @@ SRC_URI = "https://github.com/lsh123/xmlsec/releases/download/${PV}/${BP}.tar.gz
file://0001-force-to-use-our-own-libtool.patch \ file://0001-force-to-use-our-own-libtool.patch \
file://0002-change-finding-path-of-nss-and-nspr.patch \ file://0002-change-finding-path-of-nss-and-nspr.patch \
file://0003-xmlsec1-add-new-recipe.patch \ file://0003-xmlsec1-add-new-recipe.patch \
file://0004-examples-allow-build-in-separate-dir.patch \
file://0005-nss-nspr-fix-for-multilib.patch \ file://0005-nss-nspr-fix-for-multilib.patch \
file://0006-xmlsec1-Fix-configure-QA-error-caused-by-host-lookup.patch \ file://0006-xmlsec1-Fix-configure-QA-error-caused-by-host-lookup.patch \
file://0007-xmlsec-examples-Fix-LibXML2-deprecation-warnings-and.patch \ file://0008-unit_tests-guard-xmlDebugDumpDocument-with-LIBXML_DEB.patch \
file://run-ptest \ file://run-ptest \
" "
SRC_URI[sha256sum] = "a631c8cd7a6b86e6adb9f5b935d45a9cf9768b3cb090d461e8eb9d043cf9b62f" SRC_URI[sha256sum] = "53675e98fa83b48201d24f7bfbcaeaa1b51496b8b19ff969785856bdeb196af3"
UPSTREAM_CHECK_URI = "https://github.com/lsh123/xmlsec/releases" UPSTREAM_CHECK_URI = "https://github.com/lsh123/xmlsec/releases"
UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)" UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)"