[Glibc-bsd-commits] r3857 - in trunk/zfsutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-11-13 14:56:15 +0000 (Sun, 13 Nov 2011)
New Revision: 3857

Added:
   trunk/zfsutils/debian/patches/fix_realpath_abuse.diff
Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/series
Log:
  * fix_realpath_abuse.diff: Fix "cannot open /dev/dsk" problem.  See
    PR misc/162519 for details.



Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-11-13 13:16:17 UTC (rev 3856)
+++ trunk/zfsutils/debian/changelog	2011-11-13 14:56:15 UTC (rev 3857)
@@ -1,3 +1,10 @@
+zfsutils (8.3~svn226546-4) unstable; urgency=low
+
+  * fix_realpath_abuse.diff: Fix "cannot open /dev/dsk" problem.  See
+    PR misc/162519 for details.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 13 Nov 2011 15:55:27 +0100
+
 zfsutils (8.3~svn226546-3) unstable; urgency=low
 
   * Do not attempt to unmount /, as this always fails.

Added: trunk/zfsutils/debian/patches/fix_realpath_abuse.diff
===================================================================
--- trunk/zfsutils/debian/patches/fix_realpath_abuse.diff	                        (rev 0)
+++ trunk/zfsutils/debian/patches/fix_realpath_abuse.diff	2011-11-13 14:56:15 UTC (rev 3857)
@@ -0,0 +1,14 @@
+
+See PR misc/162519
+
+--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
++++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+@@ -1156,7 +1156,7 @@
+ 		int dfd;
+ 
+ 		/* use realpath to normalize the path */
+-		if (realpath(dir[i], path) == 0) {
++		if (realpath(dir[i], path) == 0 && errno != ENOENT && errno != ENOTDIR) {
+ 			(void) zfs_error_fmt(hdl, EZFS_BADPATH,
+ 			    dgettext(TEXT_DOMAIN, "cannot open '%s'"), dir[i]);
+ 			goto error;

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2011-11-13 13:16:17 UTC (rev 3856)
+++ trunk/zfsutils/debian/patches/series	2011-11-13 14:56:15 UTC (rev 3857)
@@ -21,3 +21,4 @@
 makefile.diff
 manpage_debian_specifics.diff
 libmd_static.diff
+fix_realpath_abuse.diff