[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/parted/devel parted-1.6.24-dasd.patch, NONE, 1.1 parted-1.6.24.tar.gz.sig, NONE, 1.1 .cvsignore, 1.20, 1.21 parted.spec, 1.52, 1.53 sources, 1.24, 1.25 parted-1.6.23-dasd.patch, 1.1, NONE parted-1.6.23.tar.gz.sig, 1.1, NONE

Author: clumens

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4428

Modified Files:
	.cvsignore parted.spec sources 
Added Files:
	parted-1.6.24-dasd.patch parted-1.6.24.tar.gz.sig 
Removed Files:
	parted-1.6.23-dasd.patch parted-1.6.23.tar.gz.sig 
Log Message:
Updated to parted-1.6.24.


parted-1.6.24-dasd.patch:
 include/parted/device.h |    5 
 include/parted/disk.h   |    3 
 include/parted/linux.h  |    5 
 libparted/Makefile.am   |    5 
 libparted/disk_dasd.c   |  882 +++++++++++++++++++++++++++++++
 libparted/disk_mac.c    |    2 
 libparted/fdasd.c       | 1302 ++++++++++++++++++++++++++++++++++++++++++++++
 libparted/fdasd.h       |  230 ++++++++
 libparted/libparted.c   |   12 
 libparted/linux.c       |   69 ++
 libparted/llseek.c      |   80 ++
 libparted/llseek.h      |   35 +
 libparted/vtoc.c        | 1352 ++++++++++++++++++++++++++++++++++++++++++++++++
 libparted/vtoc.h        |  371 +++++++++++++
 14 files changed, 4344 insertions(+), 9 deletions(-)

--- NEW FILE parted-1.6.24-dasd.patch ---
diff -ruN parted-1.6.24.orig/include/parted/device.h parted-1.6.24/include/parted/device.h
--- parted-1.6.24.orig/include/parted/device.h	2005-07-26 15:32:29.000000000 -0400
+++ parted-1.6.24/include/parted/device.h	2005-08-30 10:58:40.000000000 -0400
@@ -32,7 +32,8 @@
 	PED_DEVICE_CPQARRAY	= 4,
 	PED_DEVICE_FILE		= 5,
 	PED_DEVICE_ATARAID	= 6,
-	PED_DEVICE_I2O		= 7
+	PED_DEVICE_I2O		= 7,
+ 	PED_DEVICE_DASD		= 8
 } PedDeviceType;
 
 typedef struct _PedDevice PedDevice;
@@ -53,7 +54,7 @@
 	char*		path;			/* device /dev entry */
 
 	PedDeviceType	type;			/* SCSI, IDE, etc. */
-	int		sector_size;
+	unsigned int	sector_size;
 	PedSector	length;
 
 	int		open_count;
diff -ruN parted-1.6.24.orig/include/parted/disk.h parted-1.6.24/include/parted/disk.h
--- parted-1.6.24.orig/include/parted/disk.h	2005-08-10 09:50:15.000000000 -0400
+++ parted-1.6.24/include/parted/disk.h	2005-08-30 10:58:40.000000000 -0400
@@ -36,7 +36,8 @@
 	PED_PARTITION_LOGICAL		= 0x01,
 	PED_PARTITION_EXTENDED		= 0x02,
 	PED_PARTITION_FREESPACE		= 0x04,
