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

rpms/parted/devel parted-1.6.23-aix.patch, NONE, 1.1 parted-1.6.23-dasd.patch, NONE, 1.1 parted-1.6.23.tar.gz.sig, NONE, 1.1 .cvsignore, 1.19, 1.20 parted.spec, 1.50, 1.51 sources, 1.23, 1.24 parted-1.6.21-dasd.patch, 1.2, NONE parted-1.6.22-mac-lvm.patch, 1.1, NONE parted-1.6.22-mac-parts.patch, 1.2, NONE parted-1.6.22.tar.gz.sig, 1.1, NONE parted-1.6.3-aix.patch, 1.3, NONE



Author: clumens

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

Modified Files:
	.cvsignore parted.spec sources 
Added Files:
	parted-1.6.23-aix.patch parted-1.6.23-dasd.patch 
	parted-1.6.23.tar.gz.sig 
Removed Files:
	parted-1.6.21-dasd.patch parted-1.6.22-mac-lvm.patch 
	parted-1.6.22-mac-parts.patch parted-1.6.22.tar.gz.sig 
	parted-1.6.3-aix.patch 
Log Message:
Updated to parted-1.6.23.  Updated our patches to still apply.


parted-1.6.23-aix.patch:
 Makefile.am      |    1 
 Makefile.am.orig |   74 +
 disk_aix.c       |  283 +++++++
 disk_dos.c       |    7 
 disk_dos.c.orig  | 2148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 libparted.c      |    4 
 6 files changed, 2517 insertions(+)

--- NEW FILE parted-1.6.23-aix.patch ---
diff -ruN parted-1.6.23.orig/libparted/Makefile.am parted-1.6.23/libparted/Makefile.am
--- parted-1.6.23.orig/libparted/Makefile.am	2005-07-08 10:14:35.000000000 -0400
+++ parted-1.6.23/libparted/Makefile.am	2005-07-08 10:35:27.000000000 -0400
@@ -49,6 +49,7 @@
 			disk_pc98.c		\
 			disk_sun.c		\
 			disk_amiga.c		\
+			disk_aix.c		\
 			@OS  c
 
 EXTRA_libparted_la_SOURCES    = linux.c		\
