From patchwork Wed Dec 17 08:07:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxu Jia X-Patchwork-Id: 76805 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCCC2D6408D for ; Wed, 17 Dec 2025 08:07:14 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.9928.1765958825388262518 for ; Wed, 17 Dec 2025 00:07:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=gM3rly1c; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=4446d33a3f=hongxu.jia@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BH535Vm1076109; Wed, 17 Dec 2025 00:07:03 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=PPS06212021; bh=Xbzjr4NF/V6xBaL3ubtF X1xFKXB4SvcKbJWnyE8axEo=; b=gM3rly1c7czSe7u5rVe5sZGz2wL8dUrczy9S VlBr93f/ujGIEVhB8y9KrbZuP5KKpSg5JMLXmmLWtjRELFgbDpxrr0H8Ol//jo0S KetIZ9/LiSTDkBwBPhdiW2TBik7maLJguZuiHbnomqvoMA9AKUjVBBtwSXdOCrCm bBUJ1VDTHWOmIx8Mm9HYheJhY/bBJ3sGQfdx6Yrosnt0ydM+Efcs31wGuFXY8Qn3 PFtD49Q9V25Qp80sGt1w4NbktNu2m4Euq6jsCcYA8HkKt8xYuQads43BkMSuyusW pUiZs+SBWEfbgTFoUzZYRXsIcnW1BwMOJUCw241Na+MQDK4tiQ== Received: from ala-exchng01.corp.ad.wrs.com ([128.224.246.36]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4b3k6j0985-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 17 Dec 2025 00:07:03 -0800 (PST) Received: from ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) by ala-exchng01.corp.ad.wrs.com (10.11.224.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.61; Wed, 17 Dec 2025 00:07:02 -0800 Received: from pek-lpg-core5.wrs.com (10.11.232.110) by ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) with Microsoft SMTP Server id 15.1.2507.61 via Frontend Transport; Wed, 17 Dec 2025 00:07:01 -0800 From: Hongxu Jia To: , Subject: [PATCH v3] socat: 1.8.0.3 -> 1.8.1.0 Date: Wed, 17 Dec 2025 16:07:00 +0800 Message-ID: <20251217080700.4062473-1-hongxu.jia@windriver.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=ErvfbCcA c=1 sm=1 tr=0 ts=694264a7 cx=c_pps a=AbJuCvi4Y3V6hpbCNWx0WA==:117 a=AbJuCvi4Y3V6hpbCNWx0WA==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=uPZiAMpXAAAA:8 a=rFFRleaeAAAA:8 a=t7CeM3EgAAAA:8 a=kMNUVrGqrNMktKWwMbMA:9 a=YLtI_f64H5IAZ6mI3Lwl:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: Js025luXPpehE0BebdYRQGpCA1Mgk-1q X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjE3MDA2MyBTYWx0ZWRfX/FxeDpsKbVzw hvcgiob6pKexWfa0IHtGpV/fjq5BtMNJacW+x51rEnbCfhayaTKwKymPfQ6AAaCFhN47tb6tDDl /wn5llQ7EM5JJ6NaPyb9v+de2zMjQ1O8G3QGkRdtnoC719dDfVeFW6aImKkgbXdSGHu3OKsHqKM Pix123EN+q8m9G01cUY0yT2h9CqnpMp3mih1kSE6Isn66v1IVV/aOsmwoa829MRIVYAaggwVxT2 nSud+9gtlj9TwX8LSvn7GhT48C9QEHpChoh5SeuNY6lUlbt6IVxIBGnXKTGgk8sNLB+VR6uJjkq cPYYPrI+mSyJ9xVcTxXBCd4zHMDnJgPT9d3PS1bmGdzc//kceRKDLd6fF542C00Z24XFULzXltd sp7Ur9yFWtn9WI0UP0O6sVvBv7fIXg== X-Proofpoint-ORIG-GUID: Js025luXPpehE0BebdYRQGpCA1Mgk-1q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-17_01,2025-12-16_05,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 clxscore=1015 bulkscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 malwarescore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512170063 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 17 Dec 2025 08:07:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228004 Fix compile failed with musl License-Update: No change, update README to add new lines Signed-off-by: Hongxu Jia --- .../0001-fix-compile-failed-with-musl.patch | 43 +++++++++++++++++++ .../{socat_1.8.0.3.bb => socat_1.8.1.0.bb} | 5 ++- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/socat/files/0001-fix-compile-failed-with-musl.patch rename meta/recipes-connectivity/socat/{socat_1.8.0.3.bb => socat_1.8.1.0.bb} (88%) 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 0000000000..1bbc8096ce --- /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 b5f5d72f9c..331133d6f9 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