From 69bf2750bbc656f82366e00c0e1442c39dd50276 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-expand-unexpand.patch | 2 +- coreutils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/coreutils-i18n-expand-unexpand.patch b/coreutils-i18n-expand-unexpand.patch index 3fa9700..c901740 100644 --- a/coreutils-i18n-expand-unexpand.patch +++ b/coreutils-i18n-expand-unexpand.patch @@ -595,7 +595,7 @@ index 7801274..569a7ee 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 a9cf91f..7877ccb 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: 8.32 -Release: 34%{?dist} +Release: 35%{?dist} License: GPLv3+ Url: https://www.gnu.org/software/coreutils/ Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz @@ -331,6 +331,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %license COPYING %changelog +* Mon Aug 01 2022 Kamil Dudka - 8.32-35 +- make the last fix actually effective (#2112870) + * Mon Aug 01 2022 Kamil Dudka - 8.32-34 - prevent unexpand from failing on control characters (#2112870)