free: backport 91e58792: fix --si option + cleanup

Resolves: bz#2083789
This commit is contained in:
Jan Rybar 2022-09-29 17:20:37 +02:00
parent 16a826e30c
commit a06fd6533e
2 changed files with 18 additions and 1 deletions

12
free-si-fix.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up ./free.c.ori ./free.c
--- ./free.c.ori 2022-09-20 15:02:22.469320938 +0200
+++ ./free.c 2022-09-20 15:03:33.767710892 +0200
@@ -120,7 +120,7 @@ static const char *scale_size(unsigned l
/* default output */
if (args.exponent == 0 && !(flags & FREE_HUMANREADABLE)) {
- snprintf(buf, sizeof(buf), "%ld", size);
+ snprintf(buf, sizeof(buf), "%ld", (long)( ((long long int)size) * 1024 / (long long int)base));
return buf;
}

View File

@ -4,7 +4,7 @@
Summary: System and process monitoring utilities Summary: System and process monitoring utilities
Name: procps-ng Name: procps-ng
Version: 3.3.17 Version: 3.3.17
Release: 6%{?dist} Release: 7%{?dist}
License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
URL: https://sourceforge.net/projects/procps-ng/ URL: https://sourceforge.net/projects/procps-ng/
@ -18,6 +18,7 @@ Source2: README.top
Patch1: pwait-to-pidwait.patch Patch1: pwait-to-pidwait.patch
Patch2: covscan-findings.patch Patch2: covscan-findings.patch
Patch3: sysctl-hyphen-param.patch Patch3: sysctl-hyphen-param.patch
Patch4: free-si-fix.patch
BuildRequires: make BuildRequires: make
@ -161,6 +162,10 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
%files i18n -f %{name}.lang %files i18n -f %{name}.lang
%changelog %changelog
* Mon Sep 19 2022 Jan Rybar <jrybar@redhat.com> - 3.3.17-7
- free: backport 91e58792: fix --si option + cleanup
- Resolves: bz#2083789
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.17-6 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.17-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild