diff mbox series

[meta-oe] xmlsec1: upgrade 1.2.37 -> 1.3.1

Message ID 1695110541-8515-1-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-oe] xmlsec1: upgrade 1.2.37 -> 1.3.1 | expand

Commit Message

Mingyu Wang (Fujitsu) Sept. 19, 2023, 8:02 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-xmldsigverify-Include-xmlsec-parser.h.patch
removed since it's included in 1.3.1

Changelog:
==========
-Added "--with-libltdl" option for ./configure to allow custom libltdl installations and deprecated "--enable-crypto-dl" option.
-Added support for cclang compiler on non-MacOSX platforms.
-(xmlsec-openssl) Restored support for LibreSSL and bumped minimum required version to 3.5.0.
-(xmlsec-nss) Restored minimum supported NSS version to 3.35.
-Several other small fixes (more details).

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...mldsigverify-Include-xmlsec-parser.h.patch | 43 -------------------
 .../{xmlsec1_1.2.37.bb => xmlsec1_1.3.1.bb}   | 19 ++++----
 2 files changed, 9 insertions(+), 53 deletions(-)
 delete mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch
 rename meta-oe/recipes-support/xmlsec1/{xmlsec1_1.2.37.bb => xmlsec1_1.3.1.bb} (80%)

Comments

Khem Raj Sept. 21, 2023, 4:58 a.m. UTC | #1 
There is a ptest failure

---------------------------------------------------
  Verifying a signature with keys manager...
  func=xmlSecKeysMngrGetKey:file=keys.c:line=1347:obj=unknown:subj=unknown:error=45:key
is not found:details=NULL
  func=xmlSecDSigCtxProcessKeyInfoNode:file=xmldsig.c:line=822:obj=unknown:subj=unknown:error=45:key
is not found:details=NULL
  func=xmlSecDSigCtxProcessSignatureNode:file=xmldsig.c:line=537:obj=unknown:subj=xmlSecDSigCtxProcessKeyInfoNode:error=1:xmlsec
library function failed:-
  func=xmlSecDSigCtxVerify:file=xmldsig.c:line=357:obj=unknown:subj=xmlSecDSigCtxProcessSignatureNode:error=1:xmlsec
library function failed:-
  Error: signature verify
  func=xmlSecKeysMngrGetKey:file=keys.c:line=1347:obj=unknown:subj=unknown:error=45:key
is not found:details=NULL
  func=xmlSecDSigCtxProcessKeyInfoNode:file=xmldsig.c:line=822:obj=unknown:subj=unknown:error=45:key
is not found:details=NULL
  func=xmlSecDSigCtxProcessSignatureNode:file=xmldsig.c:line=537:obj=unknown:subj=xmlSecDSigCtxProcessKeyInfoNode:error=1:xmlsec
library function failed:-
  func=xmlSecDSigCtxVerify:file=xmldsig.c:line=357:obj=unknown:subj=xmlSecDSigCtxProcessSignatureNode:error=1:xmlsec
library function failed:-
  Error: signature verify
  FAIL: verify-keys-manager


On order to reproduce it.

MACHINE=qemux86-64

bitbake meta-oe-ptest-image-xmlsec1 && bitbake
meta-oe-ptest-image-xmlsec1 -ctestimage

