import cloud-utils-growpart-0.31-3.el8

SOURCES/cu-Fix-issue-LP-1928167-growpart-doesn-t-work-when-LANG.patch

@@ -0,0 +1,41 @@
+From 3fc71ad0d38a3205ad8a790769353b67f32dccff Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Thu, 10 Jun 2021 17:04:49 +0200
+Subject: [PATCH] Fix issue LP: #1928167 growpart doesn't work when
+ LANG=cs_CZ.UTF-8
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 3: Fix issue LP: #1928167 growpart doesn't work when LANG=cs_CZ.UTF-8
+RH-Commit: [1/1] e77ca8febb4171201c6c75f9420c4744ab321024
+RH-Bugzilla: 1885992
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+commit 03aa9974e7eb438b798fe95afc7cf4efe72ea73a
+Author: Amy Chen <66719270+xiachen-rh@users.noreply.github.com>
+Date:   Wed May 12 13:03:17 2021 +0800
+
+    Fix issue LP: #1928167 growpart doesn't work when LANG=cs_CZ.UTF-8
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+---
+ bin/growpart | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/growpart b/bin/growpart
+index e815e4e..66a6dd2 100755
+--- a/bin/growpart
++++ b/bin/growpart
+@@ -181,7 +181,7 @@ get_sfdisk_version() {
+ 	local out oifs="$IFS" ver=""
+ 	[ -n "$SFDISK_VERSION" ] && return 0
+ 	# expected output: sfdisk from util-linux 2.25.2
+-	out=$(sfdisk --version) ||
++	out=$(LANG=C sfdisk --version) ||
+ 		{ error "failed to get sfdisk version"; return 1; }
+ 	set -- $out
+ 	ver=$4
+-- 
+2.27.0
+

SOURCES/cu-growpart-Use-LANG-C-to-parse-sfdisk-output.patch

@@ -0,0 +1,52 @@
+From af0f5f012eef5f4728e92a0f02610e31b58a725c Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Mon, 29 Mar 2021 13:42:12 +0200
+Subject: [PATCH] growpart: Use LANG=C to parse sfdisk output
+
+RH-Author: Eduardo Otubo <otubo@redhat.com>
+RH-MergeRequest: 1: growpart: Use LANG=C to parse sfdisk output
+RH-Commit: [1/1] c61f16c69c76c3a8604a6fdcf8543f860207de46
+RH-Bugzilla: 1933768
+
+commit 3cde8344f64118c723b40ecff7066c2ff8c51013 (upstream/master)
+Author: Nicolas Chauvet <kwizart@gmail.com>
+Date:   Fri Feb 26 17:15:44 2021 +0100
+
+    growpart: Use LANG=C to parse sfdisk output
+
+    This will prevent failure to parse output of in non-C locales leading to
+    failure to resize partition.
+
+    Alternative would be to use sfdisk --dump, but this misses some
+    importants informations such as the sectors size
+
+    Reported in:
+    https://bugs.launchpad.net/cloud-utils/+bug/1860479
+
+    This was tested on centos7 with sfdisk 2.23.2 and
+    centos8 with sfdisk 2.32.1
+
+    Reported-by: https://launchpad.net/~pickadi
+    Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+---
+ bin/growpart | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/growpart b/bin/growpart
+index 446f63b..e815e4e 100755
+--- a/bin/growpart
++++ b/bin/growpart
+@@ -212,7 +212,7 @@ resize_sfdisk() {
+ 	local pt_start pt_size pt_end max_end new_size change_info dpart
+ 	local sector_num sector_size disk_size tot out
+ 
+-	rqe sfd_list sfdisk --list --unit=S "$DISK" >"$tmp" ||
++	LANG=C rqe sfd_list sfdisk --list --unit=S "$DISK" >"$tmp" ||
+ 		fail "failed: sfdisk --list $DISK"
+ 	if [ "${SFDISK_VERSION}" -lt ${SFDISK_2_26} ]; then
+ 		# exected output contains: Units: sectors of 512 bytes, ...
+-- 
+2.27.0
+

SPECS/cloud-utils-growpart.spec

@@ -1,6 +1,6 @@
 Name:		cloud-utils-growpart
 Version:	0.31
-Release:	1%{?dist}
+Release:	3%{?dist}
 License:	GPLv3
 Group:		System Environment/Base
 Source0:	cloud-utils-0.31.tar.gz
@@ -9,6 +9,11 @@ Source1:	LICENSE
 
 BuildArch:	noarch
 
+# BZ 1933768 - cloud-utils-growpart: Wrong parsing of sfdisk output in french locale
+Patch1: cu-growpart-Use-LANG-C-to-parse-sfdisk-output.patch
+# For bz#1885992 - [RHEL-8] growpart doesn't work when LANG=cs_CZ.UTF-8
+Patch2: cu-Fix-issue-LP-1928167-growpart-doesn-t-work-when-LANG.patch
+
 Summary:	Script for growing a partition
 
 Requires:	gawk
@@ -45,6 +50,16 @@ cp man/growpart.* $RPM_BUILD_ROOT/%{_mandir}/man1/
 %doc %{_mandir}/man1/growpart.*
 
 %changelog
+* Mon Jun 14 2021 Miroslav Rezanina <mrezanin@redhat.com> - 0.31-3
+- cu-Fix-issue-LP-1928167-growpart-doesn-t-work-when-LANG.patch [bz#1885992]
+- Resolves: bz#1885992
+  ([RHEL-8] growpart doesn't work when LANG=cs_CZ.UTF-8)
+
+* Wed Jun 02 2021 Miroslav Rezanina <mrezanin@redhat.com> - 0.31-2
+- cu-growpart-Use-LANG-C-to-parse-sfdisk-output.patch [bz#1933768]
+- Resolves: bz#1933768
+  (cloud-utils-growpart: Wrong parsing of sfdisk output in french locale)
+
 * Tue Jun 23 2020 Miroslav Rezanina <mrezanin@redhat.com> - 0.31-1
 - Rebase to 0.31 [bz#1846246]
 - Resolves: #bz#1846246