Compare commits
2 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 9042b5a3c4 | |||
| bb8f089909 |
BIN
20221126.tar.gz
(Stored with Git LFS)
Normal file
BIN
20221126.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
iputils-20240905.tar.xz
(Stored with Git LFS)
BIN
iputils-20240905.tar.xz
(Stored with Git LFS)
Binary file not shown.
@@ -78,10 +78,10 @@ Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
||||
ping/ping_common.c | 22 +++++++++++++++++++---
|
||||
2 files changed, 22 insertions(+), 3 deletions(-)
|
||||
|
||||
Index: iputils-20240905/iputils_common.h
|
||||
===================================================================
|
||||
--- iputils-20240905.orig/iputils_common.h
|
||||
+++ iputils-20240905/iputils_common.h
|
||||
diff --git a/iputils_common.h b/iputils_common.h
|
||||
index 67b495e..3a9c5c6 100644
|
||||
--- a/iputils_common.h
|
||||
+++ b/iputils_common.h
|
||||
@@ -10,6 +10,9 @@
|
||||
!!__builtin_types_compatible_p(__typeof__(arr), \
|
||||
__typeof__(&arr[0]))])) * 0)
|
||||
@@ -92,11 +92,11 @@ Index: iputils-20240905/iputils_common.h
|
||||
#ifdef __GNUC__
|
||||
# define iputils_attribute_format(t, n, m) __attribute__((__format__ (t, n, m)))
|
||||
#else
|
||||
Index: iputils-20240905/ping/ping_common.c
|
||||
===================================================================
|
||||
--- iputils-20240905.orig/ping/ping_common.c
|
||||
+++ iputils-20240905/ping/ping_common.c
|
||||
@@ -754,16 +754,32 @@ int gather_statistics(struct ping_rts *r
|
||||
diff --git a/ping/ping_common.c b/ping/ping_common.c
|
||||
index d188fb8..687613a 100644
|
||||
--- a/ping/ping_common.c
|
||||
+++ b/ping/ping_common.c
|
||||
@@ -741,16 +741,32 @@ int gather_statistics(struct ping_rts *rts, uint8_t *icmph, int icmplen,
|
||||
|
||||
restamp:
|
||||
tvsub(tv, &tmp_tv);
|
||||
@@ -132,3 +132,6 @@ Index: iputils-20240905/ping/ping_common.c
|
||||
if (!csfailed) {
|
||||
rts->tsum += triptime;
|
||||
rts->tsum2 += (double)((long long)triptime * (long long)triptime);
|
||||
--
|
||||
2.49.0
|
||||
|
||||
|
||||
@@ -29,10 +29,10 @@ Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
||||
ping/ping_common.c | 8 ++++----
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
Index: iputils-20240905/iputils_common.h
|
||||
===================================================================
|
||||
--- iputils-20240905.orig/iputils_common.h
|
||||
+++ iputils-20240905/iputils_common.h
|
||||
diff --git a/iputils_common.h b/iputils_common.h
|
||||
index 3a9c5c6..6c1289b 100644
|
||||
--- a/iputils_common.h
|
||||
+++ b/iputils_common.h
|
||||
@@ -11,7 +11,7 @@
|
||||
__typeof__(&arr[0]))])) * 0)
|
||||
|
||||
@@ -42,11 +42,11 @@ Index: iputils-20240905/iputils_common.h
|
||||
|
||||
#ifdef __GNUC__
|
||||
# define iputils_attribute_format(t, n, m) __attribute__((__format__ (t, n, m)))
|
||||
Index: iputils-20240905/ping/ping.h
|
||||
===================================================================
|
||||
--- iputils-20240905.orig/ping/ping.h
|
||||
+++ iputils-20240905/ping/ping.h
|
||||
@@ -194,7 +194,7 @@ struct ping_rts {
|
||||
diff --git a/ping/ping.h b/ping/ping.h
|
||||
index f667c62..242d3c3 100644
|
||||
--- a/ping/ping.h
|
||||
+++ b/ping/ping.h
|
||||
@@ -181,7 +181,7 @@ struct ping_rts {
|
||||
long tmax; /* maximum round trip time */
|
||||
double tsum; /* sum of all times, for doing average */
|
||||
double tsum2;
|
||||
@@ -55,11 +55,11 @@ Index: iputils-20240905/ping/ping.h
|
||||
int rtt_addend;
|
||||
uint16_t acked;
|
||||
int pipesize;
|
||||
Index: iputils-20240905/ping/ping_common.c
|
||||
===================================================================
|
||||
--- iputils-20240905.orig/ping/ping_common.c
|
||||
+++ iputils-20240905/ping/ping_common.c
|
||||
@@ -282,7 +282,7 @@ int __schedule_exit(int next)
|
||||
diff --git a/ping/ping_common.c b/ping/ping_common.c
|
||||
index 0fbb825..808fc05 100644
|
||||
--- a/ping/ping_common.c
|
||||
+++ b/ping/ping_common.c
|
||||
@@ -281,7 +281,7 @@ int __schedule_exit(int next)
|
||||
|
||||
static inline void update_interval(struct ping_rts *rts)
|
||||
{
|
||||
@@ -67,8 +67,8 @@ Index: iputils-20240905/ping/ping_common.c
|
||||
+ int est = rts->rtt ? (int)(rts->rtt / 8) : rts->interval * 1000;
|
||||
|
||||
rts->interval = (est + rts->rtt_addend + 500) / 1000;
|
||||
if (rts->uid && rts->interval < MIN_USER_INTERVAL_MS)
|
||||
@@ -798,7 +798,7 @@ restamp:
|
||||
if (rts->uid && rts->interval < MINUSERINTERVAL)
|
||||
@@ -785,7 +785,7 @@ restamp:
|
||||
if (triptime > rts->tmax)
|
||||
rts->tmax = triptime;
|
||||
if (!rts->rtt)
|
||||
@@ -77,7 +77,7 @@ Index: iputils-20240905/ping/ping_common.c
|
||||
else
|
||||
rts->rtt += triptime - rts->rtt / 8;
|
||||
if (rts->opt_adaptive)
|
||||
@@ -970,7 +970,7 @@ int finish(struct ping_rts *rts)
|
||||
@@ -955,7 +955,7 @@ int finish(struct ping_rts *rts)
|
||||
int ipg = (1000000 * (long long)tv.tv_sec + tv.tv_nsec / 1000) / (rts->ntransmitted - 1);
|
||||
|
||||
printf(_("%sipg/ewma %d.%03d/%d.%03d ms"),
|
||||
@@ -86,7 +86,7 @@ Index: iputils-20240905/ping/ping_common.c
|
||||
}
|
||||
putchar('\n');
|
||||
return (!rts->nreceived || (rts->deadline && rts->nreceived < rts->npackets));
|
||||
@@ -995,7 +995,7 @@ void status(struct ping_rts *rts)
|
||||
@@ -980,7 +980,7 @@ void status(struct ping_rts *rts)
|
||||
fprintf(stderr, _(", min/avg/ewma/max = %ld.%03ld/%lu.%03ld/%d.%03d/%ld.%03ld ms"),
|
||||
(long)rts->tmin / 1000, (long)rts->tmin % 1000,
|
||||
tavg / 1000, tavg % 1000,
|
||||
@@ -95,3 +95,6 @@ Index: iputils-20240905/ping/ping_common.c
|
||||
}
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
--
|
||||
2.49.0
|
||||
|
||||
|
||||
@@ -3,47 +3,25 @@ Tue Jun 10 07:18:36 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
|
||||
|
||||
- Security fix [bsc#1243772, CVE-2025-48964]
|
||||
* Fix integer overflow in ping statistics via zero timestamp
|
||||
* Add iputils-CVE-2025-48964_01.patch
|
||||
* Add iputils-CVE-2025-48964_01.patch
|
||||
* Add iputils-CVE-2025-48964_02.patch
|
||||
* Add iputils-CVE-2025-48964_03.patch
|
||||
* Add iputils-CVE-2025-48964_regression.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 16 12:25:35 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
|
||||
Fri May 16 12:51:08 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
|
||||
|
||||
- Fix bsc#1243284 - ping on s390x prints invalid ttl
|
||||
* Add iputils-invalid-ttl-s390x.patch
|
||||
* Fix ipv4 ttl value when using SOCK_DGRAM on big endian systems
|
||||
- Enable test suite
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 13 06:13:26 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
|
||||
Tue May 13 06:12:11 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
|
||||
|
||||
- Security fix [bsc#1242300, CVE-2025-47268]
|
||||
* integer overflow in RTT calculation can lead to undefined behavior
|
||||
* Add iputils-CVE-2025-47268.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 5 10:47:27 UTC 2024 - Petr Vorel <pvorel@suse.cz>
|
||||
|
||||
- Update to version 20240905 (mostly ping fixes release)
|
||||
https://github.com/iputils/iputils/releases/tag/20240905
|
||||
- Fix tarball url
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 17 11:13:09 UTC 2024 - Petr Vorel <pvorel@suse.cz>
|
||||
|
||||
- Update to version 20240117 (ping bugfix release)
|
||||
https://github.com/iputils/iputils/releases/tag/20240117
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 22 20:49:52 UTC 2023 - Petr Vorel <pvorel@suse.cz>
|
||||
|
||||
- Update to version 20231222
|
||||
https://github.com/iputils/iputils/releases/tag/20231222
|
||||
- Use tar.xz instead of tar.gz
|
||||
- Update source URL
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 27 12:27:43 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
|
||||
|
||||
|
||||
19
iputils.spec
19
iputils.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package iputils
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -17,23 +17,23 @@
|
||||
|
||||
|
||||
Name: iputils
|
||||
Version: 20240905
|
||||
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/releases/download/%{version}/iputils-%{version}.tar.xz
|
||||
Source0: https://github.com/iputils/iputils/archive/%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM: bcs#1242300 CVE-2025-47268 integer overflow in RTT calculation can lead to undefine d behavior
|
||||
Patch1: iputils-CVE-2025-47268.patch
|
||||
#PATCH-FIX-UPSTREAM: bsc#1243284 ping on s390x prints invalid ttl
|
||||
Patch2: iputils-invalid-ttl-s390x.patch
|
||||
#PATCH-FIX-UPSTREAM: bsc#1243772 CVE-2025-48964 integer overflow in ping statistics via zero timestamp
|
||||
Patch3: iputils-CVE-2025-48964_01.patch
|
||||
Patch4: iputils-CVE-2025-48964_02.patch
|
||||
Patch5: iputils-CVE-2025-48964_03.patch
|
||||
Patch3: iputils-CVE-2025-48964_01.patch
|
||||
Patch4: iputils-CVE-2025-48964_02.patch
|
||||
Patch6: iputils-CVE-2025-48964_03.patch
|
||||
#PATCH-FIX-UPSTREAM: Fix regression in -c1
|
||||
Patch6: iputils-CVE-2025-48964_regression.patch
|
||||
Patch7: iputils-CVE-2025-48964_regression.patch
|
||||
|
||||
BuildRequires: docbook5-xsl-stylesheets
|
||||
BuildRequires: docbook_5
|
||||
@@ -44,8 +44,8 @@ BuildRequires: libcap-progs
|
||||
BuildRequires: meson
|
||||
BuildRequires: opensp
|
||||
BuildRequires: perl-SGMLS
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: netcfg
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: pkgconfig(libidn2)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
@@ -95,9 +95,6 @@ ln -sf %{_bindir}/tracepath6 %{buildroot}/bin
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%check
|
||||
%meson_test
|
||||
|
||||
%post
|
||||
%set_permissions %{_bindir}/clockdiff
|
||||
|
||||
|
||||
Reference in New Issue
Block a user