rpms/util-linux/FC-4 util-linux-2.12p-fdisk-gpt.patch, 1.1, 1.2 util-linux.spec, 1.78, 1.79

[fedora-cvs-commits redhat com]

Author: kzak

Update of /cvs/dist/rpms/util-linux/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5075

Modified Files:
	util-linux-2.12p-fdisk-gpt.patch util-linux.spec 
Log Message:
- fix ..-fdisk-gpt.patch

util-linux-2.12p-fdisk-gpt.patch:
 Makefile |    4 
 fdisk.8  |    5 +
 fdisk.c  |   15 +++
 gpt.c    |  287 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gpt.h    |    9 +
 sfdisk.8 |    5 +
 sfdisk.c |   28 ++++++
 7 files changed, 351 insertions(+), 2 deletions(-)

Index: util-linux-2.12p-fdisk-gpt.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-4/util-linux-2.12p-fdisk-gpt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.12p-fdisk-gpt.patch	14 Jul 2005 09:18:25 -0000	1.1
+++ util-linux-2.12p-fdisk-gpt.patch	14 Jul 2005 12:05:18 -0000	1.2
@@ -1,5 +1,5 @@
 --- util-linux-2.12p/fdisk/Makefile.gpt	2004-09-06 22:28:58.000000000 +0200
-+++ util-linux-2.12p/fdisk/Makefile	2005-06-03 00:14:31.404242536 +0200
++++ util-linux-2.12p/fdisk/Makefile	2005-07-14 13:47:12.000000000 +0200
 @@ -56,14 +56,14 @@
  	ln -s sfdisk activate
  
@@ -17,8 +17,8 @@
  
  install: all
  	$(INSTALLDIR) $(SBINDIR)
---- util-linux-2.12p/fdisk/fdisk.c.gpt	2005-06-03 00:12:56.880612312 +0200
-+++ util-linux-2.12p/fdisk/fdisk.c	2005-06-03 00:12:57.076582520 +0200
+--- util-linux-2.12p/fdisk/fdisk.c.gpt	2005-07-14 13:47:11.000000000 +0200
++++ util-linux-2.12p/fdisk/fdisk.c	2005-07-14 13:47:12.000000000 +0200
 @@ -32,6 +32,8 @@
  #include <linux/blkpg.h>
  #endif
@@ -76,8 +76,8 @@
  	get_boot(fdisk);
  
  	if (osf_label) {
---- /dev/null	2005-05-29 23:08:17.791240320 +0200
-+++ util-linux-2.12p/fdisk/gpt.h	2005-06-03 00:12:57.076582520 +0200
+--- /dev/null	2005-07-04 12:38:58.745411448 +0200
++++ util-linux-2.12p/fdisk/gpt.h	2005-07-14 13:47:12.000000000 +0200
 @@ -0,0 +1,9 @@
 +
 +#ifndef __GPT_H__
@@ -88,8 +88,8 @@
 +
 +#endif /* __GPT_H__ */
 +
---- util-linux-2.12p/fdisk/fdisk.8.gpt	2005-06-03 00:12:56.895610032 +0200
-+++ util-linux-2.12p/fdisk/fdisk.8	2005-06-03 00:12:57.076582520 +0200
+--- util-linux-2.12p/fdisk/fdisk.8.gpt	2005-07-14 13:47:12.000000000 +0200
++++ util-linux-2.12p/fdisk/fdisk.8	2005-07-14 13:47:12.000000000 +0200
 @@ -42,6 +42,11 @@
  partition tables.
  It understands DOS type partition tables and BSD or SUN type disklabels.
@@ -103,7 +103,7 @@
  .I device
  is usually one of the following:
 --- util-linux-2.12p/fdisk/sfdisk.8.gpt	2004-12-15 23:39:27.000000000 +0100
-+++ util-linux-2.12p/fdisk/sfdisk.8	2005-06-03 00:12:57.077582368 +0200
++++ util-linux-2.12p/fdisk/sfdisk.8	2005-07-14 13:47:12.000000000 +0200
 @@ -18,6 +18,11 @@
  on a device, check the partitions on a device, and - very dangerous -
  repartition a device.
@@ -116,9 +116,9 @@
  .SS "List Sizes"
  .BI "sfdisk \-s " partition
  gives the size of
---- /dev/null	2005-05-29 23:08:17.791240320 +0200
-+++ util-linux-2.12p/fdisk/gpt.c	2005-06-03 00:22:58.086215168 +0200
-@@ -0,0 +1,285 @@
+--- /dev/null	2005-07-04 12:38:58.745411448 +0200
++++ util-linux-2.12p/fdisk/gpt.c	2005-07-14 13:50:37.000000000 +0200
+@@ -0,0 +1,287 @@
 +/*
 +    GPT (GUID Partition Table) signature detection. Based on libparted and 
 +    util-linux/partx.
@@ -148,6 +148,8 @@
 +#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 +#define SECTOR_SIZE	512	/* default */
 +
++#define _GET_BYTE(x, n)		( ((x) >> (8 * (n))) & 0xff )
++
 +#define _PED_SWAP64(x)		( (_GET_BYTE(x, 0) << 56)	\
 +				+ (_GET_BYTE(x, 1) << 48)	\
 +				+ (_GET_BYTE(x, 2) << 40)	\
@@ -212,7 +214,7 @@
 +};
 +
 +static int
-+_get_linux_version ()
++_get_linux_version (void)
 +{
 +	static int kver = -1;
 +	struct utsname uts;
@@ -404,8 +406,8 @@
 +	exit(EXIT_SUCCESS);
 +}
 +#endif
---- util-linux-2.12p/fdisk/sfdisk.c.gpt	2004-12-15 19:18:30.000000000 +0100
-+++ util-linux-2.12p/fdisk/sfdisk.c	2005-06-03 00:28:14.194159456 +0200
+--- util-linux-2.12p/fdisk/sfdisk.c.gpt	2005-07-14 13:47:12.000000000 +0200
++++ util-linux-2.12p/fdisk/sfdisk.c	2005-07-14 13:47:12.000000000 +0200
 @@ -52,6 +52,8 @@
  #include "nls.h"
  #include "common.h"


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-4/util-linux.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- util-linux.spec	14 Jul 2005 09:18:25 -0000	1.78
+++ util-linux.spec	14 Jul 2005 12:05:18 -0000	1.79
@@ -27,7 +27,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.12p
-Release: 9.6
+Release: 9.7
 License: distributable
 Group: System Environment/Base
 
@@ -273,7 +273,7 @@
 %patch200 -p1
 %patch201 -p1
 %patch202 -p1
-%patch203 -p1
+%patch203 -p1 -b .gpt
 %patch204 -p1
 %patch205 -p1
 
@@ -667,7 +667,7 @@
 /sbin/losetup
 
 %changelog
-* Tue Jul 12 2005 Karel Zak <kzak redhat com> 2.12p-9.6
+* Tue Jul 12 2005 Karel Zak <kzak redhat com> 2.12p-9.7
 - fix #159339 - util-linux updates for new audit system
 - fix #158737 - sfdisk warning for large partitions, gpt
 - fix #150912 – Add ocfs2 support