!26 update to 3.4

From: @markeryang
Reviewed-by: @liuzhiqiang26
Signed-off-by: @liuzhiqiang26
This commit is contained in:
openeuler-ci-bot 2021-11-24 09:27:57 +00:00 committed by Gitee
commit 501e1ed1c3
5 changed files with 5 additions and 72 deletions

View File

@ -1,34 +0,0 @@
From 22a4baba11ab299722e68f9ea37a53869afef7e1 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 27 Jun 2018 13:47:33 -0700
Subject: [PATCH] Switch gpt-header-move and msdos-overlap to python3
python2 is EOL on January 1, 2020 so it is time to switch to python3.
---
tests/gpt-header-move | 2 +-
tests/msdos-overlap | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/gpt-header-move b/tests/gpt-header-move
index 3dda5cb..18f58d0 100755
--- a/tests/gpt-header-move
+++ b/tests/gpt-header-move
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# open img file, subtract 33 from altlba address, and move the last 33 sectors
# back by 33 sectors
diff --git a/tests/msdos-overlap b/tests/msdos-overlap
index d6ae8d6..b2b03e6 100755
--- a/tests/msdos-overlap
+++ b/tests/msdos-overlap
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
"""
Write an overlapping partition to a msdos disk
--
2.19.1

View File

@ -1,34 +0,0 @@
From bd7a18b1bfe44ccdb2733d14bdd493b823c546bc Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 23 Apr 2019 13:52:25 -0700
Subject: [PATCH] Fix end_input usage in do_resizepart
It needs to be set to NULL, since it may not get set by the call to
command_line_get_sector
---
parted/parted.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parted/parted.c b/parted/parted.c
index 9dcdb05..df0c7ed 100644
--- a/parted/parted.c
+++ b/parted/parted.c
@@ -1545,6 +1545,7 @@ do_resizepart (PedDevice** dev, PedDisk** diskp)
PedGeometry *range_end = NULL;
PedConstraint* constraint;
int rc = 0;
+ char* end_input = NULL;
if (!disk) {
disk = ped_disk_new (*dev);
@@ -1565,7 +1566,6 @@ do_resizepart (PedDevice** dev, PedDisk** diskp)
start = part->geom.start;
end = oldend = part->geom.end;
- char *end_input;
if (!command_line_get_sector (_("End?"), *dev, &end, &range_end, &end_input))
goto error;
_adjust_end_if_iec(&start, &end, range_end, end_input);
--
1.8.3.1

Binary file not shown.

BIN
parted-3.4.tar.xz Normal file

Binary file not shown.

View File

@ -13,8 +13,8 @@
Summary: The GNU disk partition manipulation program Summary: The GNU disk partition manipulation program
Name: parted Name: parted
Version: 3.3 Version: 3.4
Release: 7 Release: 1
URL: https://www.gnu.org/software/parted/ URL: https://www.gnu.org/software/parted/
Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
License: GPLv3+ License: GPLv3+
@ -24,11 +24,9 @@ BuildRequires: autoconf automake libtool gettext-devel texinfo pkgconfig gcc mak
BuildRequires: libblkid-devel >= 2.17 BuildRequires: libblkid-devel >= 2.17
BuildRequires: device-mapper-devel, libselinux-devel libsepol-devel BuildRequires: device-mapper-devel, libselinux-devel libsepol-devel
Patch0: 0000-Switch-gpt-header-move-and-msdos-overlap-to-python3.patch
Patch1: 0001-add-support-of-gpt_sync_mbr.patch Patch1: 0001-add-support-of-gpt_sync_mbr.patch
Patch2: 0002-Add-extra-judgment-for-a-partition-created-success.patch Patch2: 0002-Add-extra-judgment-for-a-partition-created-success.patch
Patch3: 0003-bugfix-parted-fix-failure-of-mklabel-gpt_sync_mbr.patch Patch3: 0003-bugfix-parted-fix-failure-of-mklabel-gpt_sync_mbr.patch
Patch4: 0004-Fix-end_input-usage-in-do_resizepart.patch
%description %description
The GNU Parted program allows you to create, destroy, resize, move, The GNU Parted program allows you to create, destroy, resize, move,
@ -113,6 +111,9 @@ fi
%{_libdir}/pkgconfig/libparted*.pc %{_libdir}/pkgconfig/libparted*.pc
%changelog %changelog
* Tue Nov 23 2021 yanglongkang <yanglongkang@huawei.com> - 3.4-1
- update to 3.4
* Sat Aug 1 2020 volcanodragon <linfeilong@huawei.com> - 3.3-7 * Sat Aug 1 2020 volcanodragon <linfeilong@huawei.com> - 3.3-7
- delete useless file - delete useless file