From: Hongxu Jia Date: Wed, 17 Dec 2025 08:07:00 +0000 (+0800) Subject: socat: 1.8.0.3 -> 1.8.1.0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b54f0ce999f64d3f9cb2166dfd90f3c6b1c74b64;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git socat: 1.8.0.3 -> 1.8.1.0 Fix compile failed with musl License-Update: No change, update README to add new lines Signed-off-by: Hongxu Jia Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- 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 new file mode 100644 index 00000000000..1bbc8096cee --- /dev/null +++ b/meta/recipes-connectivity/socat/files/0001-fix-compile-failed-with-musl.patch @@ -0,0 +1,43 @@ +From baf05d4c74d35a98d65328b89627d1806bfd84a5 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +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 +--- + 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.0.3.bb b/meta/recipes-connectivity/socat/socat_1.8.1.0.bb similarity index 88% rename from meta/recipes-connectivity/socat/socat_1.8.0.3.bb rename to meta/recipes-connectivity/socat/socat_1.8.1.0.bb index b5f5d72f9c9..331133d6f92 100644 --- a/meta/recipes-connectivity/socat/socat_1.8.0.3.bb +++ b/meta/recipes-connectivity/socat/socat_1.8.1.0.bb @@ -7,13 +7,14 @@ SECTION = "console/network" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://README;beginline=248;endline=278;md5=338c05eadd013872abb1d6e198e10a3f" + file://README;beginline=252;endline=282;md5=338c05eadd013872abb1d6e198e10a3f" 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] = "01eb017361d95bb3a6941e840b59e4463a3fabf92df4154ed02b16a2ed6a0095" +SRC_URI[sha256sum] = "91f222ee65559036600c2505b999acebed48b899f0e2e53ae1c9c31d6986b6a4" inherit autotools