diff mbox series

[meta-oe] xmlrpc-c: 1.59.01 -> 1.60.03

Message ID 20241008075235.349939-1-kai.kang@windriver.com
State Accepted
Headers show
Series [meta-oe] xmlrpc-c: 1.59.01 -> 1.60.03 | expand

Commit Message

Kai Oct. 8, 2024, 7:52 a.m. UTC
From: Kai Kang <kai.kang@windriver.com>

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 <kai.kang@windriver.com>
---
 .../xmlrpc-c/0002-fix-formatting-issues.patch | 34 -------------------
 ...mlrpc-c_1.59.01.bb => xmlrpc-c_1.60.03.bb} |  5 ++-
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
 rename meta-oe/recipes-devtools/xmlrpc-c/{xmlrpc-c_1.59.01.bb => xmlrpc-c_1.60.03.bb} (92%)

Comments

Martin Jansa Oct. 16, 2024, 3:19 p.m. UTC | #1
This seems to cause random build failure in some builds:

rm -f libxmlrpc_util.so.4
rm -f libxmlrpc_util.so.4
ln -s libxmlrpc_util.so.4.60 libxmlrpc_util.so.4
ln -s libxmlrpc_util.so.4.60 libxmlrpc_util.so.4
rm -f libxmlrpc_util.so
ln: failed to create symbolic link 'libxmlrpc_util.so.4': File exists

On Tue, Oct 8, 2024 at 9:52 AM Kai Kang via lists.openembedded.org
<kai.kang=windriver.com@lists.openembedded.org> wrote:
>
> From: Kai Kang <kai.kang@windriver.com>
>
> 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 <kai.kang@windriver.com>
> ---
>  .../xmlrpc-c/0002-fix-formatting-issues.patch | 34 -------------------
>  ...mlrpc-c_1.59.01.bb => xmlrpc-c_1.60.03.bb} |  5 ++-
>  2 files changed, 2 insertions(+), 37 deletions(-)
>  delete mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
>  rename meta-oe/recipes-devtools/xmlrpc-c/{xmlrpc-c_1.59.01.bb => xmlrpc-c_1.60.03.bb} (92%)
>
> 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 9d92e4712..000000000
> --- 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 <hongxu.jia@windriver.com>
> -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 <hongxu.jia@windriver.com>
> ----
> - 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.60.03.bb
> similarity index 92%
> rename from meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
> rename to meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
> index 5d5152b83..a34256c27 100644
> --- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
> +++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
> @@ -7,10 +7,9 @@ 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"
> +# one more commit after Release 1.60.03 in the Stable series
> +SRCREV = "a823b0bb5cf0a4dbd34f929cbfdfb0439c5d9b0e"
>
>  S = "${WORKDIR}/git/stable"
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#112706): https://lists.openembedded.org/g/openembedded-devel/message/112706
> Mute This Topic: https://lists.openembedded.org/mt/108885171/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj Oct. 16, 2024, 5:03 p.m. UTC | #2
On Wed, Oct 16, 2024 at 8:19 AM Martin Jansa via
lists.openembedded.org <martin.jansa=gmail.com@lists.openembedded.org>
wrote:
>
> This seems to cause random build failure in some builds:
>
> rm -f libxmlrpc_util.so.4
> rm -f libxmlrpc_util.so.4
> ln -s libxmlrpc_util.so.4.60 libxmlrpc_util.so.4
> ln -s libxmlrpc_util.so.4.60 libxmlrpc_util.so.4
> rm -f libxmlrpc_util.so
> ln: failed to create symbolic link 'libxmlrpc_util.so.4': File exists
>

seems like a race condition, I have not yet hit it in the CI builds
that I have tried, but perhaps something to debug into

> On Tue, Oct 8, 2024 at 9:52 AM Kai Kang via lists.openembedded.org
> <kai.kang=windriver.com@lists.openembedded.org> wrote:
> >
> > From: Kai Kang <kai.kang@windriver.com>
> >
> > 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 <kai.kang@windriver.com>
> > ---
> >  .../xmlrpc-c/0002-fix-formatting-issues.patch | 34 -------------------
> >  ...mlrpc-c_1.59.01.bb => xmlrpc-c_1.60.03.bb} |  5 ++-
> >  2 files changed, 2 insertions(+), 37 deletions(-)
> >  delete mode 100644 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
> >  rename meta-oe/recipes-devtools/xmlrpc-c/{xmlrpc-c_1.59.01.bb => xmlrpc-c_1.60.03.bb} (92%)
> >
> > 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 9d92e4712..000000000
> > --- 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 <hongxu.jia@windriver.com>
> > -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 <hongxu.jia@windriver.com>
> > ----
> > - 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.60.03.bb
> > similarity index 92%
> > rename from meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
> > rename to meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
> > index 5d5152b83..a34256c27 100644
> > --- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
> > +++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
> > @@ -7,10 +7,9 @@ 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"
> > +# one more commit after Release 1.60.03 in the Stable series
> > +SRCREV = "a823b0bb5cf0a4dbd34f929cbfdfb0439c5d9b0e"
> >
> >  S = "${WORKDIR}/git/stable"
> >
> > --
> > 2.34.1
> >
> >
> >
> >
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#112939): https://lists.openembedded.org/g/openembedded-devel/message/112939
> Mute This Topic: https://lists.openembedded.org/mt/108885171/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-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 9d92e4712..000000000
--- 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 <hongxu.jia@windriver.com>
-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 <hongxu.jia@windriver.com>
----
- 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.60.03.bb
similarity index 92%
rename from meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
rename to meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
index 5d5152b83..a34256c27 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.60.03.bb
@@ -7,10 +7,9 @@  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"
+# one more commit after Release 1.60.03 in the Stable series
+SRCREV = "a823b0bb5cf0a4dbd34f929cbfdfb0439c5d9b0e"
 
 S = "${WORKDIR}/git/stable"