[Glibc-bsd-commits] r3092 - trunk/zfsutils/debian/patches
Aurelien Jarno
aurel32 at alioth.debian.org
Thu Jul 29 00:16:06 UTC 2010
Author: aurel32
Date: 2010-07-29 00:16:02 +0000 (Thu, 29 Jul 2010)
New Revision: 3092
Modified:
trunk/zfsutils/debian/patches/01_glibc_kludge.diff
trunk/zfsutils/debian/patches/02_glibc_misc.diff
trunk/zfsutils/debian/patches/03_glibc_namespace.diff
trunk/zfsutils/debian/patches/04_stdint.diff
trunk/zfsutils/debian/patches/05_makefile.diff
trunk/zfsutils/debian/patches/06_mountd.diff
Log:
Some more s/freebsd-libs/zfsutils/g
Modified: trunk/zfsutils/debian/patches/01_glibc_kludge.diff
===================================================================
--- trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2010-07-29 00:09:26 UTC (rev 3091)
+++ trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2010-07-29 00:16:02 UTC (rev 3092)
@@ -1,6 +1,6 @@
-diff -ur -x debian freebsd-libs-8.0.old/cddl/compat/opensolaris/misc/mnttab.c freebsd-libs-8.0/cddl/compat/opensolaris/misc/mnttab.c
---- freebsd-libs-8.0.old/cddl/compat/opensolaris/misc/mnttab.c 2008-11-17 15:49:29.000000000 -0500
-+++ freebsd-libs-8.0/cddl/compat/opensolaris/misc/mnttab.c 2010-07-27 20:07:02.656479850 -0400
+diff -ur -x debian a/cddl/compat/opensolaris/misc/mnttab.c b/cddl/compat/opensolaris/misc/mnttab.c
+--- a/cddl/compat/opensolaris/misc/mnttab.c 2008-11-17 15:49:29.000000000 -0500
++++ b/cddl/compat/opensolaris/misc/mnttab.c 2010-07-27 20:07:02.656479850 -0400
@@ -89,7 +89,7 @@
}
@@ -10,9 +10,9 @@
{
static struct statfs *sfs = NULL;
static char mntopts[MNTMAXSTR];
-diff -ur -x debian freebsd-libs-8.0.old/cddl/compat/opensolaris/misc/zmount.c freebsd-libs-8.0/cddl/compat/opensolaris/misc/zmount.c
---- freebsd-libs-8.0.old/cddl/compat/opensolaris/misc/zmount.c 2008-11-17 15:49:29.000000000 -0500
-+++ freebsd-libs-8.0/cddl/compat/opensolaris/misc/zmount.c 2010-07-27 20:07:02.659058030 -0400
+diff -ur -x debian a/cddl/compat/opensolaris/misc/zmount.c b/cddl/compat/opensolaris/misc/zmount.c
+--- a/cddl/compat/opensolaris/misc/zmount.c 2008-11-17 15:49:29.000000000 -0500
++++ b/cddl/compat/opensolaris/misc/zmount.c 2010-07-27 20:07:02.659058030 -0400
@@ -92,6 +92,9 @@
iov = NULL;
iovlen = 0;
@@ -23,9 +23,9 @@
build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir),
(size_t)-1);
build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1);
-diff -ur -x debian freebsd-libs-8.0.old/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c freebsd-libs-8.0/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c
---- freebsd-libs-8.0.old/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c 2008-03-28 18:16:18.000000000 -0400
-+++ freebsd-libs-8.0/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c 2010-07-27 20:07:02.660028620 -0400
+diff -ur -x debian a/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c b/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c
+--- a/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c 2008-03-28 18:16:18.000000000 -0400
++++ b/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c 2010-07-27 20:07:02.660028620 -0400
@@ -31,7 +31,7 @@
#include <libintl.h>
#include <limits.h>
@@ -35,9 +35,9 @@
#include <stdarg.h>
#include <stdio.h>
#include <errno.h>
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/rpc/xdr.h freebsd-libs-8.0/sys/cddl/compat/opensolaris/rpc/xdr.h
---- freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/rpc/xdr.h 2009-08-19 20:08:58.000000000 -0400
-+++ freebsd-libs-8.0/sys/cddl/compat/opensolaris/rpc/xdr.h 2010-07-27 20:07:02.661041790 -0400
+diff -ur -x debian a/sys/cddl/compat/opensolaris/rpc/xdr.h b/sys/cddl/compat/opensolaris/rpc/xdr.h
+--- a/sys/cddl/compat/opensolaris/rpc/xdr.h 2009-08-19 20:08:58.000000000 -0400
++++ b/sys/cddl/compat/opensolaris/rpc/xdr.h 2010-07-27 20:07:02.661041790 -0400
@@ -32,7 +32,31 @@
#include_next <rpc/xdr.h>
@@ -71,9 +71,9 @@
#include <assert.h>
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/sys/types.h freebsd-libs-8.0/sys/cddl/compat/opensolaris/sys/types.h
---- freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/sys/types.h 2008-11-17 15:49:29.000000000 -0500
-+++ freebsd-libs-8.0/sys/cddl/compat/opensolaris/sys/types.h 2010-07-27 20:07:02.662057600 -0400
+diff -ur -x debian a/sys/cddl/compat/opensolaris/sys/types.h b/sys/cddl/compat/opensolaris/sys/types.h
+--- a/sys/cddl/compat/opensolaris/sys/types.h 2008-11-17 15:49:29.000000000 -0500
++++ b/sys/cddl/compat/opensolaris/sys/types.h 2010-07-27 20:07:02.662057600 -0400
@@ -66,7 +66,7 @@
typedef int major_t;
@@ -83,9 +83,9 @@
#if defined(__XOPEN_OR_POSIX)
typedef enum { _B_FALSE, _B_TRUE } boolean_t;
#else
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h freebsd-libs-8.0/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h
---- freebsd-libs-8.0.old/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h 2008-05-22 03:33:39.000000000 -0400
-+++ freebsd-libs-8.0/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h 2010-07-27 20:07:02.664079110 -0400
+diff -ur -x debian a/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h b/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h
+--- a/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h 2008-05-22 03:33:39.000000000 -0400
++++ b/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h 2010-07-27 20:07:02.664079110 -0400
@@ -34,6 +34,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
Modified: trunk/zfsutils/debian/patches/02_glibc_misc.diff
===================================================================
--- trunk/zfsutils/debian/patches/02_glibc_misc.diff 2010-07-29 00:09:26 UTC (rev 3091)
+++ trunk/zfsutils/debian/patches/02_glibc_misc.diff 2010-07-29 00:16:02 UTC (rev 3092)
@@ -1,6 +1,6 @@
-diff -ur -x debian freebsd-libs-8.0.old/cddl/contrib/opensolaris/head/thread.h freebsd-libs-8.0/cddl/contrib/opensolaris/head/thread.h
---- freebsd-libs-8.0.old/cddl/contrib/opensolaris/head/thread.h 2009-07-09 16:22:05.000000000 -0400
-+++ freebsd-libs-8.0/cddl/contrib/opensolaris/head/thread.h 2010-07-27 20:09:06.102102259 -0400
+diff -ur -x debian a/cddl/contrib/opensolaris/head/thread.h b/cddl/contrib/opensolaris/head/thread.h
+--- a/cddl/contrib/opensolaris/head/thread.h 2009-07-09 16:22:05.000000000 -0400
++++ b/cddl/contrib/opensolaris/head/thread.h 2010-07-27 20:09:06.102102259 -0400
@@ -30,7 +30,10 @@
#pragma ident "%Z%%M% %I% %E% SMI"
@@ -12,9 +12,9 @@
#include <assert.h>
/*
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/sys/sysmacros.h freebsd-libs-8.0/sys/cddl/compat/opensolaris/sys/sysmacros.h
---- freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/sys/sysmacros.h 2009-02-28 11:21:25.000000000 -0500
-+++ freebsd-libs-8.0/sys/cddl/compat/opensolaris/sys/sysmacros.h 2010-07-27 20:09:06.103115289 -0400
+diff -ur -x debian a/sys/cddl/compat/opensolaris/sys/sysmacros.h b/sys/cddl/compat/opensolaris/sys/sysmacros.h
+--- a/sys/cddl/compat/opensolaris/sys/sysmacros.h 2009-02-28 11:21:25.000000000 -0500
++++ b/sys/cddl/compat/opensolaris/sys/sysmacros.h 2010-07-27 20:09:06.103115289 -0400
@@ -103,7 +103,7 @@
* High order bit is 31 (or 63 in _LP64 kernel).
*/
@@ -24,9 +24,9 @@
{
register int h = 1;
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/sys/time.h freebsd-libs-8.0/sys/cddl/compat/opensolaris/sys/time.h
---- freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/sys/time.h 2008-11-17 15:49:29.000000000 -0500
-+++ freebsd-libs-8.0/sys/cddl/compat/opensolaris/sys/time.h 2010-07-27 20:09:06.104125719 -0400
+diff -ur -x debian a/sys/cddl/compat/opensolaris/sys/time.h b/sys/cddl/compat/opensolaris/sys/time.h
+--- a/sys/cddl/compat/opensolaris/sys/time.h 2008-11-17 15:49:29.000000000 -0500
++++ b/sys/cddl/compat/opensolaris/sys/time.h 2010-07-27 20:09:06.104125719 -0400
@@ -29,7 +29,12 @@
#ifndef _OPENSOLARIS_SYS_TIME_H_
#define _OPENSOLARIS_SYS_TIME_H_
@@ -40,9 +40,9 @@
#define SEC 1
#define MILLISEC 1000
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c freebsd-libs-8.0/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
---- freebsd-libs-8.0.old/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c 2009-08-15 22:21:24.000000000 -0400
-+++ freebsd-libs-8.0/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c 2010-07-27 20:09:06.109193269 -0400
+diff -ur -x debian a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c b/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
+--- a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c 2009-08-15 22:21:24.000000000 -0400
++++ b/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c 2010-07-27 20:09:06.109193269 -0400
@@ -2199,11 +2199,11 @@
int err = 0;
nvstream_t nvs;
Modified: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2010-07-29 00:09:26 UTC (rev 3091)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2010-07-29 00:16:02 UTC (rev 3092)
@@ -1,6 +1,6 @@
-diff -ur -x debian freebsd-libs-8.0.old/cddl/compat/opensolaris/include/solaris.h freebsd-libs-8.0/cddl/compat/opensolaris/include/solaris.h
---- freebsd-libs-8.0.old/cddl/compat/opensolaris/include/solaris.h 2008-04-22 03:43:00.000000000 -0400
-+++ freebsd-libs-8.0/cddl/compat/opensolaris/include/solaris.h 2010-07-27 20:09:52.788482289 -0400
+diff -ur -x debian a/cddl/compat/opensolaris/include/solaris.h b/cddl/compat/opensolaris/include/solaris.h
+--- a/cddl/compat/opensolaris/include/solaris.h 2008-04-22 03:43:00.000000000 -0400
++++ b/cddl/compat/opensolaris/include/solaris.h 2010-07-27 20:09:52.788482289 -0400
@@ -5,6 +5,9 @@
#include <sys/ccompile.h>
@@ -11,9 +11,9 @@
+#endif
#endif /* !_SOLARIS_H_ */
-diff -ur -x debian freebsd-libs-8.0.old/cddl/compat/opensolaris/misc/fsshare.c freebsd-libs-8.0/cddl/compat/opensolaris/misc/fsshare.c
---- freebsd-libs-8.0.old/cddl/compat/opensolaris/misc/fsshare.c 2008-03-28 18:16:18.000000000 -0400
-+++ freebsd-libs-8.0/cddl/compat/opensolaris/misc/fsshare.c 2010-07-27 20:09:52.789492219 -0400
+diff -ur -x debian a/cddl/compat/opensolaris/misc/fsshare.c b/cddl/compat/opensolaris/misc/fsshare.c
+--- a/cddl/compat/opensolaris/misc/fsshare.c 2008-03-28 18:16:18.000000000 -0400
++++ b/cddl/compat/opensolaris/misc/fsshare.c 2010-07-27 20:09:52.789492219 -0400
@@ -67,7 +67,7 @@
* mountpoint specified in the 'skip' argument.
*/
@@ -32,9 +32,9 @@
fprintf(newfd, "%s\n", line);
if (oldfd != NULL && ferror(oldfd) != 0) {
error = ferror(oldfd);
-diff -ur -x debian freebsd-libs-8.0.old/cddl/compat/opensolaris/misc/mnttab.c freebsd-libs-8.0/cddl/compat/opensolaris/misc/mnttab.c
---- freebsd-libs-8.0.old/cddl/compat/opensolaris/misc/mnttab.c 2008-11-17 15:49:29.000000000 -0500
-+++ freebsd-libs-8.0/cddl/compat/opensolaris/misc/mnttab.c 2010-07-27 20:09:52.790512709 -0400
+diff -ur -x debian a/cddl/compat/opensolaris/misc/mnttab.c b/cddl/compat/opensolaris/misc/mnttab.c
+--- a/cddl/compat/opensolaris/misc/mnttab.c 2008-11-17 15:49:29.000000000 -0500
++++ b/cddl/compat/opensolaris/misc/mnttab.c 2010-07-27 20:09:52.790512709 -0400
@@ -63,7 +63,7 @@
}
@@ -44,9 +44,9 @@
{
char tmpopts[MNT_LINE_MAX];
char *f, *opts = tmpopts;
-diff -ur -x debian freebsd-libs-8.0.old/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c freebsd-libs-8.0/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
---- freebsd-libs-8.0.old/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c 2008-11-17 15:49:29.000000000 -0500
-+++ freebsd-libs-8.0/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c 2010-07-27 20:09:52.798610639 -0400
+diff -ur -x debian a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
+--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c 2008-11-17 15:49:29.000000000 -0500
++++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c 2010-07-27 20:09:52.798610639 -0400
@@ -2166,11 +2166,11 @@
case ZFS_PROP_NBMAND:
*val = getprop_uint64(zhp, prop, source);
@@ -61,9 +61,9 @@
*val = B_FALSE;
if (src)
*src = ZPROP_SRC_TEMPORARY;
-diff -ur -x debian freebsd-libs-8.0.old/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c freebsd-libs-8.0/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
---- freebsd-libs-8.0.old/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c 2009-07-09 16:22:05.000000000 -0400
-+++ freebsd-libs-8.0/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c 2010-07-27 20:09:52.800641669 -0400
+diff -ur -x debian a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
+--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c 2009-07-09 16:22:05.000000000 -0400
++++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c 2010-07-27 20:09:52.800641669 -0400
@@ -463,7 +463,7 @@
/*ARGSUSED*/
int
@@ -73,9 +73,9 @@
{
ssize_t iolen, split;
-diff -ur -x debian freebsd-libs-8.0.old/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h freebsd-libs-8.0/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
---- freebsd-libs-8.0.old/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h 2009-07-09 16:22:05.000000000 -0400
-+++ freebsd-libs-8.0/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h 2010-07-27 20:09:52.802661419 -0400
+diff -ur -x debian a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h 2009-07-09 16:22:05.000000000 -0400
++++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h 2010-07-27 20:09:52.802661419 -0400
@@ -105,8 +105,8 @@
#define ZFS_LOG(...) do { } while (0)
@@ -96,9 +96,9 @@
extern void vn_close(vnode_t *vp, int openflag, cred_t *cr, kthread_t *td);
#define vn_remove(path, x1, x2) remove(path)
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/sys/dirent.h freebsd-libs-8.0/sys/cddl/compat/opensolaris/sys/dirent.h
---- freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/sys/dirent.h 2008-03-28 18:16:18.000000000 -0400
-+++ freebsd-libs-8.0/sys/cddl/compat/opensolaris/sys/dirent.h 2010-07-27 20:09:52.803673879 -0400
+diff -ur -x debian a/sys/cddl/compat/opensolaris/sys/dirent.h b/sys/cddl/compat/opensolaris/sys/dirent.h
+--- a/sys/cddl/compat/opensolaris/sys/dirent.h 2008-03-28 18:16:18.000000000 -0400
++++ b/sys/cddl/compat/opensolaris/sys/dirent.h 2010-07-27 20:09:52.803673879 -0400
@@ -32,7 +32,10 @@
#include_next <sys/dirent.h>
@@ -110,9 +110,9 @@
#define ino64_t ino_t
#define d_ino d_fileno
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c freebsd-libs-8.0/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
---- freebsd-libs-8.0.old/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c 2009-10-12 16:36:55.000000000 -0400
-+++ freebsd-libs-8.0/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c 2010-07-27 20:09:52.816846339 -0400
+diff -ur -x debian a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c 2009-10-12 16:36:55.000000000 -0400
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c 2010-07-27 20:09:52.816846339 -0400
@@ -677,7 +677,7 @@
zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
{
Modified: trunk/zfsutils/debian/patches/04_stdint.diff
===================================================================
--- trunk/zfsutils/debian/patches/04_stdint.diff 2010-07-29 00:09:26 UTC (rev 3091)
+++ trunk/zfsutils/debian/patches/04_stdint.diff 2010-07-29 00:16:02 UTC (rev 3092)
@@ -1,6 +1,6 @@
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/sys/types.h freebsd-libs-8.0/sys/cddl/compat/opensolaris/sys/types.h
---- freebsd-libs-8.0.old/sys/cddl/compat/opensolaris/sys/types.h 2008-11-17 15:49:29.000000000 -0500
-+++ freebsd-libs-8.0/sys/cddl/compat/opensolaris/sys/types.h 2010-07-27 20:10:36.439355449 -0400
+diff -ur -x debian a/sys/cddl/compat/opensolaris/sys/types.h b/sys/cddl/compat/opensolaris/sys/types.h
+--- a/sys/cddl/compat/opensolaris/sys/types.h 2008-11-17 15:49:29.000000000 -0500
++++ b/sys/cddl/compat/opensolaris/sys/types.h 2010-07-27 20:10:36.439355449 -0400
@@ -33,7 +33,7 @@
* This is a bag of dirty hacks to keep things compiling.
*/
@@ -10,9 +10,9 @@
#include_next <sys/types.h>
#define MAXNAMELEN 256
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/contrib/opensolaris/common/avl/avl.c freebsd-libs-8.0/sys/cddl/contrib/opensolaris/common/avl/avl.c
---- freebsd-libs-8.0.old/sys/cddl/contrib/opensolaris/common/avl/avl.c 2008-11-17 15:49:29.000000000 -0500
-+++ freebsd-libs-8.0/sys/cddl/contrib/opensolaris/common/avl/avl.c 2010-07-27 20:10:36.441379999 -0400
+diff -ur -x debian a/sys/cddl/contrib/opensolaris/common/avl/avl.c b/sys/cddl/contrib/opensolaris/common/avl/avl.c
+--- a/sys/cddl/contrib/opensolaris/common/avl/avl.c 2008-11-17 15:49:29.000000000 -0500
++++ b/sys/cddl/contrib/opensolaris/common/avl/avl.c 2010-07-27 20:10:36.441379999 -0400
@@ -92,7 +92,7 @@
#include <sys/types.h>
@@ -22,9 +22,9 @@
#include <sys/debug.h>
#include <sys/avl.h>
-diff -ur -x debian freebsd-libs-8.0.old/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h freebsd-libs-8.0/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
---- freebsd-libs-8.0.old/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h 2009-08-17 05:03:47.000000000 -0400
-+++ freebsd-libs-8.0/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h 2010-07-27 20:10:36.442398029 -0400
+diff -ur -x debian a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h 2009-08-17 05:03:47.000000000 -0400
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h 2010-07-27 20:10:36.442398029 -0400
@@ -33,7 +33,7 @@
#endif
Modified: trunk/zfsutils/debian/patches/05_makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/05_makefile.diff 2010-07-29 00:09:26 UTC (rev 3091)
+++ trunk/zfsutils/debian/patches/05_makefile.diff 2010-07-29 00:16:02 UTC (rev 3092)
@@ -1,6 +1,6 @@
-diff -ur -x debian freebsd-libs-8.0.old/cddl/lib/libzfs/Makefile freebsd-libs-8.0/cddl/lib/libzfs/Makefile
---- freebsd-libs-8.0.old/cddl/lib/libzfs/Makefile 2008-11-17 15:49:29.000000000 -0500
-+++ freebsd-libs-8.0/cddl/lib/libzfs/Makefile 2010-07-27 20:11:17.801799169 -0400
+diff -ur -x debian a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
+--- a/cddl/lib/libzfs/Makefile 2008-11-17 15:49:29.000000000 -0500
++++ b/cddl/lib/libzfs/Makefile 2010-07-27 20:11:17.801799169 -0400
@@ -47,5 +47,6 @@
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
@@ -8,9 +8,9 @@
+CFLAGS+= -I${.CURDIR}/../../../lib/libgeom
.include <bsd.lib.mk>
-diff -ur -x debian freebsd-libs-8.0.old/cddl/sbin/zfs/Makefile freebsd-libs-8.0/cddl/sbin/zfs/Makefile
---- freebsd-libs-8.0.old/cddl/sbin/zfs/Makefile 2008-03-27 19:21:25.000000000 -0400
-+++ freebsd-libs-8.0/cddl/sbin/zfs/Makefile 2010-07-27 20:11:17.802817408 -0400
+diff -ur -x debian a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
+--- a/cddl/sbin/zfs/Makefile 2008-03-27 19:21:25.000000000 -0400
++++ b/cddl/sbin/zfs/Makefile 2010-07-27 20:11:17.802817408 -0400
@@ -21,7 +21,13 @@
DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
@@ -26,9 +26,9 @@
+ -L${.CURDIR}/../../../lib/libsbuf
+
.include <bsd.prog.mk>
-diff -ur -x debian freebsd-libs-8.0.old/cddl/sbin/zpool/Makefile freebsd-libs-8.0/cddl/sbin/zpool/Makefile
---- freebsd-libs-8.0.old/cddl/sbin/zpool/Makefile 2008-11-17 15:49:29.000000000 -0500
-+++ freebsd-libs-8.0/cddl/sbin/zpool/Makefile 2010-07-27 20:11:17.803821828 -0400
+diff -ur -x debian a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
+--- a/cddl/sbin/zpool/Makefile 2008-11-17 15:49:29.000000000 -0500
++++ b/cddl/sbin/zpool/Makefile 2010-07-27 20:11:17.803821828 -0400
@@ -23,7 +23,12 @@
DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
Modified: trunk/zfsutils/debian/patches/06_mountd.diff
===================================================================
--- trunk/zfsutils/debian/patches/06_mountd.diff 2010-07-29 00:09:26 UTC (rev 3091)
+++ trunk/zfsutils/debian/patches/06_mountd.diff 2010-07-29 00:16:02 UTC (rev 3092)
@@ -1,6 +1,6 @@
-diff -ur -x debian freebsd-libs-8.0.old/cddl/compat/opensolaris/misc/fsshare.c freebsd-libs-8.0/cddl/compat/opensolaris/misc/fsshare.c
---- freebsd-libs-8.0.old/cddl/compat/opensolaris/misc/fsshare.c 2008-03-28 18:16:18.000000000 -0400
-+++ freebsd-libs-8.0/cddl/compat/opensolaris/misc/fsshare.c 2010-07-27 20:11:53.585550998 -0400
+diff -ur -x debian a/cddl/compat/opensolaris/misc/fsshare.c b/cddl/compat/opensolaris/misc/fsshare.c
+--- a/cddl/compat/opensolaris/misc/fsshare.c 2008-03-28 18:16:18.000000000 -0400
++++ b/cddl/compat/opensolaris/misc/fsshare.c 2010-07-27 20:11:53.585550998 -0400
@@ -35,7 +35,6 @@
#include <errno.h>
#include <libutil.h>
More information about the Glibc-bsd-commits
mailing list