diff -ruN parted-1.6.23.orig/libparted/Makefile.am.orig parted-1.6.23/libparted/Makefile.am.orig
--- parted-1.6.23.orig/libparted/Makefile.am.orig	1969-12-31 19:00:00.000000000 -0500
+++ parted-1.6.23/libparted/Makefile.am.orig	2005-07-08 10:14:35.000000000 -0400
@@ -0,0 +1,74 @@
+# This file is part of GNU Parted
+# Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+#
+# This file may be modified and/or distributed without restriction.
+
+SUBDIRS       = fs_amiga		\
+		fs_ext2			\
+		fs_fat			\
+		fs_hfs			\
+		fs_jfs			\
+		fs_linux_swap		\
+		fs_ntfs			\
+		fs_reiserfs		\
+		fs_ufs			\
+		fs_xfs
+
+LIBS = @INTLLIBS@ @LIBS@
+
+partedincludedir      =	-I$(top_srcdir)/include
+lib_LTLIBRARIES	      =	libparted.la
+libparted_la_LDFLAGS  = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ 			-release $(LT_RELEASE)
+
+libparted_la_SOURCES  = blkpg.h			\
+			dvh.h			\
+			crc32.c			\
+			constraint.c		\
+			debug.c			\
+			device.c		\
+			exception.c		\
+			filesys.c		\
+			geom.c			\
+			libparted.c		\
+			natmath.c		\
+			timer.c			\
+			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		\
+			disk_mac.c		\
+			disk_dvh.c		\
+			disk_pc98.c		\
+			disk_sun.c		\
+			disk_amiga.c		\
+			@OS  c
+
+EXTRA_libparted_la_SOURCES    = linux.c		\
+				gnu.c
+
+libparted_la_LIBADD   = @UUID_LIBS@			\
+			@OS_LIBS@			\
+			@REISER_LIBS@			\
+			fs_amiga/libamigafs.la		\
+			fs_ext2/libext2.la		\
+			fs_fat/libfat.la		\
+			fs_hfs/libhfs.la		\
+			fs_jfs/libjfs.la		\
+			fs_linux_swap/liblinuxswap.la	\
+			fs_ntfs/libntfs.la		\
+			fs_reiserfs/libreiserfs.la	\
+			fs_ufs/libufs.la		\
+			fs_xfs/libxfs.la
+
+EXTRA_DIST	      = mbr.s
+
+INCLUDES = $(partedincludedir) @INTLINCS@
+
diff -ruN parted-1.6.23.orig/libparted/disk_aix.c parted-1.6.23/libparted/disk_aix.c
--- parted-1.6.23.orig/libparted/disk_aix.c	1969-12-31 19:00:00.000000000 -0500
+++ parted-1.6.23/libparted/disk_aix.c	2005-07-08 10:35:27.000000000 -0400
@@ -0,0 +1,283 @@
+/* -*- 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:  Matt Wilson <msw redhat com>
+*/
+
+#include "config.h"
+
+#include <string.h>
+
+#include <parted/parted.h>
+#include <parted/debug.h>
+#include <parted/endian.h>
+
+#if ENABLE_NLS
+#  include <libintl.h>
+#  define _(String) dgettext (PACKAGE, String)
+#else
+#  define _(String) (String)
+#endif /* ENABLE_NLS */
+
+typedef struct {
+	unsigned int   magic;        /* expect AIX_LABEL_MAGIC */
+	unsigned int   fillbytes[127];
+} AixLabel;
+
+#define	AIX_LABEL_MAGIC		0xc9c2d4c1
+
+static PedDiskType aix_disk_type;
+
+static int
+aix_probe (PedDevice *dev)
+{
+	PedDiskType*	disk_type;
+	AixLabel	label;
+	int		i;
+
+	PED_ASSERT (dev != NULL, return 0);
+
+	if (!ped_device_read (dev, &label, 0, 1))
+		return 0;
+
+	if (PED_BE32_TO_CPU (label.magic) != AIX_LABEL_MAGIC)
+		return 0;
+
+	return 1;
+}
+
+#ifndef DISCOVER_ONLY
+static int
+aix_clobber (PedDevice* dev)
+{
+	AixLabel label;
+
+	PED_ASSERT (dev != NULL, return 0);
+	PED_ASSERT (aix_probe (dev), return 0);
+
+	if (!ped_device_read (dev, &label, 0, 1))
+		return 0;
+	
+	label.magic = 0;
+	return ped_device_write (dev, &label, 0, 1);
+}
+#endif /* !DISCOVER_ONLY */
+
+static PedDisk*
+aix_alloc (PedDevice* dev)
+{
+	PedDisk*	disk;
+
+        disk = _ped_disk_alloc (dev, &aix_disk_type);
+	if (!disk)
+		return NULL;
+
+	return disk;
+}
+
+static PedDisk*
+aix_duplicate (const PedDisk* disk)
+{
+	PedDisk*	new_disk;
+       
+	new_disk = ped_disk_new_fresh (disk->dev, &aix_disk_type);
+	if (!new_disk)
+		return NULL;
+
+	return new_disk;
+}
+
+static void
[...2181 lines suppressed...]
+	PedPartition* last_part = get_last_part (disk);
+	PedSector start, end;
+
+	if (!first_part)
+		return 1;
+
+	start = 0;
+	end = PED_MIN (dev->bios_geom.sectors - 1, first_part->geom.start - 1);
+	if (!add_metadata_part (disk, PED_PARTITION_NORMAL, start, end))
+		return 0;
+
+	start = PED_MAX (last_part->geom.end + 1,
+			 ped_round_down_to (dev->length, cyl_size));
+	end = dev->length - 1;
+	if (start < end) {
+		if (!add_metadata_part (disk, PED_PARTITION_NORMAL, start, end))
+			return 0;
+	}
+
+	return 1;
+}
+
+static int
+msdos_alloc_metadata (PedDisk* disk)
+{
+	PedPartition*		ext_part;
+
+	PED_ASSERT (disk != NULL, return 0);
+	PED_ASSERT (disk->dev != NULL, return 0);
+
+	if (!add_startend_metadata (disk))
+		return 0;
+
+	ext_part = ped_disk_extended_partition (disk);
+	if (ext_part) {
+		int		i;
+		PedSector	start, end;
+		PedCHSGeometry	bios_geom;
+		
+		for (i=5; 1; i++) {
+			PedPartition* log_part;
+			log_part = ped_disk_get_partition (disk, i);
+			if (!log_part)
+				break;
+			if (!add_logical_part_metadata (disk, log_part))
+				return 0;
+		}
+
+		partition_probe_bios_geometry (ext_part, &bios_geom);
+		start = ext_part->geom.start;
+		end = start + bios_geom.sectors - 1;
+		if (ext_part->part_list)
+			end = PED_MIN (end,
+				       ext_part->part_list->geom.start - 1);
+		if (!add_metadata_part (disk, PED_PARTITION_LOGICAL,
+					start, end))
+			return 0;
+	}
+
+	return 1;
+}
+
+static int
+next_primary (PedDisk* disk)
+{
+	int	i;
+	for (i=1; i<=4; i++) {
+		if (!ped_disk_get_partition (disk, i))
+			return i;
+	}
+	return 0;
+}
+
+static int
+next_logical (PedDisk* disk)
+{
+	int	i;
+	for (i=5; 1; i++) {
+		if (!ped_disk_get_partition (disk, i))
+			return i;
+	}
+}
+
+static int
+msdos_partition_enumerate (PedPartition* part)
+{
+	PED_ASSERT (part != NULL, return 0);
+	PED_ASSERT (part->disk != NULL, return 0);
+
+	/* don't re-number a primary partition */
+	if (part->num != -1 && part->num <= 4)
+		return 1;
+
+	part->num = -1;
+
+	if (part->type & PED_PARTITION_LOGICAL)
+		part->num = next_logical (part->disk);
+	else
+		part->num = next_primary (part->disk);
+
+	return 1;
+}
+
+static int
+msdos_get_max_primary_partition_count (const PedDisk* disk)
+{
+	return 4;
+}
+
+static PedDiskOps msdos_disk_ops = {
+	probe:			msdos_probe,
+#ifndef DISCOVER_ONLY
+	clobber:		msdos_clobber,
+#else
+	clobber:		NULL,
+#endif
+	alloc:			msdos_alloc,
+	duplicate:		msdos_duplicate,
+	free:			msdos_free,
+	read:			msdos_read,
+#ifndef DISCOVER_ONLY
+	write:			msdos_write,
+#else
+	write:			NULL,
+#endif
+
+	partition_new:		msdos_partition_new,
+	partition_duplicate:	msdos_partition_duplicate,
+	partition_destroy:	msdos_partition_destroy,
+	partition_set_system:	msdos_partition_set_system,
+	partition_set_flag:	msdos_partition_set_flag,
+	partition_get_flag:	msdos_partition_get_flag,
+	partition_is_flag_available:	msdos_partition_is_flag_available,
+	partition_set_name:	NULL,
+	partition_get_name:	NULL,
+	partition_align:	msdos_partition_align,
+	partition_enumerate:	msdos_partition_enumerate,
+
+	alloc_metadata:		msdos_alloc_metadata,
+	get_max_primary_partition_count:
+				msdos_get_max_primary_partition_count
+};
+
+static PedDiskType msdos_disk_type = {
+	next:		NULL,
+	name:		"msdos",
+	ops:		&msdos_disk_ops,
+	features:	PED_DISK_TYPE_EXTENDED
+};
+
+void
+ped_disk_msdos_init ()
+{
+	PED_ASSERT (sizeof (DosRawPartition) == 16, return);
+	PED_ASSERT (sizeof (DosRawTable) == 512, return);
+
+	ped_register_disk_type (&msdos_disk_type);
+}
+
+void
+ped_disk_msdos_done ()
+{
+	ped_unregister_disk_type (&msdos_disk_type);
+}
+
diff -ruN parted-1.6.23.orig/libparted/libparted.c parted-1.6.23/libparted/libparted.c
--- parted-1.6.23.orig/libparted/libparted.c	2005-07-08 10:19:21.000000000 -0400
+++ parted-1.6.23/libparted/libparted.c	2005-07-08 10:37:07.000000000 -0400
@@ -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 ();
@@ -108,6 +109,7 @@
 	ped_disk_dvh_init ();
 	ped_disk_bsd_init ();
 	ped_disk_amiga_init ();
