rpms/parted/devel parted-1.6.25-dm.patch, 1.1, 1.2 parted.spec, 1.56, 1.57

[fedora-cvs-commits at redhat.com]

Author: pjones

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

Modified Files:
	parted-1.6.25-dm.patch parted.spec 
Log Message:
fix a minor bug with the dm stuff


parted-1.6.25-dm.patch:
 configure.in            |   12 +
 include/parted/device.h |    3 
 libparted/Makefile.am   |    1 
 libparted/linux.c       |  335 +++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 348 insertions(+), 3 deletions(-)

Index: parted-1.6.25-dm.patch
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted-1.6.25-dm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parted-1.6.25-dm.patch	16 Nov 2005 00:40:42 -0000	1.1
+++ parted-1.6.25-dm.patch	17 Nov 2005 04:39:06 -0000	1.2
@@ -1,5 +1,5 @@
---- parted-1.6.25/include/parted/device.h.dm	2005-11-15 17:51:59.000000000 -0500
-+++ parted-1.6.25/include/parted/device.h	2005-11-15 17:51:59.000000000 -0500
+--- parted-1.6.25/include/parted/device.h.dm	2005-11-15 19:36:44.000000000 -0500
++++ parted-1.6.25/include/parted/device.h	2005-11-15 19:36:44.000000000 -0500
 @@ -36,7 +36,8 @@
  	PED_DEVICE_UBD		= 8,
  	PED_DEVICE_DASD		= 9,
@@ -11,7 +11,7 @@
  
  typedef struct _PedDevice PedDevice;
 --- parted-1.6.25/configure.in.dm	2005-11-02 07:27:40.000000000 -0500
-+++ parted-1.6.25/configure.in	2005-11-15 17:51:59.000000000 -0500
++++ parted-1.6.25/configure.in	2005-11-15 19:36:44.000000000 -0500
 @@ -242,6 +242,16 @@
  )
  AC_SUBST(UUID_LIBS)
@@ -38,8 +38,8 @@
  	)
  	LIBS="$OLD_LIBS"
  fi
---- parted-1.6.25/libparted/linux.c.dm	2005-11-15 17:51:59.000000000 -0500
-+++ parted-1.6.25/libparted/linux.c	2005-11-15 19:35:54.000000000 -0500
+--- parted-1.6.25/libparted/linux.c.dm	2005-11-15 19:36:44.000000000 -0500
++++ parted-1.6.25/libparted/linux.c	2005-11-16 23:33:12.000000000 -0500
 @@ -17,6 +17,7 @@
      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
@@ -121,6 +121,7 @@
 +		*end = '\0';
 +
 +		if (!bd) {
++
 +			if (!strncmp(line, "Block devices:", 14))
 +				bd = 1;
 +			goto next;
@@ -138,9 +139,8 @@
 +
 +next:
 +		*end = c;
-+		line = strchr(end+1, '\n');
++                line = end+1;
 +		if (line && *line) {
-+			line++;
 +			end = strchr(line, '\n');
 +		} else
 +			end = line;
@@ -424,8 +424,8 @@
  		/* The ioctl() command BLKPG_ADD_PARTITION does not notify
  		 * the devfs system; consequently, /proc/partitions will not
  		 * be up to date, and the proper links in /dev are not
---- parted-1.6.25/libparted/Makefile.am.dm	2005-11-15 17:51:59.000000000 -0500
-+++ parted-1.6.25/libparted/Makefile.am	2005-11-15 17:51:59.000000000 -0500
+--- parted-1.6.25/libparted/Makefile.am.dm	2005-11-15 19:36:44.000000000 -0500
++++ parted-1.6.25/libparted/Makefile.am	2005-11-15 19:36:44.000000000 -0500
 @@ -56,6 +56,7 @@
  				gnu.c
  


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- parted.spec	16 Nov 2005 00:44:02 -0000	1.56
+++ parted.spec	17 Nov 2005 04:39:06 -0000	1.57
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.6.25
-Release: 2
+Release: 3
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
 Patch3: parted-1.6.25-sx8.patch
@@ -99,6 +99,9 @@
 %{_libdir}/*.a*
 
 %changelog
+* Wed Nov 16 2005 Peter Jones <pjones at redhat.com> 1.6.25-3
+- fix /proc/devices parser bug
+
 * Tue Nov 15 2005 Peter Jones <pjones at redhat.com> 1.6.25-2
 - add support for partitions on dm devices