diff mbox series

[meta-oe,94/96] xmlsec1: Fix poison-system-directories error with gcc

Message ID 20261115074918.2932593-94-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,01/96] crow: upgrade 1.3.4 -> 1.3.5 | expand

Commit Message

Khem Raj Nov. 15, 2026, 7:49 a.m. UTC
The oss-fuzz programs in apps/ are compiled with XMLSEC_OPENSSL_CFLAGS,
which is meant for the installed pkg-config files and contains
-I${includedir}/xmlsec1, i.e. -I/usr/include/xmlsec1. Backport the
upstream fix to use the in-tree crypto cflags instead.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...ass-crypto-cflags-to-fuzzer-programs.patch | 64 +++++++++++++++++++
 .../recipes-support/xmlsec1/xmlsec1_1.3.13.bb |  1 +
 2 files changed, 65 insertions(+)
 create mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/0010-xmlsec-build-correctly-pass-crypto-cflags-to-fuzzer-programs.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0010-xmlsec-build-correctly-pass-crypto-cflags-to-fuzzer-programs.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0010-xmlsec-build-correctly-pass-crypto-cflags-to-fuzzer-programs.patch
new file mode 100644
index 0000000000..89b280f086
--- /dev/null
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0010-xmlsec-build-correctly-pass-crypto-cflags-to-fuzzer-programs.patch
@@ -0,0 +1,64 @@ 
+From cf60007b5b35ba81d148f20bebd8a0f1d847f5ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= <alexis.lothore@gmail.com>
+Date: Mon, 2 Nov 2026 15:50:24 +0100
+Subject: [PATCH] (xmlsec-build) correctly pass crypto cflags to fuzzer
+ programs (#1443)
+
+Upstream-Status: Backport [https://github.com/lsh123/xmlsec/commit/cf60007b5b35ba81d148f20bebd8a0f1d847f5ed]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ apps/Makefile.am | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/apps/Makefile.am b/apps/Makefile.am
+index 8b3fda22f..a3f3086ae 100644
+--- a/apps/Makefile.am
++++ b/apps/Makefile.am
+@@ -140,6 +140,7 @@ xmlsec_fuzzer_CFLAGS = \
+ 	-I../include \
+ 	-I$(top_srcdir)/include \
+ 	$(XMLSEC_DEFINES) \
++	$(XMLSEC_CRYPTO_CFLAGS) \
+ 	$(LIBXML_CFLAGS) \
+ 	$(NULL)
+
+@@ -205,7 +206,8 @@ xmlsec_dsig_verify_fuzzer_CFLAGS = \
+ 	-I../include \
+ 	-I$(top_srcdir)/include \
+ 	$(XMLSEC_DEFINES) \
+-	$(XMLSEC_OPENSSL_CFLAGS) \
++	$(XMLSEC_CRYPTO_CFLAGS) \
++	$(CRYPTO_INCLUDES) \
+ 	$(LIBXML_CFLAGS) \
+ 	$(NULL)
+
+@@ -240,7 +242,8 @@ xmlsec_keyinfo_fuzzer_CFLAGS = \
+ 	-I../include \
+ 	-I$(top_srcdir)/include \
+ 	$(XMLSEC_DEFINES) \
+-	$(XMLSEC_OPENSSL_CFLAGS) \
++	$(XMLSEC_CRYPTO_CFLAGS) \
++	$(CRYPTO_INCLUDES) \
+ 	$(LIBXML_CFLAGS) \
+ 	$(NULL)
+
+@@ -275,7 +278,8 @@ xmlsec_keyload_fuzzer_CFLAGS = \
+ 	-I../include \
+ 	-I$(top_srcdir)/include \
+ 	$(XMLSEC_DEFINES) \
+-	$(XMLSEC_OPENSSL_CFLAGS) \
++	$(XMLSEC_CRYPTO_CFLAGS) \
++	$(CRYPTO_INCLUDES) \
+ 	$(LIBXML_CFLAGS) \
+ 	$(NULL)
+
+@@ -310,7 +314,8 @@ xmlsec_enc_fuzzer_CFLAGS = \
+ 	-I../include \
+ 	-I$(top_srcdir)/include \
+ 	$(XMLSEC_DEFINES) \
+-	$(XMLSEC_OPENSSL_CFLAGS) \
++	$(XMLSEC_CRYPTO_CFLAGS) \
++	$(CRYPTO_INCLUDES) \
+ 	$(LIBXML_CFLAGS) \
+ 	$(NULL)
+
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.13.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.13.bb
index a06ec311b9..ed0cea811d 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.13.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.13.bb
@@ -19,6 +19,7 @@  SRC_URI = "https://github.com/lsh123/xmlsec/releases/download/${PV}/${BP}.tar.gz
            file://0005-nss-nspr-fix-for-multilib.patch \
            file://0006-xmlsec1-Fix-configure-QA-error-caused-by-host-lookup.patch \
            file://0009-oss-fuzz-enc-Skip-the-DES-key-when-DES-is-disabled.patch \
+           file://0010-xmlsec-build-correctly-pass-crypto-cflags-to-fuzzer-programs.patch \
            file://run-ptest \
            "