+	ped_disk_aix_init ();
 }
 
 #ifdef ENABLE_FS
@@ -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 ();
@@ -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));

parted-1.6.23-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.23-dasd.patch ---
diff -ruN parted-1.6.23.orig/include/parted/device.h parted-1.6.23/include/parted/device.h
--- parted-1.6.23.orig/include/parted/device.h	2005-03-19 21:10:31.000000000 -0500
+++ parted-1.6.23/include/parted/device.h	2005-07-08 10:14:35.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.23.orig/include/parted/disk.h parted-1.6.23/include/parted/disk.h
--- parted-1.6.23.orig/include/parted/disk.h	2005-01-04 11:09:50.000000000 -0500
+++ parted-1.6.23/include/parted/disk.h	2005-07-08 10:14:35.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.23.orig/include/parted/linux.h parted-1.6.23/include/parted/linux.h
--- parted-1.6.23.orig/include/parted/linux.h	2001-12-26 19:26:08.000000000 -0500
+++ parted-1.6.23/include/parted/linux.h	2005-07-08 10:14:35.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.23.orig/libparted/Makefile.am parted-1.6.23/libparted/Makefile.am
--- parted-1.6.23.orig/libparted/Makefile.am	2005-03-19 19:31:48.000000000 -0500
+++ parted-1.6.23/libparted/Makefile.am	2005-07-08 10:14:35.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.23.orig/libparted/disk_dasd.c parted-1.6.23/libparted/disk_dasd.c
--- parted-1.6.23.orig/libparted/disk_dasd.c	1969-12-31 19:00:00.000000000 -0500
+++ parted-1.6.23/libparted/disk_dasd.c	2005-07-08 10:14:46.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.23.tar.gz.sig ---
ˆ?

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	23 Mar 2005 15:39:41 -0000	1.19
+++ .cvsignore	8 Jul 2005 15:24:52 -0000	1.20
@@ -6,3 +6,4 @@
 parted-1.6.20.tar.gz
 parted-1.6.21.tar.gz
 parted-1.6.22.tar.gz
