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

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-12-08 16:49:31 +0000 (Sat, 08 Dec 2007)
New Revision: 2067

Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/copyright
   trunk/ufsutils/debian/patches/02_fsck.ufs.patch
Log:
* Fix segfault of fsck.ufs on non kfreebsd. (Closes: #335482)



Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2007-12-08 16:00:37 UTC (rev 2066)
+++ trunk/ufsutils/debian/changelog	2007-12-08 16:49:31 UTC (rev 2067)
@@ -5,6 +5,7 @@
   * New upstream snapshot of RELENG_7
   * Include all needed sources in debian/upstream.sh
   * Make it build much cleanly on kfreebsd - ino_t is int32 on kfreebsd-any !!!
+  * Fix segfault of fsck.ufs on non kfreebsd. (Closes: #335482)
 
  -- Guillem Jover <guillem at debian.org>  Fri, 07 Dec 2007 18:49:11 +0100
 

Modified: trunk/ufsutils/debian/copyright
===================================================================
--- trunk/ufsutils/debian/copyright	2007-12-08 16:00:37 UTC (rev 2066)
+++ trunk/ufsutils/debian/copyright	2007-12-08 16:49:31 UTC (rev 2067)
@@ -3,7 +3,7 @@
 
 The debian packages are maintained through Subversion on:
 
-    <svn://svn.debian.org/pkg-ufsutils/>
+    <svn://svn.debian.org/glibc-bsd/>
 
 The upstream source was downloaded and packaged from the FreeBSD CVS.
 Take a look at the debian/upstream.sh script.

Modified: trunk/ufsutils/debian/patches/02_fsck.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2007-12-08 16:00:37 UTC (rev 2066)
+++ trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2007-12-08 16:49:31 UTC (rev 2067)
@@ -260,7 +260,7 @@
  	ufs2_daddr_t blks;
  	struct iovec *iov;
  	char errmsg[255];
-@@ -218,10 +235,12 @@
+@@ -218,10 +235,14 @@
  	 * if it is listed among the mounted file systems. Failing that
  	 * check to see if it is listed in /etc/fstab.
  	 */
@@ -269,6 +269,8 @@
  	if (mntp != NULL)
  		filesys = mntp->f_mntfromname;
  	else
++#else
++	mntp = NULL;
 +#endif
  		filesys = blockcheck(filesys);
  	/*