rpms/cpio/devel cpio-2.9-dev_number.patch, NONE, 1.1 cpio.spec, 1.61, 1.62

[Kamil Dudka (kdudka)]

Author: kdudka

Update of /cvs/extras/rpms/cpio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29628

Modified Files:
	cpio.spec 
Added Files:
	cpio-2.9-dev_number.patch 
Log Message:
Support major/minor device numbers over 127 (bz#450109)

cpio-2.9-dev_number.patch:

--- NEW FILE cpio-2.9-dev_number.patch ---
diff -ruN cpio-2.9.90.orig/src/copyin.c cpio-2.9.90/src/copyin.c
--- cpio-2.9.90.orig/src/copyin.c	2008-07-11 13:20:27.000000000 +0200
+++ cpio-2.9.90/src/copyin.c	2008-07-18 10:16:24.000000000 +0200
@@ -1269,15 +1269,15 @@
       swab_array ((char *) short_hdr, 13);
     }
 
-  file_hdr->c_dev_maj = major (short_hdr->c_dev);
-  file_hdr->c_dev_min = minor (short_hdr->c_dev);
+  file_hdr->c_dev_maj = major ((unsigned short)short_hdr->c_dev);
+  file_hdr->c_dev_min = minor ((unsigned short)short_hdr->c_dev);
   file_hdr->c_ino = short_hdr->c_ino;
   file_hdr->c_mode = short_hdr->c_mode;
   file_hdr->c_uid = short_hdr->c_uid;
   file_hdr->c_gid = short_hdr->c_gid;
   file_hdr->c_nlink = short_hdr->c_nlink;
-  file_hdr->c_rdev_maj = major (short_hdr->c_rdev);
-  file_hdr->c_rdev_min = minor (short_hdr->c_rdev);
+  file_hdr->c_rdev_maj = major ((unsigned short)short_hdr->c_rdev);
+  file_hdr->c_rdev_min = minor ((unsigned short)short_hdr->c_rdev);
   file_hdr->c_mtime = (unsigned long) short_hdr->c_mtimes[0] << 16
                       | short_hdr->c_mtimes[1];
 


Index: cpio.spec
===================================================================
RCS file: /cvs/extras/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- cpio.spec	3 Jun 2008 14:05:43 -0000	1.61
+++ cpio.spec	18 Jul 2008 10:22:40 -0000	1.62
@@ -3,7 +3,7 @@
 Summary: A GNU archiving program
 Name: cpio
 Version: 2.9.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -15,6 +15,7 @@
 Patch3: cpio-2.9-chmodRaceC.patch
 Patch4: cpio-2.9-exitCode.patch
 Patch5: cpio-2.9-dir_perm.patch
+Patch6: cpio-2.9-dev_number.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRequires: texinfo, autoconf, gettext
@@ -41,6 +42,7 @@
 %patch3  -p1 -b .chmodRaceC
 %patch4  -p1 -b .exitCode
 %patch5  -p1 -b .dir_perm
+%patch6  -p1 -b .dev_number
 
 autoheader
 
@@ -81,6 +83,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Fri Jul 18 2008 Kamil Dudka <kdudka at redhat.com> 2.9.90-2
+- Support major/minor device numbers over 127 (bz#450109)
+
 * Tue Jun 02 2008 Ondrej Vasik <ovasik at redhat.com> 2.9.90-1
 - new upstream alpha version 2.9.90 + removed applied patches