From 24d26a2df1462d8585bc644caf7177f906e05ca5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Mar 2023 09:55:47 +0000 Subject: [PATCH] import cloud-utils-growpart-0.33-0.el8 --- .cloud-utils-growpart.metadata | 2 +- .gitignore | 2 +- ...8167-growpart-doesn-t-work-when-LANG.patch | 41 --------------- ...rt-Use-LANG-C-to-parse-sfdisk-output.patch | 52 ------------------- SPECS/cloud-utils-growpart.spec | 19 +++---- 5 files changed, 12 insertions(+), 104 deletions(-) delete mode 100644 SOURCES/cu-Fix-issue-LP-1928167-growpart-doesn-t-work-when-LANG.patch delete mode 100644 SOURCES/cu-growpart-Use-LANG-C-to-parse-sfdisk-output.patch diff --git a/.cloud-utils-growpart.metadata b/.cloud-utils-growpart.metadata index 5de66d9..1f83961 100644 --- a/.cloud-utils-growpart.metadata +++ b/.cloud-utils-growpart.metadata @@ -1 +1 @@ -44ef173f0753bb28be970fdfc5a5a5a352c25ce0 SOURCES/cloud-utils-0.31.tar.gz +9db9db71d7ce634d3d2d80c377c4e1a19da0db77 SOURCES/cloud-utils-0.33.tar.gz diff --git a/.gitignore b/.gitignore index b109b75..95f6c74 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cloud-utils-0.31.tar.gz +SOURCES/cloud-utils-0.33.tar.gz diff --git a/SOURCES/cu-Fix-issue-LP-1928167-growpart-doesn-t-work-when-LANG.patch b/SOURCES/cu-Fix-issue-LP-1928167-growpart-doesn-t-work-when-LANG.patch deleted file mode 100644 index 01dc87c..0000000 --- a/SOURCES/cu-Fix-issue-LP-1928167-growpart-doesn-t-work-when-LANG.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3fc71ad0d38a3205ad8a790769353b67f32dccff Mon Sep 17 00:00:00 2001 -From: Emanuele Giuseppe Esposito -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 -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 -RH-Acked-by: Miroslav Rezanina - -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 -Signed-off-by: Miroslav Rezanina ---- - 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 - diff --git a/SOURCES/cu-growpart-Use-LANG-C-to-parse-sfdisk-output.patch b/SOURCES/cu-growpart-Use-LANG-C-to-parse-sfdisk-output.patch deleted file mode 100644 index 8f109e2..0000000 --- a/SOURCES/cu-growpart-Use-LANG-C-to-parse-sfdisk-output.patch +++ /dev/null @@ -1,52 +0,0 @@ -From af0f5f012eef5f4728e92a0f02610e31b58a725c Mon Sep 17 00:00:00 2001 -From: Eduardo Otubo -Date: Mon, 29 Mar 2021 13:42:12 +0200 -Subject: [PATCH] growpart: Use LANG=C to parse sfdisk output - -RH-Author: Eduardo Otubo -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 -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 - -Signed-off-by: Eduardo Otubo ---- - 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 - diff --git a/SPECS/cloud-utils-growpart.spec b/SPECS/cloud-utils-growpart.spec index 43d78a0..8166639 100644 --- a/SPECS/cloud-utils-growpart.spec +++ b/SPECS/cloud-utils-growpart.spec @@ -1,18 +1,14 @@ Name: cloud-utils-growpart -Version: 0.31 -Release: 3%{?dist} +Version: 0.33 +Release: 0%{?dist} License: GPLv3 Group: System Environment/Base -Source0: cloud-utils-0.31.tar.gz -URL: https://launchpad.net/cloud-utils +Source0: cloud-utils-0.33.tar.gz +URL: https://github.com/canonical/cloud-utils/ 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 +BuildArch: noarch Summary: Script for growing a partition @@ -50,6 +46,11 @@ cp man/growpart.* $RPM_BUILD_ROOT/%{_mandir}/man1/ %doc %{_mandir}/man1/growpart.* %changelog +* Thu Nov 17 2022 Jon Maloy - 0.33-0 +- Rebased to cloud-utils-growpart-0.33-0.el8 +- Resolves: bz#2122575 + ([RHEL-8] Add redhat build support for cloud-utils rebase 0.33 for RHEL8.8 + * Mon Jun 14 2021 Miroslav Rezanina - 0.31-3 - cu-Fix-issue-LP-1928167-growpart-doesn-t-work-when-LANG.patch [bz#1885992] - Resolves: bz#1885992