From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 11 Jun 2018 09:17:54 +0000 (+0100)
Subject: parted: Update to 3.2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88944938af78a53c8d15a94308b1c9fe93e55648;p=people%2Fms%2Fipfire-2.x.git

parted: Update to 3.2

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/parted b/lfs/parted
index 5dee653a42..c253c8b7bb 100644
--- a/lfs/parted
+++ b/lfs/parted
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1
+VER        = 3.2
 
 THISAPP    = parted-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = parted
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5d89d64d94bcfefa9ce8f59f4b81bdcb
+$(DL_FILE)_MD5 = 0247b6a7b314f8edeb618159fa95f9cb
 
 install : $(TARGET)
 
@@ -78,6 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/parted-3.2-device-mapper.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-device-mapper
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
diff --git a/src/patches/parted-3.2-device-mapper.patch b/src/patches/parted-3.2-device-mapper.patch
new file mode 100644
index 0000000000..e866c8860a
--- /dev/null
+++ b/src/patches/parted-3.2-device-mapper.patch
@@ -0,0 +1,44 @@
+--- parted-3.2/libparted/arch/linux.c.device-mapper	2014-06-15 20:15:54.000000000 +0100
++++ parted-3.2/libparted/arch/linux.c	2014-07-29 22:27:54.487430030 +0100
+@@ -2307,6 +2307,7 @@ zasprintf (const char *format, ...)
+ static char *
+ dm_canonical_path (PedDevice const *dev)
+ {
++#ifdef ENABLE_DEVICE_MAPPER
+         LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev);
+ 
+         /* Get map name from devicemapper */
+@@ -2324,6 +2325,7 @@ dm_canonical_path (PedDevice const *dev)
+         dm_task_destroy (task);
+         return dev_name;
+ err:
++#endif
+         return NULL;
+ }
+ 
+@@ -2944,13 +2946,14 @@ _disk_sync_part_table (PedDisk* disk)
+                                                unsigned long long *start,
+                                                unsigned long long *length);
+ 
+-
++#ifdef ENABLE_DEVICE_MAPPER
+         if (disk->dev->type == PED_DEVICE_DM) {
+                 add_partition = _dm_add_partition;
+                 remove_partition = _dm_remove_partition;
+                 resize_partition = _dm_resize_partition;
+                 get_partition_start_and_length = _dm_get_partition_start_and_length;
+         } else {
++#endif
+                 add_partition = _blkpg_add_partition;
+                 remove_partition = _blkpg_remove_partition;
+ #ifdef BLKPG_RESIZE_PARTITION
+@@ -2959,7 +2962,9 @@ _disk_sync_part_table (PedDisk* disk)
+                 resize_partition = NULL;
+ #endif
+                 get_partition_start_and_length = _kernel_get_partition_start_and_length;
++#ifdef ENABLE_DEVICE_MAPPER
+         }
++#endif
+ 
+         /* lpn = largest partition number.
+          * for remove pass, use greater of device or label limit */