[Glibc-bsd-commits] r4532 - in trunk/zfsutils/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Mon Jul 8 12:42:01 UTC 2013
Author: rmh
Date: 2013-06-19 12:45:08 +0000 (Wed, 19 Jun 2013)
New Revision: 4532
Removed:
trunk/zfsutils/debian/patches/08_libbsd.diff
Modified:
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/control
trunk/zfsutils/debian/patches/series
Log:
Build-depend on freebsd-glue >= 0.0.4 (and remove some of the build kludges).
Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog 2013-06-19 12:23:24 UTC (rev 4531)
+++ trunk/zfsutils/debian/changelog 2013-06-19 12:45:08 UTC (rev 4532)
@@ -1,7 +1,12 @@
zfsutils (9.0-4) UNRELEASED; urgency=low
+ [ Guillem Jover ]
* Switch to canonical Vcs URLs.
+ [ Robert Millan ]
+ * Build-depend on freebsd-glue >= 0.0.4 (and remove some of the build
+ kludges).
+
-- Guillem Jover <guillem at debian.org> Sat, 18 May 2013 21:37:41 +0200
zfsutils (9.0-3) unstable; urgency=low
Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control 2013-06-19 12:23:24 UTC (rev 4531)
+++ trunk/zfsutils/debian/control 2013-06-19 12:45:08 UTC (rev 4532)
@@ -8,7 +8,8 @@
libbsd-dev (>= 0.3.0),
libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51),
libgeom-dev,
- zlib1g-dev
+ zlib1g-dev,
+ freebsd-glue (>= 0.0.4~),
Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/zfsutils/
Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/zfsutils/
Standards-Version: 3.9.3
Deleted: trunk/zfsutils/debian/patches/08_libbsd.diff
===================================================================
--- trunk/zfsutils/debian/patches/08_libbsd.diff 2013-06-19 12:23:24 UTC (rev 4531)
+++ trunk/zfsutils/debian/patches/08_libbsd.diff 2013-06-19 12:45:08 UTC (rev 4532)
@@ -1,200 +0,0 @@
----
- cddl/compat/opensolaris/misc/deviceid.c | 1 +
- cddl/compat/opensolaris/misc/fsshare.c | 1 +
- cddl/compat/opensolaris/misc/mnttab.c | 1 +
- cddl/contrib/opensolaris/cmd/zfs/zfs_main.c | 2 ++
- cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 1 +
- cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c | 1 +
- cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c | 1 +
- cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c | 1 +
- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c | 1 +
- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c | 1 +
- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c | 1 +
- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c | 1 +
- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c | 1 +
- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c | 1 +
- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c | 1 +
- cddl/contrib/opensolaris/lib/libzpool/common/kernel.c | 1 +
- cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h | 1 +
- 17 files changed, 18 insertions(+)
-
---- a/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c
-+++ b/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c
-@@ -31,6 +31,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/time.h>
-+#include <bsd/string.h>
-
- #define ELEM_TO_NODE(lp, e) \
- ((uu_list_node_impl_t *)((uintptr_t)(e) + (lp)->ul_offset))
---- a/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c
-+++ b/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c
-@@ -31,6 +31,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/avl.h>
-+#include <bsd/string.h>
-
- static uu_avl_pool_t uu_null_apool = { &uu_null_apool, &uu_null_apool };
- static pthread_mutex_t uu_apool_list_lock = PTHREAD_MUTEX_INITIALIZER;
---- a/cddl/compat/opensolaris/misc/deviceid.c
-+++ b/cddl/compat/opensolaris/misc/deviceid.c
-@@ -35,6 +35,7 @@
- #include <errno.h>
- #include <libgeom.h>
- #include <devid.h>
-+#include <bsd/string.h>
-
- 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 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <bsd/string.h>
-
- static char *
- mntopt(char **p)
---- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
-+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
-@@ -25,6 +25,7 @@
- */
-
- #include <assert.h>
-+#include <bsd/string.h>
- #include <ctype.h>
- #include <errno.h>
- #include <libgen.h>
-@@ -35,6 +36,7 @@
- #include <stddef.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <bsd/string.h>
- #include <strings.h>
- #include <unistd.h>
- #include <fcntl.h>
---- a/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
-+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
-@@ -74,6 +74,8 @@
- #include <sys/disk.h>
- #include <sys/mntent.h>
- #include <libgeom.h>
-+#include <bsd/string.h>
-+#include <sys/limits.h>
-
- #include "zpool_util.h"
-
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
-@@ -33,6 +33,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <zone.h>
-+#include <bsd/string.h>
-
- #include <libzfs.h>
-
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c
-@@ -76,6 +76,7 @@
- #include <string.h>
- #include <strings.h>
- #include <unistd.h>
-+#include <bsd/string.h>
-
- #include <libzfs.h>
-
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
-@@ -51,6 +51,7 @@
- #include <fcntl.h>
- #include <thread_pool.h>
- #include <libgeom.h>
-+#include <bsd/string.h>
-
- #include <sys/vdev_impl.h>
-
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
-@@ -72,6 +72,7 @@
- #include <sys/mntent.h>
- #include <sys/mount.h>
- #include <sys/stat.h>
-+#include <bsd/string.h>
-
- #include <libzfs.h>
-
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-@@ -36,6 +36,7 @@
- #include <unistd.h>
- #include <sys/zfs_ioctl.h>
- #include <dlfcn.h>
-+#include <bsd/string.h>
-
- #include "zfs_namecheck.h"
- #include "zfs_prop.h"
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
-@@ -37,6 +37,7 @@
- #include <sys/mount.h>
- #include <pthread.h>
- #include <umem.h>
-+#include <bsd/string.h>
-
- #include <libzfs.h>
-
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
-@@ -31,6 +31,7 @@
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <bsd/string.h>
- #include <strings.h>
- #include <unistd.h>
- #include <stddef.h>
---- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
-+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
-@@ -27,6 +27,7 @@
- #include <poll.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <bsd/string.h>
- #include <string.h>
- #include <zlib.h>
- #include <sys/spa.h>
---- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-@@ -35,6 +35,7 @@
- #include <locale.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <bsd/string.h>
- #include <string.h>
- #include <strings.h>
- #include <unistd.h>
---- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-@@ -49,6 +49,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <bsd/string.h>
- #include <string.h>
- #include <strings.h>
- #include <thread.h>
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2013-06-19 12:23:24 UTC (rev 4531)
+++ trunk/zfsutils/debian/patches/series 2013-06-19 12:45:08 UTC (rev 4532)
@@ -8,7 +8,6 @@
03_glibc_namespace.diff
04_stdint.diff
06_mountd.diff
-08_libbsd.diff
09_xdr_control.diff
11_endian.diff
12_freebsd.diff
More information about the Glibc-bsd-commits
mailing list