rpms/parted/F-12 parted-1.9.0-lo-as-file-rh546622.patch, 1.1, 1.2 parted.spec, 1.151, 1.152

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/parted/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10270

Modified Files:
	parted-1.9.0-lo-as-file-rh546622.patch parted.spec 
Log Message:
* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-17.2
- Fix crash when partitioning loopback devices (#546622)


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/F-12/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 10:29:01 -0000	1.1
+++ parted-1.9.0-lo-as-file-rh546622.patch	20 Dec 2009 10:54:50 -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


Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/F-12/parted.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- parted.spec	18 Dec 2009 10:29:01 -0000	1.151
+++ parted.spec	20 Dec 2009 10:54:50 -0000	1.152
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 17.1%{?dist}
+Release: 17.2%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -146,6 +146,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-17.2
+- Fix crash when partitioning loopback devices (#546622)
+
 * Fri Dec 18 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-17.1
 - Allow partitioning of loopback devices (#546622)
 - Don't crash when printing partition tables in Russian (#543029)