From 8ffadc658b14bf27e79ce422dbea2ac18b59fed5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 3 Nov 2023 17:19:20 -0700 Subject: xmlsec1: upgrade 1.2.37 -> 1.3.2 Signed-off-by: Khem Raj --- ...001-xmldsigverify-Include-xmlsec-parser.h.patch | 43 -------------- meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb | 68 ---------------------- meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb | 67 +++++++++++++++++++++ 3 files changed, 67 insertions(+), 111 deletions(-) delete mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1/0001-xmldsigverify-Include-xmlsec-parser.h.patch delete mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb create mode 100644 meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb 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 -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 ---- - 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 - #include - -+#include - /* #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.2.37.bb deleted file mode 100644 index a3da770943..0000000000 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.37.bb +++ /dev/null @@ -1,68 +0,0 @@ -SUMMARY = "XML Security Library is a C library based on LibXML2" -DESCRIPTION = "\ - XML Security Library is a C library based on \ - LibXML2 and OpenSSL. The library was created with a goal to support major \ - XML security standards "XML Digital Signature" and "XML Encryption". \ - " -HOMEPAGE = "http://www.aleksey.com/xmlsec/" -DEPENDS = "libtool libxml2 libxslt zlib" - -LICENSE = "MIT" -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 \ - " - -SRC_URI[sha256sum] = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c" - -inherit autotools-brokensep ptest pkgconfig - -#CFLAGS += "-I${STAGING_INCDIR}/nss3" -#CPPFLAGS += "-I${STAGING_INCDIR}/nss3" - -PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des" -PACKAGECONFIG[gnutls] = ",,gnutls" -PACKAGECONFIG[libgcrypt] = ",,libgcrypt" -PACKAGECONFIG[nss] = "--with-nss=${STAGING_DIR_HOST} --with-nspr=${STAGING_DIR_HOST},--with-nss=no --with-nspr=no,nss nspr" -PACKAGECONFIG[openssl] = ",,openssl" -PACKAGECONFIG[des] = ",--disable-des,," - -# these can be dynamically loaded with xmlSecCryptoDLLoadLibrary() -FILES_SOLIBSDEV = "${libdir}/libxmlsec1.so" -FILES:${PN} += "${libdir}/libxmlsec1-*.so" -INSANE_SKIP:${PN} = "dev-so" - -FILES:${PN}-dev += "${libdir}/xmlsec1Conf.sh" -FILES:${PN}-dbg += "${PTEST_PATH}/.debug/*" - -RDEPENDS:${PN}-ptest += "${PN}-dev" -INSANE_SKIP:${PN}-ptest += "dev-deps" - -PTEST_EXTRA_ARGS = "top_srcdir=${S} top_builddir=${B}" - -do_compile_ptest () { - oe_runmake -C ${S}/examples ${PTEST_EXTRA_ARGS} all -} - -do_install:append() { - for i in ${bindir}/xmlsec1-config ${libdir}/xmlsec1Conf.sh \ - ${libdir}/pkgconfig/xmlsec1-openssl.pc; do - sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i - done -} - -do_install_ptest () { - oe_runmake -C ${S}/examples DESTDIR=${D}${PTEST_PATH} ${PTEST_EXTRA_ARGS} install-ptest -} - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb new file mode 100644 index 0000000000..ff5b6faeb4 --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb @@ -0,0 +1,67 @@ +SUMMARY = "XML Security Library is a C library based on LibXML2" +DESCRIPTION = "\ + XML Security Library is a C library based on \ + LibXML2 and OpenSSL. The library was created with a goal to support major \ + XML security standards "XML Digital Signature" and "XML Encryption". \ + " +HOMEPAGE = "http://www.aleksey.com/xmlsec/" +DEPENDS = "libtool libxml2 libxslt zlib" + +LICENSE = "MIT" +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 \ + " + +SRC_URI[sha256sum] = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf" + +inherit autotools-brokensep ptest pkgconfig + +#CFLAGS += "-I${STAGING_INCDIR}/nss3" +#CPPFLAGS += "-I${STAGING_INCDIR}/nss3" + +PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des" +PACKAGECONFIG[gnutls] = ",,gnutls" +PACKAGECONFIG[libgcrypt] = ",,libgcrypt" +PACKAGECONFIG[nss] = "--with-nss=${STAGING_DIR_HOST} --with-nspr=${STAGING_DIR_HOST},--with-nss=no --with-nspr=no,nss nspr" +PACKAGECONFIG[openssl] = ",,openssl" +PACKAGECONFIG[des] = ",--disable-des,," + +# these can be dynamically loaded with xmlSecCryptoDLLoadLibrary() +FILES_SOLIBSDEV = "${libdir}/libxmlsec1.so" +FILES:${PN} += "${libdir}/libxmlsec1-*.so" +INSANE_SKIP:${PN} = "dev-so" + +FILES:${PN}-dev += "${libdir}/xmlsec1Conf.sh" +FILES:${PN}-dbg += "${PTEST_PATH}/.debug/*" + +RDEPENDS:${PN}-ptest += "${PN}-dev" +INSANE_SKIP:${PN}-ptest += "dev-deps" + +PTEST_EXTRA_ARGS = "top_srcdir=${S} top_builddir=${B}" + +do_compile_ptest () { + oe_runmake -C ${S}/examples ${PTEST_EXTRA_ARGS} all +} + +do_install:append() { + for i in ${bindir}/xmlsec1-config ${libdir}/xmlsec1Conf.sh \ + ${libdir}/pkgconfig/xmlsec1-openssl.pc; do + sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i + done +} + +do_install_ptest () { + oe_runmake -C ${S}/examples DESTDIR=${D}${PTEST_PATH} ${PTEST_EXTRA_ARGS} install-ptest +} + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf