Bug#985115: buster-pu: package iputils/3:20180629-2+deb10u1
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
I'd like to update iputils in buster to address important bugs in the
iputils-ping and iputils-tracepath binary packages:
* #976277: iputils-tracepath: destination address of ipv6 probes is cut
off after the first 64 bits. This basically makes tracepath useless for
IPv6.
* #920434: ping does not round correctly. This causing ping to report
incorrect timing results in some cases.
Both are upstream issues that have since been fixed in the upstream
repositories and in bullseye.
The proposed debdiff is attached.
noah
diff -Nru iputils-20180629/debian/changelog iputils-20180629/debian/changelog
--- iputils-20180629/debian/changelog 2020-01-13 15:29:01.000000000 -0800
+++ iputils-20180629/debian/changelog 2021-03-08 11:46:59.000000000 -0800
@@ -1,3 +1,11 @@
+iputils (3:20180629-2+deb10u2) buster; urgency=medium
+
+ * Backport upstream fix for ping rounding errors (Closes: #920434)
+ * Backport upstream fix for tracepath target corruption
+ (Closes: #976277)
+
+ -- Noah Meyerhans <noahm@debian.org> Mon, 08 Mar 2021 11:46:59 -0800
+
iputils (3:20180629-2+deb10u1) buster; urgency=medium
* Incorporate patches from Benjamin Poirier <benjamin.poirier@gmail.com> to
diff -Nru iputils-20180629/debian/patches/bug-920434-Backport-timing-fixes-from-upstream.patch iputils-20180629/debian/patches/bug-920434-Backport-timing-fixes-from-upstream.patch
--- iputils-20180629/debian/patches/bug-920434-Backport-timing-fixes-from-upstream.patch 1969-12-31 16:00:00.000000000 -0800
+++ iputils-20180629/debian/patches/bug-920434-Backport-timing-fixes-from-upstream.patch 2021-03-08 11:33:32.000000000 -0800
@@ -0,0 +1,39 @@
+From: Noah Meyerhans <noahm@debian.org>
+Description: Backport ping timing fixes from upstream
+Bug-Debian: https://bugs.debian.org/920434
+
+---
+ ping_common.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+Index: iputils/ping_common.c
+===================================================================
+--- iputils.orig/ping_common.c
++++ iputils/ping_common.c
+@@ -853,17 +853,17 @@ restamp:
+ return 1;
+ }
+ if (timing) {
+- if (triptime >= 100000)
+- printf(" time=%ld ms", (triptime+500)/1000);
+- else if (triptime >= 10000)
+- printf(" time=%ld.%01ld ms", triptime/1000,
+- ((triptime%1000)+50)/100);
++ if (triptime >= 100000 - 50)
++ printf(" time=%ld ms", (triptime + 500) / 1000);
++ else if (triptime >= 10000 - 5)
++ printf(" time=%ld.%01ld ms", (triptime + 50) / 1000,
++ ((triptime + 50) % 1000) / 100);
+ else if (triptime >= 1000)
+- printf(" time=%ld.%02ld ms", triptime/1000,
+- ((triptime%1000)+5)/10);
++ printf(" time=%ld.%02ld ms", (triptime + 5) / 1000,
++ ((triptime + 5) % 1000) / 10);
+ else
+- printf(" time=%ld.%03ld ms", triptime/1000,
+- triptime%1000);
++ printf(" time=%ld.%03ld ms", triptime / 1000,
++ triptime % 1000);
+ }
+ if (dupflag)
+ printf(" (DUP!)");
diff -Nru iputils-20180629/debian/patches/bug-976277-tracepath-dont-truncate-destination.patch iputils-20180629/debian/patches/bug-976277-tracepath-dont-truncate-destination.patch
--- iputils-20180629/debian/patches/bug-976277-tracepath-dont-truncate-destination.patch 1969-12-31 16:00:00.000000000 -0800
+++ iputils-20180629/debian/patches/bug-976277-tracepath-dont-truncate-destination.patch 2021-03-08 11:46:59.000000000 -0800
@@ -0,0 +1,21 @@
+From: Noah Meyerhans <noahm@debian.org>
+Description: backport tracepath bug fix from upstram
+Bug-Debian: https://bugs.debian.org/976277
+
+---
+ tracepath.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: iputils/tracepath.c
+===================================================================
+--- iputils.orig/tracepath.c
++++ iputils/tracepath.c
+@@ -475,7 +475,7 @@ int main(int argc, char **argv)
+ fd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ if (fd < 0)
+ continue;
+- memcpy(&target, ai->ai_addr, sizeof(*ai->ai_addr));
++ memcpy(&target, ai->ai_addr, ai->ai_addrlen);
+ targetlen = ai->ai_addrlen;
+ break;
+ }
diff -Nru iputils-20180629/debian/patches/series iputils-20180629/debian/patches/series
--- iputils-20180629/debian/patches/series 2020-01-13 15:29:01.000000000 -0800
+++ iputils-20180629/debian/patches/series 2021-03-08 11:46:59.000000000 -0800
@@ -1,3 +1,5 @@
set_buildflags
ping-fix-main-loop-over-multiple-addrinfo-results.patch
ping-try-next-addrinfo-on-connect-failure.patch
+bug-920434-Backport-timing-fixes-from-upstream.patch
+bug-976277-tracepath-dont-truncate-destination.patch
Reply to: