From 98f269320269299af57f48d10d45a4d89c576000 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Tue, 2 Aug 2022 14:20:57 +0200 Subject: [PATCH] Resolves: #2112870 - make the last fix actually effective --- coreutils-i18n.patch | 2 +- coreutils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch index fec5f3a..719f4d1 100644 --- a/coreutils-i18n.patch +++ b/coreutils-i18n.patch @@ -4141,7 +4141,7 @@ index cec392d..483f0ef 100644 - column++; + /* mb_width() returns 0 for control characters */ + const int width = mb_width (c); -+ column += MIN(1, width); ++ column += MAX(1, width); if (!column) die (EXIT_FAILURE, 0, _("input line is too long")); } diff --git a/coreutils.spec b/coreutils.spec index e538fee..4dfd593 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils Version: 9.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ Url: https://www.gnu.org/software/coreutils/ Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz @@ -269,6 +269,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %license COPYING %changelog +* Mon Aug 01 2022 Kamil Dudka - 9.0-7 +- make the last fix actually effective (#2112870) + * Mon Aug 01 2022 Kamil Dudka - 9.0-6 - prevent unexpand from failing on control characters (#2112870)