rpms
/
coreutils
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolves: #2112870 - make the last fix actually effective

This commit is contained in:
Kamil Dudka 2022-08-02 14:20:57 +02:00
parent 016c9b4368
commit 69bf2750bb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreutils-i18n-expand-unexpand.patch
View File

@ -595,7 +595,7 @@ index 7801274..569a7ee 100644
- column++; - column++;
+ /* mb_width() returns 0 for control characters */ + /* mb_width() returns 0 for control characters */
+ const int width = mb_width (c); + const int width = mb_width (c);
+ column += MIN(1, width); + column += MAX(1, width);
if (!column) if (!column)
die (EXIT_FAILURE, 0, _("input line is too long")); die (EXIT_FAILURE, 0, _("input line is too long"));
} }

5
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 8.32 Version: 8.32
Release: 34%{?dist} Release: 35%{?dist}
License: GPLv3+ License: GPLv3+
Url: https://www.gnu.org/software/coreutils/ Url: https://www.gnu.org/software/coreutils/
Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
@ -331,6 +331,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%license COPYING %license COPYING
%changelog %changelog
* Mon Aug 01 2022 Kamil Dudka <kdudka@redhat.com> - 8.32-35
- make the last fix actually effective (#2112870)
* Mon Aug 01 2022 Kamil Dudka <kdudka@redhat.com> - 8.32-34 * Mon Aug 01 2022 Kamil Dudka <kdudka@redhat.com> - 8.32-34
- prevent unexpand from failing on control characters (#2112870) - prevent unexpand from failing on control characters (#2112870)