SOURCES: parted-aix.patch, parted-dasd.patch - updated for 1.6.23

[qboosh]

Author: qboosh                       Date: Mon Jul 18 19:06:22 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.6.23

---- Files affected:
SOURCES:
   parted-aix.patch (1.1 -> 1.2) , parted-dasd.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/parted-aix.patch
diff -u SOURCES/parted-aix.patch:1.1 SOURCES/parted-aix.patch:1.2
--- SOURCES/parted-aix.patch:1.1	Sun Apr 24 14:58:50 2005
+++ SOURCES/parted-aix.patch	Mon Jul 18 21:06:17 2005
@@ -310,37 +310,37 @@
  #ifdef ENABLE_PC98
  	/* HACK: it's impossible to tell PC98 and msdos disk labels apart.
  	 * Someone made the signatures the same (very clever).  Since
---- parted-1.6.3/libparted/libparted.c.aix	2003-05-28 02:38:42.000000000 -0400
-+++ parted-1.6.3/libparted/libparted.c	2003-05-28 02:38:25.000000000 -0400
+--- parted-1.6.23/libparted/libparted.c.orig	2005-07-18 20:57:53.057531736 +0200
++++ parted-1.6.23/libparted/libparted.c	2005-07-18 20:59:01.716094048 +0200
 @@ -78,6 +78,7 @@
  	return 1;
  }
  
 +extern void ped_disk_aix_init ();
  extern void ped_disk_bsd_init ();
+ extern void ped_disk_dvh_init ();
  extern void ped_disk_gpt_init ();
- extern void ped_disk_loop_init ();
-@@ -107,6 +108,7 @@
-	ped_disk_mac_init ();
- 	ped_disk_gpt_init ();
+@@ -108,6 +109,7 @@
+ 	ped_disk_dvh_init ();
  	ped_disk_bsd_init ();
+ 	ped_disk_amiga_init ();
 +	ped_disk_aix_init ();
  }
  
  #ifdef ENABLE_FS
-@@ -136,6 +138,7 @@
+@@ -138,6 +140,7 @@
  }
  #endif /* ENABLE_FS */
  
 +extern void ped_disk_aix_done ();
  extern void ped_disk_bsd_done ();
+ extern void ped_disk_dvh_done ();
  extern void ped_disk_gpt_done ();
- extern void ped_disk_loop_done ();
-@@ -161,6 +164,7 @@
- 	ped_disk_loop_done ();
- 	ped_disk_gpt_done ();
+@@ -166,6 +169,7 @@
+ 	ped_disk_dvh_done ();
  	ped_disk_bsd_done ();
+ 	ped_disk_amiga_done ();
 +	ped_disk_aix_done ();
  }
-
+ 
  static void _init() __attribute__ ((constructor));

================================================================
Index: SOURCES/parted-dasd.patch
diff -u SOURCES/parted-dasd.patch:1.1 SOURCES/parted-dasd.patch:1.2
--- SOURCES/parted-dasd.patch:1.1	Sun Apr 24 14:59:51 2005
+++ SOURCES/parted-dasd.patch	Mon Jul 18 21:06:17 2005
@@ -1,14 +1,6 @@
 diff -ruN --minimal parted-1.6.21.orig/include/parted/device.h parted-1.6.21/include/parted/device.h
 --- parted-1.6.21.orig/include/parted/device.h	2004-08-15 08:35:05.000000000 -0400
 +++ parted-1.6.21/include/parted/device.h	2005-01-21 15:00:40.421628532 -0500
-@@ -22,6 +22,7 @@
- 
- #include <parted/timer.h>
- 
-+
- #define PED_SECTOR_SIZE		512
- typedef long long PedSector;
- 
 @@ -33,7 +34,8 @@
  	PED_DEVICE_CPQARRAY	= 4,
  	PED_DEVICE_FILE		= 5,
@@ -2488,9 +2480,8 @@
 +int fdasd_prepare_labels (fdasd_anchor_t *anc, int fd) ;
 +
 +#endif /* FDASD_H */
-diff -ruN --minimal parted-1.6.21.orig/libparted/libparted.c parted-1.6.21/libparted/libparted.c
---- parted-1.6.21.orig/libparted/libparted.c	2005-01-04 11:09:51.000000000 -0500
-+++ parted-1.6.21/libparted/libparted.c	2005-01-21 15:00:40.429628321 -0500
+--- parted-1.6.23/libparted/libparted.c.orig	2005-03-29 02:01:22.000000000 +0200
++++ parted-1.6.23/libparted/libparted.c	2005-07-18 20:57:09.847100720 +0200
 @@ -87,12 +87,17 @@
  extern void ped_disk_pc98_init ();
  extern void ped_disk_sun_init ();
@@ -2506,9 +2497,9 @@
 +	ped_disk_dasd_init();
 +#endif
 +
- 	ped_disk_amiga_init ();
  	ped_disk_sun_init ();
  #ifdef ENABLE_PC98
+ 	ped_disk_pc98_init ();
 @@ -142,10 +147,14 @@
  extern void ped_disk_pc98_done ();
  extern void ped_disk_sun_done ();
@@ -2521,18 +2512,18 @@
 +#if defined(__s390__) || defined(__s390x__)
 +	ped_disk_dasd_done ();
 +#endif
- 	ped_disk_amiga_done ();
  	ped_disk_sun_done ();
  #ifdef ENABLE_PC98
+ 	ped_disk_pc98_done ();
 @@ -282,8 +291,9 @@
  		return NULL;
  	}
  
-+	memset (mem, 0, size); 
++	memset (mem, 0, size);
  #ifdef DEBUG
 -	memset (mem, 0xff, size);
 +	/* memset (mem, 0xff, size); */
- 	_check_dodgey_pointer (mem, size, 1);
+ 	_check_dodgy_pointer (mem, size, 1);
  #endif
  
 diff -ruN --minimal parted-1.6.21.orig/libparted/linux.c parted-1.6.21/libparted/linux.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/parted-aix.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/parted-dasd.patch?r1=1.1&r2=1.2&f=u