rpms/parted/devel parted-1.9.0-diskflags.patch, 1.1, 1.2 parted-1.9.0-export-alignment-info.patch, 1.3, 1.4 parted-1.9.0-lo-as-file-rh546622.patch, 1.1, 1.2 parted-1.9.0-partition-limits-rh533417.patch, 1.1, 1.2 parted.spec, 1.158, 1.159

Sun Dec 20 10:19:50 UTC 2009

Author: jwrdegoede

Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3934

Modified Files:
	parted-1.9.0-diskflags.patch 
	parted-1.9.0-export-alignment-info.patch 
	parted-1.9.0-lo-as-file-rh546622.patch 
	parted-1.9.0-partition-limits-rh533417.patch parted.spec 
Log Message:
* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-25
- Fix crash when partitioning loopback devices (#546622)
- Drop no-cylinder-align patch:
  - its functionality is superseeded by the per disk flags
  - its only user (pyparted) has been updated to use those
  - this is not upstream so we don't want other programs to start using it


parted-1.9.0-diskflags.patch:
 include/parted/disk.h  |   33 +++++++++++++
 libparted/disk.c       |  124 +++++++++++++++++++++++++++++++++++++++++++++++++
 libparted/labels/dos.c |   70 +++++++++++++++++++++++++--
 libparted/labels/sun.c |   57 ++++++++++++++++++++--
 4 files changed, 273 insertions(+), 11 deletions(-)

Index: parted-1.9.0-diskflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted-1.9.0-diskflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2

--- parted-1.9.0-diskflags.patch	18 Dec 2009 09:42:14 -0000	1.1
+++ parted-1.9.0-diskflags.patch	20 Dec 2009 10:19:49 -0000	1.2
@@ -287,17 +287,20 @@ diff -up parted-1.9.0/libparted/labels/d
  }
  
  #ifndef DISCOVER_ONLY
