From 92be39994ac6db3c6877bb89e930f59062fea9bad55d1b1f6b730ab6ec4b7d55 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 19 Jul 2010 18:20:24 +0000 Subject: [PATCH] Accepting request 43319 from Base:System checked in (request 43319) OBS-URL: https://build.opensuse.org/request/show/43319 OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=27 --- always-resize-part.dif | 10 +-- always_print_geom.diff | 6 +- etherd_support.diff | 52 ++++++++++++++ fix-dm-partition-name.patch | 8 +-- fix-function-def.patch | 8 +-- hfs_fix.dif | 10 +-- ...align-check-work-in-interactive-mode.patch | 44 ++++++++++++ parted-2.2.tar.bz2 | 3 + parted-2.3.tar.bz2 | 3 - parted-gpt-mbr-sync.patch | 12 ++-- parted-mac.patch | 42 +++++------ parted-no-inttypes-include | 27 +++++++ parted-remove-experimental-warning.patch | 31 ++++++++ parted-type.patch | 70 ++++++++++--------- parted-wipeaix.patch | 8 +-- parted.changes | 33 --------- parted.spec | 24 +++++-- 17 files changed, 263 insertions(+), 128 deletions(-) create mode 100644 etherd_support.diff create mode 100644 make-align-check-work-in-interactive-mode.patch create mode 100644 parted-2.2.tar.bz2 delete mode 100644 parted-2.3.tar.bz2 create mode 100644 parted-no-inttypes-include create mode 100644 parted-remove-experimental-warning.patch diff --git a/always-resize-part.dif b/always-resize-part.dif index 5ff9ac5..c29dd32 100644 --- a/always-resize-part.dif +++ b/always-resize-part.dif @@ -4,9 +4,9 @@ Index: parted/parted.c =================================================================== ---- parted/parted.c.orig 2010-05-28 17:09:04.000000000 +0200 -+++ parted/parted.c 2010-07-08 13:26:06.000000000 +0200 -@@ -1917,7 +1917,7 @@ do_resize (PedDevice** dev) +--- parted/parted.c.orig 2010-02-02 11:28:07.000000000 +0100 ++++ parted/parted.c 2010-02-02 11:31:00.000000000 +0100 +@@ -1853,7 +1853,7 @@ do_resize (PedDevice** dev) issue_fs_op_warning ("resize"); PedDisk *disk; PedPartition *part = NULL; @@ -15,7 +15,7 @@ Index: parted/parted.c PedConstraint *constraint; PedSector start, end; PedGeometry *range_start = NULL, *range_end = NULL; -@@ -1959,22 +1959,39 @@ do_resize (PedDevice** dev) +@@ -1890,22 +1890,39 @@ do_resize (PedDevice** dev) goto error_destroy_constraint; ped_partition_set_system (part, NULL); } else { @@ -57,7 +57,7 @@ Index: parted/parted.c ped_disk_commit (disk); ped_constraint_destroy (constraint); -@@ -1990,6 +2007,7 @@ do_resize (PedDevice** dev) +@@ -1921,6 +1938,7 @@ do_resize (PedDevice** dev) return 1; error_close_fs: diff --git a/always_print_geom.diff b/always_print_geom.diff index 9c6e6c8..821a412 100644 --- a/always_print_geom.diff +++ b/always_print_geom.diff @@ -1,8 +1,8 @@ Index: parted/parted.c =================================================================== ---- parted/parted.c.orig 2010-07-08 13:29:24.000000000 +0200 -+++ parted/parted.c 2010-07-08 13:29:28.000000000 +0200 -@@ -1437,8 +1437,20 @@ do_print (PedDevice** dev) +--- parted/parted.c.orig 2010-04-02 10:22:16.000000000 +0200 ++++ parted/parted.c 2010-04-02 10:40:03.000000000 +0200 +@@ -1435,8 +1435,20 @@ do_print (PedDevice** dev) wchar_t* table_rendered; disk = ped_disk_new (*dev); diff --git a/etherd_support.diff b/etherd_support.diff new file mode 100644 index 0000000..6f40b73 --- /dev/null +++ b/etherd_support.diff @@ -0,0 +1,52 @@ +--- + include/parted/device.h | 3 ++- + libparted/arch/linux.c | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +Index: include/parted/device.h +=================================================================== +--- include/parted/device.h.orig 2009-11-06 19:31:18.000000000 +0100 ++++ include/parted/device.h 2010-02-02 13:10:06.000000000 +0100 +@@ -46,7 +46,8 @@ typedef enum { + PED_DEVICE_DM = 12, + PED_DEVICE_XVD = 13, + PED_DEVICE_SDMMC = 14, +- PED_DEVICE_VIRTBLK = 15 ++ PED_DEVICE_VIRTBLK = 15, ++ PED_DEVICE_AOE = 16 + } PedDeviceType; + + typedef struct _PedDevice PedDevice; +Index: libparted/arch/linux.c +=================================================================== +--- libparted/arch/linux.c.orig 2009-12-20 12:38:23.000000000 +0100 ++++ libparted/arch/linux.c 2010-02-02 13:13:27.000000000 +0100 +@@ -248,6 +248,7 @@ struct blkdev_ioctl_param { + #define I2O_MAJOR7 86 + #define I2O_MAJOR8 87 + #define UBD_MAJOR 98 ++#define AOE_MAJOR 152 + #define DASD_MAJOR 94 + #define VIODASD_MAJOR 112 + #define SX8_MAJOR1 160 +@@ -541,6 +542,8 @@ _device_probe_type (PedDevice* dev) + dev->type = PED_DEVICE_DAC960; + } else if (dev_major == ATARAID_MAJOR && (dev_minor % 0x10 == 0)) { + dev->type = PED_DEVICE_ATARAID; ++ } else if (dev_major == AOE_MAJOR && (dev_minor % 0x10 == 0)) { ++ dev->type = PED_DEVICE_AOE; + } else if (dev_major == DASD_MAJOR && (dev_minor % 0x4 == 0)) { + dev->type = PED_DEVICE_DASD; + } else if (dev_major == VIODASD_MAJOR && (dev_minor % 0x8 == 0)) { +@@ -1310,6 +1313,11 @@ linux_new (const char* path) + goto error_free_arch_specific; + break; + ++ case PED_DEVICE_AOE: ++ if (!init_generic (dev, _("AoE Driver"))) ++ goto error_free_arch_specific; ++ break; ++ + #if defined __s390__ || defined __s390x__ + case PED_DEVICE_DASD: + if (!init_dasd (dev, _("IBM S390 DASD drive"))) diff --git a/fix-dm-partition-name.patch b/fix-dm-partition-name.patch index 005b56f..dc4dda1 100644 --- a/fix-dm-partition-name.patch +++ b/fix-dm-partition-name.patch @@ -1,8 +1,8 @@ -Index: parted-2.3/libparted/arch/linux.c +Index: parted-1.9.0/libparted/arch/linux.c =================================================================== ---- parted-2.3.orig/libparted/arch/linux.c 2010-07-08 13:33:05.000000000 +0200 -+++ parted-2.3/libparted/arch/linux.c 2010-07-08 13:33:13.000000000 +0200 -@@ -2194,7 +2194,7 @@ _device_get_part_path (PedDevice* dev, i +--- parted-1.9.0.orig/libparted/arch/linux.c 2009-07-30 16:28:49.000000000 +0200 ++++ parted-1.9.0/libparted/arch/linux.c 2009-07-30 16:28:57.000000000 +0200 +@@ -2095,7 +2095,7 @@ _device_get_part_path (PedDevice* dev, i || dev->type == PED_DEVICE_ATARAID || dev->type == PED_DEVICE_DM || isdigit (dev->path[path_len - 1])) diff --git a/fix-function-def.patch b/fix-function-def.patch index 2bdcfaa..8ddf5aa 100644 --- a/fix-function-def.patch +++ b/fix-function-def.patch @@ -1,8 +1,6 @@ -Index: libparted/fs/reiserfs/reiserfs.c -=================================================================== ---- libparted/fs/reiserfs/reiserfs.c.orig 2010-07-08 13:33:05.000000000 +0200 -+++ libparted/fs/reiserfs/reiserfs.c 2010-07-08 13:33:10.000000000 +0200 -@@ -86,7 +86,7 @@ FCLASS int (FPTR libreiserfs_exception_t +--- libparted/fs/reiserfs/reiserfs.c ++++ libparted/fs/reiserfs/reiserfs.c +@@ -85,7 +85,7 @@ FCLASS int (FPTR libreiserfs_exception_option) (reiserfs_exception_t *); FCLASS char *(FPTR libreiserfs_exception_message) (reiserfs_exception_t *); FCLASS void (FPTR libreiserfs_exception_set_handler) diff --git a/hfs_fix.dif b/hfs_fix.dif index 25d4a7d..3bf5d4a 100644 --- a/hfs_fix.dif +++ b/hfs_fix.dif @@ -1,8 +1,8 @@ -Index: parted-2.3/libparted/labels/mac.c +Index: parted-1.9.0/libparted/labels/mac.c =================================================================== ---- parted-2.3.orig/libparted/labels/mac.c 2010-07-08 13:29:24.000000000 +0200 -+++ parted-2.3/libparted/labels/mac.c 2010-07-08 13:29:25.000000000 +0200 -@@ -469,7 +469,7 @@ _rawpart_is_void (MacRawPartition* raw_p +--- parted-1.9.0.orig/libparted/labels/mac.c 2009-07-29 11:56:11.000000000 +0200 ++++ parted-1.9.0/libparted/labels/mac.c 2009-07-29 12:14:34.000000000 +0200 +@@ -495,7 +495,7 @@ _rawpart_is_void (MacRawPartition* raw_p return _rawpart_cmp_type (raw_part, "Apple_Void"); } @@ -11,7 +11,7 @@ Index: parted-2.3/libparted/labels/mac.c * 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" -@@ -534,6 +534,13 @@ _rawpart_analyse (MacRawPartition* raw_p +@@ -560,6 +560,13 @@ _rawpart_analyse (MacRawPartition* raw_p if (!part) goto error; diff --git a/make-align-check-work-in-interactive-mode.patch b/make-align-check-work-in-interactive-mode.patch new file mode 100644 index 0000000..466cfe1 --- /dev/null +++ b/make-align-check-work-in-interactive-mode.patch @@ -0,0 +1,44 @@ +Index: parted-2.2/parted/parted.c +=================================================================== +--- parted-2.2.orig/parted/parted.c 2010-06-30 13:10:27.000000000 +0200 ++++ parted-2.2/parted/parted.c 2010-06-30 13:11:09.000000000 +0200 +@@ -2135,18 +2135,33 @@ do_align_check (PedDevice **dev) + { + PedDisk *disk = ped_disk_new (*dev); + if (!disk) +- return 0; ++ goto error; + +- enum AlignmentType align_type; ++ enum AlignmentType align_type = PA_OPTIMUM; + PedPartition *part = NULL; +- bool aligned = +- (command_line_get_align_type (_("alignment type(min/opt)"), &align_type) +- && command_line_get_partition (_("Partition number?"), disk, &part) +- && partition_align_check (disk, part, align_type)); ++ ++ if (!command_line_get_align_type (_("alignment type(min/opt)"), &align_type)) ++ goto error_destroy_disk; ++ if (!command_line_get_partition (_("Partition number?"), disk, &part)) ++ goto error_destroy_disk; ++ ++ bool aligned = partition_align_check (disk, part, align_type); ++ if (!opt_script_mode) ++ printf(aligned ? _("%d aligned\n") : _("%d not aligned\n"), part->num); + + ped_disk_destroy (disk); + ++ if (opt_script_mode) + return aligned ? 1 : 0; ++ ++ /* Always return 1 in interactive mode, to be consistent ++ with the other modes. */ ++ return 1; ++ ++error_destroy_disk: ++ ped_disk_destroy (disk); ++error: ++ return 0; + } + + static int diff --git a/parted-2.2.tar.bz2 b/parted-2.2.tar.bz2 new file mode 100644 index 0000000..29a9f0e --- /dev/null +++ b/parted-2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfe1251c63939edc3fa1ed858e1a03a2462ec515063ebecd1c3555a86629b23c +size 1952115 diff --git a/parted-2.3.tar.bz2 b/parted-2.3.tar.bz2 deleted file mode 100644 index acbc31f..0000000 --- a/parted-2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f872728d228cfa5bdc25e694f161c282e8e7551ad1fdad673898b5216a81cc95 -size 2034059 diff --git a/parted-gpt-mbr-sync.patch b/parted-gpt-mbr-sync.patch index 8dab874..b5b73d1 100644 --- a/parted-gpt-mbr-sync.patch +++ b/parted-gpt-mbr-sync.patch @@ -4,8 +4,8 @@ Index: libparted/labels/gpt.c =================================================================== ---- libparted/labels/gpt.c.orig 2010-05-06 15:46:05.000000000 +0200 -+++ libparted/labels/gpt.c 2010-07-08 13:29:33.000000000 +0200 +--- libparted/labels/gpt.c.orig 2009-12-16 18:01:34.000000000 +0100 ++++ libparted/labels/gpt.c 2010-02-02 14:12:46.000000000 +0100 @@ -50,6 +50,11 @@ # define _(String) (String) #endif /* ENABLE_NLS */ @@ -18,7 +18,7 @@ Index: libparted/labels/gpt.c #define EFI_PMBR_OSTYPE_EFI 0xEE #define MSDOS_MBR_SIGNATURE 0xaa55 -@@ -1056,11 +1061,60 @@ error: +@@ -1062,11 +1067,60 @@ error: return 0; } @@ -80,7 +80,7 @@ Index: libparted/labels/gpt.c /* 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). -@@ -1070,10 +1124,13 @@ _write_pmbr (PedDevice *dev) +@@ -1076,10 +1130,13 @@ _write_pmbr (PedDevice *dev) return 0; LegacyMBR_t *pmbr = s0; @@ -94,7 +94,7 @@ Index: libparted/labels/gpt.c pmbr->PartitionRecord[0].OSType = EFI_PMBR_OSTYPE_EFI; pmbr->PartitionRecord[0].StartSector = 1; pmbr->PartitionRecord[0].EndHead = 0xFE; -@@ -1084,6 +1141,54 @@ _write_pmbr (PedDevice *dev) +@@ -1090,6 +1147,54 @@ _write_pmbr (PedDevice *dev) pmbr->PartitionRecord[0].SizeInLBA = PED_CPU_TO_LE32 (0xFFFFFFFF); else pmbr->PartitionRecord[0].SizeInLBA = PED_CPU_TO_LE32 (dev->length - 1UL); @@ -149,7 +149,7 @@ Index: libparted/labels/gpt.c int write_ok = ped_device_write (dev, pmbr, GPT_PMBR_LBA, GPT_PMBR_SECTORS); -@@ -1198,7 +1303,7 @@ gpt_write (const PedDisk *disk) +@@ -1204,7 +1309,7 @@ gpt_write (const PedDisk *disk) ptes_crc = efi_crc32 (ptes, ptes_size); /* Write protective MBR */ diff --git a/parted-mac.patch b/parted-mac.patch index a14a534..20efecc 100644 --- a/parted-mac.patch +++ b/parted-mac.patch @@ -1,8 +1,8 @@ -Index: parted-2.3/libparted/disk.c +Index: parted-2.1/libparted/disk.c =================================================================== ---- parted-2.3.orig/libparted/disk.c 2010-07-08 13:28:03.000000000 +0200 -+++ parted-2.3/libparted/disk.c 2010-07-08 13:28:04.000000000 +0200 -@@ -1182,6 +1182,41 @@ _disk_pop_update_mode (PedDisk* disk) +--- parted-2.1.orig/libparted/disk.c 2010-02-02 11:38:31.000000000 +0100 ++++ parted-2.1/libparted/disk.c 2010-02-02 11:39:16.000000000 +0100 +@@ -1178,6 +1178,41 @@ _disk_pop_update_mode (PedDisk* disk) * @{ */ @@ -44,11 +44,11 @@ Index: parted-2.3/libparted/disk.c PedPartition* _ped_partition_alloc (const PedDisk* disk, PedPartitionType type, const PedFileSystemType* fs_type, -Index: parted-2.3/libparted/labels/mac.c +Index: parted-2.1/libparted/labels/mac.c =================================================================== ---- parted-2.3.orig/libparted/labels/mac.c 2010-02-20 12:37:24.000000000 +0100 -+++ parted-2.3/libparted/labels/mac.c 2010-07-08 13:28:04.000000000 +0200 -@@ -1387,6 +1387,36 @@ mac_get_partition_alignment(const PedDis +--- parted-2.1.orig/libparted/labels/mac.c 2009-12-16 18:18:13.000000000 +0100 ++++ parted-2.1/libparted/labels/mac.c 2010-02-02 11:43:23.000000000 +0100 +@@ -1437,6 +1437,36 @@ mac_get_partition_alignment(const PedDis return ped_alignment_new(0, sector_size); } @@ -85,7 +85,7 @@ Index: parted-2.3/libparted/labels/mac.c static PedConstraint* _primary_constraint (PedDisk* disk) { -@@ -1590,6 +1620,8 @@ static PedDiskOps mac_disk_ops = { +@@ -1640,6 +1670,8 @@ static PedDiskOps mac_disk_ops = { partition_set_name: mac_partition_set_name, partition_get_name: mac_partition_get_name, @@ -94,7 +94,7 @@ Index: parted-2.3/libparted/labels/mac.c get_partition_alignment: mac_get_partition_alignment, -@@ -1600,7 +1632,7 @@ static PedDiskType mac_disk_type = { +@@ -1650,7 +1682,7 @@ static PedDiskType mac_disk_type = { next: NULL, name: "mac", ops: &mac_disk_ops, @@ -103,11 +103,11 @@ Index: parted-2.3/libparted/labels/mac.c }; void -Index: parted-2.3/include/parted/disk.h +Index: parted-2.1/include/parted/disk.h =================================================================== ---- parted-2.3.orig/include/parted/disk.h 2010-07-08 13:28:03.000000000 +0200 -+++ parted-2.3/include/parted/disk.h 2010-07-08 13:28:04.000000000 +0200 -@@ -77,10 +77,11 @@ enum _PedPartitionFlag { +--- parted-2.1.orig/include/parted/disk.h 2010-02-02 11:38:31.000000000 +0100 ++++ parted-2.1/include/parted/disk.h 2010-02-02 11:39:16.000000000 +0100 +@@ -76,10 +76,11 @@ enum _PedPartitionFlag { enum _PedDiskTypeFeature { PED_DISK_TYPE_EXTENDED=1, /**< supports extended partitions */ @@ -121,7 +121,7 @@ Index: parted-2.3/include/parted/disk.h struct _PedDisk; struct _PedPartition; -@@ -240,6 +241,8 @@ struct _PedDiskOps { +@@ -239,6 +240,8 @@ struct _PedDiskOps { /* other */ int (*alloc_metadata) (PedDisk* disk); int (*get_max_primary_partition_count) (const PedDisk* disk); @@ -130,7 +130,7 @@ Index: parted-2.3/include/parted/disk.h bool (*get_max_supported_partition_count) (const PedDisk* disk, int* supported); PedAlignment *(*get_partition_alignment)(const PedDisk *disk); -@@ -326,7 +329,9 @@ extern int ped_partition_is_flag_availab +@@ -325,7 +328,9 @@ extern int ped_partition_is_flag_availab extern int ped_partition_set_system (PedPartition* part, const PedFileSystemType* fs_type); extern int ped_partition_set_name (PedPartition* part, const char* name); @@ -140,11 +140,11 @@ Index: parted-2.3/include/parted/disk.h extern int ped_partition_is_busy (const PedPartition* part); extern char* ped_partition_get_path (const PedPartition* part); -Index: parted-2.3/parted/parted.c +Index: parted-2.1/parted/parted.c =================================================================== ---- parted-2.3.orig/parted/parted.c 2010-07-08 13:28:03.000000000 +0200 -+++ parted-2.3/parted/parted.c 2010-07-08 13:28:04.000000000 +0200 -@@ -1293,6 +1293,7 @@ partition_print_flags (PedPartition* par +--- parted-2.1.orig/parted/parted.c 2010-02-02 11:38:31.000000000 +0100 ++++ parted-2.1/parted/parted.c 2010-02-02 11:39:16.000000000 +0100 +@@ -1235,6 +1235,7 @@ partition_print_flags (PedPartition* par char* res = ped_malloc(1); void* _res = res; int xtype; @@ -152,7 +152,7 @@ Index: parted-2.3/parted/parted.c *res = '\0'; -@@ -1327,6 +1328,23 @@ partition_print_flags (PedPartition* par +@@ -1269,6 +1270,23 @@ partition_print_flags (PedPartition* par } } diff --git a/parted-no-inttypes-include b/parted-no-inttypes-include new file mode 100644 index 0000000..14d3d9b --- /dev/null +++ b/parted-no-inttypes-include @@ -0,0 +1,27 @@ +Index: parted-1.9.0/libparted/fs/ext2/ext2.h +=================================================================== +--- parted-1.9.0.orig/libparted/fs/ext2/ext2.h 2009-07-23 19:52:08.000000000 +0200 ++++ parted-1.9.0/libparted/fs/ext2/ext2.h 2009-07-30 16:28:45.000000000 +0200 +@@ -24,10 +24,6 @@ + #include + #include "tune.h" + +-#if HAVE_INTTYPES_H +-# include +-#endif +- + #if ENABLE_NLS + # include + # define _(String) dgettext (PACKAGE, String) +Index: parted-1.9.0/libparted/labels/gpt.c +=================================================================== +--- parted-1.9.0.orig/libparted/labels/gpt.c 2009-07-30 16:28:44.000000000 +0200 ++++ parted-1.9.0/libparted/labels/gpt.c 2009-07-30 16:28:45.000000000 +0200 +@@ -30,7 +30,6 @@ + #include + #include + #include +-#include + #include + #include + #include diff --git a/parted-remove-experimental-warning.patch b/parted-remove-experimental-warning.patch new file mode 100644 index 0000000..e125c66 --- /dev/null +++ b/parted-remove-experimental-warning.patch @@ -0,0 +1,31 @@ +From 2d81422f3caea30d9d65ec343a34bc1f447a4f01 Mon Sep 17 00:00:00 2001 +From: Jim Meyering +Date: Thu, 11 Mar 2010 19:01:41 +0100 +Subject: [PATCH] libparted: remove "HIGHLY EXPERIMENTAL" warning for >512B-sector devices + +* libparted/arch/linux.c (_device_set_sector_size): Remove the +"HIGHLY EXPERIMENTAL" warning, now that support for >512-byte sectors +seems to be usable. Suggested by Colin Watson. +--- + +Index: parted-2.2/libparted/arch/linux.c +=================================================================== +--- parted-2.2.orig/libparted/arch/linux.c 2010-04-02 09:53:02.000000000 +0200 ++++ parted-2.2/libparted/arch/linux.c 2010-04-02 09:53:43.000000000 +0200 +@@ -688,16 +688,6 @@ _device_set_sector_size (PedDevice* dev) + dev->sector_size = PED_SECTOR_SIZE_DEFAULT; + } + #endif +- +- if (dev->sector_size != PED_SECTOR_SIZE_DEFAULT) { +- ped_exception_throw ( +- PED_EXCEPTION_WARNING, +- PED_EXCEPTION_OK, +- _("Device %s has a logical sector size of %lld. Not " +- "all parts of GNU Parted support this at the moment, " +- "and the working code is HIGHLY EXPERIMENTAL.\n"), +- dev->path, dev->sector_size); +- } + } + + static int diff --git a/parted-type.patch b/parted-type.patch index bf7f32c..d3114ce 100644 --- a/parted-type.patch +++ b/parted-type.patch @@ -6,11 +6,11 @@ parted/ui.c | 3 +++ 5 files changed, 39 insertions(+), 7 deletions(-) -Index: parted-2.3/libparted/disk.c +Index: parted-2.1/libparted/disk.c =================================================================== ---- parted-2.3.orig/libparted/disk.c 2010-05-05 18:08:38.000000000 +0200 -+++ parted-2.3/libparted/disk.c 2010-07-08 13:26:24.000000000 +0200 -@@ -2433,6 +2433,8 @@ ped_partition_flag_get_name (PedPartitio +--- parted-2.1.orig/libparted/disk.c 2010-02-02 11:57:03.000000000 +0100 ++++ parted-2.1/libparted/disk.c 2010-02-02 11:57:14.000000000 +0100 +@@ -2429,6 +2429,8 @@ ped_partition_flag_get_name (PedPartitio return N_("lba"); case PED_PARTITION_HPSERVICE: return N_("hp-service"); @@ -19,11 +19,11 @@ Index: parted-2.3/libparted/disk.c case PED_PARTITION_PALO: return N_("palo"); case PED_PARTITION_PREP: -Index: parted-2.3/libparted/labels/dos.c +Index: parted-2.1/libparted/labels/dos.c =================================================================== ---- parted-2.3.orig/libparted/labels/dos.c 2010-05-25 15:42:21.000000000 +0200 -+++ parted-2.3/libparted/labels/dos.c 2010-07-08 13:26:24.000000000 +0200 -@@ -1412,6 +1412,10 @@ msdos_partition_set_flag (PedPartition* +--- parted-2.1.orig/libparted/labels/dos.c 2010-02-02 11:57:03.000000000 +0100 ++++ parted-2.1/libparted/labels/dos.c 2010-02-02 11:57:14.000000000 +0100 +@@ -1397,6 +1397,10 @@ msdos_partition_set_flag (PedPartition* disk = part->disk; switch (flag) { @@ -34,7 +34,7 @@ Index: parted-2.3/libparted/labels/dos.c case PED_PARTITION_HIDDEN: if (part->type == PED_PARTITION_EXTENDED) { ped_exception_throw ( -@@ -1507,6 +1511,9 @@ msdos_partition_get_flag (const PedParti +@@ -1494,6 +1498,9 @@ msdos_partition_get_flag (const PedParti case PED_PARTITION_LBA: return dos_data->lba; @@ -44,18 +44,18 @@ Index: parted-2.3/libparted/labels/dos.c case PED_PARTITION_PALO: return dos_data->palo; -@@ -1533,6 +1540,7 @@ msdos_partition_is_flag_available (const +@@ -1515,6 +1522,7 @@ msdos_partition_is_flag_available (const case PED_PARTITION_RAID: case PED_PARTITION_LVM: case PED_PARTITION_LBA: + case PED_PARTITION_TYPE: case PED_PARTITION_PALO: case PED_PARTITION_PREP: - case PED_PARTITION_DIAG: -Index: parted-2.3/parted/ui.c + return 1; +Index: parted-2.1/parted/ui.c =================================================================== ---- parted-2.3.orig/parted/ui.c 2010-05-05 18:08:38.000000000 +0200 -+++ parted-2.3/parted/ui.c 2010-07-08 13:26:24.000000000 +0200 +--- parted-2.1.orig/parted/ui.c 2010-02-02 11:57:03.000000000 +0100 ++++ parted-2.1/parted/ui.c 2010-02-02 12:00:01.000000000 +0100 @@ -918,6 +918,9 @@ command_line_get_integer (const char* pr NULL, 1); if (!input) @@ -66,25 +66,31 @@ Index: parted-2.3/parted/ui.c valid = sscanf (input, "%d", value); free (input); return valid; -Index: parted-2.3/include/parted/disk.h +Index: parted-2.1/include/parted/disk.h =================================================================== ---- parted-2.3.orig/include/parted/disk.h 2010-05-05 18:08:38.000000000 +0200 -+++ parted-2.3/include/parted/disk.h 2010-07-08 13:27:28.000000000 +0200 -@@ -69,7 +69,8 @@ enum _PedPartitionFlag { - PED_PARTITION_MSFT_RESERVED=11, - PED_PARTITION_BIOS_GRUB=12, - PED_PARTITION_APPLE_TV_RECOVERY=13, -- PED_PARTITION_DIAG=14 -+ PED_PARTITION_DIAG=14, -+ PED_PARTITION_TYPE=15 +--- parted-2.1.orig/include/parted/disk.h 2010-02-02 11:57:03.000000000 +0100 ++++ parted-2.1/include/parted/disk.h 2010-02-02 11:58:02.000000000 +0100 +@@ -65,10 +65,11 @@ enum _PedPartitionFlag { + PED_PARTITION_LBA=7, + PED_PARTITION_HPSERVICE=8, + PED_PARTITION_PALO=9, +- PED_PARTITION_PREP=10, +- PED_PARTITION_MSFT_RESERVED=11, +- PED_PARTITION_BIOS_GRUB=12, +- PED_PARTITION_APPLE_TV_RECOVERY=13 ++ PED_PARTITION_TYPE=10, ++ PED_PARTITION_PREP=11, ++ PED_PARTITION_MSFT_RESERVED=12, ++ PED_PARTITION_BIOS_GRUB=13, ++ PED_PARTITION_APPLE_TV_RECOVERY=14 }; #define PED_PARTITION_FIRST_FLAG PED_PARTITION_BOOT - #define PED_PARTITION_LAST_FLAG PED_PARTITION_DIAG -Index: parted-2.3/parted/parted.c + #define PED_PARTITION_LAST_FLAG PED_PARTITION_APPLE_TV_RECOVERY +Index: parted-2.1/parted/parted.c =================================================================== ---- parted-2.3.orig/parted/parted.c 2010-07-08 13:26:06.000000000 +0200 -+++ parted-2.3/parted/parted.c 2010-07-08 13:26:24.000000000 +0200 -@@ -1292,13 +1292,14 @@ partition_print_flags (PedPartition* par +--- parted-2.1.orig/parted/parted.c 2010-02-02 11:57:03.000000000 +0100 ++++ parted-2.1/parted/parted.c 2010-02-02 11:57:14.000000000 +0100 +@@ -1234,13 +1234,14 @@ partition_print_flags (PedPartition* par const char* name; char* res = ped_malloc(1); void* _res = res; @@ -100,7 +106,7 @@ Index: parted-2.3/parted/parted.c if (first_flag) first_flag = 0; else { -@@ -1307,7 +1308,16 @@ partition_print_flags (PedPartition* par +@@ -1249,7 +1250,16 @@ partition_print_flags (PedPartition* par res = _res; strncat (res, ", ", 2); } @@ -118,7 +124,7 @@ Index: parted-2.3/parted/parted.c name = _(ped_partition_flag_get_name (flag)); _res = res; ped_realloc (&_res, strlen (res) + 1 + strlen (name)); -@@ -1315,6 +1325,7 @@ partition_print_flags (PedPartition* par +@@ -1257,6 +1267,7 @@ partition_print_flags (PedPartition* par strcat(res, name); } } @@ -126,7 +132,7 @@ Index: parted-2.3/parted/parted.c return res; } -@@ -2141,12 +2152,19 @@ do_set (PedDevice** dev) +@@ -2057,12 +2068,19 @@ do_set (PedDevice** dev) goto error_destroy_disk; if (!command_line_get_part_flag (_("Flag to Invert?"), part, &flag)) goto error_destroy_disk; diff --git a/parted-wipeaix.patch b/parted-wipeaix.patch index fe47747..7cf4677 100644 --- a/parted-wipeaix.patch +++ b/parted-wipeaix.patch @@ -1,8 +1,8 @@ -Index: parted-2.3/libparted/labels/dos.c +Index: parted-2.1/libparted/labels/dos.c =================================================================== ---- parted-2.3.orig/libparted/labels/dos.c 2010-07-08 13:28:03.000000000 +0200 -+++ parted-2.3/libparted/labels/dos.c 2010-07-08 13:28:13.000000000 +0200 -@@ -1176,7 +1176,13 @@ msdos_write (const PedDisk* disk) +--- parted-2.1.orig/libparted/labels/dos.c 2010-02-02 13:26:28.000000000 +0100 ++++ parted-2.1/libparted/labels/dos.c 2010-02-02 13:28:15.000000000 +0100 +@@ -1187,7 +1187,13 @@ msdos_write (const PedDisk* disk) return 0; DosRawTable *table = (DosRawTable *) s0; diff --git a/parted.changes b/parted.changes index ddaa74b..9aa8040 100644 --- a/parted.changes +++ b/parted.changes @@ -1,36 +1,3 @@ -------------------------------------------------------------------- -Thu Jul 8 11:43:17 UTC 2010 - puzel@novell.com - -- update to parted-2.3 - - parted now recognizes ATA over Ethernet (AoE) devices - - parted now recognizes Linux Software RAID Arrays - - libparted has a new partition flag to check for diagnostic - (aka recovery or reserved) partitions: PED_PARTITION_DIAG - - When libparted deferenced a /dev/mapper/foo symlink, it would - keep the resulting /dev/dm-N name and sometimes use it later, - even though it had since become stale and invalid. - It no longer stores the result of dereferencing a /dev/mapper - symlink. - - libparted's msdos_partition_is_flag_available function now - always reports that the "hidden" flag is not available for - an extended partition. Similarly, - msdos_partition_get_flag(p,PED_PARTITION_HIDDEN) always - returns 0 for an extended partition. - - libparted uses a more accurate heuristic to distinguish between - ext4 and ext3 partitions. - - libparted now properly checks the return value of dm_task_run - when operating on devicemapper devices. - - allow using ped_device_cache_remove(dev) followed by a (later) - ped_device_destroy() without corrupting the device cache. - - when creating an ext2 file system, Parted no longer creates an - invalid one when its size is 2TiB or larger. -- drop etherd_support.diff (included upstream) -- drop parted-remove-experimental-warning.patch (included upstream) -- drop make-align-check-work-in-interactive-mode.patch - (included upstream) -- drop parted-no-inttypes-include (not needed) -- refresh all remaining patches - ------------------------------------------------------------------- Wed Jun 30 11:12:03 UTC 2010 - puzel@novell.com diff --git a/parted.spec b/parted.spec index 6e0c5cb..9a59a83 100644 --- a/parted.spec +++ b/parted.spec @@ -1,5 +1,5 @@ # -# spec file for package parted (Version 2.3) +# spec file for package parted (Version 2.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: parted -Version: 2.3 +Version: 2.2 Release: 2 License: GPLv3+ Summary: GNU partitioner @@ -30,14 +30,20 @@ Patch0: always-resize-part.dif Patch1: parted-type.patch Patch2: parted-mac.patch Patch3: parted-wipeaix.patch +Patch4: etherd_support.diff Patch5: hfs_fix.dif Patch6: always_print_geom.diff Patch7: fix-function-def.patch Patch8: parted-gpt-mbr-sync.patch +Patch9: parted-no-inttypes-include #PATCH-FEATURE-OPENSUSE fix-dm-partition-name.patch bnc471440,447591 petr.uzel@suse.cz Patch10: fix-dm-partition-name.patch #PATCH-FEATURE-OPENSUSE do-not-create-dm-nodes.patch bnc#501773 petr.uzel@suse.cz Patch11: do-not-create-dm-nodes.patch +#PATCH-FIX-UPSTREAM parted-remove-experimental-warning.patch +Patch12: parted-remove-experimental-warning.patch +#PATCH-FIX-UPSTREAM make-align-check-work-in-interactive-mode.patch bnc#608704 petr.uzel@centrum.cz +Patch13: make-align-check-work-in-interactive-mode.patch Requires: /sbin/udevadm BuildRequires: check-devel @@ -83,21 +89,25 @@ to develop applications that require these. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p0 %patch5 -p1 %patch6 %patch7 %patch8 +%patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %build AUTOPOINT=true autoreconf --force --install %configure --disable-static \ - --with-pic \ - --enable-device-mapper=yes \ - --enable-dynamic-loading=no \ - --enable-selinux \ - --disable-Werror + --with-pic \ + --enable-device-mapper=yes \ + --enable-dynamic-loading=no \ + --enable-selinux \ + --disable-Werror make %{?_smp_mflags} %install