[Glibc-bsd-commits] r3904 - in trunk/ufsutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-11-27 17:15:39 +0000 (Sun, 27 Nov 2011)
New Revision: 3904

Added:
   trunk/ufsutils/debian/patches/00_portable_ufs_types.patch
Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/patches/series
Log:
00_portable_ufs_types.patch: Fix broken type for non-kFreeBSD platforms.  Thanks Vladimir Serbinenko.  (Closes: #646518)

Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2011-11-27 17:09:45 UTC (rev 3903)
+++ trunk/ufsutils/debian/changelog	2011-11-27 17:15:39 UTC (rev 3904)
@@ -12,8 +12,10 @@
     - 05_wipe_otherfs.patch: Wipe out other filesystems by erasing first and
       last 512 kiB of disk (this works for at least ZFS, in addition to UFS1
       which was already taken care of).
+  * 00_portable_ufs_types.patch: Fix broken type for non-kFreeBSD
+    platforms.  Thanks Vladimir Serbinenko.  (Closes: #646518)
 
- -- Robert Millan <rmh at debian.org>  Sun, 27 Nov 2011 18:05:37 +0100
+ -- Robert Millan <rmh at debian.org>  Sun, 27 Nov 2011 18:15:19 +0100
 
 ufsutils (8.2-1) unstable; urgency=low
 

Added: trunk/ufsutils/debian/patches/00_portable_ufs_types.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_portable_ufs_types.patch	                        (rev 0)
+++ trunk/ufsutils/debian/patches/00_portable_ufs_types.patch	2011-11-27 17:15:39 UTC (rev 3904)
@@ -0,0 +1,14 @@
+
+Reported by Vladimir Serbinenko.  Fixed in upstream SVN r227382.
+
+--- a/sys/ufs/ffs/fs.h
++++ b/sys/ufs/ffs/fs.h
+@@ -333,7 +333,7 @@
+ 	ufs2_daddr_t fs_csaddr;		/* blk addr of cyl grp summary area */
+ 	int64_t	 fs_pendingblocks;	/* (u) blocks being freed */
+ 	u_int32_t fs_pendinginodes;	/* (u) inodes being freed */
+-	ino_t	 fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */
++	uint32_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */
+ 	u_int32_t fs_avgfilesize;	/* expected average file size */
+ 	u_int32_t fs_avgfpdir;		/* expected # of files per directory */
+ 	int32_t	 fs_save_cgsize;	/* save real cg size to use fs_bsize */

Modified: trunk/ufsutils/debian/patches/series
===================================================================
--- trunk/ufsutils/debian/patches/series	2011-11-27 17:09:45 UTC (rev 3903)
+++ trunk/ufsutils/debian/patches/series	2011-11-27 17:15:39 UTC (rev 3904)
@@ -2,6 +2,7 @@
 00_libport.patch
 00_mount.patch
 00_param.patch
+00_portable_ufs_types.patch
 01_libufs.patch
 02_badsect.ufs.patch
 02_bsdlabel.ufs.patch