diff --git a/backport-Revert-sscanf-pattern-is-Lu-not-llu-for-long-long-unsigned.patch b/backport-Revert-sscanf-pattern-is-Lu-not-llu-for-long-long-unsigned.patch new file mode 100644 index 0000000..a03f8db --- /dev/null +++ b/backport-Revert-sscanf-pattern-is-Lu-not-llu-for-long-long-unsigned.patch @@ -0,0 +1,46 @@ +From 20a78e06a69bd9b6b4e15468201d5d3aa9c395db Mon Sep 17 00:00:00 2001 +From: Zach van Rijn +Date: Wed, 21 Jun 2023 16:50:30 +0000 +Subject: [PATCH] Revert "sscanf pattern is %Lu not %llu for long long unsigned + byte counters." + +This reverts commit 811cf0aaf40a0e7f426f8ffaea7c3ca4b8bebdfc. + +See also: + * https://sourceforge.net/p/net-tools/mailman/message/37860727/ + * https://git.adelielinux.org/adelie/packages/-/issues/600 +--- + lib/interface.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/interface.c b/lib/interface.c +index ef28dec..71d4163 100644 +--- a/lib/interface.c ++++ b/lib/interface.c +@@ -254,7 +254,7 @@ static int get_dev_fields(const char *bp, struct interface *ife) + switch (procnetdev_vsn) { + case 3: + sscanf(bp, +- "%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu", ++ "%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu", + &ife->stats.rx_bytes, + &ife->stats.rx_packets, + &ife->stats.rx_errors, +@@ -274,7 +274,7 @@ static int get_dev_fields(const char *bp, struct interface *ife) + &ife->stats.tx_compressed); + break; + case 2: +- sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu", ++ sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu", + &ife->stats.rx_bytes, + &ife->stats.rx_packets, + &ife->stats.rx_errors, +@@ -292,7 +292,7 @@ static int get_dev_fields(const char *bp, struct interface *ife) + ife->stats.rx_multicast = 0; + break; + case 1: +- sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu", ++ sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu", + &ife->stats.rx_packets, + &ife->stats.rx_errors, + &ife->stats.rx_dropped, diff --git a/net-tools.spec b/net-tools.spec index 0c1a382..7c92ded 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,6 +1,6 @@ Name: net-tools Version: 2.0 -Release: 0.56 +Release: 0.57 Summary: Important Programs for Networking License: GPLv2+ URL: https://sourceforge.net/projects/net-tools/ @@ -24,6 +24,7 @@ Patch22: net-tools-timer-man.patch Patch23: net-tools-interface-name-len.patch Patch24: backport-interface-change-pointopoint-short-flag-from-P-to-p.patch Patch25: fix-ifconfig-display-error-when-the-length-of-interface-name-is-15.patch +Patch26: backport-Revert-sscanf-pattern-is-Lu-not-llu-for-long-long-unsigned.patch BuildRequires: bluez-libs-devel gettext, libselinux libselinux-devel systemd gcc %{?systemd_requires} @@ -55,6 +56,7 @@ cp %SOURCE8 ./man/en_US %patch23 -p1 -b .interface-name-len %patch24 -p1 %patch25 -p1 +%patch26 -p1 touch ./config.h @@ -116,6 +118,12 @@ touch %{buildroot}%{_unitdir}/arp-ethers.service %exclude %{_mandir}/pt/man5 %changelog +* Tue Apr 08 2025 gaihuiying - 2.0-0.57 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:backport to use llu instead of Lu for unsigned long long type + * Mon Dec 19 2022 eaglegai - 2.0-0.56 - Type:bugfix - ID:NA