Hello community, here is the log from the commit of package parted for openSUSE:Factory checked in at 2020-01-15 16:08:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parted (Old) and /work/SRC/openSUSE:Factory/.parted.new.30080 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "parted" Wed Jan 15 16:08:41 2020 rev:129 rq:763641 version:3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/parted/parted.changes 2019-07-31 14:15:03.498822681 +0200 +++ /work/SRC/openSUSE:Factory/.parted.new.30080/parted.changes 2020-01-15 16:43:15.325118919 +0100 @@ -1,0 +2,81 @@ +Fri Jan 3 14:46:27 UTC 2020 - Anna Maresova <[email protected]> + +- fix crash in do_resizepart + + parted-fix-end_input-usage.patch: Fix end_input usage in + do_resizepart + +------------------------------------------------------------------- +Fri Nov 22 14:25:28 UTC 2019 - Anna Maresova <[email protected]> + +- update to version 3.3, noteworthy changes: + - s390: Re-enabled virtio-attached DASD heuristics by using + HDIO_GETGEO when probing device geometry. Fixes a bug with + KVM virtio-blk backed by a DASD. + Parted now recognizes NVMe devices, NVDIMM, and RAM drives. + - Fix atari disklabel false positives by probing other labels first. + - Fix resizepart to adjust the end to be -1 sector when using iec + power of 2 units so that the next partition can start immediately + following the new end, just like mkpart does. + - Fix set and disk_set to not crash when there are no flags to set. + - Fix a udev cookie leak when using resizepart on device-mapper devices. + - Fix a gettext crash/error sometimes when using localized languages. + - Fix fat resize to preverve boot code, and thus not render the + filesystem unreconized by Windows. + - Fix rescue command: the rescue command often failed to find + filesystems due to leaving on cylinder alignment. + - libparted-fs-resize: Prevent crash resizing FAT file systems with very + deep directories with path names over 512 bytes long. + - Use 512b sector size when communicating with device-mapper. Fixes + problems with partitions being created too small on dm devices + with sector sizes > 5121b + - Don't crash in the disk_set command when a disk label is not found + - libparted-fs-resize: Prevent crash resizing FAT16 file systems. + - libparted-fs-resize: Prevent crash resizing FAT16 file systems. + - If the user specifies start/end of the partition as cylinders + and a cylinder has a size which is power of 2, then such address + does not trigger exact placement. + - mkpart: Allow negative start value when FS-TYPE is not given +- remove following patches (now in upstream): + - 0001-fdasd-geometry-handling-updated-from-upstream-s390-t.patch + - 0002-dasd-enhance-device-probing.patch + - 0003-parted-fix-build-error-on-s390.patch + - 0004-fdasd.c-Safeguard-against-geometry-misprobing.patch + - 0005-libparted-Remove-fdasd-geometry-code-from-alloc_meta.patch + - clean-the-disk-information-when-commands-fail-in-int.patch + - lib-fs-resize-prevent-crash-resizing-FAT16.patch + - libpartd-dasd-improve-flag-processing-for-DASD-LDL.patch + - libparted-Add-support-for-NVDIMM-devices.patch + - libparted-Add-support-for-NVMe-devices.patch + - libparted-Add-support-for-RAM-drives.patch + - libparted-BLKPG_RESIZE_PARTITION-uses-bytes.patch + - libparted-Use-read-only-when-probing-devices-on-linu.patch + - libparted-allow-bigger-snap-radius-if-cylinders-are-used.patch + - libparted-dasd-add-an-exception-for-changing-DASD-LD.patch + - libparted-dasd-add-new-fdasd-functions.patch + - libparted-dasd-add-test-cases-for-the-new-fdasd-func.patch + - libparted-dasd-correct-the-offset-where-the-first-pa.patch + - libparted-dasd-unify-vtoc-handling-for-cdl-ldl.patch + - libparted-dasd-update-and-improve-fdasd-functions.patch + - libparted-device-mapper-uses-512b-sectors.patch + - libparted-dont-warn-if-no-HDIO_GET_IDENTITY.patch + - libparted-fix-starting-CHS-in-protective-MBR.patch + - libparted-fix-udev-cookie-leak.patch + - libparted-make-sure-not-to-treat-percentages-and-cyls-as-exact.patch + - libparted-set-swap-flag-on-GPT-partitions.patch + - libparted-sysmacros.patch + - parted-3.2.tar.xz + - parted-3.2.tar.xz.sig + - parted-check-the-name-of-partition-first-when-to-nam.patch + - parted-dont-crash-in-disk_set-when-disk-label-not-found.patch + - parted-fix-crash-due-to-improper-partition-number-in.patch + - parted-fix-wrong-error-label-jump-in-mkpart.patch + - parted-ui-remove-unneccesary-information-of-command.patch + - tests-check-extended-partition-length.patch + - tests-increase-scsi_debug-tmo.patch + - tests-set-optimal-blocks-for-scsi_debug.patch + - tests-update-t0220-t0280-for-swap-flag.patch + - tests-use-wait_for_dev_to_-functions.patch + - tests-wait_for_-loop.patch +- backported or refreshed remaining patches + +------------------------------------------------------------------- Old: ---- 0001-fdasd-geometry-handling-updated-from-upstream-s390-t.patch 0002-dasd-enhance-device-probing.patch 0003-parted-fix-build-error-on-s390.patch 0004-fdasd.c-Safeguard-against-geometry-misprobing.patch 0005-libparted-Remove-fdasd-geometry-code-from-alloc_meta.patch clean-the-disk-information-when-commands-fail-in-int.patch lib-fs-resize-prevent-crash-resizing-FAT16.patch libpartd-dasd-improve-flag-processing-for-DASD-LDL.patch libparted-Add-support-for-NVDIMM-devices.patch libparted-Add-support-for-NVMe-devices.patch libparted-Add-support-for-RAM-drives.patch libparted-BLKPG_RESIZE_PARTITION-uses-bytes.patch libparted-Use-read-only-when-probing-devices-on-linu.patch libparted-allow-bigger-snap-radius-if-cylinders-are-used.patch libparted-dasd-add-an-exception-for-changing-DASD-LD.patch libparted-dasd-add-new-fdasd-functions.patch libparted-dasd-add-test-cases-for-the-new-fdasd-func.patch libparted-dasd-correct-the-offset-where-the-first-pa.patch libparted-dasd-unify-vtoc-handling-for-cdl-ldl.patch libparted-dasd-update-and-improve-fdasd-functions.patch libparted-device-mapper-uses-512b-sectors.patch libparted-dont-warn-if-no-HDIO_GET_IDENTITY.patch libparted-fix-starting-CHS-in-protective-MBR.patch libparted-fix-udev-cookie-leak.patch libparted-make-sure-not-to-treat-percentages-and-cyls-as-exact.patch libparted-set-swap-flag-on-GPT-partitions.patch libparted-sysmacros.patch parted-3.2.tar.xz parted-3.2.tar.xz.sig parted-check-the-name-of-partition-first-when-to-nam.patch parted-dont-crash-in-disk_set-when-disk-label-not-found.patch parted-fix-crash-due-to-improper-partition-number-in.patch parted-fix-wrong-error-label-jump-in-mkpart.patch parted-ui-remove-unneccesary-information-of-command.patch tests-check-extended-partition-length.patch tests-increase-scsi_debug-tmo.patch tests-set-optimal-blocks-for-scsi_debug.patch tests-update-t0220-t0280-for-swap-flag.patch tests-use-wait_for_dev_to_-functions.patch tests-wait_for_-loop.patch New: ---- parted-3.3.tar.xz parted-3.3.tar.xz.sig parted-fix-end_input-usage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parted.spec ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.261119256 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.265119258 +0100 @@ -1,7 +1,7 @@ # # spec file for package parted # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: parted -Version: 3.2 +Version: 3.3 Release: 0 Summary: GNU partitioner License: GPL-3.0-or-later @@ -37,78 +37,36 @@ Patch12: libparted-partition-naming.patch #PATCH-FEATURE-SUSE more-reliable-informing-the-kernel.patch bnc#657360 [email protected] Patch13: more-reliable-informing-the-kernel.patch -Patch17: dummy-bootcode-only-for-x86.patch -Patch18: parted-type.patch -Patch19: parted-mac.patch -Patch21: libparted-use-BLKRRPART-for-DASD.patch.patch -Patch22: libparted-allow-bigger-snap-radius-if-cylinders-are-used.patch -Patch23: libparted-make-BLKRRPART-more-robust.patch -Patch24: libparted-make-sure-not-to-treat-percentages-and-cyls-as-exact.patch -Patch25: libparted-dasd-implicit-partition-disk-flag.patch -Patch26: lib-fs-resize-prevent-crash-resizing-FAT16.patch -Patch27: parted-dont-crash-in-disk_set-when-disk-label-not-found.patch -Patch28: libparted-device-mapper-uses-512b-sectors.patch +Patch14: dummy-bootcode-only-for-x86.patch +Patch15: parted-type.patch +Patch16: parted-mac.patch +Patch17: libparted-use-BLKRRPART-for-DASD.patch.patch +Patch18: libparted-make-BLKRRPART-more-robust.patch +Patch19: libparted-dasd-implicit-partition-disk-flag.patch # Remove following compatibility patch once bnc#931765 is resolved -Patch29: parted-resize-alias-to-resizepart.patch -Patch30: libparted-avoid-libdevice-mapper-warnings.patch +Patch20: parted-resize-alias-to-resizepart.patch +Patch21: libparted-avoid-libdevice-mapper-warnings.patch # Patch31 dropped for bsc#1058667 -Patch32: libparted-Use-read-only-when-probing-devices-on-linu.patch -Patch33: libparted-open-the-device-RO-and-lazily-switch-to-RW.patch -Patch34: parted-implement-wipesignatures-option.patch +Patch22: libparted-open-the-device-RO-and-lazily-switch-to-RW.patch +Patch23: parted-implement-wipesignatures-option.patch # bsc#982169 -Patch35: libparted-Add-support-for-NVMe-devices.patch -Patch36: libparted-fix-nvme-partition-naming.patch -Patch37: libparted-dont-warn-if-no-HDIO_GET_IDENTITY.patch -# fate#320525 / bsc#935127 -Patch38: 0001-fdasd-geometry-handling-updated-from-upstream-s390-t.patch -Patch39: 0002-dasd-enhance-device-probing.patch -Patch40: 0003-parted-fix-build-error-on-s390.patch -Patch41: 0004-fdasd.c-Safeguard-against-geometry-misprobing.patch -Patch42: 0005-libparted-Remove-fdasd-geometry-code-from-alloc_meta.patch -# fate#321531 -Patch43: libparted-dasd-unify-vtoc-handling-for-cdl-ldl.patch -Patch44: libparted-dasd-update-and-improve-fdasd-functions.patch -Patch45: libparted-dasd-add-new-fdasd-functions.patch -Patch46: libparted-Add-support-for-RAM-drives.patch +Patch24: libparted-fix-nvme-partition-naming.patch # fate#314888 -Patch47: libparted-dasd-improve-lvm-raid-flag-handling.patch -Patch48: parted-mkpart-set-a-swap-flag-if-available.patch -Patch49: libparted-set-swap-flag-on-GPT-partitions.patch -Patch50: libparted-dasd-add-swap-flag-handling-for-DASD-CDL.patch -Patch51: parted-mkpart-allow-empty-gpt-part-name.patch -Patch52: libparted-fix-starting-CHS-in-protective-MBR.patch -Patch53: libparted-BLKPG_RESIZE_PARTITION-uses-bytes.patch -Patch54: libparted-fix-udev-cookie-leak.patch -Patch55: libparted-Add-support-for-NVDIMM-devices.patch -Patch56: libparted-fix-NVDIMM-partition-naming.patch -Patch57: parted-escape-printed-device-path.patch -Patch58: parted-add-ignore-busy-option.patch -Patch59: parted-fix-resizepart-and-rm-command.patch -Patch60: libparted-use-BLKRRPART-only-when-needed.patch -Patch61: libparted-canonicalize-dev-md-paths.patch -Patch62: libparted-sysmacros.patch - -# bsc#1136245 -Patch63: libparted-dasd-correct-the-offset-where-the-first-pa.patch -Patch64: parted-fix-crash-due-to-improper-partition-number-in.patch -Patch65: parted-fix-wrong-error-label-jump-in-mkpart.patch -Patch66: clean-the-disk-information-when-commands-fail-in-int.patch -Patch67: parted-check-the-name-of-partition-first-when-to-nam.patch -Patch68: parted-ui-remove-unneccesary-information-of-command.patch -Patch69: libpartd-dasd-improve-flag-processing-for-DASD-LDL.patch -Patch70: libparted-dasd-add-an-exception-for-changing-DASD-LD.patch -Patch71: libparted-dasd-add-test-cases-for-the-new-fdasd-func.patch - +Patch25: libparted-dasd-improve-lvm-raid-flag-handling.patch +Patch26: parted-mkpart-set-a-swap-flag-if-available.patch +Patch27: libparted-dasd-add-swap-flag-handling-for-DASD-CDL.patch +Patch28: parted-mkpart-allow-empty-gpt-part-name.patch +Patch29: libparted-fix-NVDIMM-partition-naming.patch +Patch30: parted-escape-printed-device-path.patch +Patch31: parted-add-ignore-busy-option.patch +Patch32: parted-fix-resizepart-and-rm-command.patch +Patch33: libparted-use-BLKRRPART-only-when-needed.patch +Patch34: libparted-canonicalize-dev-md-paths.patch +Patch35: parted-fix-end_input-usage.patch # Fatresize Patch100: parted-fatresize-autoconf.patch Patch101: fatresize-fix-getting-dev-name.patch -# Upstream tests patches -Patch150: tests-set-optimal-blocks-for-scsi_debug.patch -Patch151: tests-increase-scsi_debug-tmo.patch -Patch152: tests-use-wait_for_dev_to_-functions.patch -Patch153: tests-wait_for_-loop.patch -Patch154: tests-update-t0220-t0280-for-swap-flag.patch -Patch155: tests-check-extended-partition-length.patch +# Tests patches Patch156: tests-add-helper-require_swap_.patch Patch157: tests-add-dev-md-check-to-t6100.patch @@ -169,9 +127,13 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 @@ -182,54 +144,13 @@ %patch28 -p1 %patch29 -p1 %patch30 -p1 +%patch31 -p1 %patch32 -p1 %patch33 -p1 %patch34 -p1 %patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 -%patch58 -p1 -%patch59 -p1 -%patch60 -p1 -%patch61 -p1 -%patch62 -p1 -%patch63 -p1 -%patch64 -p1 -%patch65 -p1 -%patch66 -p1 -%patch67 -p1 -%patch68 -p1 -%patch69 -p1 -%patch70 -p1 -%patch71 -p1 %patch100 -p1 %patch101 -p1 -%patch150 -p1 -%patch151 -p1 -%patch152 -p1 -%patch153 -p1 -%patch154 -p1 -%patch155 -p1 %patch156 -p1 %patch157 -p1 %patch200 -p1 @@ -271,7 +192,7 @@ %defattr(-,root,root) %doc doc/API doc/FAT %{_includedir}/* -%{_libdir}/pkgconfig/libparted.pc +%{_libdir}/pkgconfig/libparted*.pc %{_libdir}/*.so %files -n libparted0 ++++++ dummy-bootcode-only-for-x86.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.297119269 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.297119269 +0100 @@ -5,11 +5,11 @@ libparted/labels/dos.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: parted-3.2/libparted/labels/dos.c +Index: parted-3.3/libparted/labels/dos.c =================================================================== ---- parted-3.2.orig/libparted/labels/dos.c -+++ parted-3.2/libparted/labels/dos.c -@@ -1285,6 +1285,12 @@ msdos_write (const PedDisk* disk) +--- parted-3.3.orig/libparted/labels/dos.c ++++ parted-3.3/libparted/labels/dos.c +@@ -1287,6 +1287,12 @@ msdos_write (const PedDisk* disk) return 0; DosRawTable *table = (DosRawTable *) s0; @@ -22,7 +22,7 @@ /* either no bootrecord at all, or AIX IPL signature ... */ if ( (!table->boot_code[0]) || ( table->boot_code[0] == (char) 0xc9 && -@@ -1295,6 +1301,7 @@ msdos_write (const PedDisk* disk) +@@ -1297,6 +1303,7 @@ msdos_write (const PedDisk* disk) memset (table->boot_code, 0, 512); memcpy (table->boot_code, MBR_BOOT_CODE, sizeof (MBR_BOOT_CODE)); } ++++++ hfs_fix.dif ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.309119274 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.309119274 +0100 @@ -2,11 +2,11 @@ libparted/labels/mac.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -Index: parted-3.2/libparted/labels/mac.c +Index: parted-3.3/libparted/labels/mac.c =================================================================== ---- parted-3.2.orig/libparted/labels/mac.c -+++ parted-3.2/libparted/labels/mac.c -@@ -467,7 +467,7 @@ _rawpart_is_void (MacRawPartition* raw_p +--- parted-3.3.orig/libparted/labels/mac.c ++++ parted-3.3/libparted/labels/mac.c +@@ -468,7 +468,7 @@ _rawpart_is_void (MacRawPartition* raw_p return _rawpart_cmp_type (raw_part, "Apple_Void"); } @@ -15,7 +15,7 @@ * doesn't represent a partition at all. NOTE: some people make Apple_Free * partitions with MacOS, because they can't select another type. So, if the * name is anything other than "Extra" or "", it is treated as a "real" -@@ -530,6 +530,13 @@ _rawpart_analyse (MacRawPartition* raw_p +@@ -531,6 +531,13 @@ _rawpart_analyse (MacRawPartition* raw_p if (!part) goto error; ++++++ libparted-avoid-libdevice-mapper-warnings.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.321119278 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.321119278 +0100 @@ -5,11 +5,11 @@ libparted/arch/linux.c | 6 ++++++ 1 file changed, 6 insertions(+) -Index: parted-3.2/libparted/arch/linux.c +Index: parted-3.3/libparted/arch/linux.c =================================================================== ---- parted-3.2.orig/libparted/arch/linux.c -+++ parted-3.2/libparted/arch/linux.c -@@ -2728,6 +2728,12 @@ _dm_remove_partition(PedDisk* disk, int +--- parted-3.3.orig/libparted/arch/linux.c ++++ parted-3.3/libparted/arch/linux.c +@@ -2852,6 +2852,12 @@ _dm_remove_partition(PedDisk* disk, int goto err; } close (fd); ++++++ libparted-dasd-add-swap-flag-handling-for-DASD-CDL.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.329119281 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.329119281 +0100 @@ -18,8 +18,10 @@ libparted/labels/dasd.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) ---- a/libparted/labels/dasd.c -+++ b/libparted/labels/dasd.c +Index: parted-3.3/libparted/labels/dasd.c +=================================================================== +--- parted-3.3.orig/libparted/labels/dasd.c ++++ parted-3.3/libparted/labels/dasd.c @@ -65,6 +65,7 @@ extern void ped_disk_dasd_done (); typedef struct { int type; @@ -64,7 +66,7 @@ vtoc_ebcdic_enc(p->f1->DS1DSNAM, p->f1->DS1DSNAM, 44); dasd_data->type = 0; -@@ -745,14 +741,25 @@ dasd_partition_set_flag (PedPartition* p +@@ -749,14 +745,25 @@ dasd_partition_set_flag (PedPartition* p dasd_data = part->disk_specific; switch (flag) { @@ -92,7 +94,7 @@ dasd_data->lvm = state; return ped_partition_set_system(part, part->fs_type); default: -@@ -770,6 +777,8 @@ dasd_partition_get_flag (const PedPartit +@@ -774,6 +781,8 @@ dasd_partition_get_flag (const PedPartit dasd_data = part->disk_specific; switch (flag) { @@ -101,16 +103,16 @@ case PED_PARTITION_RAID: return dasd_data->raid; case PED_PARTITION_LVM: -@@ -784,6 +793,8 @@ dasd_partition_is_flag_available (const - PedPartitionFlag flag) - { +@@ -802,6 +811,8 @@ dasd_partition_is_flag_available (const + return 0; + switch (flag) { + case PED_PARTITION_SWAP: + return 1; case PED_PARTITION_RAID: return 1; case PED_PARTITION_LVM: -@@ -962,17 +973,14 @@ dasd_partition_set_system (PedPartition* +@@ -985,17 +996,14 @@ dasd_partition_set_system (PedPartition* return 1; } ++++++ libparted-dasd-implicit-partition-disk-flag.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.341119285 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.341119285 +0100 @@ -7,10 +7,10 @@ libparted/labels/dasd.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) -Index: parted-3.1/include/parted/disk.in.h +Index: parted-3.3/include/parted/disk.in.h =================================================================== ---- parted-3.1.orig/include/parted/disk.in.h -+++ parted-3.1/include/parted/disk.in.h +--- parted-3.3.orig/include/parted/disk.in.h ++++ parted-3.3/include/parted/disk.in.h @@ -38,9 +38,11 @@ enum _PedDiskFlag { PED_DISK_CYLINDER_ALIGNMENT=1, /* This flag controls whether the boot flag of a GPT PMBR is set */ @@ -24,11 +24,11 @@ /** * Partition types -Index: parted-3.1/libparted/disk.c +Index: parted-3.3/libparted/disk.c =================================================================== ---- parted-3.1.orig/libparted/disk.c -+++ parted-3.1/libparted/disk.c -@@ -838,6 +838,8 @@ ped_disk_flag_get_name(PedDiskFlag flag) +--- parted-3.3.orig/libparted/disk.c ++++ parted-3.3/libparted/disk.c +@@ -841,6 +841,8 @@ ped_disk_flag_get_name(PedDiskFlag flag) return N_("cylinder_alignment"); case PED_DISK_GPT_PMBR_BOOT: return N_("pmbr_boot"); @@ -37,10 +37,10 @@ default: ped_exception_throw ( PED_EXCEPTION_BUG, -Index: parted-3.1/libparted/labels/dasd.c +Index: parted-3.3/libparted/labels/dasd.c =================================================================== ---- parted-3.1.orig/libparted/labels/dasd.c -+++ parted-3.1/libparted/labels/dasd.c +--- parted-3.3.orig/libparted/labels/dasd.c ++++ parted-3.3/libparted/labels/dasd.c @@ -73,6 +73,7 @@ typedef struct { unsigned int format_type; unsigned int label_block; @@ -79,7 +79,7 @@ /* CDL format, newer */ disk_specific->format_type = 2; disk_specific->label_block = 2; -@@ -293,6 +303,7 @@ dasd_read (PedDisk* disk) +@@ -289,6 +299,7 @@ dasd_read (PedDisk* disk) goto error_close_dev; disk_specific->format_type = 1; @@ -87,7 +87,7 @@ /* Register implicit partition */ ped_disk_delete_all (disk); -@@ -905,6 +916,40 @@ dasd_partition_enumerate (PedPartition* +@@ -922,6 +933,40 @@ dasd_partition_enumerate (PedPartition* } static int ++++++ libparted-fix-NVDIMM-partition-naming.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.349119288 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.349119288 +0100 @@ -9,11 +9,11 @@ libparted/arch/linux.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 1aef651..cf6c754 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -2439,6 +2439,7 @@ _device_get_part_path (PedDevice const *dev, int num) +Index: parted-3.3/libparted/arch/linux.c +=================================================================== +--- parted-3.3.orig/libparted/arch/linux.c ++++ parted-3.3/libparted/arch/linux.c +@@ -2489,6 +2489,7 @@ _device_get_part_path (PedDevice const * dev->type == PED_DEVICE_CPQARRAY || dev->type == PED_DEVICE_DAC960 || dev->type == PED_DEVICE_NVME || ++++++ libparted-fix-nvme-partition-naming.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.361119292 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.361119292 +0100 @@ -6,11 +6,11 @@ libparted/arch/linux.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index e9a694e..69176c6 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -2414,6 +2414,7 @@ _device_get_part_path (PedDevice const *dev, int num) +Index: parted-3.3/libparted/arch/linux.c +=================================================================== +--- parted-3.3.orig/libparted/arch/linux.c ++++ parted-3.3/libparted/arch/linux.c +@@ -2488,6 +2488,7 @@ _device_get_part_path (PedDevice const * if (dev->type == PED_DEVICE_ATARAID || dev->type == PED_DEVICE_CPQARRAY || dev->type == PED_DEVICE_DAC960 || ++++++ libparted-make-BLKRRPART-more-robust.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.369119295 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.369119295 +0100 @@ -5,8 +5,10 @@ libparted/arch/linux.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c +Index: parted-3.3/libparted/arch/linux.c +=================================================================== +--- parted-3.3.orig/libparted/arch/linux.c ++++ parted-3.3/libparted/arch/linux.c @@ -39,6 +39,7 @@ #include <sys/stat.h> #include <sys/types.h> @@ -14,8 +16,8 @@ +#include <sys/file.h> #include <scsi/scsi.h> #include <assert.h> - #ifdef ENABLE_DEVICE_MAPPER -@@ -3102,14 +3103,15 @@ static int + #include <sys/sysmacros.h> +@@ -3242,14 +3243,15 @@ static int _kernel_reread_part_table (PedDevice* dev) { LinuxSpecific* arch_specific = LINUX_SPECIFIC (dev); @@ -34,7 +36,7 @@ if (!retry_count) { ped_exception_throw ( -@@ -3119,10 +3121,12 @@ _kernel_reread_part_table (PedDevice* de +@@ -3259,10 +3261,12 @@ _kernel_reread_part_table (PedDevice* de "table on %s (%s). As a result, it may not " "reflect all of your changes until after reboot."), dev->path, strerror (errno)); ++++++ libparted-open-the-device-RO-and-lazily-switch-to-RW.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.377119298 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.377119298 +0100 @@ -18,11 +18,11 @@ libparted/arch/linux.h | 1 + 2 files changed, 31 insertions(+), 3 deletions(-) -Index: parted-3.2/libparted/arch/linux.c +Index: parted-3.3/libparted/arch/linux.c =================================================================== ---- parted-3.2.orig/libparted/arch/linux.c -+++ parted-3.2/libparted/arch/linux.c -@@ -295,6 +295,9 @@ static unsigned int _device_get_partitio +--- parted-3.3.orig/libparted/arch/linux.c ++++ parted-3.3/libparted/arch/linux.c +@@ -298,6 +298,9 @@ static unsigned int _device_get_partitio static int _device_open (PedDevice* dev, int flags); static int _device_open_ro (PedDevice* dev); static int _device_close (PedDevice* dev); @@ -32,8 +32,8 @@ static int _read_fd (int fd, char **buf) -@@ -442,6 +445,22 @@ _is_virtblk_major (int major) - return _major_type_in_devices (major, "virtblk"); +@@ -451,6 +454,22 @@ _is_blkext_major (int major) + return _major_type_in_devices (major, "blkext"); } +static void @@ -55,7 +55,7 @@ #ifdef ENABLE_DEVICE_MAPPER static int _dm_task_run_wait (struct dm_task *task, uint32_t cookie) -@@ -1603,7 +1622,7 @@ _flush_cache (PedDevice* dev) +@@ -1678,7 +1697,7 @@ _flush_cache (PedDevice* dev) if (!name) break; if (!_partition_is_mounted_by_path (name)) { @@ -64,7 +64,7 @@ if (fd > 0) { ioctl (fd, BLKFLSBUF); retry: -@@ -1634,7 +1653,7 @@ _device_open_ro (PedDevice* dev) +@@ -1709,7 +1728,7 @@ _device_open_ro (PedDevice* dev) static int linux_open (PedDevice* dev) { @@ -73,7 +73,7 @@ } static int -@@ -1672,6 +1691,10 @@ retry: +@@ -1747,6 +1766,10 @@ retry: } } else { dev->read_only = 0; @@ -84,7 +84,7 @@ } _flush_cache (dev); -@@ -1907,6 +1930,7 @@ _write_lastoddsector (PedDevice* dev, co +@@ -1984,6 +2007,7 @@ _write_lastoddsector (PedDevice* dev, co PED_ASSERT(dev != NULL); PED_ASSERT(buffer != NULL); @@ -92,7 +92,7 @@ arch_specific = LINUX_SPECIFIC (dev); -@@ -1955,6 +1979,9 @@ linux_write (PedDevice* dev, const void* +@@ -2032,6 +2056,9 @@ linux_write (PedDevice* dev, const void* return 1; } @@ -102,7 +102,7 @@ if (_get_linux_version() < KERNEL_VERSION (2,6,0)) { /* Kludge. This is necessary to read/write the last block of an odd-sized disk, until Linux 2.5.x kernel fixes. -@@ -2480,6 +2507,7 @@ _blkpg_part_command (PedDevice* dev, str +@@ -2570,6 +2597,7 @@ _blkpg_part_command (PedDevice* dev, str LinuxSpecific* arch_specific = LINUX_SPECIFIC (dev); struct blkpg_ioctl_arg ioctl_arg; @@ -110,10 +110,10 @@ ioctl_arg.op = op; ioctl_arg.flags = 0; ioctl_arg.datalen = sizeof (struct blkpg_partition); -Index: parted-3.2/libparted/arch/linux.h +Index: parted-3.3/libparted/arch/linux.h =================================================================== ---- parted-3.2.orig/libparted/arch/linux.h -+++ parted-3.2/libparted/arch/linux.h +--- parted-3.3.orig/libparted/arch/linux.h ++++ parted-3.3/libparted/arch/linux.h @@ -30,6 +30,7 @@ struct _LinuxSpecific { int fd; int major; @@ -122,13 +122,13 @@ char* dmtype; /**< device map target type */ #if defined __s390__ || defined __s390x__ unsigned int real_sector_size; -Index: parted-3.2/libparted/labels/dasd.c +Index: parted-3.3/libparted/labels/dasd.c =================================================================== ---- parted-3.2.orig/libparted/labels/dasd.c -+++ parted-3.2/libparted/labels/dasd.c -@@ -639,6 +639,10 @@ dasd_write (const PedDisk* disk) - if (disk_specific->format_type == 1) +--- parted-3.3.orig/libparted/labels/dasd.c ++++ parted-3.3/libparted/labels/dasd.c +@@ -637,6 +637,10 @@ dasd_write (const PedDisk* disk) return 1; + } + /* Ensure the device is open RW */ + char dummy[10]; /* to avoid assertion in ped_device_write */ @@ -136,4 +136,4 @@ + /* initialize the anchor */ fdasd_initialize_anchor(&anchor); - fdasd_get_geometry(disk->dev, &anchor, arch_specific->fd); + if (fdasd_get_geometry(disk->dev, &anchor, arch_specific->fd) == 0) ++++++ libparted-partition-naming.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.385119301 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.389119303 +0100 @@ -18,11 +18,11 @@ libparted/arch/linux.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 0f18904..cad5159 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -2342,11 +2342,17 @@ _device_get_part_path (PedDevice const *dev, int num) +Index: parted-3.3/libparted/arch/linux.c +=================================================================== +--- parted-3.3.orig/libparted/arch/linux.c ++++ parted-3.3/libparted/arch/linux.c +@@ -2456,11 +2456,17 @@ _device_get_part_path (PedDevice const * result = zasprintf ("%.*s/part%d", (int) (path_len - 5), devpath, num); } else { @@ -44,8 +44,8 @@ + ? "p" : ""); result = zasprintf ("%s%s%d", devpath, p, num); } - if (dev->type == PED_DEVICE_DM) -@@ -2797,7 +2803,7 @@ _dm_add_partition (PedDisk* disk, const PedPartition* part) + #ifdef ENABLE_DEVICE_MAPPER +@@ -2927,7 +2933,7 @@ _dm_add_partition (PedDisk* disk, const size_t name_len = strlen (dev_name); vol_name = zasprintf ("%s%s%d", dev_name, @@ -54,7 +54,7 @@ part->num); if (vol_name == NULL) goto err; -@@ -2870,7 +2876,7 @@ _dm_resize_partition (PedDisk* disk, const PedPartition* part) +@@ -3004,7 +3010,7 @@ _dm_resize_partition (PedDisk* disk, con size_t name_len = strlen (dev_name); vol_name = zasprintf ("%s%s%d", dev_name, ++++++ libparted-use-BLKRRPART-for-DASD.patch.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.397119305 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.397119305 +0100 @@ -11,11 +11,11 @@ libparted/arch/linux.c | 50 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 9 deletions(-) -Index: parted-3.2/libparted/arch/linux.c +Index: parted-3.3/libparted/arch/linux.c =================================================================== ---- parted-3.2.orig/libparted/arch/linux.c -+++ parted-3.2/libparted/arch/linux.c -@@ -3097,6 +3097,34 @@ _disk_sync_part_table (PedDisk* disk) +--- parted-3.3.orig/libparted/arch/linux.c ++++ parted-3.3/libparted/arch/linux.c +@@ -3239,6 +3239,34 @@ _disk_sync_part_table (PedDisk* disk) } static int @@ -50,19 +50,18 @@ _have_blkpg () { static int have_blkpg = -1; -@@ -3114,15 +3142,19 @@ static int - linux_disk_commit (PedDisk* disk) +@@ -3257,14 +3285,19 @@ linux_disk_commit (PedDisk* disk) { if (disk->dev->type != PED_DEVICE_FILE) { + +- /* We now require BLKPG support. If this assertion fails, +- please write to the mailing list describing your system. +- Assuming it's never triggered, ... +- FIXME: remove this assertion in 2012. */ +- assert (_have_blkpg ()); - -- /* We now require BLKPG support. If this assertion fails, -- please write to the mailing list describing your system. -- Assuming it's never triggered, ... -- FIXME: remove this assertion in 2012. */ -- assert (_have_blkpg ()); -- -- if (!_disk_sync_part_table (disk)) -- return 0; +- if (!_disk_sync_part_table (disk)) +- return 0; + /* The ioctl() command BLKPG_ADD_PARTITION does not notify + * the devfs system; consequently, /proc/partitions will not + * be up to date, and the proper links in /dev are not @@ -70,12 +69,12 @@ + * to re-read and grok the partition table. + */ + /* Work around kernel dasd problem so we really do BLKRRPART */ -+ if (disk->dev->type == PED_DEVICE_DASD) -+ return _kernel_reread_part_table(disk->dev); ++ if (disk->dev->type == PED_DEVICE_DASD) ++ return _kernel_reread_part_table(disk->dev); + -+ assert(_have_blkpg()); -+ if (!_disk_sync_part_table(disk)) -+ return 0; ++ assert(_have_blkpg()); ++ if (!_disk_sync_part_table(disk)) ++ return 0; } return 1; ++++++ libparted-use-BLKRRPART-only-when-needed.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.405119308 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.405119308 +0100 @@ -19,10 +19,10 @@ libparted/disk.c | 15 +++++++++++++-- 3 files changed, 21 insertions(+), 8 deletions(-) -diff --git a/include/parted/disk.in.h b/include/parted/disk.in.h -index b42e7cf..ac57d68 100644 ---- a/include/parted/disk.in.h -+++ b/include/parted/disk.in.h +Index: parted-3.3/include/parted/disk.in.h +=================================================================== +--- parted-3.3.orig/include/parted/disk.in.h ++++ parted-3.3/include/parted/disk.in.h @@ -195,6 +195,7 @@ struct _PedDisk { int update_mode; /**< mode without free/metadata partitions, for easier @@ -31,14 +31,15 @@ }; struct _PedDiskOps { -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 461c095..d7d37e7 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -3264,14 +3264,15 @@ static int +Index: parted-3.3/libparted/arch/linux.c +=================================================================== +--- parted-3.3.orig/libparted/arch/linux.c ++++ parted-3.3/libparted/arch/linux.c +@@ -3324,15 +3324,15 @@ static int linux_disk_commit (PedDisk* disk) { if (disk->dev->type != PED_DEVICE_FILE) { +- - /* The ioctl() command BLKPG_ADD_PARTITION does not notify - * the devfs system; consequently, /proc/partitions will not - * be up to date, and the proper links in /dev are not @@ -52,16 +53,16 @@ + * and grok the partition table. */ /* Work around kernel dasd problem so we really do BLKRRPART */ -- if (disk->dev->type == PED_DEVICE_DASD) -+ if (disk->dev->type == PED_DEVICE_DASD && disk->needs_blkrrpart) - return _kernel_reread_part_table(disk->dev); - - assert(_have_blkpg()); -diff --git a/libparted/disk.c b/libparted/disk.c -index 18cee12..03f8548 100644 ---- a/libparted/disk.c -+++ b/libparted/disk.c -@@ -406,6 +406,7 @@ _ped_disk_alloc (const PedDevice* dev, const PedDiskType* disk_type) +- if (disk->dev->type == PED_DEVICE_DASD) ++ if (disk->dev->type == PED_DEVICE_DASD && disk->needs_blkrrpart) + return _kernel_reread_part_table(disk->dev); + + assert(_have_blkpg()); +Index: parted-3.3/libparted/disk.c +=================================================================== +--- parted-3.3.orig/libparted/disk.c ++++ parted-3.3/libparted/disk.c +@@ -407,6 +407,7 @@ _ped_disk_alloc (const PedDevice* dev, c disk->update_mode = 1; disk->part_list = NULL; disk->needs_clobber = 0; @@ -69,7 +70,7 @@ return disk; error: -@@ -1733,8 +1734,12 @@ _disk_raw_remove (PedDisk* disk, PedPartition* part) +@@ -1734,8 +1735,12 @@ _disk_raw_remove (PedDisk* disk, PedPart if (part->prev) { part->prev->next = part->next; @@ -83,7 +84,7 @@ } else { if (part->type & PED_PARTITION_LOGICAL) { ped_disk_extended_partition (disk)->part_list -@@ -1742,8 +1747,12 @@ _disk_raw_remove (PedDisk* disk, PedPartition* part) +@@ -1743,8 +1748,12 @@ _disk_raw_remove (PedDisk* disk, PedPart } else { disk->part_list = part->next; } @@ -97,7 +98,7 @@ } return 1; -@@ -1773,6 +1782,8 @@ _disk_raw_add (PedDisk* disk, PedPartition* part) +@@ -1774,6 +1783,8 @@ _disk_raw_add (PedDisk* disk, PedPartiti } if (walk) { ++++++ more-reliable-informing-the-kernel.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.417119313 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.417119313 +0100 @@ -15,11 +15,11 @@ parted/parted.c | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) -Index: parted-3.2/libparted/arch/linux.c +Index: parted-3.3/libparted/arch/linux.c =================================================================== ---- parted-3.2.orig/libparted/arch/linux.c -+++ parted-3.2/libparted/arch/linux.c -@@ -3011,7 +3011,7 @@ _disk_sync_part_table (PedDisk* disk) +--- parted-3.3.orig/libparted/arch/linux.c ++++ parted-3.3/libparted/arch/linux.c +@@ -3153,7 +3153,7 @@ _disk_sync_part_table (PedDisk* disk) /* Attempt to remove the partition, retrying for up to max_sleep_seconds upon any failure due to EBUSY. */ unsigned int sleep_microseconds = 10000; @@ -28,11 +28,11 @@ unsigned int n_sleep = (max_sleep_seconds * 1000000 / sleep_microseconds); do { -Index: parted-3.2/parted/parted.c +Index: parted-3.3/parted/parted.c =================================================================== ---- parted-3.2.orig/parted/parted.c -+++ parted-3.2/parted/parted.c -@@ -266,6 +266,32 @@ _disk_warn_loss (PedDisk* disk) +--- parted-3.3.orig/parted/parted.c ++++ parted-3.3/parted/parted.c +@@ -267,6 +267,32 @@ _disk_warn_loss (PedDisk* disk) disk->dev->path) == PED_EXCEPTION_YES; } @@ -65,7 +65,7 @@ /* This function changes "sector" to "new_sector" if the new value lies * within the required range. */ -@@ -1735,7 +1761,7 @@ do_set (PedDevice** dev, PedDisk **diskp +@@ -1791,7 +1817,7 @@ do_set (PedDevice** dev, PedDisk **diskp if (!ped_partition_set_flag (part, flag, state)) goto error; ++++++ parted-2.4-ncursesw6.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:16.425119315 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:16.425119315 +0100 @@ -5,11 +5,11 @@ configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -Index: parted-3.2/configure.ac +Index: parted-3.3/configure.ac =================================================================== ---- parted-3.2.orig/configure.ac -+++ parted-3.2/configure.ac -@@ -165,7 +165,8 @@ AM_CPPFLAGS="$AM_CPPFLAGS -D_REENTRANT" +--- parted-3.3.orig/configure.ac ++++ parted-3.3/configure.ac +@@ -151,7 +151,8 @@ AM_CPPFLAGS="$AM_CPPFLAGS -D_REENTRANT" dnl Check for programs. AC_ISC_POSIX @@ -19,7 +19,7 @@ AC_PROG_GCC_TRADITIONAL AM_PROG_CC_C_O -@@ -377,7 +378,7 @@ dnl Check for termcap +@@ -331,7 +332,7 @@ dnl Check for termcap if test "$with_readline" = yes; then OLD_LIBS="$LIBS" LIBS="" ++++++ parted-3.2.tar.xz -> parted-3.3.tar.xz ++++++ ++++ 233474 lines of diff (skipped) ++++++ parted-add-ignore-busy-option.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.353119650 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.357119651 +0100 @@ -19,10 +19,10 @@ parted/parted.c | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) -diff --git a/doc/C/parted.8 b/doc/C/parted.8 -index e2a24dc..ff01162 100644 ---- a/doc/C/parted.8 -+++ b/doc/C/parted.8 +Index: parted-3.3/doc/C/parted.8 +=================================================================== +--- parted-3.3.orig/doc/C/parted.8 ++++ parted-3.3/doc/C/parted.8 @@ -30,6 +30,9 @@ never prompts for user intervention .B -v, --version displays the version @@ -33,11 +33,11 @@ .B --wipesignatures mkpart wipes the superblock signatures from the disk region where it is about to create the partition -diff --git a/parted/parted.c b/parted/parted.c -index 3d7ec4b..3cc8f77 100644 ---- a/parted/parted.c -+++ b/parted/parted.c -@@ -76,7 +76,8 @@ static int MEGABYTE_SECTORS (PedDevice* dev) +Index: parted-3.3/parted/parted.c +=================================================================== +--- parted-3.3.orig/parted/parted.c ++++ parted-3.3/parted/parted.c +@@ -76,7 +76,8 @@ static int MEGABYTE_SECTORS (PedDevice* enum { PRETEND_INPUT_TTY = CHAR_MAX + 1, @@ -55,7 +55,7 @@ {"wipesignatures", 0, NULL, WIPESIGNATURES}, {"-pretend-input-tty", 0, NULL, PRETEND_INPUT_TTY}, {NULL, 0, NULL, 0} -@@ -130,10 +132,13 @@ static const char *const options_help [][2] = { +@@ -130,10 +132,13 @@ static const char *const options_help [] {"script", N_("never prompts for user intervention")}, {"version", N_("displays the version")}, {"align=[none|cyl|min|opt]", N_("alignment for new partitions")}, @@ -77,7 +77,7 @@ static const char* number_msg = N_( "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " -@@ -513,12 +519,17 @@ print_options_help () +@@ -514,12 +520,17 @@ print_options_help () { int i; @@ -96,7 +96,7 @@ } int -@@ -2244,6 +2255,7 @@ while (1) +@@ -2299,6 +2310,7 @@ while (1) alignment = XARGMATCH ("--align", optarg, align_args, align_types); break; ++++++ parted-escape-printed-device-path.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.365119654 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.365119654 +0100 @@ -21,9 +21,11 @@ parted/parted.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) ---- a/parted/parted.c -+++ b/parted/parted.c -@@ -1038,6 +1038,30 @@ _print_disk_geometry (const PedDevice *d +Index: parted-3.3/parted/parted.c +=================================================================== +--- parted-3.3.orig/parted/parted.c ++++ parted-3.3/parted/parted.c +@@ -1053,6 +1053,30 @@ _print_disk_geometry (const PedDevice *d free (cyl_size); } @@ -54,7 +56,7 @@ static void _print_disk_info (const PedDevice *dev, const PedDisk *diskp) { -@@ -1058,6 +1082,8 @@ _print_disk_info (const PedDevice *dev, +@@ -1073,6 +1097,8 @@ _print_disk_info (const PedDevice *dev, char *disk_flags = disk_print_flags (diskp); if (opt_machine_mode) { @@ -63,7 +65,7 @@ switch (default_unit) { case PED_UNIT_CHS: puts ("CHS;"); break; -@@ -1068,9 +1094,10 @@ _print_disk_info (const PedDevice *dev, +@@ -1083,9 +1109,10 @@ _print_disk_info (const PedDevice *dev, } printf ("%s:%s:%s:%lld:%lld:%s:%s:%s;\n", ++++++ parted-fatresize-autoconf.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.373119657 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.373119657 +0100 @@ -17,10 +17,10 @@ configure.ac | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: parted-3.1/Makefile.am +Index: parted-3.3/Makefile.am =================================================================== ---- parted-3.1.orig/Makefile.am -+++ parted-3.1/Makefile.am +--- parted-3.3.orig/Makefile.am ++++ parted-3.3/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = po lib include libparted parted partprobe doc debug tests @@ -28,12 +28,12 @@ EXTRA_DIST = \ .version \ -Index: parted-3.1/configure.ac +Index: parted-3.3/configure.ac =================================================================== ---- parted-3.1.orig/configure.ac -+++ parted-3.1/configure.ac -@@ -610,6 +610,7 @@ libparted/tests/Makefile - libparted.pc +--- parted-3.3.orig/configure.ac ++++ parted-3.3/configure.ac +@@ -571,6 +571,7 @@ libparted.pc + libparted-fs-resize.pc parted/Makefile partprobe/Makefile +fatresize/Makefile ++++++ parted-fix-end_input-usage.patch ++++++ From: Brian C. Lane <[email protected]> Date: Tue Apr 23 13:52:25 2019 -0700 Subject: Fix end_input usage in do_resizepart Patch-mainline: v4.4 Git-commit: ca845aeeddb17343c9289816833ca352f7c0d87b 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 Index: parted-3.3/parted/parted.c =================================================================== --- parted-3.3.orig/parted/parted.c +++ parted-3.3/parted/parted.c @@ -1667,6 +1667,7 @@ do_resizepart (PedDevice** dev, PedDisk* const int end_idx = 2; const bool danger_if_busy = false; int rc = 0; + char* end_input = NULL; if (!disk) { disk = ped_disk_new (*dev); @@ -1688,7 +1689,6 @@ do_resizepart (PedDevice** dev, PedDisk* 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); ++++++ parted-fix-resizepart-and-rm-command.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.389119662 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.389119662 +0100 @@ -29,11 +29,11 @@ parted/parted.c | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 7 deletions(-) -diff --git a/parted/parted.c b/parted/parted.c -index 3cc8f77..2e31659 100644 ---- a/parted/parted.c -+++ b/parted/parted.c -@@ -228,13 +228,19 @@ _timer_handler (PedTimer* timer, void* context) +Index: parted-3.3/parted/parted.c +=================================================================== +--- parted-3.3.orig/parted/parted.c ++++ parted-3.3/parted/parted.c +@@ -229,13 +229,19 @@ _timer_handler (PedTimer* timer, void* c } static int @@ -55,7 +55,7 @@ PED_EXCEPTION_WARNING, PED_EXCEPTION_YES_NO, _("Partition %s is being used. Are you sure you " \ -@@ -1634,6 +1640,11 @@ do_resizepart (PedDevice** dev, PedDisk** diskp) +@@ -1655,6 +1661,11 @@ do_resizepart (PedDevice** dev, PedDisk* PedSector start, end, oldend; PedGeometry *range_end = NULL; PedConstraint* constraint; @@ -67,19 +67,20 @@ int rc = 0; if (!disk) { -@@ -1650,26 +1661,39 @@ do_resizepart (PedDevice** dev, PedDisk** diskp) +@@ -1671,7 +1682,8 @@ do_resizepart (PedDevice** dev, PedDisk* if (!command_line_get_partition (_("Partition number?"), disk, &part)) goto error; - if (!_partition_warn_busy (part)) -+ /* warn early if the partition end is not provided on cmdline */ ++ /* warn early if the partition end is not provided on cmdline */ + if (cmdline_words <= part_idx && !_partition_warn_busy (part, danger_if_busy)) goto error; -- + start = part->geom.start; - end = oldend = part->geom.end; - if (!command_line_get_sector (_("End?"), *dev, &end, &range_end, NULL)) +@@ -1681,19 +1693,32 @@ do_resizepart (PedDevice** dev, PedDisk* goto error; + _adjust_end_if_iec(&start, &end, range_end, end_input); + free(end_input); + if (cmdline_words >= end_idx && !_partition_warn_busy (part, danger_if_busy)) + goto error; + @@ -92,26 +93,27 @@ - if (part->geom.end < oldend) - if (ped_exception_throw ( + if (part->geom.end < oldend) { -+ if (opt_script_mode && (!ped_partition_is_busy (part) || ignore_busy)) { -+ char *path = ped_partition_get_path (part); ++ if (opt_script_mode && (!ped_partition_is_busy (part) || ignore_busy)) { ++ char *path = ped_partition_get_path (part); + ped_exception_throw ( -+ PED_EXCEPTION_WARNING, -+ PED_EXCEPTION_UNHANDLED, -+ _("Shrinking partition %s, data loss possible."), path); -+ free(path); ++ PED_EXCEPTION_WARNING, ++ PED_EXCEPTION_UNHANDLED, ++ _("Shrinking partition %s, data loss possible."), path); ++ free(path); + } else if (ped_exception_throw ( PED_EXCEPTION_WARNING, PED_EXCEPTION_YES_NO, _("Shrinking a partition can cause data loss, " \ "are you sure you want to continue?")) != PED_EXCEPTION_YES) -+ { - goto error_destroy_constraint; -+ } +- goto error_destroy_constraint; ++ { ++ goto error_destroy_constraint; ++ } + } ped_disk_commit (disk); if ((*dev)->type != PED_DEVICE_FILE) -@@ -1690,6 +1714,7 @@ static int +@@ -1714,6 +1739,7 @@ static int do_rm (PedDevice** dev, PedDisk** diskp) { PedPartition* part = NULL; @@ -119,7 +121,7 @@ if (!*diskp) *diskp = ped_disk_new (*dev); -@@ -1698,7 +1723,7 @@ do_rm (PedDevice** dev, PedDisk** diskp) +@@ -1722,7 +1748,7 @@ do_rm (PedDevice** dev, PedDisk** diskp) if (!command_line_get_partition (_("Partition number?"), *diskp, &part)) goto error; @@ -127,4 +129,4 @@ + if (!_partition_warn_busy (part, danger_if_busy)) goto error; - ped_disk_delete_partition (*diskp, part); + if (!ped_disk_delete_partition (*diskp, part)) ++++++ parted-implement-wipesignatures-option.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.397119666 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.397119666 +0100 @@ -17,8 +17,10 @@ parted/parted.c | 16 ++++++++++++++++ 5 files changed, 78 insertions(+) ---- a/doc/C/parted.8 -+++ b/doc/C/parted.8 +Index: parted-3.3/doc/C/parted.8 +=================================================================== +--- parted-3.3.orig/doc/C/parted.8 ++++ parted-3.3/doc/C/parted.8 @@ -30,6 +30,10 @@ never prompts for user intervention .B -v, --version displays the version @@ -30,9 +32,11 @@ .B -a \fIalignment-type\fP, --align \fIalignment-type\fP Set alignment for newly created partitions, valid alignment types are: .RS ---- a/include/parted/device.in.h -+++ b/include/parted/device.in.h -@@ -119,6 +119,7 @@ struct _PedDeviceArchOps { +Index: parted-3.3/include/parted/device.in.h +=================================================================== +--- parted-3.3.orig/include/parted/device.in.h ++++ parted-3.3/include/parted/device.in.h +@@ -122,6 +122,7 @@ struct _PedDeviceArchOps { /* These functions are optional */ PedAlignment *(*get_minimum_alignment)(const PedDevice *dev); PedAlignment *(*get_optimum_alignment)(const PedDevice *dev); @@ -40,7 +44,7 @@ }; #include <parted/constraint.h> -@@ -155,6 +156,7 @@ extern PedConstraint *ped_device_get_opt +@@ -158,6 +159,7 @@ extern PedConstraint *ped_device_get_opt extern PedAlignment *ped_device_get_minimum_alignment(const PedDevice *dev); extern PedAlignment *ped_device_get_optimum_alignment(const PedDevice *dev); @@ -48,9 +52,11 @@ /* private stuff ;-) */ ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -3298,6 +3298,44 @@ linux_get_optimum_alignment(const PedDev +Index: parted-3.3/libparted/arch/linux.c +=================================================================== +--- parted-3.3.orig/libparted/arch/linux.c ++++ parted-3.3/libparted/arch/linux.c +@@ -3395,6 +3395,44 @@ linux_get_optimum_alignment(const PedDev blkid_topology_get_alignment_offset(tp) / dev->sector_size, blkid_topology_get_optimal_io_size(tp) / dev->sector_size); } @@ -94,8 +100,8 @@ +} #endif - static PedDeviceArchOps linux_dev_ops = { -@@ -3318,6 +3356,9 @@ static PedDeviceArchOps linux_dev_ops = + #if defined __s390__ || defined __s390x__ +@@ -3471,6 +3509,9 @@ static PedDeviceArchOps linux_dev_ops = get_minimum_alignment: linux_get_minimum_alignment, get_optimum_alignment: linux_get_optimum_alignment, #endif @@ -105,9 +111,11 @@ }; PedDiskArchOps linux_disk_ops = { ---- a/libparted/device.c -+++ b/libparted/device.c -@@ -565,4 +565,21 @@ ped_device_get_optimum_alignment(const P +Index: parted-3.3/libparted/device.c +=================================================================== +--- parted-3.3.orig/libparted/device.c ++++ parted-3.3/libparted/device.c +@@ -559,4 +559,21 @@ ped_device_get_optimum_alignment(const P return align; } @@ -129,8 +137,10 @@ +} + /** @} */ ---- a/parted/parted.c -+++ b/parted/parted.c +Index: parted-3.3/parted/parted.c +=================================================================== +--- parted-3.3.orig/parted/parted.c ++++ parted-3.3/parted/parted.c @@ -76,6 +76,7 @@ static int MEGABYTE_SECTORS (PedDevice* enum { @@ -161,7 +171,7 @@ int opt_machine_mode = 0; int disk_is_modified = 0; int is_toggle_mode = 0; -@@ -650,6 +654,7 @@ _adjust_end_if_iec (PedSector* start, Pe +@@ -651,6 +655,7 @@ _adjust_end_if_iec (PedSector* start, Pe } } @@ -169,7 +179,7 @@ static int do_mkpart (PedDevice** dev, PedDisk** diskp) { -@@ -840,6 +845,14 @@ do_mkpart (PedDevice** dev, PedDisk** di +@@ -848,6 +853,14 @@ do_mkpart (PedDevice** dev, PedDisk** di if (ped_partition_is_flag_available (part, PED_PARTITION_LBA)) ped_partition_set_flag (part, PED_PARTITION_LBA, 1); @@ -182,9 +192,9 @@ + } + if (!ped_disk_commit (disk)) - goto error; + goto error_remove_part; -@@ -2196,6 +2209,9 @@ while (1) +@@ -2252,6 +2265,9 @@ while (1) case PRETEND_INPUT_TTY: pretend_input_tty = 1; break; ++++++ parted-mac.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.409119670 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.409119670 +0100 @@ -8,10 +8,10 @@ parted/parted.c | 12 ++++++++++++ 4 files changed, 85 insertions(+), 3 deletions(-) -Index: parted-3.2/include/parted/disk.in.h +Index: parted-3.3/include/parted/disk.in.h =================================================================== ---- parted-3.2.orig/include/parted/disk.in.h -+++ parted-3.2/include/parted/disk.in.h +--- parted-3.3.orig/include/parted/disk.in.h ++++ parted-3.3/include/parted/disk.in.h @@ -83,10 +83,11 @@ enum _PedPartitionFlag { enum _PedDiskTypeFeature { @@ -45,11 +45,11 @@ extern int ped_partition_is_busy (const PedPartition* part); extern char* ped_partition_get_path (const PedPartition* part); -Index: parted-3.2/libparted/disk.c +Index: parted-3.3/libparted/disk.c =================================================================== ---- parted-3.2.orig/libparted/disk.c -+++ parted-3.2/libparted/disk.c -@@ -1184,6 +1184,39 @@ _disk_pop_update_mode (PedDisk* disk) +--- parted-3.3.orig/libparted/disk.c ++++ parted-3.3/libparted/disk.c +@@ -1185,6 +1185,39 @@ _disk_pop_update_mode (PedDisk* disk) * @{ */ @@ -89,11 +89,11 @@ PedPartition* _ped_partition_alloc (const PedDisk* disk, PedPartitionType type, const PedFileSystemType* fs_type, -Index: parted-3.2/libparted/labels/mac.c +Index: parted-3.3/libparted/labels/mac.c =================================================================== ---- parted-3.2.orig/libparted/labels/mac.c -+++ parted-3.2/libparted/labels/mac.c -@@ -1393,6 +1393,36 @@ mac_get_partition_alignment(const PedDis +--- parted-3.3.orig/libparted/labels/mac.c ++++ parted-3.3/libparted/labels/mac.c +@@ -1396,6 +1396,36 @@ mac_get_partition_alignment(const PedDis return ped_alignment_new(0, 1); } @@ -130,7 +130,7 @@ static PedConstraint* _primary_constraint (PedDisk* disk) { -@@ -1593,6 +1623,8 @@ static PedDiskOps mac_disk_ops = { +@@ -1596,6 +1626,8 @@ static PedDiskOps mac_disk_ops = { partition_set_name: mac_partition_set_name, partition_get_name: mac_partition_get_name, @@ -139,7 +139,7 @@ get_partition_alignment: mac_get_partition_alignment, -@@ -1603,7 +1635,7 @@ static PedDiskType mac_disk_type = { +@@ -1606,7 +1638,7 @@ static PedDiskType mac_disk_type = { next: NULL, name: "mac", ops: &mac_disk_ops, @@ -148,11 +148,11 @@ }; void -Index: parted-3.2/parted/parted.c +Index: parted-3.3/parted/parted.c =================================================================== ---- parted-3.2.orig/parted/parted.c -+++ parted-3.2/parted/parted.c -@@ -888,6 +888,7 @@ static char* +--- parted-3.3.orig/parted/parted.c ++++ parted-3.3/parted/parted.c +@@ -929,6 +929,7 @@ static char* partition_print_flags (PedPartition const *part) { int xtype; @@ -160,7 +160,7 @@ char *res = xstrdup (""); if (!part) return res; -@@ -920,6 +921,17 @@ partition_print_flags (PedPartition cons +@@ -961,6 +962,17 @@ partition_print_flags (PedPartition cons } } ++++++ parted-mkpart-set-a-swap-flag-if-available.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.421119675 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.425119676 +0100 @@ -16,9 +16,11 @@ parted/parted.c | 10 ++++++++++ 1 file changed, 10 insertions(+) ---- a/parted/parted.c -+++ b/parted/parted.c -@@ -655,6 +655,13 @@ _adjust_end_if_iec (PedSector* start, Pe +Index: parted-3.3/parted/parted.c +=================================================================== +--- parted-3.3.orig/parted/parted.c ++++ parted-3.3/parted/parted.c +@@ -656,6 +656,13 @@ _adjust_end_if_iec (PedSector* start, Pe } @@ -32,8 +34,8 @@ static int do_mkpart (PedDevice** dev, PedDisk** diskp) { -@@ -844,6 +851,9 @@ do_mkpart (PedDevice** dev, PedDisk** di - goto error; +@@ -852,6 +859,9 @@ do_mkpart (PedDevice** dev, PedDisk** di + goto error_remove_part; if (ped_partition_is_flag_available (part, PED_PARTITION_LBA)) ped_partition_set_flag (part, PED_PARTITION_LBA, 1); + if (ped_partition_is_flag_available (part, PED_PARTITION_SWAP) && ++++++ parted-resize-alias-to-resizepart.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.433119679 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.433119679 +0100 @@ -5,11 +5,11 @@ parted/parted.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -Index: parted-3.2/parted/parted.c +Index: parted-3.3/parted/parted.c =================================================================== ---- parted-3.2.orig/parted/parted.c -+++ parted-3.2/parted/parted.c -@@ -2055,9 +2055,11 @@ NULL), +--- parted-3.3.orig/parted/parted.c ++++ parted-3.3/parted/parted.c +@@ -2111,9 +2111,11 @@ NULL), command_register (commands, command_create ( str_list_create_unique ("resize", _("resize"), NULL), ++++++ parted-type.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.441119682 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.441119682 +0100 @@ -12,10 +12,10 @@ parted/ui.c | 3 ++ 5 files changed, 56 insertions(+), 23 deletions(-) -Index: parted-3.2/include/parted/disk.in.h +Index: parted-3.3/include/parted/disk.in.h =================================================================== ---- parted-3.2.orig/include/parted/disk.in.h -+++ parted-3.2/include/parted/disk.in.h +--- parted-3.3.orig/include/parted/disk.in.h ++++ parted-3.3/include/parted/disk.in.h @@ -75,10 +75,11 @@ enum _PedPartitionFlag { PED_PARTITION_LEGACY_BOOT=15, PED_PARTITION_MSFT_DATA=16, @@ -30,11 +30,11 @@ enum _PedDiskTypeFeature { PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions */ -Index: parted-3.2/libparted/disk.c +Index: parted-3.3/libparted/disk.c =================================================================== ---- parted-3.2.orig/libparted/disk.c -+++ parted-3.2/libparted/disk.c -@@ -2388,6 +2388,8 @@ ped_partition_flag_get_name (PedPartitio +--- parted-3.3.orig/libparted/disk.c ++++ parted-3.3/libparted/disk.c +@@ -2389,6 +2389,8 @@ ped_partition_flag_get_name (PedPartitio return N_("lba"); case PED_PARTITION_HPSERVICE: return N_("hp-service"); @@ -43,11 +43,11 @@ case PED_PARTITION_PALO: return N_("palo"); case PED_PARTITION_PREP: -Index: parted-3.2/libparted/labels/dos.c +Index: parted-3.3/libparted/labels/dos.c =================================================================== ---- parted-3.2.orig/libparted/labels/dos.c -+++ parted-3.2/libparted/labels/dos.c -@@ -1550,6 +1550,10 @@ msdos_partition_set_flag (PedPartition* +--- parted-3.3.orig/libparted/labels/dos.c ++++ parted-3.3/libparted/labels/dos.c +@@ -1565,6 +1565,10 @@ msdos_partition_set_flag (PedPartition* disk = part->disk; switch (flag) { @@ -58,7 +58,7 @@ case PED_PARTITION_HIDDEN: if (part->type == PED_PARTITION_EXTENDED) { ped_exception_throw ( -@@ -1657,6 +1661,9 @@ msdos_partition_get_flag (const PedParti +@@ -1690,6 +1694,9 @@ msdos_partition_get_flag (const PedParti case PED_PARTITION_LBA: return dos_data->lba; @@ -68,7 +68,7 @@ case PED_PARTITION_PALO: return dos_data->palo; -@@ -1689,6 +1696,7 @@ msdos_partition_is_flag_available (const +@@ -1728,6 +1735,7 @@ msdos_partition_is_flag_available (const case PED_PARTITION_RAID: case PED_PARTITION_LVM: case PED_PARTITION_LBA: @@ -76,11 +76,11 @@ case PED_PARTITION_PALO: case PED_PARTITION_PREP: case PED_PARTITION_IRST: -Index: parted-3.2/parted/parted.c +Index: parted-3.3/parted/parted.c =================================================================== ---- parted-3.2.orig/parted/parted.c -+++ parted-3.2/parted/parted.c -@@ -887,28 +887,40 @@ error: +--- parted-3.3.orig/parted/parted.c ++++ parted-3.3/parted/parted.c +@@ -928,28 +928,40 @@ error: static char* partition_print_flags (PedPartition const *part) { @@ -140,7 +140,7 @@ } static int -@@ -1726,12 +1738,19 @@ do_set (PedDevice** dev, PedDisk **diskp +@@ -1808,12 +1820,19 @@ do_set (PedDevice** dev, PedDisk **diskp goto error; if (!command_line_get_part_flag (_("Flag to Invert?"), part, &flag)) goto error; ++++++ parted-wipeaix.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.449119685 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.449119685 +0100 @@ -5,11 +5,11 @@ libparted/labels/dos.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -Index: parted-3.2/libparted/labels/dos.c +Index: parted-3.3/libparted/labels/dos.c =================================================================== ---- parted-3.2.orig/libparted/labels/dos.c -+++ parted-3.2/libparted/labels/dos.c -@@ -1285,7 +1285,13 @@ msdos_write (const PedDisk* disk) +--- parted-3.3.orig/libparted/labels/dos.c ++++ parted-3.3/libparted/labels/dos.c +@@ -1287,7 +1287,13 @@ msdos_write (const PedDisk* disk) return 0; DosRawTable *table = (DosRawTable *) s0; ++++++ tests-adapt-to-SUSE.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.469119692 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.469119692 +0100 @@ -11,8 +11,10 @@ Tests: t6001, t6002, t6004, t6005 For: libparted-partition-naming.patch --- ---- a/tests/t2200-dos-label-recog.sh -+++ b/tests/t2200-dos-label-recog.sh +Index: parted-3.3/tests/t2200-dos-label-recog.sh +=================================================================== +--- parted-3.3.orig/tests/t2200-dos-label-recog.sh ++++ parted-3.3/tests/t2200-dos-label-recog.sh @@ -45,7 +45,7 @@ printf FAT | dd bs=1c seek=82 count=3 of # print the partition table parted -m -s $dev unit s p > out || fail=1 @@ -22,8 +24,10 @@ compare exp out || fail=1 ---- a/tests/t2310-dos-extended-2-sector-min-offset.sh -+++ b/tests/t2310-dos-extended-2-sector-min-offset.sh +Index: parted-3.3/tests/t2310-dos-extended-2-sector-min-offset.sh +=================================================================== +--- parted-3.3.orig/tests/t2310-dos-extended-2-sector-min-offset.sh ++++ parted-3.3/tests/t2310-dos-extended-2-sector-min-offset.sh @@ -33,8 +33,8 @@ p5=${scsi_dev}5 cat <<EOF > exp || framework_failure BYT; @@ -35,8 +39,10 @@ EOF # Create a DOS label with an extended partition starting at sector 64. ---- a/tests/t3200-resize-partition.sh -+++ b/tests/t3200-resize-partition.sh +Index: parted-3.3/tests/t3200-resize-partition.sh +=================================================================== +--- parted-3.3.orig/tests/t3200-resize-partition.sh ++++ parted-3.3/tests/t3200-resize-partition.sh @@ -75,7 +75,7 @@ compare /dev/null err || fail=1 parted -m -s $dev u s p > out 2>&1 || fail=1 @@ -46,8 +52,10 @@ compare exp out || fail=1 # Remove the partition explicitly, so that mklabel doesn't evoke a warning. ---- a/tests/t3300-palo-prep.sh -+++ b/tests/t3300-palo-prep.sh +Index: parted-3.3/tests/t3300-palo-prep.sh +=================================================================== +--- parted-3.3.orig/tests/t3300-palo-prep.sh ++++ parted-3.3/tests/t3300-palo-prep.sh @@ -20,9 +20,9 @@ ss=$sector_size_ @@ -70,8 +78,10 @@ compare exp out || fail=1 ---- a/tests/t4100-msdos-starting-sector.sh -+++ b/tests/t4100-msdos-starting-sector.sh +Index: parted-3.3/tests/t4100-msdos-starting-sector.sh +=================================================================== +--- parted-3.3.orig/tests/t4100-msdos-starting-sector.sh ++++ parted-3.3/tests/t4100-msdos-starting-sector.sh @@ -56,7 +56,7 @@ cat <<EOF > exp || fail=1 BYT; path:${N}s:file:$ss:$ss:msdos::; @@ -81,8 +91,10 @@ EOF # create a partition at the end of the label ---- a/tests/t6001-psep.sh -+++ b/tests/t6001-psep.sh +Index: parted-3.3/tests/t6001-psep.sh +=================================================================== +--- parted-3.3.orig/tests/t6001-psep.sh ++++ parted-3.3/tests/t6001-psep.sh @@ -31,9 +31,9 @@ linear2_=plinear-$$foo d1= d2= f1= f2= @@ -113,8 +125,10 @@ if [ -n "$fail" ]; then ls /dev/mapper ---- a/tests/t6004-dm-many-partitions.sh -+++ b/tests/t6004-dm-many-partitions.sh +Index: parted-3.3/tests/t6004-dm-many-partitions.sh +=================================================================== +--- parted-3.3.orig/tests/t6004-dm-many-partitions.sh ++++ parted-3.3/tests/t6004-dm-many-partitions.sh @@ -50,10 +50,10 @@ parted -m -a min -s /dev/mapper/$dm_name # Make sure all the partitions appeared under /dev/mapper/ @@ -128,8 +142,10 @@ done Exit $fail ---- a/tests/t6005-dm-uuid.sh -+++ b/tests/t6005-dm-uuid.sh +Index: parted-3.3/tests/t6005-dm-uuid.sh +=================================================================== +--- parted-3.3.orig/tests/t6005-dm-uuid.sh ++++ parted-3.3/tests/t6005-dm-uuid.sh @@ -47,14 +47,14 @@ for ((i=1; i<=$n_partitions; i+=1)); do cmd="$cmd mkpart p$i ${s}s ${s}s" done @@ -148,8 +164,10 @@ done Exit $fail ---- a/tests/t0283-overlap-partitions.sh -+++ b/tests/t0283-overlap-partitions.sh +Index: parted-3.3/tests/t0283-overlap-partitions.sh +=================================================================== +--- parted-3.3.orig/tests/t0283-overlap-partitions.sh ++++ parted-3.3/tests/t0283-overlap-partitions.sh @@ -54,8 +54,8 @@ Partition Table: msdos Disk Flags: @@ -170,8 +188,10 @@ (parted) rm Partition number? 1 ---- a/tests/t6002-dm-busy.sh -+++ b/tests/t6002-dm-busy.sh +Index: parted-3.3/tests/t6002-dm-busy.sh +=================================================================== +--- parted-3.3.orig/tests/t6002-dm-busy.sh ++++ parted-3.3/tests/t6002-dm-busy.sh @@ -35,9 +35,9 @@ d1= f1= dev= @@ -212,8 +232,10 @@ EOF compare exp out || fail=1 ---- a/tests/t9042-dos-partition-limit.sh -+++ b/tests/t9042-dos-partition-limit.sh +Index: parted-3.3/tests/t9042-dos-partition-limit.sh +=================================================================== +--- parted-3.3.orig/tests/t9042-dos-partition-limit.sh ++++ parted-3.3/tests/t9042-dos-partition-limit.sh @@ -41,7 +41,7 @@ scsi_dev=$(cat dev-name) n=$((n_MiB * sectors_per_MiB)) printf '%s\n' "BYT;" \ @@ -222,7 +244,7 @@ + "1:$((start-2))s:$((n-1))s:$((n-start+2))s:::lba, type=0f;" \ > exp || fail=1 - parted -s $scsi_dev mklabel msdos || fail=1 + parted -s -a min $scsi_dev mklabel msdos mkpart extended $((start-2))s 100% || fail=1 @@ -51,7 +51,7 @@ i=1 while :; do end=$((start + partition_sectors - 2)) @@ -232,8 +254,10 @@ test $i = $((n_partitions - 1)) && break start=$((start + partition_sectors)) i=$((i+1)) ---- a/tests/t4100-msdos-partition-limits.sh -+++ b/tests/t4100-msdos-partition-limits.sh +Index: parted-3.3/tests/t4100-msdos-partition-limits.sh +=================================================================== +--- parted-3.3.orig/tests/t4100-msdos-partition-limits.sh ++++ parted-3.3/tests/t4100-msdos-partition-limits.sh @@ -81,7 +81,7 @@ do_mkpart $n $end || fail=1 # print the result parted -s $dev unit s p > out 2>&1 || fail=1 ++++++ tests-add-dev-md-check-to-t6100.patch ++++++ --- /var/tmp/diff_new_pack.ofThKv/_old 2020-01-15 16:43:17.505119705 +0100 +++ /var/tmp/diff_new_pack.ofThKv/_new 2020-01-15 16:43:17.505119705 +0100 @@ -21,10 +21,10 @@ tests/t6100-mdraid-partitions.sh | 62 +++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 7 deletions(-) -diff --git a/tests/t6100-mdraid-partitions.sh b/tests/t6100-mdraid-partitions.sh -index dbb1686..b471f56 100755 ---- a/tests/t6100-mdraid-partitions.sh -+++ b/tests/t6100-mdraid-partitions.sh +Index: parted-3.3/tests/t6100-mdraid-partitions.sh +=================================================================== +--- parted-3.3.orig/tests/t6100-mdraid-partitions.sh ++++ parted-3.3/tests/t6100-mdraid-partitions.sh @@ -21,6 +21,7 @@ require_root_ require_scsi_debug_module_ @@ -33,13 +33,14 @@ # create memory-backed device scsi_debug_setup_ dev_size_mb=10 > dev-name || -@@ -40,13 +41,27 @@ parted -s "$scsi_dev" mklabel gpt \ +@@ -40,14 +41,28 @@ parted -s "$scsi_dev" mklabel gpt \ compare /dev/null out || fail=1 wait_for_dev_to_appear_ ${scsi_dev}2 || { fail=1; cat /proc/partitions; } +create_mddev() { + # create mdraid on top of both partitions -+ mdadm -C $md_dev --force -R -l1 -n2 "${scsi_dev}1" "${scsi_dev}2" ++ mdadm -C $md_dev -e0 --force -R -l1 -n2 "${scsi_dev}1" "${scsi_dev}2" ++ wait_for_dev_to_appear_ ${md_dev} || { fail=1; cat /proc/partitions; } +} + cleanup_fn_() { @@ -47,8 +48,9 @@ mdadm -S $md_dev || warn_ "Failed to stop MD array, $md_dev" } --# create mdraid on top of both partitions --mdadm -C $md_dev --force -R -l1 -n2 "${scsi_dev}1" "${scsi_dev}2" +-# create mdraid on top of both partitions with v0.90 metadata +-mdadm -C $md_dev -e0 --force -R -l1 -n2 "${scsi_dev}1" "${scsi_dev}2" +-wait_for_dev_to_appear_ ${md_dev} || { fail=1; cat /proc/partitions; } +remove_mdparts() { + # Remove partitions from the raid device. + parted -s $md_dev rm 2 rm 1 > out 2>&1 || fail=1 @@ -63,7 +65,7 @@ # create gpt and two partitions on the raid device parted -s $md_dev mklabel gpt \ -@@ -57,12 +72,45 @@ compare /dev/null out || fail=1 +@@ -58,12 +73,45 @@ compare /dev/null out || fail=1 # Verify that kernel has been informed about the second device. wait_for_dev_to_appear_ ${md_dev}p2 || { fail=1; cat /proc/partitions; }
