2 files changed, 3 insertions, 47 deletions

diff --git a/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch b/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch
deleted file mode 100644
index 9965d2ec57..0000000000
--- a/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c3f476a763412be51b4df0e748af04d4150a2c71 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 29 Aug 2022 15:41:51 -0700
-Subject: [PATCH] fping: Initialize msghdr struct in a portable way
-
-Initializing the structure assuming glibc layout results in
-compile errors on musl, therefore do partial intialization and then
-assigning the members individually.
-
-Upstream-Status: Submitted [https://github.com/schweikert/fping/pull/263]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/fping.c | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/src/fping.c b/src/fping.c
-index e26b216..81a61d9 100644
---- a/src/fping.c
-+++ b/src/fping.c
-@@ -1951,15 +1951,13 @@ int receive_packet(int64_t wait_time,
-         reply_buf,
-         reply_buf_len
-     };
--    struct msghdr recv_msghdr = {
--        reply_src_addr,
--        reply_src_addr_len,
--        &msg_iov,
--        1,
--        &msg_control,
--        sizeof(msg_control),
--        0
--    };
-+    struct msghdr recv_msghdr = {0};
-+    recv_msghdr.msg_name = reply_src_addr;
-+    recv_msghdr.msg_namelen = reply_src_addr_len;
-+    recv_msghdr.msg_iov = &msg_iov;
-+    recv_msghdr.msg_iovlen = 1;
-+    recv_msghdr.msg_control = &msg_control;
-+    recv_msghdr.msg_controllen = sizeof(msg_control);
- #if HAVE_SO_TIMESTAMPNS
-     struct cmsghdr* cmsg;
- #endif
diff --git a/meta-networking/recipes-support/fping/fping_5.1.bb b/meta-networking/recipes-support/fping/fping_5.3.bb
index 0682eafa09..5f3ec67cfc 100644
--- a/meta-networking/recipes-support/fping/fping_5.1.bb
+++ b/meta-networking/recipes-support/fping/fping_5.3.bb
@@ -14,12 +14,10 @@ LICENSE = "fping"
 NO_GENERIC_LICENSE[fping] = "COPYING"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901"
 
-SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz \
-           file://0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch \
-           "
-SRC_URI[sha256sum] = "1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe"
+SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz"
+SRC_URI[sha256sum] = "d57bd0141aea082e3adfc198bfc3db5dfd12a7014c7c2655e97f61cd54901d0e"
 
-S = "${WORKDIR}/fping-${PV}"
+S = "${UNPACKDIR}/fping-${PV}"
 
 inherit autotools