+parted-1.6.23.tar.gz


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- parted.spec	7 Jun 2005 15:05:28 -0000	1.50
+++ parted.spec	8 Jul 2005 15:24:52 -0000	1.51
@@ -3,18 +3,16 @@
 
 Summary: The GNU disk partition manipulation program.
 Name: parted
-Version: 1.6.22
-Release: 3
+Version: 1.6.23
+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.21-dasd.patch
+Patch100: parted-1.6.23-dasd.patch
 Patch150: parted-1.6.3-iseries.patch
-Patch151: parted-1.6.3-aix.patch
+Patch151: parted-1.6.23-aix.patch
 Patch152: parted-1.6.15-dasd_geometry.patch
-Patch153: parted-1.6.22-mac-lvm.patch
-Patch154: parted-1.6.22-mac-parts.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -51,8 +49,8 @@
 %patch3 -p1 -b .sx8
 %patch151 -p1 -b .aix
 %patch152 -p1 -b .dasd_geometry
-%patch153 -p1 -b .mac-lvm
-%patch154 -p1 -b .mac-parts
+#%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
@@ -101,6 +99,11 @@
 %{_libdir}/*.a*
 
 %changelog
+* Fri Jul 08 2005 Chris Lumens <clumens redhat com> 1.6.23-1
+- Updated to 1.6.23.
+- Get rid of separate Mac patches that are now included in upstream.
+- Update DASD and AIX patches.
+
 * Tue Jun 07 2005 Chris Lumens <clumens redhat com> 1.6.22-3
 - Modified Apple_Free patch to take care of the case where the partitions
   are unnamed, causing many errors to be printed (#159047).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	23 Mar 2005 15:39:41 -0000	1.23
+++ sources	8 Jul 2005 15:24:52 -0000	1.24
@@ -1 +1 @@
-a8177c27ce5830bdaa4d6f2d7cd13671  parted-1.6.22.tar.gz
+7e46a32def60ea355c193d9225691742  parted-1.6.23.tar.gz


--- parted-1.6.21-dasd.patch DELETED ---


--- parted-1.6.22-mac-lvm.patch DELETED ---


--- parted-1.6.22-mac-parts.patch DELETED ---


--- parted-1.6.22.tar.gz.sig DELETED ---


--- parted-1.6.3-aix.patch DELETED ---


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