From: Randy.MacLeod@windriver.com
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 3/3] socat: upgrade 1.8.1.0 -> 1.8.1.1
Date: Tue, 24 Feb 2026 16:42:59 -0500 [thread overview]
Message-ID: <20260224214259.2236671-3-Randy.MacLeod@windriver.com> (raw)
In-Reply-To: <20260224214259.2236671-1-Randy.MacLeod@windriver.com>
From: Randy MacLeod <Randy.MacLeod@windriver.com>
Drop patch:
0001-fix-compile-failed-with-musl.patch
which is merged upstream:
a235f59 Avoid compilation issue in xio-netlink.c with Musl libc
commit log:
4ce8786 Version 1.8.1.1
f13b27d A few minor corrections
d5a2c46 Fixed a few buffer read overruns
b314687 Fixed issue with POSIXMQ in unidirectional context
a235f59 Avoid compilation issue in xio-netlink.c with Musl libc
a7058c9 Fixed strchr with const for new glibc
35d5da1 Fixed timestamps of -v and -x (really)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
.../0001-fix-compile-failed-with-musl.patch | 43 -------------------
.../{socat_1.8.1.0.bb => socat_1.8.1.1.bb} | 3 +-
2 files changed, 1 insertion(+), 45 deletions(-)
delete mode 100644 meta/recipes-connectivity/socat/files/0001-fix-compile-failed-with-musl.patch
rename meta/recipes-connectivity/socat/{socat_1.8.1.0.bb => socat_1.8.1.1.bb} (91%)
diff --git a/meta/recipes-connectivity/socat/files/0001-fix-compile-failed-with-musl.patch b/meta/recipes-connectivity/socat/files/0001-fix-compile-failed-with-musl.patch
deleted file mode 100644
index 1bbc8096ce..0000000000
--- a/meta/recipes-connectivity/socat/files/0001-fix-compile-failed-with-musl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From baf05d4c74d35a98d65328b89627d1806bfd84a5 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 17 Dec 2025 11:31:29 +0800
-Subject: [PATCH] fix compile failed with musl
-
-...
-|../sources/socat-1.8.1.0/xio-netlink.c:33:59: error: initialization of 'int' from 'void *' makes integer from pointer without a cast [-Wint-conversion]
-| 33 | struct msghdr rtmsg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
-| | ^~~~
-...
-
-The warning is due to the fact the NULL macro is defined (by most modern
-compilers) as ((void *)0), as it is intended to be used only for pointers.
-Assigning this value to the void *msg_control member of structure msghdr
-causes the warning.
-
-Make the 0/NULL initialization implicit
-
-Refer https://stackoverflow.com/questions/64535635/assignment-to-int-from-void-makes-integer-from-pointer-without-a-cast
-
-Upstream-Status: Submitted [socat@dest-unreach.org]
-Suggested-by: socat@dest-unreach.org
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- xio-netlink.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xio-netlink.c b/xio-netlink.c
-index 533d78c..cb31c43 100644
---- a/xio-netlink.c
-+++ b/xio-netlink.c
-@@ -30,7 +30,7 @@ int xio_netlink_mtu(
- struct nlmsghdr buf[8192/sizeof(struct nlmsghdr)];
- struct iovec iov = { buf, sizeof(buf) };
- struct sockaddr_nl sa;
-- struct msghdr rtmsg = { &sa, sizeof(sa), &iov, 1, NULL, 0, 0 };
-+ struct msghdr rtmsg = { &sa, sizeof(sa), &iov, 1};
- struct nlmsghdr *nh;
-
- Info2("Setting interface %d MTU to %u using netlink", interface_index, mtu);
---
-2.49.0
-
diff --git a/meta/recipes-connectivity/socat/socat_1.8.1.0.bb b/meta/recipes-connectivity/socat/socat_1.8.1.1.bb
similarity index 91%
rename from meta/recipes-connectivity/socat/socat_1.8.1.0.bb
rename to meta/recipes-connectivity/socat/socat_1.8.1.1.bb
index b9a27c648e..f6f2a3304b 100644
--- a/meta/recipes-connectivity/socat/socat_1.8.1.0.bb
+++ b/meta/recipes-connectivity/socat/socat_1.8.1.1.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
file://0001-fix-compile-procan.c-failed.patch \
- file://0001-fix-compile-failed-with-musl.patch \
"
-SRC_URI[sha256sum] = "91f222ee65559036600c2505b999acebed48b899f0e2e53ae1c9c31d6986b6a4"
+SRC_URI[sha256sum] = "5ebc636b7f427053f98806696521653a614c7e06464910353cbf54e2327adc1b"
inherit autotools
--
2.34.1
prev parent reply other threads:[~2026-02-24 21:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-24 21:42 [PATCH 1/3] nfs-utils: upgrade 2.8.4 -> 2.8.5 Randy.MacLeod
2026-02-24 21:42 ` [PATCH 2/3] socat: Remove -fcommon from compiler flags Randy.MacLeod
2026-02-24 21:42 ` Randy.MacLeod [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260224214259.2236671-3-Randy.MacLeod@windriver.com \
--to=randy.macleod@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox