!25 同步sp2的修改

From: @wieder
Reviewed-by: @liuzhiqiang26
Signed-off-by: @liuzhiqiang26

0000-Switch-gpt-header-move-and-msdos-overlap-to-python3.patch

@@ -0,0 +1,34 @@
+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
+

0004-hfsplus_btree_search-free-node-when-hfsplus_file_rea.patch

@@ -1,35 +0,0 @@
-From f7e08c5cb68f84541bb982c3dd6ab50a163bd2c2 Mon Sep 17 00:00:00 2001
-From: Li Jinlin <lijinlin3@huawei.com>
-Date: Tue, 29 Mar 2022 11:00:07 +0800
-Subject: [PATCH 1/6] hfsplus_btree_search: free node when hfsplus_file_read
- failed
-
-when hfsplus_file_read() return error, need to free node, otherwise there
-will be memory leak
-
-Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
-Signed-off-by: Li Jinlin <lijinlin3@huawei.com>
----
- libparted/fs/r/hfs/advfs_plus.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/libparted/fs/r/hfs/advfs_plus.c b/libparted/fs/r/hfs/advfs_plus.c
-index 55e88cd..b1cc644 100644
---- a/libparted/fs/r/hfs/advfs_plus.c
-+++ b/libparted/fs/r/hfs/advfs_plus.c
-@@ -101,9 +101,10 @@ hfsplus_btree_search (HfsPPrivateFile* b_tree_file, HfsPPrivateGenericKey* key,
- 
- 	/* Read the root node */
- 	if (!hfsplus_file_read (b_tree_file, node,
--				(PedSector) node_number * size, size))
-+				(PedSector) node_number * size, size)) {
-+		free(node);
- 		return 0;
--
-+	}
- 	/* Follow the white rabbit */
- 	while (1) {
- 		record_number = PED_BE16_TO_CPU (desc->rec_nb);
--- 
-2.27.0
-

0005-amiga_read-need-free-part-and-partition-when-constra.patch

@@ -1,35 +0,0 @@
-From 853f6bd35f22092f31595504d27c4910042631c5 Mon Sep 17 00:00:00 2001
-From: Li Jinlin <lijinlin3@huawei.com>
-Date: Tue, 29 Mar 2022 11:01:43 +0800
-Subject: [PATCH 2/6] amiga_read: need free part and partition when
- constraint_exact is NULL
-
-When constraint_exact is NULL and exit, need to release part and partition,
-otherwise there will be memory leaks
-
-Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
-Signed-off-by: Li Jinlin <lijinlin3@huawei.com>
----
- libparted/labels/rdb.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libparted/labels/rdb.c b/libparted/labels/rdb.c
-index cbbf29a..8096285 100644
---- a/libparted/labels/rdb.c
-+++ b/libparted/labels/rdb.c
-@@ -545,8 +545,11 @@ amiga_read (PedDisk* disk)
- 
- 		PedConstraint *constraint_exact
- 			= ped_constraint_exact (&part->geom);
--		if (constraint_exact == NULL)
-+		if (constraint_exact == NULL) {
-+			ped_partition_destroy(part);
-+			free(partition);
- 			return 0;
-+		}
- 		bool ok = ped_disk_add_partition (disk, part, constraint_exact);
- 		ped_constraint_destroy (constraint_exact);
- 		if (!ok) {
--- 
-2.27.0
-

0006-scsi_get_product_info-fix-memleak-and-avoid-to-use-N.patch

@@ -1,58 +0,0 @@
-From 1fdae37b82d0cf16df80f648b5489f7ffd15eae1 Mon Sep 17 00:00:00 2001
-From: Li Jinlin <lijinlin3@huawei.com>
-Date: Tue, 29 Mar 2022 11:02:38 +0800
-Subject: [PATCH 3/6] scsi_get_product_info: fix memleak and avoid to use NULL
- pointer
-
-Need to ensure that *vendor and *product are not NULL in scsi_query_product_info()
-before return 1, otherwise a null pointer may be used.
-
-Regardless of whether scsi_query_product_info() returns success or failed,
-vendor and product should be released, otherwise there will be a memory leak
-
-Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
-Signed-off-by: Li Jinlin <lijinlin3@huawei.com>
----
- libparted/arch/linux.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
-index 94ea176..23ec55a 100644
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -1130,7 +1130,9 @@ scsi_query_product_info (PedDevice* dev, char **vendor, char **product)
-         buf[16] = '\0';
-         *product = strip_name (buf);
- 
--        return 1;
-+        if (*vendor && *product)
-+            return 1;
-+        return 0;
- }
- 
- /* This function provides the vendor and product name for a SCSI device.
-@@ -1144,7 +1146,6 @@ scsi_get_product_info (PedDevice* dev, char **vendor, char **product)
-         *product = read_device_sysfs_file (dev, "model");
-         if (*vendor && *product)
-                 return 1;
--
-         return scsi_query_product_info (dev, vendor, product);
- }
- 
-@@ -1188,11 +1189,11 @@ init_scsi (PedDevice* dev)
- 
-         if (scsi_get_product_info (dev, &vendor, &product)) {
-                 sprintf (dev->model, "%.8s %.16s", vendor, product);
--                free (vendor);
--                free (product);
-         } else {
-                 strcpy (dev->model, "Generic SCSI");
-         }
-+        free (vendor);
-+        free (product);
- 
-         if (!_device_probe_geometry (dev))
-                 goto error_close_dev;
--- 
-2.27.0
-

0007-fat_op_context_new-free-ctx-remap-and-goto-correct-l.patch

@@ -1,49 +0,0 @@
-From fa8544b4229e19679db070c31969c9739f702fd0 Mon Sep 17 00:00:00 2001
-From: Li Jinlin <lijinlin3@huawei.com>
-Date: Tue, 29 Mar 2022 11:07:33 +0800
-Subject: [PATCH 4/6] fat_op_context_new: free ctx->remap and goto correct
- label to avoid memleak
-
-When calc_deltas returns an error, need to release ctx->remap,
-and eed to jump to the correct label to release ctx, otherwise
-there will be memory leaks
-
-Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
-Signed-off-by: Li Jinlin <lijinlin3@huawei.com>
----
- libparted/fs/r/fat/context.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/libparted/fs/r/fat/context.c b/libparted/fs/r/fat/context.c
-index 5ca154c..fce77af 100644
---- a/libparted/fs/r/fat/context.c
-+++ b/libparted/fs/r/fat/context.c
-@@ -86,9 +86,9 @@ fat_op_context_new (PedFileSystem* new_fs, PedFileSystem* old_fs)
- 	ctx->frag_sectors = PED_MIN (old_fs_info->cluster_sectors,
- 				     new_fs_info->cluster_sectors);
- 	if (!fat_set_frag_sectors (new_fs, ctx->frag_sectors))
--		goto error;
-+		goto error_free_ctx;
- 	if (!fat_set_frag_sectors (old_fs, ctx->frag_sectors))
--		goto error;
-+		goto error_free_ctx;
- 
- 	ctx->buffer_frags = old_fs_info->buffer_sectors / ctx->frag_sectors;
- 	ctx->buffer_map = (FatFragment*) ped_malloc (sizeof (FatFragment)
-@@ -104,10 +104,12 @@ fat_op_context_new (PedFileSystem* new_fs, PedFileSystem* old_fs)
- 	ctx->new_fs = new_fs;
- 	ctx->old_fs = old_fs;
- 	if (!calc_deltas (ctx))
--		goto error_free_buffer_map;
-+		goto error_free_remap;
- 
- 	return ctx;
- 
-+error_free_remap:
-+	free(ctx->remap);
- error_free_buffer_map:
- 	free (ctx->buffer_map);
- error_free_ctx:
--- 
-2.27.0
-

0008-hfsplus_cache_from_extent-fix-memleak.patch

@@ -1,32 +0,0 @@
-From ab6fde7a74ae90446a1ae88da82fee572a8a0466 Mon Sep 17 00:00:00 2001
-From: Li Jinlin <lijinlin3@huawei.com>
-Date: Tue, 29 Mar 2022 11:08:46 +0800
-Subject: [PATCH 5/6] hfsplus_cache_from_extent: fix memleak
-
-Need to release node when an error occurs
-
-Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
-Signed-off-by: Li Jinlin <lijinlin3@huawei.com>
----
- libparted/fs/r/hfs/reloc_plus.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libparted/fs/r/hfs/reloc_plus.c b/libparted/fs/r/hfs/reloc_plus.c
-index f065406..44e3490 100644
---- a/libparted/fs/r/hfs/reloc_plus.c
-+++ b/libparted/fs/r/hfs/reloc_plus.c
-@@ -670,8 +670,10 @@ hfsplus_cache_from_extent(HfsCPrivateCache* cache, PedFileSystem* fs,
- 					_("The extents overflow file should not"
- 					" contain its own extents!  You should "
- 					"check the file system."))
--						!= PED_EXCEPTION_IGNORE)
-+						!= PED_EXCEPTION_IGNORE) {
-+					free(node);
- 					return 0;
-+				}
- 				where = CR_BTREE_EXT_EXT;
- 				break;
- 			    case PED_CPU_TO_BE32 (HFS_CATALOG_ID) :
--- 
-2.27.0
-

0009-fat_clobber-set-boot_sector-NULL-and-free-boot_secto.patch

@@ -1,38 +0,0 @@
-From 1512dc33b36ad0feff9dbdcfe38e6d2acdcb38a0 Mon Sep 17 00:00:00 2001
-From: Li Jinlin <lijinlin3@huawei.com>
-Date: Tue, 29 Mar 2022 11:10:19 +0800
-Subject: [PATCH 6/6] fat_clobber: set boot_sector = NULL and free boot_sector
- after failed of fat_boot_sector_read
-
-When fat_boot_sector_read() returns failure, boot_sector may have
-allocated memory, and memory leak will occur
-
-Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
-Signed-off-by: Li Jinlin <lijinlin3@huawei.com>
----
- libparted/fs/r/fat/fat.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libparted/fs/r/fat/fat.c b/libparted/fs/r/fat/fat.c
-index 396494a..33a4284 100644
---- a/libparted/fs/r/fat/fat.c
-+++ b/libparted/fs/r/fat/fat.c
-@@ -117,11 +117,13 @@ fat_set_frag_sectors (PedFileSystem* fs, PedSector frag_sectors)
- int
- fat_clobber (PedGeometry* geom)
- {
--	FatBootSector *boot_sector;
-+	FatBootSector *boot_sector = NULL;
- 	int ok;
- 
--	if (!fat_boot_sector_read (&boot_sector, geom))
-+	if (!fat_boot_sector_read (&boot_sector, geom)) {
-+		free(boot_sector);
- 		return 1;
-+	}
- 
- 	boot_sector->system_id[0] = 0;
- 	boot_sector->boot_sign = 0;
--- 
-2.27.0
-

6000-add-support-of-gpt_sync_mbr.patch

@@ -1,26 +1,19 @@
-From 7c5b213ab881dbf4a49673908092359f78bc13ce Mon Sep 17 00:00:00 2001
+From 22be792bfd8e4a4da7495ec60084c23dd8a43677 Mon Sep 17 00:00:00 2001
 From: huangkaibin <huangkaibin@huawei.com>
 Date: Fri, 25 Jan 2019 19:46:52 +0000
 Subject: [PATCH] add-support-of-gpt_sync_mbr
 
 Hybrid MBR support is support by adding a new type of 'gpt_sync_mbr' for mklabel command.
 This feature is migrated from the path of "parted-gpt-mbr-sync.patch" of SUSE 12 SP1.
-
-Compilation Error:
-gpt.c:1345:50: error: 'GPTPartitionData' {aka 'struct _GPTPartitionData'}
-has no member named 'boot'
-This code has been refactored.'boot' is removed.
-So we should call ped_partition_get_flag to instead.
-Signed-off-by: Hongtao Zhang <zhanghongtao22@huawei.com>
 ---
- libparted/labels/gpt.c | 246 ++++++++++++++++++++++++++++++++++++++++-
+ libparted/labels/gpt.c | 246 ++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 242 insertions(+), 4 deletions(-)
 
 diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
-index 780fb70..f63d414 100644
+index 4f922b2..b2dad71 100644
 --- a/libparted/labels/gpt.c
 +++ b/libparted/labels/gpt.c
-@@ -364,6 +364,7 @@ typedef struct _GPTPartitionData
+@@ -306,6 +306,7 @@ typedef struct _GPTPartitionData
  } GPTPartitionData;
  
  static PedDiskType gpt_disk_type;
@@ -28,7 +21,7 @@ index 780fb70..f63d414 100644
  
  static inline uint32_t
  pth_get_size (const PedDevice *dev)
-@@ -530,8 +531,54 @@ _pmbr_is_valid (const LegacyMBR_t *mbr)
+@@ -474,8 +475,54 @@ _pmbr_is_valid (const LegacyMBR_t *mbr)
    return 0;
  }
  
@@ -84,7 +77,7 @@ index 780fb70..f63d414 100644
  {
    int gpt_sig_found = 0;
  
-@@ -565,6 +612,19 @@ gpt_probe (const PedDevice *dev)
+@@ -509,6 +556,19 @@ gpt_probe (const PedDevice *dev)
    return gpt_sig_found;
  }
  
@@ -104,11 +97,10 @@ index 780fb70..f63d414 100644
  static PedDisk *
  gpt_alloc (const PedDevice *dev)
  {
-@@ -609,6 +669,36 @@ error:
-   return NULL;
+@@ -554,6 +614,36 @@ error:
  }
  
-+static PedDisk *
+ static PedDisk *
 +gpt_sync_mbr_alloc (const PedDevice *dev)
 +{
 +  PedDisk *disk;
@@ -138,10 +130,11 @@ index 780fb70..f63d414 100644
 +  return NULL;
 +}
 +
- static PedDisk *
++static PedDisk *
  gpt_duplicate (const PedDisk *disk)
  {
-@@ -983,7 +1073,7 @@ gpt_read (PedDisk *disk)
+   PedDisk *new_disk;
+@@ -967,7 +1057,7 @@ gpt_read (PedDisk *disk)
  
    /* motivation: let the user decide about the pmbr... during
       ped_disk_probe(), they probably didn't get a choice... */
@@ -150,7 +143,7 @@ index 780fb70..f63d414 100644
      goto error;
  
    GuidPartitionTableHeader_t *gpt = NULL;
-@@ -1140,11 +1230,61 @@ error:
+@@ -1124,11 +1214,61 @@ error:
    return 0;
  }
  
@@ -213,7 +206,7 @@ index 780fb70..f63d414 100644
    /* The UEFI spec is not clear about what to do with the following
       elements of the Protective MBR (pmbr): BootCode (0-440B),
       UniqueMBRSignature (440B-444B) and Unknown (444B-446B).
-@@ -1158,6 +1298,8 @@ _write_pmbr (PedDevice *dev, bool pmbr_boot)
+@@ -1142,6 +1282,8 @@ _write_pmbr (PedDevice *dev, bool pmbr_boot)
    memset (pmbr->PartitionRecord, 0, sizeof pmbr->PartitionRecord);
  
    pmbr->Signature = PED_CPU_TO_LE16 (MSDOS_MBR_SIGNATURE);
@@ -222,7 +215,7 @@ index 780fb70..f63d414 100644
    pmbr->PartitionRecord[0].OSType = EFI_PMBR_OSTYPE_EFI;
    pmbr->PartitionRecord[0].StartSector = 2;
    pmbr->PartitionRecord[0].EndHead = 0xFF;
-@@ -1170,6 +1312,60 @@ _write_pmbr (PedDevice *dev, bool pmbr_boot)
+@@ -1154,6 +1296,60 @@ _write_pmbr (PedDevice *dev, bool pmbr_boot)
      pmbr->PartitionRecord[0].SizeInLBA = PED_CPU_TO_LE32 (dev->length - 1UL);
    if (pmbr_boot)
      pmbr->PartitionRecord[0].BootIndicator = 0x80;
@@ -275,7 +268,7 @@ index 780fb70..f63d414 100644
 +      pmbr->PartitionRecord[i].EndSector   = 0xFF;
 +      pmbr->PartitionRecord[i].EndTrack    = 0xFF;
 +      pmbr->PartitionRecord[i].StartingLBA = PED_CPU_TO_LE32 (_part_32bitmax(part->geom.start));
-+      if(ped_partition_get_flag(part, PED_PARTITION_BOOT))
++      if(((GPTPartitionData*)part->disk_specific)->boot)
 +          pmbr->PartitionRecord[i].BootIndicator = 0x80;
 +      pmbr->PartitionRecord[i].SizeInLBA = PED_CPU_TO_LE32 (_part_32bitmax(part->geom.end - part->geom.start + 1));
 +  }
@@ -283,7 +276,7 @@ index 780fb70..f63d414 100644
  
    int write_ok = ped_device_write (dev, pmbr, GPT_PMBR_LBA,
                                     GPT_PMBR_SECTORS);
-@@ -1284,7 +1480,7 @@ gpt_write (const PedDisk *disk)
+@@ -1273,7 +1469,7 @@ gpt_write (const PedDisk *disk)
    ptes_crc = efi_crc32 (ptes, ptes_bytes);
  
    /* Write protective MBR */
@@ -292,7 +285,7 @@ index 780fb70..f63d414 100644
      goto error_free_ptes;
  
    /* Write PTH and PTEs */
-@@ -1916,6 +2112,38 @@ static PedDiskOps gpt_disk_ops =
+@@ -2070,6 +2266,38 @@ static PedDiskOps gpt_disk_ops =
    PT_op_function_initializers (gpt)
  };
  
@@ -331,8 +324,8 @@ index 780fb70..f63d414 100644
  static PedDiskType gpt_disk_type =
  {
    next:		NULL,
-@@ -1925,16 +2153,26 @@ static PedDiskType gpt_disk_type =
- 		PED_DISK_TYPE_DISK_UUID | PED_DISK_TYPE_PARTITION_UUID
+@@ -2078,16 +2306,26 @@ static PedDiskType gpt_disk_type =
+   features:	PED_DISK_TYPE_PARTITION_NAME
  };
  
 +static PedDiskType gpt_sync_mbr_disk_type =
@@ -359,5 +352,5 @@ index 780fb70..f63d414 100644
  
  verify (sizeof (GuidPartitionEntryAttributes_t) == 8);
 -- 
-2.33.0
+1.8.3.1
 

9002-Fix-end_input-usage-in-do_resizepart.patch

@@ -0,0 +1,34 @@
+From ca845aeeddb17343c9289816833ca352f7c0d87b 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
+

