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

[Arno Töll]

Author: atoell-guest
Date: 2012-06-21 18:12:16 +0000 (Thu, 21 Jun 2012)
New Revision: 4322

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/control
   trunk/zfsutils/debian/patches/08_libbsd.diff
Log:
Apply patch by Steven to fix #678136 which includes the right lubutil.h path

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2012-06-21 18:07:47 UTC (rev 4321)
+++ trunk/zfsutils/debian/changelog	2012-06-21 18:12:16 UTC (rev 4322)
@@ -1,3 +1,10 @@
+zfsutils (9.0-2.1) UNRELEASED; urgency=low
+
+  * Apply patch supplied by Steven Chamberlain to fix "FTBFS with
+    libbsd-dev >= 0.4.0" (Closes: #678136)
+
+ -- Arno Töll <arno at debian.org>  Thu, 21 Jun 2012 19:53:39 +0200
+
 zfsutils (9.0-2) unstable; urgency=low
 
   * Remove gratuitous build-dependency on libsbuf-dev (see upstream rev

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2012-06-21 18:07:47 UTC (rev 4321)
+++ trunk/zfsutils/debian/control	2012-06-21 18:12:16 UTC (rev 4322)
@@ -6,7 +6,7 @@
 Dm-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
  freebsd-buildutils (>= 9.0-5~),
- libbsd-dev (>= 0.1.4),
+ libbsd-dev (>= 0.3.0),
  libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51),
  libgeom-dev,
  zlib1g-dev

Modified: trunk/zfsutils/debian/patches/08_libbsd.diff
===================================================================
--- trunk/zfsutils/debian/patches/08_libbsd.diff	2012-06-21 18:07:47 UTC (rev 4321)
+++ trunk/zfsutils/debian/patches/08_libbsd.diff	2012-06-21 18:12:16 UTC (rev 4322)
@@ -48,6 +48,17 @@
  
  int
  devid_str_decode(char *devidstr, ddi_devid_t *retdevid, char **retminor_name)
+--- a/cddl/compat/opensolaris/misc/fsshare.c
++++ b/cddl/compat/opensolaris/misc/fsshare.c
+@@ -34,7 +34,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <fsshare.h>
+-#include <libutil.h>
++#include <bsd/libutil.h>
+ #include <signal.h>
+ #include <stdio.h>
+ #include <string.h>
 --- a/cddl/compat/opensolaris/misc/mnttab.c
 +++ b/cddl/compat/opensolaris/misc/mnttab.c
 @@ -42,6 +42,7 @@