-@@ -2029,7 +2083,9 @@ msdos_partition_align (PedPartition* par
+@@ -2029,8 +2082,11 @@ msdos_partition_align (PedPartition* par
  
  	partition_probe_bios_geometry (part, &bios_geom);
  
--	if (ped_disk_align_to_cylinders_on())
+-	if (_align (part, &bios_geom, constraint))
+-		return 1;
 +	DosDiskData *disk_specific = part->disk->disk_specific;
-+	if (ped_disk_align_to_cylinders_on() &&
-+	    disk_specific->cylinder_alignment)
- 		if (_align (part, &bios_geom, constraint))
- 			return 1;
++	if (disk_specific->cylinder_alignment)
++		if (_align (part, &bios_geom, constraint))
++			return 1;
++
  	if (_align_no_geom (part, constraint))
+ 		return 1;
+ 
 @@ -2324,6 +2380,10 @@ static PedDiskOps msdos_disk_ops = {
  	write:			NULL,
  #endif

parted-1.9.0-export-alignment-info.patch:
 configure.ac             |   12 ++++
 include/parted/device.h  |   13 ++++
 include/parted/disk.h    |    2 
 include/parted/natmath.h |    1 
 libparted/Makefile.am    |    1 
 libparted/arch/linux.c   |   67 ++++++++++++++++++++++-
 libparted/arch/linux.h   |    8 ++
 libparted/device.c       |  135 +++++++++++++++++++++++++++++++++++++++++++----
 libparted/disk.c         |   20 ++++++
 libparted/labels/dasd.c  |   11 +++
 libparted/labels/mac.c   |   11 +++
 libparted/labels/pc98.c  |   12 +++-
 libparted/labels/rdb.c   |   12 +++-
 libparted/labels/sun.c   |   10 +++
 14 files changed, 298 insertions(+), 17 deletions(-)

Index: parted-1.9.0-export-alignment-info.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted-1.9.0-export-alignment-info.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- parted-1.9.0-export-alignment-info.patch	3 Nov 2009 12:07:15 -0000	1.3
+++ parted-1.9.0-export-alignment-info.patch	20 Dec 2009 10:19:49 -0000	1.4
@@ -68,15 +68,14 @@ diff -up parted-1.9.0/include/parted/dis
  };
  
  struct _PedDiskType {
-@@ -263,6 +264,8 @@ extern int ped_disk_get_last_partition_n
+@@ -263,6 +264,7 @@ extern int ped_disk_get_last_partition_n
  extern int ped_disk_get_max_primary_partition_count (const PedDisk* disk);
  extern bool ped_disk_get_max_supported_partition_count(const PedDisk* disk,
                                                         int* supported);
 +extern PedAlignment *ped_disk_get_partition_alignment(const PedDisk *disk);
-+
- extern int ped_disk_align_to_cylinders_on();
- extern int ped_disk_align_to_cylinders_toggle();
+ 
  /** @} */
+ 
 diff -up parted-1.9.0/include/parted/natmath.h.export-align parted-1.9.0/include/parted/natmath.h
 --- parted-1.9.0/include/parted/natmath.h.export-align	2009-07-23 19:52:08.000000000 +0200
 +++ parted-1.9.0/include/parted/natmath.h	2009-11-03 11:30:46.000000000 +0100

parted-1.9.0-lo-as-file-rh546622.patch:
 linux.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

Index: parted-1.9.0-lo-as-file-rh546622.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted-1.9.0-lo-as-file-rh546622.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parted-1.9.0-lo-as-file-rh546622.patch	18 Dec 2009 09:42:14 -0000	1.1
+++ parted-1.9.0-lo-as-file-rh546622.patch	20 Dec 2009 10:19:49 -0000	1.2
@@ -18,3 +18,19 @@ diff -up parted-1.9.0/libparted/arch/lin
          } else {
                  dev->type = PED_DEVICE_UNKNOWN;
          }
+@@ -1048,6 +1048,15 @@ init_file (PedDevice* dev)
+         if (!ped_device_open (dev))
+                 goto error;
+ 
++        dev->sector_size = PED_SECTOR_SIZE_DEFAULT;
++        char *p = getenv ("PARTED_SECTOR_SIZE");
++        if (p) {
++                int s = atoi (p);
++                if (0 < s && s % 512 == 0)
++                        dev->sector_size = s;
++        }
++        dev->phys_sector_size = dev->sector_size;
++
+         if (S_ISBLK(dev_stat.st_mode))
+                 dev->length = _device_get_length (dev);
+         else

parted-1.9.0-partition-limits-rh533417.patch:
 include/parted/disk.h           |    2 
 libparted/disk.c                |   34 ++++++++
 libparted/labels/pt-limit.c     |  164 ++++++++++++++++++++++++++++++++++++++++
 libparted/labels/pt-limit.gperf |   26 ++++++
 4 files changed, 226 insertions(+)

Index: parted-1.9.0-partition-limits-rh533417.patch
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted-1.9.0-partition-limits-rh533417.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parted-1.9.0-partition-limits-rh533417.patch	18 Dec 2009 09:42:14 -0000	1.1
+++ parted-1.9.0-partition-limits-rh533417.patch	20 Dec 2009 10:19:49 -0000	1.2
@@ -1,15 +1,14 @@
 --- parted-1.9.0.orig/include/parted/disk.h	2009-12-15 10:32:24.000000000 +0100
 +++ parted-1.9.0/include/parted/disk.h	2009-12-15 10:59:26.000000000 +0100
-@@ -266,6 +266,9 @@
+@@ -265,6 +265,8 @@ extern int ped_disk_get_max_primary_part
+ extern bool ped_disk_get_max_supported_partition_count(const PedDisk* disk,
                                                         int* supported);
  extern PedAlignment *ped_disk_get_partition_alignment(const PedDisk *disk);
- 
 +extern PedSector ped_disk_max_partition_length (const PedDisk *disk);
 +extern PedSector ped_disk_max_partition_start_sector (const PedDisk *disk);
-+
- extern int ped_disk_align_to_cylinders_on();
- extern int ped_disk_align_to_cylinders_toggle();
+ 
  /** @} */
+ 
 --- parted-1.9.0.orig/libparted/disk.c	2009-12-15 10:32:24.000000000 +0100
 +++ parted-1.9.0/libparted/disk.c	2009-12-15 10:55:16.000000000 +0100
 @@ -738,6 +738,40 @@


Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- parted.spec	18 Dec 2009 09:42:14 -0000	1.158
+++ parted.spec	20 Dec 2009 10:19:49 -0000	1.159
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -14,7 +14,6 @@ Patch1:  %{name}-1.9.0-appletv-support.p
 Patch2:  %{name}-1.9.0-extended-mbr.patch
 Patch3:  %{name}-1.9.0-noheaders.patch
 Patch4:  %{name}-1.9.0-pop-push-error.patch
-Patch5:  %{name}-1.9.0-no-cylinder-align.patch
 Patch6:  %{name}-1.9.0-remove-struct-elem.patch
 Patch7:  %{name}-1.9.0-move-function-declarations.patch
 Patch10:  %{name}-1.9.0-handle-dup-error.patch
@@ -78,7 +77,6 @@ Parted library, you need to install this
 %patch2 -p1 -b .extended-mbr
 %patch3 -p1 -b .noheaders
 %patch4 -p1 -b .pop-push-error
-%patch5 -p1 -b .no-cylinder-align
 %patch6 -p1 -b .remove-struct-elem
 %patch7 -p1 -b .move-function-declarations
 %patch10 -p1 -b .handle-dup-error
@@ -164,7 +162,15 @@ fi
 %{_exec_prefix}/%{_lib}/libparted.so
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
+
 %changelog
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-25
+- Fix crash when partitioning loopback devices (#546622)
+- Drop no-cylinder-align patch:
+  - its functionality is superseeded by the per disk flags
+  - its only user (pyparted) has been updated to use those
+  - this is not upstream so we don't want other programs to start using it
+
 * Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-24
 - Allow partitioning of loopback devices (#546622)
 - Add libparted function to query maximum partition length and start


