From db5feaf13b0265d33183af6202805b68c91c60f7321d3075d5efd4d551b1f3a9 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sat, 26 Nov 2022 00:36:03 +0000 Subject: [PATCH] Accepting request 1038284 from home:pevik:branches:network:utilities - Update to version 20221126 https://github.com/iputils/iputils/releases/tag/20221126 - Update configure variables (ninfod, rarpd and rdisc were removed from upstream in next release => remove -DBUILD_NINFOD=false -DBUILD_RARPD=false -DBUILD_RDISC=false) - Remove 2 backported fixes from this release 0001-ping-Add-SA_RESTART-to-sa_flags.patch 0002-ping-Make-ping_rts-struct-static.patch OBS-URL: https://build.opensuse.org/request/show/1038284 OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=104 --- 0001-ping-Add-SA_RESTART-to-sa_flags.patch | 40 --------------------- 0002-ping-Make-ping_rts-struct-static.patch | 38 -------------------- 20211215.tar.gz | 3 -- 20221126.tar.gz | 3 ++ iputils.changes | 12 +++++++ iputils.spec | 6 ++-- 6 files changed, 17 insertions(+), 85 deletions(-) delete mode 100644 0001-ping-Add-SA_RESTART-to-sa_flags.patch delete mode 100644 0002-ping-Make-ping_rts-struct-static.patch delete mode 100644 20211215.tar.gz create mode 100644 20221126.tar.gz diff --git a/0001-ping-Add-SA_RESTART-to-sa_flags.patch b/0001-ping-Add-SA_RESTART-to-sa_flags.patch deleted file mode 100644 index 15e3cd4..0000000 --- a/0001-ping-Add-SA_RESTART-to-sa_flags.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ea0eb08a17866f1bc586f0c3d5c2a44babd7a67f Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Tue, 20 Sep 2022 21:30:12 +0200 -Subject: [PATCH 1/2] ping: Add SA_RESTART to sa_flags - -To avoid missing output in write on aarch64. -This error was in ping since ever (since git era), -but got visible only after 4655ecc ("libcommon: check standard streams -status at exit"). - -Issue found with LTP net stress interface tests. - -Fixes: 3337034 ("Initial import of iputils") -Fixes: https://github.com/iputils/iputils/issues/424 - -Reported-by: Petr Vorel -Suggested-by: Benjamin Poirier -Suggested-by: Cyril Hrubis -Reviewed-by: Cyril Hrubis -Signed-off-by: Petr Vorel -[ upstream status: https://github.com/iputils/iputils/commit/09f1b3706e90e748910c82612bc9d28fbfe0e9fb ] ---- - ping/ping.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ping/ping.h b/ping/ping.h -index 007ae28..3fb5156 100644 ---- a/ping/ping.h -+++ b/ping/ping.h -@@ -316,6 +316,7 @@ static inline void set_signal(int signo, void (*handler)(int)) - memset(&sa, 0, sizeof(sa)); - - sa.sa_handler = (void (*)(int))handler; -+ sa.sa_flags = SA_RESTART; - sigaction(signo, &sa, NULL); - } - --- -2.37.3 - diff --git a/0002-ping-Make-ping_rts-struct-static.patch b/0002-ping-Make-ping_rts-struct-static.patch deleted file mode 100644 index e8aae40..0000000 --- a/0002-ping-Make-ping_rts-struct-static.patch +++ /dev/null @@ -1,38 +0,0 @@ -From eb6fb669f64aa3af2baf0e5cef5d46793fc97129 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Tue, 20 Sep 2022 22:23:44 +0200 -Subject: [PATCH 2/2] ping: Make ping_rts struct static - -This allows accessing global_rts->exiting in sigexit() signal handler -after main() has exited. Problem occurred on aarch64, which occasionally -delivered signal after main() has exited, which causes segfault. - -Fixes: b3a41a6 ("ping: move global variables to runtime config structure") -Fixes: https://github.com/iputils/iputils/issues/423 -Closes: https://github.com/iputils/iputils/pull/425 - -Reported-by: linzhanglong -Suggested-by: Cyril Hrubis -Reviewed-by: Cyril Hrubis -Signed-off-by: Petr Vorel -[ upstream status: https://github.com/iputils/iputils/commit/7861af993bf47fccaf37c5659d66c09832844ae3 ] ---- - ping/ping.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ping/ping.c b/ping/ping.c -index 7a27b63..176410a 100644 ---- a/ping/ping.c -+++ b/ping/ping.c -@@ -267,7 +267,7 @@ main(int argc, char **argv) - socket_st sock6 = { .fd = -1 }; - char *target; - char *outpack_fill = NULL; -- struct ping_rts rts = { -+ static struct ping_rts rts = { - .interval = 1000, - .preload = 1, - .lingertime = MAXWAIT * 1000, --- -2.37.3 - diff --git a/20211215.tar.gz b/20211215.tar.gz deleted file mode 100644 index 26f6fe4..0000000 --- a/20211215.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf -size 524567 diff --git a/20221126.tar.gz b/20221126.tar.gz new file mode 100644 index 0000000..a268875 --- /dev/null +++ b/20221126.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:745ea711fe06d5c57d470d21acce3c3ab866eb6afb69379a16c6d60b89bd4311 +size 511944 diff --git a/iputils.changes b/iputils.changes index 354a3c9..fc202ed 100644 --- a/iputils.changes +++ b/iputils.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Nov 26 00:10:00 UTC 2022 - Petr Vorel + +- Update to version 20221126 + https://github.com/iputils/iputils/releases/tag/20221126 +- Update configure variables (ninfod, rarpd and rdisc were removed from + upstream in next release => remove -DBUILD_NINFOD=false -DBUILD_RARPD=false + -DBUILD_RDISC=false) +- Remove 2 backported fixes from this release + 0001-ping-Add-SA_RESTART-to-sa_flags.patch + 0002-ping-Make-ping_rts-struct-static.patch + ------------------------------------------------------------------- Mon Oct 3 11:45:30 UTC 2022 - Petr Vorel diff --git a/iputils.spec b/iputils.spec index e5078a7..20b38b3 100644 --- a/iputils.spec +++ b/iputils.spec @@ -17,15 +17,13 @@ Name: iputils -Version: 20211215 +Version: 20221126 Release: 0 Summary: IPv4 and IPv6 Networking Utilities License: BSD-3-Clause AND GPL-2.0-or-later Group: Productivity/Networking/Other URL: https://github.com/iputils/iputils Source0: https://github.com/iputils/iputils/archive/%{version}.tar.gz -Patch1: 0001-ping-Add-SA_RESTART-to-sa_flags.patch -Patch2: 0002-ping-Make-ping_rts-struct-static.patch BuildRequires: docbook5-xsl-stylesheets BuildRequires: docbook_5 BuildRequires: iproute2 @@ -57,7 +55,7 @@ ping, arping and tracepath. # Pulled-in by the LINK.o variable. export LDFLAGS="-Wl,-z,relro,-z,now" -%meson -DBUILD_NINFOD=false -DBUILD_RARPD=false -DBUILD_RDISC=false -DNO_SETCAP_OR_SUID=true -Db_pie=true -Dc_std=none +%meson -DNO_SETCAP_OR_SUID=true -Db_pie=true -Dc_std=none %meson_build %install