From fb5244fe5fb60cc148ba684021af11f897d6aaa1 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2020 09:41:38 +0000
Subject: import parted-3.1-32.el7


---

diff --git a/SOURCES/0056-libparted-Fix-starting-CHS-in-protective-MBR.patch b/SOURCES/0056-libparted-Fix-starting-CHS-in-protective-MBR.patch
new file mode 100644
index 0000000..c772e76
--- /dev/null
+++ b/SOURCES/0056-libparted-Fix-starting-CHS-in-protective-MBR.patch
@@ -0,0 +1,36 @@
+From 54d5658d326e8a65beb3451699166604f03489da Mon Sep 17 00:00:00 2001
+From: Petr Uzel <petr.uzel@suse.cz>
+Date: Thu, 10 Mar 2016 14:18:52 +0100
+Subject: [PATCH] libparted: Fix starting CHS in protective MBR
+
+The CHS address for protective partition start in protective MBR
+should be 0/0/2, according to UEFI spec (v2.6, section 5.2.1).
+
+* libparted/labels/gpt.c (_write_pmbr): Fix starting CHS address
+
+Reported by Steffen Winterfeldt in https://bugzilla.suse.com/969165
+
+Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
+(cherry picked from commit df6770d213b60320426a3ee0bed118d063b40fc5)
+Signed-off-by: Brian C. Lane <bcl@redhat.com>
+Resolves: rhbz#1702778
+---
+ libparted/labels/gpt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
+index f9332bd..5cc582c 100644
+--- a/libparted/labels/gpt.c
++++ b/libparted/labels/gpt.c
+@@ -1097,7 +1097,7 @@ _write_pmbr (PedDevice *dev, bool pmbr_boot)
+ 
+   pmbr->Signature = PED_CPU_TO_LE16 (MSDOS_MBR_SIGNATURE);
+   pmbr->PartitionRecord[0].OSType = EFI_PMBR_OSTYPE_EFI;
+-  pmbr->PartitionRecord[0].StartSector = 1;
++  pmbr->PartitionRecord[0].StartSector = 2;
+   pmbr->PartitionRecord[0].EndHead = 0xFE;
+   pmbr->PartitionRecord[0].EndSector = 0xFF;
+   pmbr->PartitionRecord[0].EndTrack = 0xFF;
+-- 
+2.21.0
+
diff --git a/SPECS/parted.spec b/SPECS/parted.spec
index 43d206f..fc34b7c 100644
--- a/SPECS/parted.spec
+++ b/SPECS/parted.spec
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 3.1
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -71,6 +71,7 @@ Patch52: 0052-dasd-enhance-device-probing.patch
 Patch53: 0053-parted-fix-build-error-on-s390.patch
 Patch54: 0054-fdasd.c-Safeguard-against-geometry-misprobing.patch
 Patch55: 0055-Add-part-label-documentation-to-mkpart-command.patch
+Patch56: 0056-libparted-Fix-starting-CHS-in-protective-MBR.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -207,6 +208,10 @@ fi
 
 
 %changelog
+* Fri Nov 08 2019 Brian C. Lane <bcl@redhat.com> - 3.1-32
+- libparted: Fix starting CHS in protective MBR
+  Resolves: rhbz#1702778
+
 * Wed Mar 27 2019 Brian C. Lane <bcl@redhat.com> - 3.1-31
 - Backport patches for dasd on virtio
   fdasd: geometry handling updated from upstream s390-tools