From a733b0c75c8111a79cd35a1e78651c78b9bbd2ef Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 2 May 2024 10:48:00 -0400 Subject: fping: upgrade 5.1 -> 5.2 0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch removed since it's included in 5.2 Changelog: ============ -New option -X / --fast-reachable to exit immediately once N hosts have been found -New option -k / -fwmark to set Linux fwmark mask -Always output fatal error messages -Fallback to SO_TIMESTAMP if SO_TIMESTAMPNS is not available -Fix "not enough sequence numbers available" error on BSD-like systems -Fix running in unprivileged mode -Fix build issue for NetBSD/alpha -Fix build issue for OpenBSD/alpha -Fix build warning for long int usage -Fix build error with musl libc -Fix to guard against division by zero -Decouple -a/-u effects from -c -Added contrib/Dockerfile -Remove host from Netdata chart titles -Add additional tests -Update github action os images -Fix Azure pipeline tests -Various autoconf fixes -Extended configure script with --enable-debug and output cpu usage -Documentation: Update Netdata website link -Documentation: fix description of --file option -Documentation: improve exit status description -Documentation: move description of -i MSEC -Documentation: improve help output for options -c and -C Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...nitialize-msghdr-struct-in-a-portable-way.patch | 42 ---------------------- meta-networking/recipes-support/fping/fping_5.1.bb | 29 --------------- meta-networking/recipes-support/fping/fping_5.2.bb | 27 ++++++++++++++ 3 files changed, 27 insertions(+), 71 deletions(-) delete mode 100644 meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch delete mode 100644 meta-networking/recipes-support/fping/fping_5.1.bb create mode 100644 meta-networking/recipes-support/fping/fping_5.2.bb 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 9965d2ec5..000000000 --- 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 -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 ---- - 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.1.bb deleted file mode 100644 index 0682eafa0..000000000 --- a/meta-networking/recipes-support/fping/fping_5.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "sends ICMP ECHO_REQUEST packets to network hosts" -DESCRIPTION = "fping is a ping like program which uses the Internet Control \ -Message Protocol (ICMP) echo request to determine if a target host is \ -responding. fping differs from ping in that you can specify any number of \ -targets on the command line, or specify a file containing the lists of \ -targets to ping. Instead of sending to one target until it times out or \ -replies, fping will send out a ping packet and move on to the next target \ -in a round-robin fashion." -HOMEPAGE = "http://www.fping.org/" -BUGTRACKER = "https://github.com/schweikert/fping/issues" -SECTION = "net" - -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" - -S = "${WORKDIR}/fping-${PV}" - -inherit autotools - -EXTRA_OECONF = "--enable-ipv4" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-networking/recipes-support/fping/fping_5.2.bb b/meta-networking/recipes-support/fping/fping_5.2.bb new file mode 100644 index 000000000..f75b6441b --- /dev/null +++ b/meta-networking/recipes-support/fping/fping_5.2.bb @@ -0,0 +1,27 @@ +SUMMARY = "sends ICMP ECHO_REQUEST packets to network hosts" +DESCRIPTION = "fping is a ping like program which uses the Internet Control \ +Message Protocol (ICMP) echo request to determine if a target host is \ +responding. fping differs from ping in that you can specify any number of \ +targets on the command line, or specify a file containing the lists of \ +targets to ping. Instead of sending to one target until it times out or \ +replies, fping will send out a ping packet and move on to the next target \ +in a round-robin fashion." +HOMEPAGE = "http://www.fping.org/" +BUGTRACKER = "https://github.com/schweikert/fping/issues" +SECTION = "net" + +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" +SRC_URI[sha256sum] = "a7692d10d73fb0bb76e1f7459aa7f19bbcdbfc5adbedef02f468974b18b0e42f" + +S = "${WORKDIR}/fping-${PV}" + +inherit autotools + +EXTRA_OECONF = "--enable-ipv4" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -- cgit v1.2.3-54-g00ecf