On Tue, Sep 19, 2023 at 1:03 AM wangmy <wangmy@fujitsu.com> wrote:
>
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 0001-xmldsigverify-Include-xmlsec-parser.h.patch
> removed since it's included in 1.3.1
>
> Changelog:
> ==========
> -Added "--with-libltdl" option for ./configure to allow custom libltdl installations and deprecated "--enable-crypto-dl" option.
> -Added support for cclang compiler on non-MacOSX platforms.
> -(xmlsec-openssl) Restored support for LibreSSL and bumped minimum required version to 3.5.0.
> -(xmlsec-nss) Restored minimum supported NSS version to 3.35.
> -Several other small fixes (more details).
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  ...mldsigverify-Include-xmlsec-parser.h.patch | 43 -------------------
>  .../{xmlsec1_1.2.37.bb => xmlsec1_1.3.1.bb}   | 19 ++++----
>  2 files changed, 9 insertions(+), 53 deletions(-)
>  delete mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch
>  rename meta-oe/recipes-support/xmlsec1/{xmlsec1_1.2.37.bb => xmlsec1_1.3.1.bb} (80%)
>
> 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 @@
> -From 30e1afe60820c18c89cd10e9dcb7208ad5676d1d Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Thu, 19 Jan 2023 15:06:35 -0800
> -Subject: [PATCH] xmldsigverify: Include xmlsec/parser.h
> -
> -this ensures that xmlSecParserSetDefaultOptions definition is made
> -available
> -
> -Fixes
> -| xmldsigverify.c:275:5: error: call to undeclared function 'xmlSecParserSetDefaultOptions'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
> -|     xmlSecParserSetDefaultOptions(XML_PARSE_NOENT | XML_PARSE_NOCDATA |
> -|     ^
> -
> -Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/pull/463]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - examples/xmldsigverify.c | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> -
> -diff --git a/examples/xmldsigverify.c b/examples/xmldsigverify.c
> -index ed538c70..ff68120e 100644
> ---- a/examples/xmldsigverify.c
> -+++ b/examples/xmldsigverify.c
> -@@ -25,6 +25,7 @@
> - #include <xmlsec/xmldsig.h>
> - #include <xmlsec/crypto.h>
> -
> -+#include <xmlsec/parser.h>
> - /* #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER   "/etc/httpd/conf/ssl.crt" */
> - #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER      "/var/www/cgi-bin/keys-certs.def"
> - #define XMLDSIGVERIFY_KEY_AND_CERTS_FOLDER              "/var/www/cgi-bin/keys-certs"
> -@@ -36,7 +37,7 @@ int verify_request(xmlSecKeysMngrPtr mngr);
> - int url_decode(char *buf, size_t size);
> -
> - int
> --main(int , char **) {
> -+main() {
> -     xmlSecKeysMngrPtr mngr;
> - #ifndef XMLSEC_NO_XSLT
> -     xsltSecurityPrefsPtr xsltSecPrefs = NULL;
> ---
> -2.39.1
> -
> diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.1.bb
> similarity index 80%
> rename from meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb
> rename to meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.1.bb
> index a3da770943..934e81a3c3 100644
> --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb
> +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.1.bb
> @@ -13,17 +13,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0"
>  SECTION = "libs"
>
>  SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \
> -    file://fix-ltmain.sh.patch \
> -    file://change-finding-path-of-nss.patch \
> -    file://makefile-ptest.patch \
> -    file://xmlsec1-examples-allow-build-in-separate-dir.patch \
> -    file://0001-nss-nspr-fix-for-multilib.patch \
> -    file://run-ptest \
> -    file://ensure-search-path-non-host.patch \
> -    file://0001-xmldsigverify-Include-xmlsec-parser.h.patch \
> -    "
> +           file://fix-ltmain.sh.patch \
> +           file://change-finding-path-of-nss.patch \
> +           file://makefile-ptest.patch \
> +           file://xmlsec1-examples-allow-build-in-separate-dir.patch \
> +           file://0001-nss-nspr-fix-for-multilib.patch \
> +           file://run-ptest \
> +           file://ensure-search-path-non-host.patch \
> +           "
>
> -SRC_URI[sha256sum] = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c"
> +SRC_URI[sha256sum] = "10f48384d4fd1afc05fea545b74fbf7c152582f0a895c189f164d55270400c63"
>
>  inherit autotools-brokensep ptest pkgconfig
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#105001): https://lists.openembedded.org/g/openembedded-devel/message/105001
> Mute This Topic: https://lists.openembedded.org/mt/101452077/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

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 @@ 
-From 30e1afe60820c18c89cd10e9dcb7208ad5676d1d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 19 Jan 2023 15:06:35 -0800
-Subject: [PATCH] xmldsigverify: Include xmlsec/parser.h
-
-this ensures that xmlSecParserSetDefaultOptions definition is made
-available
-
-Fixes
-| xmldsigverify.c:275:5: error: call to undeclared function 'xmlSecParserSetDefaultOptions'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-|     xmlSecParserSetDefaultOptions(XML_PARSE_NOENT | XML_PARSE_NOCDATA |
-|     ^
-
-Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/pull/463]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- examples/xmldsigverify.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/examples/xmldsigverify.c b/examples/xmldsigverify.c
-index ed538c70..ff68120e 100644
---- a/examples/xmldsigverify.c
-+++ b/examples/xmldsigverify.c
-@@ -25,6 +25,7 @@
- #include <xmlsec/xmldsig.h>
- #include <xmlsec/crypto.h>
- 
-+#include <xmlsec/parser.h>
- /* #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER   "/etc/httpd/conf/ssl.crt" */
- #define XMLDSIGVERIFY_DEFAULT_TRUSTED_CERTS_FOLDER      "/var/www/cgi-bin/keys-certs.def"
- #define XMLDSIGVERIFY_KEY_AND_CERTS_FOLDER              "/var/www/cgi-bin/keys-certs"
-@@ -36,7 +37,7 @@ int verify_request(xmlSecKeysMngrPtr mngr);
- int url_decode(char *buf, size_t size);
- 
- int
--main(int , char **) {
-+main() {
-     xmlSecKeysMngrPtr mngr;
- #ifndef XMLSEC_NO_XSLT
-     xsltSecurityPrefsPtr xsltSecPrefs = NULL;
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.1.bb
similarity index 80%
rename from meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb
rename to meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.1.bb
index a3da770943..934e81a3c3 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.1.bb
@@ -13,17 +13,16 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0"
 SECTION = "libs"
 
 SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \
-    file://fix-ltmain.sh.patch \
-    file://change-finding-path-of-nss.patch \
-    file://makefile-ptest.patch \
-    file://xmlsec1-examples-allow-build-in-separate-dir.patch \
-    file://0001-nss-nspr-fix-for-multilib.patch \
-    file://run-ptest \
-    file://ensure-search-path-non-host.patch \
-    file://0001-xmldsigverify-Include-xmlsec-parser.h.patch \
-    "
+           file://fix-ltmain.sh.patch \
+           file://change-finding-path-of-nss.patch \
+           file://makefile-ptest.patch \
+           file://xmlsec1-examples-allow-build-in-separate-dir.patch \
+           file://0001-nss-nspr-fix-for-multilib.patch \
+           file://run-ptest \
+           file://ensure-search-path-non-host.patch \
+           "
 
-SRC_URI[sha256sum] = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c"
+SRC_URI[sha256sum] = "10f48384d4fd1afc05fea545b74fbf7c152582f0a895c189f164d55270400c63"
 
 inherit autotools-brokensep ptest pkgconfig