README.md

@@ -0,0 +1,39 @@
+# parted
+
+#### 介绍
+{**以下是码云平台说明，您可以替换此简介**
+码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
+无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
+
+#### 软件架构
+软件架构说明
+
+
+#### 安装教程
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### 使用说明
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码
+4.  新建 Pull Request
+
+
+#### 码云特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
+5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

parted-3.3.tar.xz.sig

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQFDBAABCgAtFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAl2fxMwPHGJjbEByZWRo
+YXQuY29tAAoJEBF+jBaO/jp/bygH/ReO2REK9e3YvbNmJmI4jRsiS6KHJ7ufVHAW
+DwFHE6TvD8c0EG5RcZNwJUNB2rLUs+RlZCVxU/qzN+nPlZJNXVqjpIZOwNn9H9op
+vqLk/Ja6FzvIDPeyes3HTZFojdLZSLvJ5WUnFf/ZKiiJCM2Qgxy3bp/mmBL9niQb
+jEr3UUHzVxfMHBFIqnY81+HriBZGCD+vmcKPZ5iMtb4LhHl+WeiFXByS3j4ZrVcg
+NvnyjDQgPJj7oKFGgTfbaZs/d9LCE9XAudYUUTszlEajN2JsNEud4jse19EHeLzd
+Gd7gR4NFK0k1qhOvi9GaBReMiW7YzX6xey3oxBKdNRHmu8wGhSA=
+=i81F
+-----END PGP SIGNATURE-----

parted.spec

@@ -1,5 +1,3 @@
-#needsrootforbuild
-
 # This SPEC file come from GNU Parted Project(git://git.savannah.gnu.org/parted.git)
 # Default to disabling device-mapper and SELinux
 %define use_devmapper 0
@@ -15,10 +13,11 @@
 
 Summary:   The GNU disk partition manipulation program
 Name:      parted
-Version:   3.6
-Release:   1
+Version:   3.3
+Release:   6
 URL:       https://www.gnu.org/software/parted/
 Source0:   ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
+Source1:   ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
 License:   GPLv3+
 
 BuildRequires: e2fsprogs-devel e2fsprogs xfsprogs readline-devel ncurses-devel gettext-devel python3 gperf
@@ -26,17 +25,12 @@ BuildRequires: autoconf automake libtool gettext-devel texinfo pkgconfig gcc mak
 BuildRequires: libblkid-devel >= 2.17
 BuildRequires: device-mapper-devel, libselinux-devel libsepol-devel
 
-Patch1: 0001-add-support-of-gpt_sync_mbr.patch
-Patch2: 0002-Add-extra-judgment-for-a-partition-created-success.patch
-Patch3: 0003-bugfix-parted-fix-failure-of-mklabel-gpt_sync_mbr.patch
-Patch4: 0004-hfsplus_btree_search-free-node-when-hfsplus_file_rea.patch
-Patch5: 0005-amiga_read-need-free-part-and-partition-when-constra.patch
-Patch6: 0006-scsi_get_product_info-fix-memleak-and-avoid-to-use-N.patch
-Patch7: 0007-fat_op_context_new-free-ctx-remap-and-goto-correct-l.patch
-Patch8: 0008-hfsplus_cache_from_extent-fix-memleak.patch
-Patch9: 0009-fat_clobber-set-boot_sector-NULL-and-free-boot_secto.patch
-
-Patch9000: 9000-parted-remove-patch-which-modifid-cyl-size.patch
+Patch0000: 0000-Switch-gpt-header-move-and-msdos-overlap-to-python3.patch 
+Patch6000: 6000-add-support-of-gpt_sync_mbr.patch
+Patch9000: 9000-Add-extra-judgment-for-a-partition-created-success.patch
+Patch9001: 9001-bugfix-parted-fix-failure-of-mklabel-gpt_sync_mbr.patch
+Patch9002: 9002-Fix-end_input-usage-in-do_resizepart.patch
+Patch9003: 9003-parted-remove-patch-which-modifid-cyl-size.patch
 
 %description
 The GNU Parted program allows you to create, destroy, resize, move,
@@ -57,7 +51,7 @@ Parted library, you need to install this package.
 %autosetup -n %{name}-%{version} -p1
 
 %build
-autoreconf -i
+autoreconf
 autoconf
 %configure \
    --enable-shared \
@@ -121,48 +115,20 @@ fi
 %{_libdir}/pkgconfig/libparted*.pc
 
 %changelog
-* Mon Feb 26 2024 wangzhiqiang <wangzhiqiang95@huawei.com> - 3.6-1
-- update to 3.6
-- update version dependency
-
-* Thu Dec 14 2023 lingsheng <lingsheng@xfusion.com> - 3.5-2
+* Tue May 18 2021 wuguanghao<wuguanghao3@huawei.com> - 3.3-6
 - remove patch which modifid cyl-size
 
-* Wed Oct 26 2022 Hongtao Zhang  <zhanghongtao22@huawei.com> - 3.5-1
-- update to 3.5
+* Tue Feb 9 2021 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 3.3-5
+- fix end input usage in do_resizepart
 
-* Thu Mar 3 2022 Li Jinlin  <lijinlin3@huawei.com> - 3.4-4
-- fix memory leak in libparted
+* Tue Feb 9 2021 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 3.3-4
+- set release num to 4 for CI
 
-* Thu Mar 3 2022 Li Jinlin  <lijinlin3@huawei.com> - 3.4-3
-- add need root for build
-
-* Tue Dec 21 2021 Chenxi Mao <chenxi.mao@suse.com> - 3.4-2
-- fix build error on SUSE Euler 2.0
-
-* 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
-- delete useless file
-
-* Sun Jul 12 2020 Zhiqiang Liu <lzhq28@mail.ustc.edu.cn> - 3.3-6
-- backport bugfix patches
-
-* Sun Jul 5 2020 Zhiqiang Liu <lzhq28@mail.ustc.edu.cn> - 3.3-5
-- remove useless readme files
-
-* Mon Jun 29 2020 Zhiqiang Liu <lzhq28@mail.ustc.edu.cn> - 3.3-4
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: renumber patches
-
-* Wed Jun 17 2020 Zhiqiang Liu <lzhq28@mail.ustc.edu.cn> - 3.3-3
+* Sat Jun 20 2020 fuyangqing<fuyangqing@huawei.com> - 3.3-3
 - Type:bugfix
 - ID:NA
 - SUG:NA
-- DESC: add parted.tar.gz.sig file in Source tag
+- DESC: add parted.gz.sig file in source tag
 
 * Sat Mar 14 2020 hy-euler <eulerstoragemt@huawei.com> - 3.3-2
 - Type:enhancement

parted.yaml

@@ -1,5 +0,0 @@
-version_control: git
-src_repo: git://git.savannah.gnu.org/parted.git
-tag_prefix: "^v"
-seperator: "."
-