-	PED_PARTITION_METADATA		= 0x08
+	PED_PARTITION_METADATA		= 0x08,
+	PED_PARTITION_PROTECTED		= 0x10
 } PedPartitionType;
 
 typedef enum {
diff -ruN parted-1.6.24.orig/include/parted/linux.h parted-1.6.24/include/parted/linux.h
--- parted-1.6.24.orig/include/parted/linux.h	2005-07-26 15:32:29.000000000 -0400
+++ parted-1.6.24/include/parted/linux.h	2005-08-30 10:58:40.000000000 -0400
@@ -29,6 +29,11 @@
 
 struct _LinuxSpecific {
 	int	fd;
+#if defined(__s390__) || defined(__s390x__)
+	unsigned int	real_sector_size;
+        /* IBM internal dasd structure (i guess ;), required. */
+        struct fdasd_anchor  *anchor;
+#endif
 };
 
 extern PedArchitecture ped_linux_arch;
diff -ruN parted-1.6.24.orig/libparted/Makefile.am parted-1.6.24/libparted/Makefile.am
--- parted-1.6.24.orig/libparted/Makefile.am	2005-03-20 00:41:19.000000000 -0500
+++ parted-1.6.24/libparted/Makefile.am	2005-08-30 10:58:40.000000000 -0400
@@ -36,6 +36,11 @@
 			unit.c			\
 			disk.c			\
 			disk_bsd.c		\
+			disk_dasd.c		\
+			fdasd.c 		\
+			fdasd.h 		\
+			vtoc.c 			\
+			vtoc.h 			\
 			disk_dos.c		\
 			disk_gpt.c		\
 			disk_loop.c		\
diff -ruN parted-1.6.24.orig/libparted/disk_dasd.c parted-1.6.24/libparted/disk_dasd.c
--- parted-1.6.24.orig/libparted/disk_dasd.c	1969-12-31 19:00:00.000000000 -0500
+++ parted-1.6.24/libparted/disk_dasd.c	2005-08-30 10:58:40.000000000 -0400
@@ -0,0 +1,882 @@
+/* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+
+    libparted - a library for manipulating disk partitions
+    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Contributor:  Phil Knirsch <phil redhat de>
+                  Harald Hoyer <harald redhat de>
+*/
+
+#include "config.h"
+
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <parted/parted.h>
+#include <parted/endian.h>
+#include <parted/debug.h>
+
+#include "vtoc.h"
+#include "fdasd.h"
+#include <parted/linux.h>
+
+#include <libintl.h>
+#if ENABLE_NLS
+#  define _(String) dgettext (PACKAGE, String)
+#else
+#  define _(String) (String)
+#endif /* ENABLE_NLS */
+
+
+#define PARTITION_LINUX_SWAP	0x82
+#define PARTITION_LINUX		0x83
+#define PARTITION_LINUX_EXT	0x85
+#define PARTITION_LINUX_LVM	0x8e
+#define PARTITION_LINUX_RAID	0xfd
+#define PARTITION_LINUX_LVM_OLD 0xfe
+
+
+extern void ped_disk_dasd_init ();
+extern void ped_disk_dasd_done ();
+
+
+#define DASD_NAME "dasd"
+
+typedef struct {
+	int type;
+        int system;
+	int		raid;
+	int		lvm;
+  void            *part_info;
+} DasdPartitionData;
+
+typedef struct {
+        unsigned int	real_sector_size;
+        unsigned int	format_type;
+        /* IBM internal dasd structure (i guess ;), required. */
+        struct fdasd_anchor  *anchor;
+} DasdDiskSpecific;
+
+static int dasd_probe (PedDevice *dev);
+static int dasd_clobber (PedDevice* dev);
+static int dasd_read (PedDisk* disk);
+static int dasd_write (PedDisk* disk);
+
+static PedPartition* dasd_partition_new (
+	const PedDisk* disk, PedPartitionType part_type,
+       	const PedFileSystemType* fs_type, PedSector start, PedSector end);
+static void dasd_partition_destroy (PedPartition* part);
+static int dasd_partition_set_flag (
+	PedPartition* part, PedPartitionFlag flag, int state);
+static int dasd_partition_get_flag (
+	const PedPartition* part, PedPartitionFlag flag);
+static int dasd_partition_is_flag_available (
+	const PedPartition* part,
+	PedPartitionFlag flag);
+static int dasd_partition_align (PedPartition* part,
+	       			  const PedConstraint* constraint);
+static int dasd_partition_enumerate (PedPartition* part);
+static int dasd_get_max_primary_partition_count (const PedDisk* disk);
+
+static PedDisk* dasd_alloc (PedDevice* dev);
+static PedDisk* dasd_duplicate (const PedDisk* disk);
+static void dasd_free (PedDisk* disk);
+static int dasd_partition_set_system (PedPartition* part, const PedFileSystemType* fs_type);
+static int dasd_alloc_metadata (PedDisk* disk);
+
+static PedDiskOps dasd_disk_ops = {
+	probe:			dasd_probe,
+	clobber:		dasd_clobber,
+	read:			dasd_read,
+	write:			dasd_write,
+
+	alloc: dasd_alloc,
+	duplicate: dasd_duplicate,
+	free: dasd_free,
+	partition_set_system:	dasd_partition_set_system,
+	
+	partition_new:		dasd_partition_new,
+	partition_destroy:	dasd_partition_destroy,
+	partition_set_flag:	dasd_partition_set_flag,
+	partition_get_flag:	dasd_partition_get_flag,
+	partition_is_flag_available:	dasd_partition_is_flag_available,
+	partition_set_name:	NULL,
+	partition_get_name:	NULL,
+	partition_align:	dasd_partition_align,
+	partition_enumerate:	dasd_partition_enumerate,
+
+	alloc_metadata:		dasd_alloc_metadata,
+	get_max_primary_partition_count:
[...4140 lines suppressed...]
+        char DS4AMCAT[3];         /* VSAM catalog indicator                  */
+        char DS4R2TIM[8];         /* VSAM volume/catalog match time stamp    */
+        char res1[5];             /* reserved                                */
+        char DS4F6PTR[5];         /* pointer to first format 6 DSCB          */
+        extent_t DS4VTOCE;        /* VTOC extent description                 */
+        char res2[10];            /* reserved                                */
+        u_int8_t DS4EFLVL;            /* extended free-space management level    */
+        cchhb_t DS4EFPTR;         /* pointer to extended free-space info     */
+        char res3[9];             /* reserved                                */
+} __attribute__ ((packed)) format4_label_t;
+
+
+typedef struct ds5ext 
+{
+	u_int16_t t;                  /* RTA of the first track of free extent   */
+	u_int16_t fc;                 /* number of whole cylinders in free ext.  */
+	u_int8_t  ft;                 /* number of remaining free tracks         */
+} __attribute__ ((packed)) ds5ext_t;
+
+
+typedef struct format5_label 
+{
+	char DS5KEYID[4];         /* key identifier                          */
+	ds5ext_t DS5AVEXT;        /* first available (free-space) extent.    */
+	ds5ext_t DS5EXTAV[7];     /* seven available extents                 */
+	u_int8_t DS5FMTID;            /* format identifier                       */
+	ds5ext_t DS5MAVET[18];    /* eighteen available extents              */
+	cchhb_t DS5PTRDS;         /* pointer to next format5 DSCB            */
+} __attribute__ ((packed)) format5_label_t;
+
+
+typedef struct ds7ext 
+{
+	u_int32_t a;                  /* starting RTA value                      */
+	u_int32_t b;                  /* ending RTA value + 1                    */
+} __attribute__ ((packed)) ds7ext_t;
+
+
+typedef struct format7_label 
+{
+	char DS7KEYID[4];         /* key identifier                          */
+	ds7ext_t DS7EXTNT[5];     /* space for 5 extent descriptions         */
+	u_int8_t DS7FMTID;            /* format identifier                       */
+	ds7ext_t DS7ADEXT[11];    /* space for 11 extent descriptions        */
+	char res1[2];             /* reserved                                */
+	cchhb_t DS7PTRDS;         /* pointer to next FMT7 DSCB               */
+} __attribute__ ((packed)) format7_label_t;
+
+
+char * vtoc_ebcdic_enc (
+        char source[LINE_LENGTH],
+        char target[LINE_LENGTH],
+	int l);
+char * vtoc_ebcdic_dec (
+        char source[LINE_LENGTH],
+	char target[LINE_LENGTH],
+	int l);
+void vtoc_set_extent (
+        extent_t * ext,
+        u_int8_t typeind,
+        u_int8_t seqno,
+        cchh_t * lower,
+        cchh_t * upper);
+void vtoc_set_cchh (
+        cchh_t * addr,
+	u_int16_t cc,
+	u_int16_t hh);
+void vtoc_set_cchhb (
+        cchhb_t * addr,
+        u_int16_t cc,
+        u_int16_t hh,
+        u_int8_t b);
+void vtoc_set_date (
+        labeldate_t * d,
+        u_int8_t year,
+        u_int16_t day);
+
+void vtoc_volume_label_init (
+	volume_label_t *vlabel);
+
+int vtoc_read_volume_label (
+        int fd,
+        unsigned long vlabel_start,
+        volume_label_t * vlabel);
+
+int vtoc_write_volume_label (
+        int fd,
+        unsigned long vlabel_start,
+        volume_label_t *vlabel);
+
+void vtoc_volume_label_set_volser (
+	volume_label_t *vlabel,
+	char *volser);
+
+char *vtoc_volume_label_get_volser (
+	volume_label_t *vlabel,
+	char *volser);
+
+void vtoc_volume_label_set_key (
+        volume_label_t *vlabel,
+        char *key);     
+
+void vtoc_volume_label_set_label (
+	volume_label_t *vlabel,
+	char *lbl);
+
+char *vtoc_volume_label_get_label (
+	volume_label_t *vlabel,
+	char *lbl);
+
+void vtoc_read_label (
+        int fd,
+        unsigned long position,
+        format1_label_t *f1,
+        format4_label_t *f4,
+        format5_label_t *f5,
+        format7_label_t *f7);
+
+void vtoc_write_label (
+        int fd,
+        unsigned long position,
+        format1_label_t *f1,
+	format4_label_t *f4,
+	format5_label_t *f5,
+	format7_label_t *f7);
+
+
+void vtoc_init_format1_label (
+        char *volid,
+        unsigned int blksize,
+        extent_t *part_extent,
+        format1_label_t *f1);
+
+
+void vtoc_init_format4_label (
+        format4_label_t *f4lbl,
+	unsigned int usable_partitions,
+	unsigned int cylinders,
+	unsigned int tracks,
+	unsigned int blocks,
+	unsigned int blksize,
+	u_int16_t dev_type);
+
+void vtoc_update_format4_label (
+	format4_label_t *f4,
+	cchhb_t *highest_f1,
+	u_int16_t unused_update);
+
+
+void vtoc_init_format5_label (
+	format5_label_t *f5);
+
+void vtoc_update_format5_label_add (
+	format5_label_t *f5,
+	int verbose,
+	int cyl,
+	int trk,
+	u_int16_t a, 
+	u_int16_t b, 
+	u_int8_t c);
+ 
+void vtoc_update_format5_label_del (
+	format5_label_t *f5,
+	int verbose,
+	int cyl,
+	int trk,
+	u_int16_t a, 
+	u_int16_t b, 
+	u_int8_t c);
+
+
+void vtoc_init_format7_label (
+	format7_label_t *f7);
+
+void vtoc_update_format7_label_add (
+	format7_label_t *f7,
+	int verbose,
+	u_int32_t a, 
+	u_int32_t b);
+
+void vtoc_update_format7_label_del (
+	format7_label_t *f7, 
+	int verbose,
+	u_int32_t a, 
+	u_int32_t b);
+
+
+void vtoc_set_freespace(
+	format4_label_t *f4,
+	format5_label_t *f5,
+	format7_label_t *f7,
+	char ch,
+	int verbose,
+	u_int32_t start,
+	u_int32_t stop,
+	int cyl,
+	int trk);
+
+
+#endif /* VTOC_H */


--- NEW FILE parted-1.6.24.tar.gz.sig ---
ˆ?

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	8 Jul 2005 15:24:52 -0000	1.20
+++ .cvsignore	30 Aug 2005 15:10:19 -0000	1.21
@@ -7,3 +7,4 @@
 parted-1.6.21.tar.gz
 parted-1.6.22.tar.gz
 parted-1.6.23.tar.gz
+parted-1.6.24.tar.gz


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- parted.spec	18 Jul 2005 14:22:40 -0000	1.52
+++ parted.spec	30 Aug 2005 15:10:19 -0000	1.53
@@ -3,13 +3,13 @@
 
 Summary: The GNU disk partition manipulation program.
 Name: parted
-Version: 1.6.23
-Release: 2
+Version: 1.6.24
+Release: 1
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
 Patch3: parted-1.6.19-sx8.patch
 
-Patch100: parted-1.6.23-dasd.patch
+Patch100: parted-1.6.24-dasd.patch
 Patch150: parted-1.6.3-iseries.patch
 Patch151: parted-1.6.23-aix.patch
 Patch152: parted-1.6.15-dasd_geometry.patch
@@ -48,8 +48,6 @@
 %patch3 -p1 -b .sx8
 %patch151 -p1 -b .aix
 %patch152 -p1 -b .dasd_geometry
-#%patch153 -p1 -b .mac-lvm
-#%patch154 -p1 -b .mac-parts
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
 mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8
@@ -98,6 +96,9 @@
 %{_libdir}/*.a*
 
 %changelog
+* Tue Aug 30 2005 Chris Lumens <clumens redhat com> 1.6.24-1
+- Updated to 1.6.24.
+
 * Mon Jul 18 2005 Chris Lumens <clumens redhat com> 1.6.23-2
 - Add buildreq for texinfo.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	8 Jul 2005 15:24:52 -0000	1.24
+++ sources	30 Aug 2005 15:10:19 -0000	1.25
@@ -1 +1 @@
-7e46a32def60ea355c193d9225691742  parted-1.6.23.tar.gz
+b1e83f3abab0a1894a8cc617779461ef  parted-1.6.24.tar.gz


--- parted-1.6.23-dasd.patch DELETED ---


--- parted-1.6.23.tar.gz.sig DELETED ---
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]