[Glibc-bsd-commits] r4997 - in trunk/zfsutils/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sun Oct 6 12:26:26 UTC 2013
Author: rmh
Date: 2013-10-06 12:26:26 +0000 (Sun, 06 Oct 2013)
New Revision: 4997
Added:
trunk/zfsutils/debian/patches/assfail_protection.diff
trunk/zfsutils/debian/patches/zfs_needs_libjail.diff
Modified:
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/control
trunk/zfsutils/debian/patches/01_glibc_kludge.diff
trunk/zfsutils/debian/patches/03_glibc_namespace.diff
trunk/zfsutils/debian/patches/12_freebsd.diff
trunk/zfsutils/debian/patches/14_bootloader_advice.diff
trunk/zfsutils/debian/patches/15_pthread_compat.diff
trunk/zfsutils/debian/patches/fix_implicit_warnx_declaration.diff
trunk/zfsutils/debian/patches/fix_realpath_abuse.diff
trunk/zfsutils/debian/patches/gratuitous_dependencies.diff
trunk/zfsutils/debian/patches/libmd_static.diff
trunk/zfsutils/debian/patches/makefile.diff
trunk/zfsutils/debian/patches/series
trunk/zfsutils/debian/rules
trunk/zfsutils/debian/zfsutils.install
Log:
* New upstream release.
- Refresh all patches.
- Update library dependencies.
- Add new library: libzfs_core.
- New patches (zfs_needs_libjail.diff, assfail_protection.diff) pending
merge in upstream.
- Add libjail-dev to B-D.
Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/changelog 2013-10-06 12:26:26 UTC (rev 4997)
@@ -1,11 +1,20 @@
-zfsutils (9.1-3) UNRELEASED; urgency=low
+zfsutils (9.2-1) UNRELEASED; urgency=low
+ * New upstream release.
+ - Refresh all patches.
+ - Update library dependencies.
+ - Add new library: libzfs_core.
+ - New patches (zfs_needs_libjail.diff, assfail_protection.diff) pending
+ merge in upstream.
+ - Add libjail-dev to B-D.
+
+ [ Robert Millan ]
* Build with -Werror=implicit-function-declaration.
- Requires freebsd-glue >= 0.1.1.
- fix_implicit_warnx_declaration.diff: Cherry-pick from HEAD.
- 03_glibc_namespace.diff: Extend solaris_hasmntopt kludge.
- -- Robert Millan <rmh at debian.org> Sun, 04 Aug 2013 18:28:11 +0200
+ -- Robert Millan <rmh at debian.org> Thu, 03 Oct 2013 01:49:26 +0200
zfsutils (9.1-2) unstable; urgency=low
Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/control 2013-10-06 12:26:26 UTC (rev 4997)
@@ -10,6 +10,7 @@
kfreebsd-kernel-headers (>= 9.1-2~),
libgeom-dev,
zlib1g-dev,
+ libjail-dev,
freebsd-glue (>= 0.1.1~),
Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/zfsutils/
Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/zfsutils/
Modified: trunk/zfsutils/debian/patches/01_glibc_kludge.diff
===================================================================
--- trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -29,7 +29,7 @@
build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1);
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
-@@ -2329,7 +2329,7 @@
+@@ -2505,7 +2505,7 @@
}
static void
@@ -38,7 +38,7 @@
{
clock_t growtime = 0;
arc_reclaim_strategy_t last_reclaim = ARC_RECLAIM_CONS;
-@@ -3710,7 +3710,7 @@
+@@ -3931,7 +3931,7 @@
static eventhandler_tag arc_event_lowmem = NULL;
static void
@@ -47,7 +47,7 @@
{
/* Serialize access via arc_lowmem_lock. */
-@@ -4772,7 +4772,7 @@
+@@ -5267,7 +5267,7 @@
* heart of the L2ARC.
*/
static void
Modified: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -31,7 +31,7 @@
char *f, *opts = tmpopts;
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
-@@ -1810,11 +1810,11 @@
+@@ -1829,11 +1829,11 @@
if (received)
break;
@@ -47,7 +47,7 @@
*src = ZPROP_SRC_TEMPORARY;
--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
-@@ -463,7 +463,7 @@
+@@ -467,7 +467,7 @@
/*ARGSUSED*/
int
vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
@@ -58,7 +58,7 @@
--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-@@ -108,8 +108,8 @@
+@@ -113,8 +113,8 @@
#define ZFS_LOG(...) do { } while (0)
@@ -69,7 +69,7 @@
#ifdef ZFS_DEBUG
extern void dprintf_setup(int *argc, char **argv);
-@@ -499,7 +499,7 @@
+@@ -498,7 +498,7 @@
extern int vn_openat(char *path, int x1, int oflags, int mode, vnode_t **vpp,
int x2, int x3, vnode_t *vp, int fd);
extern int vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len,
@@ -93,7 +93,7 @@
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
-@@ -724,7 +724,7 @@
+@@ -794,7 +794,7 @@
zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
{
znode_t *zp = VTOZ(vp);
Modified: trunk/zfsutils/debian/patches/12_freebsd.diff
===================================================================
--- trunk/zfsutils/debian/patches/12_freebsd.diff 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/12_freebsd.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -21,7 +21,7 @@
#endif
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
-@@ -1681,7 +1681,7 @@
+@@ -1683,7 +1683,7 @@
} else {
acl_ids->z_fgid = zfs_fuid_create_cred(zfsvfs,
ZFS_GROUP, cr, &acl_ids->z_fuidp);
@@ -30,7 +30,7 @@
gid = acl_ids->z_fgid = dzp->z_gid;
#else
gid = crgetgid(cr);
-@@ -2371,7 +2371,7 @@
+@@ -2374,7 +2374,7 @@
is_attr = ((zp->z_pflags & ZFS_XATTR) && (ZTOV(zp)->v_type == VDIR));
@@ -41,7 +41,7 @@
* Note that not checking them is not just an optimization - without
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
-@@ -919,7 +919,7 @@
+@@ -938,7 +938,7 @@
* In FreeBSD, access checking for creating an EA is being done
* in zfs_setextattr(),
*/
@@ -50,23 +50,14 @@
if (error = zfs_zaccess(zp, ACE_WRITE_NAMED_ATTRS, 0, B_FALSE, cr))
return (error);
#endif
-@@ -1012,7 +1012,7 @@
-
- if (!(flags & CREATE_XATTR_DIR)) {
- zfs_dirent_unlock(dl);
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- return (ENOATTR);
- #else
- return (ENOENT);
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
-@@ -1810,7 +1810,7 @@
- rrw_exit(&zfsvfs->z_teardown_lock, FTAG);
- rw_exit(&zfsvfs->z_teardown_inactive_lock);
+@@ -173,7 +173,7 @@
+ return (0);
+ }
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- /*
- * Some znodes might not be fully reclaimed, wait for them.
- */
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+ static int
+ zfs_create_unique_device(dev_t *dev)
+ {
Modified: trunk/zfsutils/debian/patches/14_bootloader_advice.diff
===================================================================
--- trunk/zfsutils/debian/patches/14_bootloader_advice.diff 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/14_bootloader_advice.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -8,7 +8,7 @@
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-@@ -4524,11 +4524,11 @@
+@@ -4945,11 +4945,11 @@
if (cb.cb_poolname[0] != '\0') {
(void) printf(
@@ -25,7 +25,7 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-@@ -2496,11 +2496,11 @@
+@@ -2701,11 +2701,11 @@
(void) fprintf(stderr, dgettext(TEXT_DOMAIN, "If "
"you boot from pool '%s', you may need to update\n"
"boot code on newly attached disk '%s'.\n\n"
Modified: trunk/zfsutils/debian/patches/15_pthread_compat.diff
===================================================================
--- trunk/zfsutils/debian/patches/15_pthread_compat.diff 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/15_pthread_compat.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -1,6 +1,6 @@
--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-@@ -252,7 +252,28 @@
+@@ -239,7 +239,28 @@
#undef MUTEX_NOT_HELD
#define MUTEX_HELD(m) ((m)->m_owner == curthread)
#define MUTEX_NOT_HELD(m) (!MUTEX_HELD(m))
Added: trunk/zfsutils/debian/patches/assfail_protection.diff
===================================================================
--- trunk/zfsutils/debian/patches/assfail_protection.diff (rev 0)
+++ trunk/zfsutils/debian/patches/assfail_protection.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -0,0 +1,15 @@
+--- a/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c
++++ b/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c
+@@ -23,10 +23,10 @@
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ */
+
+-#include "libuutil_common.h"
+-
+ #define HAVE_ASSFAIL 1
+
++#include "libuutil_common.h"
++
+ #include <assert.h>
+ #include <errno.h>
+ #include <libintl.h>
Modified: trunk/zfsutils/debian/patches/fix_implicit_warnx_declaration.diff
===================================================================
--- trunk/zfsutils/debian/patches/fix_implicit_warnx_declaration.diff 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/fix_implicit_warnx_declaration.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -3,11 +3,11 @@
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
-@@ -56,6 +56,7 @@
+@@ -57,6 +57,7 @@
#include <sys/fs/zfs.h>
#include <sys/types.h>
#include <time.h>
+#include <err.h>
#include <libzfs.h>
- #include <zfs_prop.h>
+ #include <libzfs_core.h>
Modified: trunk/zfsutils/debian/patches/fix_realpath_abuse.diff
===================================================================
--- trunk/zfsutils/debian/patches/fix_realpath_abuse.diff 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/fix_realpath_abuse.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -3,7 +3,7 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
-@@ -1171,7 +1171,7 @@
+@@ -1158,7 +1158,7 @@
int dfd;
/* use realpath to normalize the path */
Modified: trunk/zfsutils/debian/patches/gratuitous_dependencies.diff
===================================================================
--- trunk/zfsutils/debian/patches/gratuitous_dependencies.diff 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/gratuitous_dependencies.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -1,11 +1,11 @@
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
-@@ -7,7 +7,7 @@
-
+@@ -8,7 +8,7 @@
LIB= zfs
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL}
--LDADD= -lmd -lpthread -lumem -lutil
-+LDADD= -lmd -lpthread -lumem -lutil -lnvpair -luutil -lgeom -lm
+ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
+ ${LIBZFS_CORE}
+-LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core
++LDADD= -lmd -lpthread -lumem -lutil -lzfs_core
SRCS= deviceid.c \
fsshare.c \
@@ -20,55 +20,3 @@
# atomic.S doesn't like profiling.
NO_PROFILE=
---- a/cddl/sbin/zfs/Makefile
-+++ b/cddl/sbin/zfs/Makefile
-@@ -23,6 +23,6 @@
-
- DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
--LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-+LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs
-
- .include <bsd.prog.mk>
---- a/cddl/sbin/zpool/Makefile
-+++ b/cddl/sbin/zpool/Makefile
-@@ -28,6 +28,6 @@
-
- DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
- ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
--LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-+LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs
-
- .include <bsd.prog.mk>
---- a/cddl/usr.bin/zinject/Makefile
-+++ b/cddl/usr.bin/zinject/Makefile
-@@ -21,6 +21,6 @@
-
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- ${LIBZFS} ${LIBZPOOL}
--LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
-+LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
-
- .include <bsd.prog.mk>
---- a/cddl/usr.bin/ztest/Makefile
-+++ b/cddl/usr.bin/ztest/Makefile
-@@ -19,7 +19,7 @@
-
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
--LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-+LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lavl
-
- CSTD= c99
-
---- a/cddl/usr.sbin/zdb/Makefile
-+++ b/cddl/usr.sbin/zdb/Makefile
-@@ -25,7 +25,7 @@
-
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
--LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
-+LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool
-
-
- .include <bsd.prog.mk>
Modified: trunk/zfsutils/debian/patches/libmd_static.diff
===================================================================
--- trunk/zfsutils/debian/patches/libmd_static.diff 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/libmd_static.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -1,24 +1,18 @@
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
-@@ -7,12 +7,13 @@
-
+@@ -8,7 +8,7 @@
LIB= zfs
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL}
--LDADD= -lmd -lpthread -lumem -lnvpair -luutil -lgeom -lm -lbsd
-+LDADD= -lpthread -lumem -lnvpair -luutil -lgeom -lm -lbsd
+ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
+ ${LIBZFS_CORE}
+-LDADD= -lmd -lpthread -lumem -lzfs_core
++LDADD= ${.CURDIR}/../../../lib/libmd/libmd.a -lpthread -lumem -lzfs_core
- LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
- LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
- LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
- LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
-+LDADD+= ${.CURDIR}/../../../lib/libmd/libmd.a
-
- SRCS= deviceid.c \
- fsshare.c \
-@@ -58,5 +59,6 @@
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+ LDADD+= -lbsd -lm
+ LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
+@@ -61,5 +61,6 @@
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
+CFLAGS+= -I${.CURDIR}/../../../lib/libmd
.include <bsd.lib.mk>
Modified: trunk/zfsutils/debian/patches/makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/makefile.diff 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/makefile.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -11,17 +11,16 @@
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
-@@ -7,7 +7,12 @@
-
+@@ -8,7 +8,11 @@
LIB= zfs
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL}
--LDADD= -lmd -lpthread -lumem -lutil -lnvpair -luutil -lgeom -lm
-+LDADD= -lmd -lpthread -lumem -lnvpair -luutil -lgeom -lm -lbsd
+ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
+ ${LIBZFS_CORE}
+-LDADD= -lmd -lpthread -lumem -lutil -lzfs_core
++LDADD= -lmd -lpthread -lumem -lzfs_core
+
++LDADD+= -lbsd -lm
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
-+LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
SRCS= deviceid.c \
fsshare.c \
@@ -42,77 +41,101 @@
NO_PROFILE=
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
-@@ -23,6 +23,12 @@
+@@ -24,6 +24,13 @@
- DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
--LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs
-+LDADD= -lgeom -lnvpair -lumem -luutil -lzfs -lbsd
+ DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
+ ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
+-LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
++LDADD= -lgeom -ljail -lnvpair -lumem -luutil -lzfs_core -lzfs
+
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
-+
++LDADD+= -lbsd
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
.include <bsd.prog.mk>
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
-@@ -28,6 +28,12 @@
+@@ -28,6 +28,14 @@
- DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
- ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
--LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs
-+LDADD= -lgeom -lnvpair -lumem -luutil -lzfs -lbsd
+ DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
+ ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
+-LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
++LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
+
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
-+LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
++LDADD+= -lbsd
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
++LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
.include <bsd.prog.mk>
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
-@@ -23,4 +23,11 @@
- ${LIBZFS} ${LIBZPOOL}
- LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
+@@ -23,4 +23,12 @@
+ ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
+ LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool
+LDADD+= -lbsd
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzpool
+
.include <bsd.prog.mk>
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
-@@ -19,7 +19,12 @@
+@@ -20,9 +20,18 @@
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
--LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lavl
-+LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lbsd -ldl -lrt
-+
+ DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+ ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
+-LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \
++LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lzfs_core -lzfs \
+ -luutil
+
++LDADD+= -lbsd -ldl -lrt
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzpool
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
+LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
-
++
CSTD= c99
+ CFLAGS+= -DDEBUG=1
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
-@@ -27,5 +27,11 @@
- ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
- LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool
+@@ -27,6 +27,14 @@
+ ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
+ LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
+LDADD+= -lbsd
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzpool
++
+ CFLAGS+= -DDEBUG=1
+ #DEBUG_FLAGS+= -g
- .include <bsd.prog.mk>
+--- a/cddl/lib/libzfs_core/Makefile
++++ b/cddl/lib/libzfs_core/Makefile
+@@ -10,6 +10,8 @@
+ DPADD= ${LIBNVPAIR}
+ LDADD= -lnvpair
+
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++
+ SRCS= libzfs_core.c \
+ libzfs_core_compat.c
+
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/patches/series 2013-10-06 12:26:26 UTC (rev 4997)
@@ -6,6 +6,8 @@
gratuitous_dependencies.diff
#manpage_hyphens.diff
include_next.diff
+assfail_protection.diff
+zfs_needs_libjail.diff
# Other patches that might or might not be mergeable
01_glibc_kludge.diff
Added: trunk/zfsutils/debian/patches/zfs_needs_libjail.diff
===================================================================
--- trunk/zfsutils/debian/patches/zfs_needs_libjail.diff (rev 0)
+++ trunk/zfsutils/debian/patches/zfs_needs_libjail.diff 2013-10-06 12:26:26 UTC (rev 4997)
@@ -0,0 +1,10 @@
+--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
++++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+@@ -58,6 +58,7 @@
+ #include <sys/types.h>
+ #include <time.h>
+ #include <err.h>
++#include <jail.h>
+
+ #include <libzfs.h>
+ #include <libzfs_core.h>
Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/rules 2013-10-06 12:26:26 UTC (rev 4997)
@@ -57,6 +57,7 @@
cddl/contrib/opensolaris/lib/libnvpair \
cddl/contrib/opensolaris/lib/libuutil \
cddl/contrib/opensolaris/lib/libzfs \
+ cddl/contrib/opensolaris/lib/libzfs_core \
cddl/contrib/opensolaris/lib/libzpool \
cddl/contrib/opensolaris/cmd/stat/common/ \
sys/cddl/compat/opensolaris \
@@ -68,6 +69,7 @@
cddl/lib/libzpool \
cddl/lib/libumem \
cddl/lib/libzfs \
+ cddl/lib/libzfs_core \
cddl/sbin/zpool \
cddl/sbin/zfs \
cddl/usr.bin/zinject \
@@ -104,15 +106,20 @@
build-libzpool: build-libzpool-stamp
-build-libzpool-stamp: build-libavl build-libnvpair-stamp build-libumem build-libuutil-stamp build-libzfs-stamp
+build-libzpool-stamp: build-libavl build-libnvpair-stamp build-libumem build-libmd
$(PMAKE) -C $(CURDIR)/cddl/lib/libzpool
touch $@
build-libzfs: build-libzfs-stamp
-build-libzfs-stamp: build-libnvpair-stamp build-libuutil-stamp build-libumem-stamp build-libavl-stamp build-libmd-stamp
+build-libzfs-stamp: build-libumem build-libzfs_core
$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs
touch $@
+build-libzfs_core: build-libzfs_core-stamp
+build-libzfs_core-stamp: build-libnvpair
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libzfs_core
+ touch $@
+
build-libmd: build-libmd-stamp
build-libmd-stamp:
$(PMAKE) -C $(CURDIR)/lib/libmd
@@ -124,7 +131,9 @@
touch $@
build-zfsutils: build-zfsutils-stamp
-build-zfsutils-stamp: build-libzfs-stamp build-libnvpair-stamp build-libuutil-stamp build-libumem build-libzpool
+build-zfsutils-stamp: build-libzfs \
+ build-libzfs_core \
+ build-libnvpair-stamp build-libuutil-stamp build-libumem build-libzpool
$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool
$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs
@@ -141,6 +150,7 @@
$(PMAKE) -C $(CURDIR)/cddl/lib/libuutil clean
$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs clean
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libzfs_core clean
$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool clean
$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs clean
Modified: trunk/zfsutils/debian/zfsutils.install
===================================================================
--- trunk/zfsutils/debian/zfsutils.install 2013-10-05 22:29:12 UTC (rev 4996)
+++ trunk/zfsutils/debian/zfsutils.install 2013-10-06 12:26:26 UTC (rev 4997)
@@ -1,3 +1,5 @@
+cddl/lib/libzfs_core/libzfs_core.so.* /lib
+
cddl/sbin/zpool/zpool /sbin
cddl/sbin/zfs/zfs /sbin
cddl/usr.bin/zinject/zinject /usr/bin
More information about the Glibc-bsd-commits
mailing list