From ca7ea3ed024a2cf697aa336eeddbb69bda99a196 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 8 Oct 2024 15:52:35 +0800 Subject: xmlrpc-c: 1.59.01 -> 1.60.03 Update xmlrpc-c from 1.59.01 to latest stable version 1.60.03. The SRCREV is one more fix commit after release 1.60.03 in the stable series. And remove 0002-fix-formatting-issues.patch which has been fixed in upstream. Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- .../xmlrpc-c/0002-fix-formatting-issues.patch | 34 --------------- .../recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb | 49 ---------------------- .../recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb | 48 +++++++++++++++++++++ 3 files changed, 48 insertions(+), 83 deletions(-) delete mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch delete mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb create mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch deleted file mode 100644 index 9d92e4712b..0000000000 --- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 14f15cb0f03defa8efb4c8e2fece58e50655be6b Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Sun, 23 Jul 2017 22:20:29 -0400 -Subject: [PATCH] src/xmlrpc_server_abyss.c: fix formatting issues - -Fixed when compile with "-Wformat -Wformat-security -Werror=format-security": -|src/xmlrpc_server_abyss.c:771:13: error: format not a string literal -and no format arguments [-Werror=format-security] -| xmlrpc_faultf(envP, error); -| ^~~~~~~~~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - src/xmlrpc_server_abyss.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xmlrpc_server_abyss.c b/src/xmlrpc_server_abyss.c -index 2388652..3843f10 100644 ---- a/src/xmlrpc_server_abyss.c -+++ b/src/xmlrpc_server_abyss.c -@@ -768,7 +768,7 @@ createServer(xmlrpc_env * const envP, - ServerInit2(abyssServerP, &error); - - if (error) { -- xmlrpc_faultf(envP, error); -+ xmlrpc_faultf(envP, "%s", error); - xmlrpc_strfree(error); - } - } --- -2.8.1 - diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb deleted file mode 100644 index 5d5152b834..0000000000 --- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \ -write an XML-RPC server or client in C or C++." - -HOMEPAGE = "http://xmlrpc-c.sourceforge.net/" -LICENSE = "BSD-3-Clause & MIT" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" - -SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \ - file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ - file://0002-fix-formatting-issues.patch \ - " -#Release 1.59.01 -SRCREV = "352aeaa9ae49e90e55187cbda839f2113df06278" - -S = "${WORKDIR}/git/stable" - -inherit autotools-brokensep binconfig pkgconfig - -TARGET_CFLAGS += "-Wno-narrowing" - -EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \ - LD_FOR_BUILD='${BUILD_LD}' \ - CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \ - LDFLAGS_FOR_BUILD='${BUILD_LDFLAGS}' \ - " - -EXTRA_OECONF += "--disable-libwww-client --disable-wininet-client" - -PACKAGECONFIG ??= "curl cplusplus" - -PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-abyss-openssl,--disable-abyss-server --disable-abyss-threads --disable-abyss-openssl,openssl" -PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus" -PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl" - -do_configure() { - gnu-configize --verbose --force ${S} - autoconf - oe_runconf - # license is incompatible with lib/util/getoptx.* - rm -fv ${S}/tools/turbocharger/mod_gzip.c -} - -do_install:append:class-target() { - sed -i 's,${WORKDIR},${TARGET_DBGSRC_DIR},g' ${D}${bindir}/xmlrpc-c-config -} - -BBCLASSEXTEND = "native" - -CLEANBROKEN = "1" diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb new file mode 100644 index 0000000000..a34256c275 --- /dev/null +++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \ +write an XML-RPC server or client in C or C++." + +HOMEPAGE = "http://xmlrpc-c.sourceforge.net/" +LICENSE = "BSD-3-Clause & MIT" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" + +SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \ + file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ + " +# one more commit after Release 1.60.03 in the Stable series +SRCREV = "a823b0bb5cf0a4dbd34f929cbfdfb0439c5d9b0e" + +S = "${WORKDIR}/git/stable" + +inherit autotools-brokensep binconfig pkgconfig + +TARGET_CFLAGS += "-Wno-narrowing" + +EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \ + LD_FOR_BUILD='${BUILD_LD}' \ + CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \ + LDFLAGS_FOR_BUILD='${BUILD_LDFLAGS}' \ + " + +EXTRA_OECONF += "--disable-libwww-client --disable-wininet-client" + +PACKAGECONFIG ??= "curl cplusplus" + +PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-abyss-openssl,--disable-abyss-server --disable-abyss-threads --disable-abyss-openssl,openssl" +PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus" +PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl" + +do_configure() { + gnu-configize --verbose --force ${S} + autoconf + oe_runconf + # license is incompatible with lib/util/getoptx.* + rm -fv ${S}/tools/turbocharger/mod_gzip.c +} + +do_install:append:class-target() { + sed -i 's,${WORKDIR},${TARGET_DBGSRC_DIR},g' ${D}${bindir}/xmlrpc-c-config +} + +BBCLASSEXTEND = "native" + +CLEANBROKEN = "1" -- cgit v1.2.3-54-g00ecf