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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-19 19:07:36 +0000 (Fri, 19 Sep 2014)
New Revision: 5546

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/compat_opensolaris.diff
Log:
cddl/compat/opensolaris/misc/fsshare.c: don't include missing/unused
libutil.h;  not needed and caused FTBFS on kfreebsd-i386 only


Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2014-09-19 14:23:02 UTC (rev 5545)
+++ trunk/zfsutils/debian/changelog	2014-09-19 19:07:36 UTC (rev 5546)
@@ -1,8 +1,10 @@
-zfsutils (10.1~svn271683-3) UNRELEASED; urgency=medium
+zfsutils (10.1~svn271683-2) UNRELEASED; urgency=medium
 
   [ Steven Chamberlain ]
   * bug762199.patch: st_size is only meaningful for regular files;
     existing code did not detect any zpools for import (Closes: #762199)
+  * cddl/compat/opensolaris/misc/fsshare.c: don't include missing/unused
+    libutil.h;  not needed and caused FTBFS on kfreebsd-i386 only
 
  -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Fri, 19 Sep 2014 15:21:25 +0100
 

Modified: trunk/zfsutils/debian/patches/compat_opensolaris.diff
===================================================================
--- trunk/zfsutils/debian/patches/compat_opensolaris.diff	2014-09-19 14:23:02 UTC (rev 5545)
+++ trunk/zfsutils/debian/patches/compat_opensolaris.diff	2014-09-19 19:07:36 UTC (rev 5546)
@@ -133,15 +133,16 @@
  
 --- a/cddl/compat/opensolaris/misc/fsshare.c
 +++ b/cddl/compat/opensolaris/misc/fsshare.c
-@@ -34,7 +34,6 @@
+@@ -33,8 +33,6 @@
+ #include <errno.h>
  #include <fcntl.h>
  #include <fsshare.h>
- #include <libutil.h>
+-#include <libutil.h>
 -#include <pathnames.h>	/* _PATH_MOUNTDPID */
  #include <signal.h>
  #include <stdio.h>
  #include <string.h>
-@@ -47,6 +46,9 @@
+@@ -47,6 +45,9 @@
  static void
  restart_mountd(void)
  {
@@ -151,7 +152,7 @@
  	struct pidfh *pfh;
  	pid_t mountdpid;
  
-@@ -62,6 +64,7 @@
+@@ -62,6 +63,7 @@
  	}
  	/* We have mountd(8) PID in mountdpid varible. */
  	kill(mountdpid, SIGHUP);
@@ -159,7 +160,7 @@
  }
  
  /*
-@@ -69,7 +72,7 @@
+@@ -69,7 +71,7 @@
   * mountpoint specified in the 'skip' argument.
   */
  static char *
@@ -168,7 +169,7 @@
  {
  	static char line[MAXLINESIZE];
  	size_t len, skiplen;
-@@ -200,7 +203,7 @@
+@@ -200,7 +202,7 @@
  
  	/* Place big, fat warning at the begining of the file. */
  	fprintf(newfd, "%s", FILE_HEADER);