[Glibc-bsd-commits] r3298 - trunk/zfsutils/debian/patches
Aurelien Jarno
aurel32 at alioth.debian.org
Sat Apr 23 19:51:31 UTC 2011
Author: aurel32
Date: 2011-04-23 19:51:31 +0000 (Sat, 23 Apr 2011)
New Revision: 3298
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
trunk/zfsutils/debian/patches/07_manpages.diff
trunk/zfsutils/debian/patches/08_libbsd.diff
trunk/zfsutils/debian/patches/09_xdr_control.diff
trunk/zfsutils/debian/patches/10_zpool_import.diff
trunk/zfsutils/debian/patches/11_endian.diff
trunk/zfsutils/debian/patches/12_freebsd.diff
trunk/zfsutils/debian/patches/13_mnttab.diff
trunk/zfsutils/debian/patches/14_bootloader_advice.diff
trunk/zfsutils/debian/patches/15_ztest.fix
Log:
Refresh all patches
Modified: trunk/zfsutils/debian/patches/01_glibc_kludge.diff
===================================================================
--- trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,18 +1,22 @@
-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 @@
+---
+ cddl/compat/opensolaris/misc/mnttab.c | 2 +-
+ cddl/compat/opensolaris/misc/zmount.c | 3 +++
+ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c | 6 +++---
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+--- a/cddl/compat/opensolaris/misc/mnttab.c
++++ b/cddl/compat/opensolaris/misc/mnttab.c
+@@ -164,7 +164,7 @@
}
int
-getmntany(FILE *fd __unused, struct mnttab *mgetp, struct mnttab *mrefp)
+getmntany(FILE *fd, struct mnttab *mgetp, struct mnttab *mrefp)
{
- static struct statfs *sfs = NULL;
- static char mntopts[MNTMAXSTR];
-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
+ struct statfs *sfs;
+ int i, error;
+--- a/cddl/compat/opensolaris/misc/zmount.c
++++ b/cddl/compat/opensolaris/misc/zmount.c
@@ -92,6 +92,9 @@
iov = NULL;
iovlen = 0;
@@ -52,4 +56,3 @@
{
callb_cpr_t cpr;
l2arc_dev_t *dev;
-v
Modified: trunk/zfsutils/debian/patches/02_glibc_misc.diff
===================================================================
--- trunk/zfsutils/debian/patches/02_glibc_misc.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/02_glibc_misc.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,6 +1,11 @@
-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
+---
+ cddl/contrib/opensolaris/head/thread.h | 3 +++
+ sys/cddl/compat/opensolaris/sys/sysmacros.h | 2 +-
+ sys/cddl/compat/opensolaris/sys/time.h | 5 +++++
+ 3 files changed, 9 insertions(+), 1 deletion(-)
+
+--- a/cddl/contrib/opensolaris/head/thread.h
++++ b/cddl/contrib/opensolaris/head/thread.h
@@ -30,7 +30,10 @@
#pragma ident "%Z%%M% %I% %E% SMI"
@@ -12,10 +17,9 @@
#include <assert.h>
/*
-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 @@
+--- a/sys/cddl/compat/opensolaris/sys/sysmacros.h
++++ b/sys/cddl/compat/opensolaris/sys/sysmacros.h
+@@ -107,7 +107,7 @@
* High order bit is 31 (or 63 in _LP64 kernel).
*/
static __inline int
@@ -24,9 +28,8 @@
{
register int h = 1;
-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
+--- a/sys/cddl/compat/opensolaris/sys/time.h
++++ b/sys/cddl/compat/opensolaris/sys/time.h
@@ -29,7 +29,12 @@
#ifndef _OPENSOLARIS_SYS_TIME_H_
#define _OPENSOLARIS_SYS_TIME_H_
Modified: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,3 +1,14 @@
+---
+ cddl/compat/opensolaris/include/solaris.h | 3 +++
+ cddl/compat/opensolaris/misc/fsshare.c | 5 +++--
+ cddl/compat/opensolaris/misc/mnttab.c | 2 +-
+ cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c | 4 ++--
+ cddl/contrib/opensolaris/lib/libzpool/common/kernel.c | 2 +-
+ cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h | 6 +++---
+ sys/cddl/compat/opensolaris/sys/dirent.h | 3 +++
+ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 2 +-
+ 8 files changed, 17 insertions(+), 10 deletions(-)
+
--- a/cddl/compat/opensolaris/include/solaris.h
+++ b/cddl/compat/opensolaris/include/solaris.h
@@ -5,6 +5,9 @@
Modified: trunk/zfsutils/debian/patches/04_stdint.diff
===================================================================
--- trunk/zfsutils/debian/patches/04_stdint.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/04_stdint.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,6 +1,11 @@
-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
+---
+ sys/cddl/compat/opensolaris/sys/types.h | 2 +-
+ sys/cddl/contrib/opensolaris/common/avl/avl.c | 2 +-
+ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/sys/cddl/compat/opensolaris/sys/types.h
++++ b/sys/cddl/compat/opensolaris/sys/types.h
@@ -33,7 +33,7 @@
* This is a bag of dirty hacks to keep things compiling.
*/
@@ -10,9 +15,8 @@
#include_next <sys/types.h>
#define MAXNAMELEN 256
-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
+--- a/sys/cddl/contrib/opensolaris/common/avl/avl.c
++++ b/sys/cddl/contrib/opensolaris/common/avl/avl.c
@@ -92,7 +92,7 @@
#include <sys/types.h>
@@ -22,9 +26,8 @@
#include <sys/debug.h>
#include <sys/avl.h>
-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
+--- 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
@@ -33,7 +33,7 @@
#endif
Modified: trunk/zfsutils/debian/patches/05_makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/05_makefile.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/05_makefile.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,3 +1,14 @@
+---
+ cddl/lib/libuutil/Makefile | 2 ++
+ cddl/lib/libzfs/Makefile | 5 ++++-
+ cddl/lib/libzpool/Makefile | 5 ++++-
+ cddl/sbin/zfs/Makefile | 11 +++++++----
+ cddl/sbin/zpool/Makefile | 9 +++++----
+ cddl/usr.bin/zinject/Makefile | 7 ++++++-
+ cddl/usr.bin/ztest/Makefile | 5 ++++-
+ cddl/usr.sbin/zdb/Makefile | 7 ++++++-
+ 8 files changed, 38 insertions(+), 13 deletions(-)
+
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -7,7 +7,10 @@
@@ -12,8 +23,8 @@
SRCS= deviceid.c \
fsshare.c \
---- a/cddl/lib/libuutil/Makefile 2010-07-29 03:23:17.000000000 +0200
-+++ b/cddl/lib/libuutil/Makefile 2010-07-29 03:24:01.000000000 +0200
+--- a/cddl/lib/libuutil/Makefile
++++ b/cddl/lib/libuutil/Makefile
@@ -22,4 +22,6 @@
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
@@ -21,9 +32,8 @@
+LDADD= -lrt -lbsd -lpthread
+
.include <bsd.lib.mk>
-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
+--- a/cddl/sbin/zfs/Makefile
++++ b/cddl/sbin/zfs/Makefile
@@ -19,9 +19,12 @@
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
@@ -41,9 +51,8 @@
+ -L${.CURDIR}/../../../cddl/lib/libuutil
.include <bsd.prog.mk>
-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
+--- a/cddl/sbin/zpool/Makefile
++++ b/cddl/sbin/zpool/Makefile
@@ -21,9 +21,10 @@
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
@@ -59,12 +68,9 @@
+ -L${.CURDIR}/../../../cddl/lib/libuutil
.include <bsd.prog.mk>
-
-Index: zfsutils-8.1-patch/cddl/usr.sbin/zdb/Makefile
-===================================================================
---- zfsutils-8.1-patch.orig/cddl/usr.sbin/zdb/Makefile 2011-04-06 17:17:31.000000000 -0400
-+++ zfsutils-8.1-patch/cddl/usr.sbin/zdb/Makefile 2011-04-06 17:17:47.000000000 -0400
-@@ -18,7 +18,12 @@
+--- a/cddl/usr.sbin/zdb/Makefile
++++ b/cddl/usr.sbin/zdb/Makefile
+@@ -21,7 +21,12 @@
DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
@@ -78,11 +84,9 @@
CSTD= c99
-Index: zfsutils-8.1-patch/cddl/usr.bin/zinject/Makefile
-===================================================================
---- zfsutils-8.1-patch.orig/cddl/usr.bin/zinject/Makefile 2011-04-06 17:17:31.000000000 -0400
-+++ zfsutils-8.1-patch/cddl/usr.bin/zinject/Makefile 2011-04-06 17:17:47.000000000 -0400
-@@ -17,6 +17,11 @@
+--- a/cddl/usr.bin/zinject/Makefile
++++ b/cddl/usr.bin/zinject/Makefile
+@@ -20,6 +20,11 @@
DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
@@ -95,12 +99,9 @@
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
.include <bsd.prog.mk>
-Index: zfsutils-8.1-patch/cddl/usr.bin/ztest/Makefile
-===================================================================
---- zfsutils-8.1-patch.orig/cddl/usr.bin/ztest/Makefile 2011-04-06 17:17:31.000000000 -0400
-+++ zfsutils-8.1-patch/cddl/usr.bin/ztest/Makefile 2011-04-06 17:21:32.000000000 -0400
-@@ -14,7 +14,10 @@
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
+--- a/cddl/usr.bin/ztest/Makefile
++++ b/cddl/usr.bin/ztest/Makefile
+@@ -17,7 +17,10 @@
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
${LIBPTHREAD} ${LIBZ} ${LIBAVL}
@@ -112,8 +113,8 @@
CSTD= c99
---- zfsutils-8.2.orig/cddl/lib/libzpool/Makefile
-+++ zfsutils-8.2/cddl/lib/libzpool/Makefile
+--- a/cddl/lib/libzpool/Makefile
++++ b/cddl/lib/libzpool/Makefile
@@ -53,7 +53,10 @@
CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_ARCH}/include
@@ -126,4 +127,3 @@
# atomic.S doesn't like profiling.
NO_PROFILE=
-
Modified: trunk/zfsutils/debian/patches/06_mountd.diff
===================================================================
--- trunk/zfsutils/debian/patches/06_mountd.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/06_mountd.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,7 +1,10 @@
-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 @@
+---
+ cddl/compat/opensolaris/misc/fsshare.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/cddl/compat/opensolaris/misc/fsshare.c
++++ b/cddl/compat/opensolaris/misc/fsshare.c
+@@ -36,7 +36,6 @@
#include <errno.h>
#include <libutil.h>
#include <assert.h>
@@ -9,7 +12,7 @@
#include <fsshare.h>
#define FILE_HEADER "# !!! DO NOT EDIT THIS FILE MANUALLY !!!\n\n"
-@@ -45,6 +44,9 @@
+@@ -46,6 +45,9 @@
static void
restart_mountd(void)
{
@@ -19,7 +22,7 @@
struct pidfh *pfh;
pid_t mountdpid;
-@@ -60,6 +62,7 @@
+@@ -61,6 +63,7 @@
}
/* We have mountd(8) PID in mountdpid varible. */
kill(mountdpid, SIGHUP);
Modified: trunk/zfsutils/debian/patches/07_manpages.diff
===================================================================
--- trunk/zfsutils/debian/patches/07_manpages.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/07_manpages.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,3 +1,8 @@
+---
+ cddl/contrib/opensolaris/cmd/zfs/zfs.8 | 2 +-
+ cddl/contrib/opensolaris/cmd/zpool/zpool.8 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
@@ -6,7 +6,7 @@
Modified: trunk/zfsutils/debian/patches/08_libbsd.diff
===================================================================
--- trunk/zfsutils/debian/patches/08_libbsd.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/08_libbsd.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,3 +1,23 @@
+---
+ 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 @@
@@ -40,7 +60,15 @@
mntopt(char **p)
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
-@@ -35,6 +35,7 @@
+@@ -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>
@@ -138,8 +166,8 @@
#include <strings.h>
#include <unistd.h>
#include <stddef.h>
---- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c 2011-04-23 08:38:33.000000000 +0000
-+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c 2011-04-23 08:38:33.000000000 +0000
+--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
++++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
@@ -28,6 +28,7 @@
#include <poll.h>
#include <stdio.h>
@@ -148,18 +176,8 @@
#include <string.h>
#include <zlib.h>
#include <sys/spa.h>
---- zfsutils-8.2.orig/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
-+++ zfsutils-8.2/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>
---- zfsutils-8.2.orig/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-+++ zfsutils-8.2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
++++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
@@ -36,6 +36,7 @@
#include <locale.h>
#include <stdio.h>
@@ -168,8 +186,8 @@
#include <string.h>
#include <strings.h>
#include <unistd.h>
---- zfsutils-8.2.orig/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-+++ zfsutils-8.2/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
++++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
@@ -50,6 +50,7 @@
#include <fcntl.h>
#include <unistd.h>
@@ -178,4 +196,3 @@
#include <string.h>
#include <strings.h>
#include <thread.h>
-
Modified: trunk/zfsutils/debian/patches/09_xdr_control.diff
===================================================================
--- trunk/zfsutils/debian/patches/09_xdr_control.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/09_xdr_control.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,3 +1,7 @@
+---
+ sys/cddl/compat/opensolaris/rpc/xdr.h | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
--- a/sys/cddl/compat/opensolaris/rpc/xdr.h
+++ b/sys/cddl/compat/opensolaris/rpc/xdr.h
@@ -34,6 +34,26 @@
@@ -27,7 +31,7 @@
#include <assert.h>
/*
-@@ -80,10 +80,16 @@
+@@ -60,10 +80,16 @@
}
#undef XDR_CONTROL
Modified: trunk/zfsutils/debian/patches/10_zpool_import.diff
===================================================================
--- trunk/zfsutils/debian/patches/10_zpool_import.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/10_zpool_import.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,6 +1,11 @@
+---
+ cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c | 26 +++++--------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
-@@ -845,7 +845,5 @@
+@@ -845,8 +845,6 @@
+ DIR *dirp = NULL;
struct dirent64 *dp;
char path[MAXPATHLEN];
- char *end;
@@ -8,7 +13,7 @@
struct stat64 statbuf;
nvlist_t *ret = NULL, *config;
static char *default_dir = "/dev/dsk";
-@@ -872,6 +871,11 @@
+@@ -873,6 +871,11 @@
char *rdsk;
int dfd;
@@ -20,7 +25,7 @@
/* use realpath to normalize the path */
if (realpath(argv[i], path) == 0) {
(void) zfs_error_fmt(hdl, EZFS_BADPATH,
-@@ -879,15 +883,6 @@
+@@ -880,15 +883,6 @@
argv[i]);
goto error;
}
@@ -36,7 +41,7 @@
/*
* Using raw devices instead of block devices when we're
-@@ -911,15 +906,16 @@
+@@ -912,15 +906,16 @@
* This is not MT-safe, but we have no MT consumers of libzfs
*/
while ((dp = readdir64(dirp)) != NULL) {
@@ -56,7 +61,7 @@
continue;
/*
-@@ -966,8 +962,7 @@
+@@ -967,8 +962,7 @@
continue;
}
/* use the non-raw path for the config */
Modified: trunk/zfsutils/debian/patches/11_endian.diff
===================================================================
--- trunk/zfsutils/debian/patches/11_endian.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/11_endian.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,6 +1,13 @@
-diff -ur a/sys/cddl/compat/opensolaris/sys/byteorder.h b/sys/cddl/compat/opensolaris/sys/byteorder.h
---- a/sys/cddl/compat/opensolaris/sys/byteorder.h 2010-08-13 16:14:54.000000000 -0400
-+++ b/sys/cddl/compat/opensolaris/sys/byteorder.h 2010-08-13 16:22:57.000000000 -0400
+---
+ sys/cddl/compat/opensolaris/sys/byteorder.h | 4 +++-
+ sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c | 5 +++--
+ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h | 4 +++-
+ sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h | 6 ++++--
+ sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 6 ++++--
+ 5 files changed, 17 insertions(+), 8 deletions(-)
+
+--- a/sys/cddl/compat/opensolaris/sys/byteorder.h
++++ b/sys/cddl/compat/opensolaris/sys/byteorder.h
@@ -42,6 +42,8 @@
#ifndef _OPENSOLARIS_SYS_BYTEORDER_H_
#define _OPENSOLARIS_SYS_BYTEORDER_H_
@@ -19,9 +26,8 @@
#define LE_64(x) BSWAP_64(x)
#else
#define LE_64(x) BMASK_64(x)
-diff -ur 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 2010-08-13 16:21:43.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c 2010-08-13 16:23:13.000000000 -0400
+--- a/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
++++ b/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
@@ -36,6 +36,7 @@
#include <sys/varargs.h>
#include <sys/sunddi.h>
@@ -44,9 +50,8 @@
nvs_header_t *nvh = (void *)buf;
if (buflen == NULL || nvl == NULL ||
-diff -ur a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h 2010-08-13 16:14:54.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h 2010-08-13 16:23:46.000000000 -0400
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
@@ -33,6 +33,8 @@
#include <sys/types.h>
#include <sys/fs/zfs.h>
@@ -65,9 +70,8 @@
#define ZFS_HOST_BYTEORDER (0ULL)
#else
#define ZFS_HOST_BYTEORDER (-1ULL)
-diff -ur a/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h b/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h
---- a/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h 2010-08-13 16:14:54.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h 2010-08-13 16:23:59.000000000 -0400
+--- a/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h
++++ b/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h
@@ -48,6 +48,8 @@
#include <asm/byteorder.h>
#endif
@@ -95,9 +99,8 @@
#define BE_8(x) BMASK_8(x)
#define BE_16(x) BMASK_16(x)
#define BE_32(x) BMASK_32(x)
-diff -ur a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
---- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h 2010-08-13 16:14:54.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h 2010-08-13 16:24:08.000000000 -0400
+--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
++++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
@@ -29,6 +29,8 @@
#pragma ident "%Z%%M% %I% %E% SMI"
Modified: trunk/zfsutils/debian/patches/12_freebsd.diff
===================================================================
--- trunk/zfsutils/debian/patches/12_freebsd.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/12_freebsd.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,3 +1,13 @@
+---
+ cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h | 2 +-
+ cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h | 2 +-
+ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c | 4 ++--
+ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h | 2 +-
+ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c | 4 ++--
+ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c | 4 ++--
+ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c | 2 +-
+ 7 files changed, 10 insertions(+), 10 deletions(-)
+
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
@@ -601,7 +601,7 @@
Modified: trunk/zfsutils/debian/patches/13_mnttab.diff
===================================================================
--- trunk/zfsutils/debian/patches/13_mnttab.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/13_mnttab.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -1,3 +1,7 @@
+---
+ cddl/compat/opensolaris/include/mnttab.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/cddl/compat/opensolaris/include/mnttab.h
+++ b/cddl/compat/opensolaris/include/mnttab.h
@@ -9,7 +9,7 @@
Modified: trunk/zfsutils/debian/patches/14_bootloader_advice.diff
===================================================================
--- trunk/zfsutils/debian/patches/14_bootloader_advice.diff 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/14_bootloader_advice.diff 2011-04-23 19:51:31 UTC (rev 3298)
@@ -6,11 +6,14 @@
update is mandatory and warning message will be necessary (maybe a debconf
template as well).
-Index: zfsutils/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-===================================================================
---- zfsutils.orig/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c 2011-02-23 11:21:17.310006001 +0100
-+++ zfsutils/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c 2011-02-23 11:20:06.178006002 +0100
-@@ -3608,11 +3608,11 @@
+---
+ cddl/contrib/opensolaris/cmd/zpool/zpool_main.c | 6 +++---
+ cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
++++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+@@ -3609,11 +3609,11 @@
if (cb.cb_poolname[0] != '\0') {
(void) printf(
@@ -25,10 +28,8 @@
cb.cb_poolname);
}
-Index: zfsutils/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-===================================================================
---- zfsutils.orig/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c 2011-02-23 11:21:08.374006002 +0100
-+++ zfsutils/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c 2011-02-23 11:20:01.282006001 +0100
+--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
++++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
@@ -1895,11 +1895,11 @@
(void) fprintf(stderr, dgettext(TEXT_DOMAIN, "If "
"you boot from pool '%s', you may need to update\n"
Modified: trunk/zfsutils/debian/patches/15_ztest.fix
===================================================================
--- trunk/zfsutils/debian/patches/15_ztest.fix 2011-04-23 19:31:49 UTC (rev 3297)
+++ trunk/zfsutils/debian/patches/15_ztest.fix 2011-04-23 19:51:31 UTC (rev 3298)
@@ -12,9 +12,13 @@
Last-Update: 2011-04-22
+---
+ cddl/contrib/opensolaris/cmd/ztest/ztest.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
--- a/cddl/contrib/opensolaris/cmd/ztest/ztest.c
+++ b/cddl/contrib/opensolaris/cmd/ztest/ztest.c
-@@ -2907,8 +2907,8 @@
+@@ -3362,8 +3362,8 @@
int isalen;
FILE *fp;
More information about the Glibc-bsd-commits
mailing list