summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-11-03 17:19:20 -0700
committerKhem Raj <raj.khem@gmail.com>2023-11-05 22:27:14 -0800
commit8ffadc658b14bf27e79ce422dbea2ac18b59fed5 (patch)
tree537e5202a7618e696d2a301ad844fda984e10376
parent891c773c5f940f9250d9e39403d3a20a4ad696c7 (diff)
downloadmeta-openembedded-8ffadc658b14bf27e79ce422dbea2ac18b59fed5.tar.gz
xmlsec1: upgrade 1.2.37 -> 1.3.2
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch43
-rw-r--r--meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb (renamed from meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb)19
2 files changed, 9 insertions, 53 deletions
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch
deleted file mode 100644
index 4347e925a3..0000000000
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 30e1afe60820c18c89cd10e9dcb7208ad5676d1d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 19 Jan 2023 15:06:35 -0800
4Subject: [PATCH] xmldsigverify: Include xmlsec/parser.h
5
6this ensures that xmlSecParserSetDefaultOptions definition is made
7available
8
9Fixes
10| xmldsigverify.c:275:5: error: call to undeclared function 'xmlSecParserSetDefaultOptions'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
11| xmlSecParserSetDefaultOptions(XML_PARSE_NOENT | XML_PARSE_NOCDATA |
12| ^
13
14Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/pull/463]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 examples/xmldsigverify.c | 3 ++-
18 1 file changed, 2 insertions(+), 1 deletion(-)
19
20diff --git a/examples/xmldsigverify.c b/examples/xmldsigverify.c
21index ed538c70..ff68120e 100644
22--- a/examples/xmldsigverify.c
23+++ b/examples/xmldsigverify.c
24@@ -25,6 +25,7 @@
25 #include <xmlsec/xmldsig.h>
26 #include <xmlsec/crypto.h>
27
28+#include <xmlsec/parser.h>
29 /* #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/etc/httpd/conf/ssl.crt" */
30 #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER "/var/www/cgi-bin/keys-certs.def"
31 #define XMLDSIGVERIFY_KEY_AND_CERTS_FOLDER "/var/www/cgi-bin/keys-certs"
32@@ -36,7 +37,7 @@ int verify_request(xmlSecKeysMngrPtr mngr);
33 int url_decode(char *buf, size_t size);
34
35 int
36-main(int , char **) {
37+main() {
38 xmlSecKeysMngrPtr mngr;
39 #ifndef XMLSEC_NO_XSLT
40 xsltSecurityPrefsPtr xsltSecPrefs = NULL;
41--
422.39.1
43
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb
index a3da770943..ff5b6faeb4 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb
@@ -13,17 +13,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0"
13SECTION = "libs" 13SECTION = "libs"
14 14
15SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ 15SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \
16 file://fix-ltmain.sh.patch \ 16 file://fix-ltmain.sh.patch \
17 file://change-finding-path-of-nss.patch \ 17 file://change-finding-path-of-nss.patch \
18 file://makefile-ptest.patch \ 18 file://makefile-ptest.patch \
19 file://xmlsec1-examples-allow-build-in-separate-dir.patch \ 19 file://xmlsec1-examples-allow-build-in-separate-dir.patch \
20 file://0001-nss-nspr-fix-for-multilib.patch \ 20 file://0001-nss-nspr-fix-for-multilib.patch \
21 file://run-ptest \ 21 file://run-ptest \
22 file://ensure-search-path-non-host.patch \ 22 file://ensure-search-path-non-host.patch \
23 file://0001-xmldsigverify-Include-xmlsec-parser.h.patch \ 23 "
24 "
25 24
26SRC_URI[sha256sum] = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c" 25SRC_URI[sha256sum] = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf"
27 26
28inherit autotools-brokensep ptest pkgconfig 27inherit autotools-brokensep ptest pkgconfig
29 28