[Glibc-bsd-commits] r5531 - in trunk/zfsutils/debian: . patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Tue Sep 16 14:01:44 UTC 2014
Author: stevenc-guest
Date: 2014-09-16 14:01:44 +0000 (Tue, 16 Sep 2014)
New Revision: 5531
Added:
trunk/zfsutils/debian/patches/match_glibc_idtype.diff
trunk/zfsutils/debian/patches/missing_includes.diff
Modified:
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/patches/14_bootloader_advice.diff
trunk/zfsutils/debian/patches/compat_opensolaris.diff
trunk/zfsutils/debian/patches/disable_libjail.diff
trunk/zfsutils/debian/patches/fix_realpath_abuse.diff
trunk/zfsutils/debian/patches/gratuitous_dependencies.diff
trunk/zfsutils/debian/patches/makefile.diff
trunk/zfsutils/debian/patches/series
trunk/zfsutils/debian/patches/solaris_rlim64_t.diff
trunk/zfsutils/debian/rules
Log:
* New upstream snapshot of 10.1-PRERELEASE
- bump libraries' SONAME to 2
* Drop patches applied upstream:
- new upstream has 12_freebsd.diff merged
- fix_implicit_warnx_declaration.diff
- zfs_needs_libjail.diff
* Refresh patches:
- compat_opensolaris.diff
- gratuitous_dependencies.diff
- 14_bootloader_advice.diff
- solaris_rlim64_t.diff
- 15_pthread_compat.diff
- fix_realpath_abuse.diff
- makefile.diff
* Build fixes:
- missing_includes.diff
- match_glibc_idtype.diff
Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog 2014-09-16 10:32:23 UTC (rev 5530)
+++ trunk/zfsutils/debian/changelog 2014-09-16 14:01:44 UTC (rev 5531)
@@ -1,12 +1,32 @@
-zfsutils (9.2-5) UNRELEASED; urgency=low
+zfsutils (10.1~pre1) UNRELEASED; urgency=low
+ [ Robert Millan ]
* Library dependency cleanup: Remove gratuitous dependencies, add
missing dependencies and build libavl as a shared object.
* Fetch source code securely (https) in get-orig-source.
* Correctly setup BSD version of MAKEFLAGS to support parallel builds.
- -- Robert Millan <rmh at debian.org> Sun, 01 Dec 2013 14:03:01 +0100
+ [ Steven Chamberlain ]
+ * New upstream snapshot of 10.1-PRERELEASE
+ - bump libraries' SONAME to 2
+ * Drop patches applied upstream:
+ - new upstream has 12_freebsd.diff merged
+ - fix_implicit_warnx_declaration.diff
+ - zfs_needs_libjail.diff
+ * Refresh patches:
+ - compat_opensolaris.diff
+ - gratuitous_dependencies.diff
+ - 14_bootloader_advice.diff
+ - solaris_rlim64_t.diff
+ - 15_pthread_compat.diff
+ - fix_realpath_abuse.diff
+ - makefile.diff
+ * Build fixes:
+ - missing_includes.diff
+ - match_glibc_idtype.diff
+ -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org> Tue, 16 Sep 2014 10:56:18 +0100
+
zfsutils (9.2-4) unstable; urgency=critical
* Make 14_bootloader_advice.diff more pallatable to upstream.
Modified: trunk/zfsutils/debian/patches/14_bootloader_advice.diff
===================================================================
--- trunk/zfsutils/debian/patches/14_bootloader_advice.diff 2014-09-16 10:32:23 UTC (rev 5530)
+++ trunk/zfsutils/debian/patches/14_bootloader_advice.diff 2014-09-16 14:01:44 UTC (rev 5531)
@@ -1,6 +1,6 @@
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-@@ -4946,10 +4946,17 @@
+@@ -5004,10 +5004,17 @@
if (cb.cb_poolname[0] != '\0') {
(void) printf(
"If you boot from pool '%s', don't forget to update boot code.\n"
@@ -20,7 +20,7 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-@@ -2701,11 +2701,18 @@
+@@ -2718,11 +2718,18 @@
(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/compat_opensolaris.diff
===================================================================
--- trunk/zfsutils/debian/patches/compat_opensolaris.diff 2014-09-16 10:32:23 UTC (rev 5530)
+++ trunk/zfsutils/debian/patches/compat_opensolaris.diff 2014-09-16 14:01:44 UTC (rev 5531)
@@ -30,22 +30,6 @@
#define ftello64 ftello
#define lseek64 lseek
#define fseeko64 fseeko
---- a/cddl/compat/opensolaris/include/stdlib.h
-+++ b/cddl/compat/opensolaris/include/stdlib.h
-@@ -27,11 +27,11 @@
- *
- */
-
-+#include_next <stdlib.h>
-+
- #ifndef _COMPAT_OPENSOLARIS_STDLIB_H_
- #define _COMPAT_OPENSOLARIS_STDLIB_H_
-
--#include_next <stdlib.h>
--
- #define getexecname getprogname
-
- #endif
--- a/cddl/compat/opensolaris/include/alloca.h
+++ b/cddl/compat/opensolaris/include/alloca.h
@@ -27,6 +27,10 @@
Modified: trunk/zfsutils/debian/patches/disable_libjail.diff
===================================================================
--- trunk/zfsutils/debian/patches/disable_libjail.diff 2014-09-16 10:32:23 UTC (rev 5530)
+++ trunk/zfsutils/debian/patches/disable_libjail.diff 2014-09-16 14:01:44 UTC (rev 5531)
@@ -1,7 +1,7 @@
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -1,5 +1,7 @@
- # $FreeBSD$
+ # $FreeBSD: stable/10/cddl/sbin/zfs/Makefile 248571 2013-03-21 08:38:03Z mm $
+.include <bsd.own.mk>
+
@@ -45,10 +45,10 @@
static int zfs_do_jail(int argc, char **argv);
static int zfs_do_unjail(int argc, char **argv);
+#endif
+ static int zfs_do_bookmark(int argc, char **argv);
/*
- * Enable a reasonable set of defaults for libumem debugging on DEBUG builds.
-@@ -133,8 +137,10 @@
+@@ -134,8 +138,10 @@
HELP_GET,
HELP_INHERIT,
HELP_UPGRADE,
@@ -59,7 +59,7 @@
HELP_LIST,
HELP_MOUNT,
HELP_PROMOTE,
-@@ -208,8 +214,10 @@
+@@ -211,8 +217,10 @@
{ "release", zfs_do_release, HELP_RELEASE },
{ "diff", zfs_do_diff, HELP_DIFF },
{ NULL },
@@ -70,7 +70,7 @@
};
#define NCOMMAND (sizeof (command_table) / sizeof (command_table[0]))
-@@ -244,10 +252,12 @@
+@@ -248,10 +256,12 @@
case HELP_UPGRADE:
return (gettext("\tupgrade [-v]\n"
"\tupgrade [-r] [-V version] <-a | filesystem ...>\n"));
@@ -81,9 +81,9 @@
return (gettext("\tunjail <jailid|jailname> <filesystem>\n"));
+#endif
case HELP_LIST:
- return (gettext("\tlist [-rH][-d max] "
- "[-o property[,...]] [-t type[,...]] [-s property] ...\n"
-@@ -6358,6 +6368,7 @@
+ return (gettext("\tlist [-Hp] [-r|-d max] [-o property[,...]] "
+ "[-s property]...\n\t [-S property]... [-t type[,...]] "
+@@ -6480,6 +6490,7 @@
return (unshare_unmount(OP_SHARE, argc, argv));
}
@@ -91,7 +91,7 @@
/*
* Attach/detach the given dataset to/from the given jail
*/
-@@ -6419,6 +6430,7 @@
+@@ -6541,6 +6552,7 @@
return (do_jail(argc, argv, 0));
}
Modified: trunk/zfsutils/debian/patches/fix_realpath_abuse.diff
===================================================================
--- trunk/zfsutils/debian/patches/fix_realpath_abuse.diff 2014-09-16 10:32:23 UTC (rev 5530)
+++ trunk/zfsutils/debian/patches/fix_realpath_abuse.diff 2014-09-16 14:01:44 UTC (rev 5531)
@@ -3,7 +3,7 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
-@@ -1158,7 +1158,7 @@
+@@ -1169,7 +1169,7 @@
int dfd;
/* use realpath to normalize the path */
Modified: trunk/zfsutils/debian/patches/gratuitous_dependencies.diff
===================================================================
--- trunk/zfsutils/debian/patches/gratuitous_dependencies.diff 2014-09-16 10:32:23 UTC (rev 5530)
+++ trunk/zfsutils/debian/patches/gratuitous_dependencies.diff 2014-09-16 14:01:44 UTC (rev 5531)
@@ -3,9 +3,9 @@
@@ -8,7 +8,7 @@
LIB= zfs
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
+ ${LIBAVL} ${LIBZFS_CORE}
+-LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
++LDADD= -lmd -lpthread -lumem -lutil -lavl -lzfs_core
SRCS= deviceid.c \
fsshare.c \
Modified: trunk/zfsutils/debian/patches/makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/makefile.diff 2014-09-16 10:32:23 UTC (rev 5530)
+++ trunk/zfsutils/debian/patches/makefile.diff 2014-09-16 14:01:44 UTC (rev 5531)
@@ -14,8 +14,8 @@
@@ -8,7 +8,13 @@
LIB= zfs
DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- ${LIBZFS_CORE}
--LDADD= -lmd -lpthread -lumem -lutil -lzfs_core
+ ${LIBAVL} ${LIBZFS_CORE}
+-LDADD= -lmd -lpthread -lumem -lutil -lavl -lzfs_core
+LDADD= ${.CURDIR}/../../../lib/libmd/libmd.a -lpthread -lumem -lzfs_core
+
+LDADD+= -lbsd -lm -luutil -lnvpair -lgeom
@@ -26,7 +26,7 @@
SRCS= deviceid.c \
fsshare.c \
-@@ -57,5 +63,6 @@
+@@ -58,5 +64,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
@@ -53,15 +53,16 @@
NO_PROFILE=
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
-@@ -26,7 +26,12 @@
+@@ -26,7 +26,13 @@
DPADD= ${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
-LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-+LDADD= -lgeom -lnvpair -lbsd -luutil -lzfs_core -lzfs
++LDADD= -lgeom -lnvpair -lbsd -luutil -lzfs_core -lzfs -lumem
+
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
@@ -69,23 +70,24 @@
CFLAGS+= -DJAIL
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
-@@ -28,6 +28,12 @@
+@@ -29,6 +29,13 @@
DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
-LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-+LDADD= -lgeom -lnvpair -luutil -lzfs_core -lzfs
++LDADD= -lgeom -lnvpair -luutil -lzfs_core -lzfs -lumem
+
+LDADD+= -lbsd
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
.include <bsd.prog.mk>
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
-@@ -23,4 +23,12 @@
+@@ -25,4 +25,12 @@
${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool
@@ -118,10 +120,10 @@
+
CSTD= c99
- CFLAGS+= -DDEBUG=1
+ # Since there are many asserts in this program, it makes no sense to compile
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
-@@ -27,6 +27,14 @@
+@@ -28,6 +28,14 @@
${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
@@ -133,9 +135,9 @@
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzpool
+
- CFLAGS+= -DDEBUG=1
- #DEBUG_FLAGS+= -g
-
+ # Since there are many asserts in this program, it makes no sense to compile
+ # it without debugging.
+ CFLAGS+= -g -DDEBUG=1
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -10,6 +10,9 @@
Added: trunk/zfsutils/debian/patches/match_glibc_idtype.diff
===================================================================
--- trunk/zfsutils/debian/patches/match_glibc_idtype.diff (rev 0)
+++ trunk/zfsutils/debian/patches/match_glibc_idtype.diff 2014-09-16 14:01:44 UTC (rev 5531)
@@ -0,0 +1,13 @@
+Use the same include guard as glibc, to not define idtype_t twice
+
+--- a/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h
++++ b/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h
+@@ -51,6 +51,8 @@
+ #define P_INITUID 0
+ #define P_INITPGID 0
+
++#define _IDTYPE_T_DECLARED __ENUM_IDTYPE_T
++
+ #ifndef _IDTYPE_T_DECLARED
+
+ /*
Added: trunk/zfsutils/debian/patches/missing_includes.diff
===================================================================
--- trunk/zfsutils/debian/patches/missing_includes.diff (rev 0)
+++ trunk/zfsutils/debian/patches/missing_includes.diff 2014-09-16 14:01:44 UTC (rev 5531)
@@ -0,0 +1,13 @@
+cddl/compat/opensolaris/misc/thread_pool.c
+ - missing <string.h> for bzero()
+
+--- a/cddl/compat/opensolaris/misc/thread_pool.c
++++ b/cddl/compat/opensolaris/misc/thread_pool.c
+@@ -31,6 +31,7 @@
+
+ #include <stdlib.h>
+ #include <signal.h>
++#include <string.h>
+ #include <errno.h>
+ #include "thread_pool_impl.h"
+
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2014-09-16 10:32:23 UTC (rev 5530)
+++ trunk/zfsutils/debian/patches/series 2014-09-16 14:01:44 UTC (rev 5531)
@@ -1,7 +1,4 @@
# Patches from (or merged in) upstream
-12_freebsd.diff
-fix_implicit_warnx_declaration.diff
-zfs_needs_libjail.diff
# Mergeable material
compat_opensolaris.diff
@@ -20,3 +17,5 @@
#manpage_debian_specifics.diff
fix_realpath_abuse.diff
makefile.diff
+missing_includes.diff
+match_glibc_idtype.diff
Modified: trunk/zfsutils/debian/patches/solaris_rlim64_t.diff
===================================================================
--- trunk/zfsutils/debian/patches/solaris_rlim64_t.diff 2014-09-16 10:32:23 UTC (rev 5530)
+++ trunk/zfsutils/debian/patches/solaris_rlim64_t.diff 2014-09-16 14:01:44 UTC (rev 5531)
@@ -1,6 +1,6 @@
--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
-@@ -467,7 +467,7 @@
+@@ -521,7 +521,7 @@
/*ARGSUSED*/
int
vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
@@ -11,7 +11,7 @@
--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-@@ -113,8 +113,8 @@
+@@ -117,8 +117,8 @@
#define ZFS_LOG(...) do { } while (0)
@@ -22,7 +22,7 @@
#ifdef ZFS_DEBUG
extern void dprintf_setup(int *argc, char **argv);
-@@ -498,7 +498,7 @@
+@@ -513,7 +513,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,
@@ -33,7 +33,7 @@
#define vn_remove(path, x1, x2) remove(path)
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
-@@ -794,7 +794,7 @@
+@@ -798,7 +798,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/rules
===================================================================
--- trunk/zfsutils/debian/rules 2014-09-16 10:32:23 UTC (rev 5530)
+++ trunk/zfsutils/debian/rules 2014-09-16 14:01:44 UTC (rev 5531)
@@ -35,9 +35,9 @@
major := $(shell echo $(version) | sed -e 's/\..*//g')
revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
-SVN := https://svn0.us-west.freebsd.org/base/release/$(version).0
+#SVN := https://svn0.us-west.freebsd.org/base/release/$(version).0
#SVN := https://svn0.us-west.freebsd.org/base/releng/$(version)
-#SVN := https://svn0.us-west.freebsd.org/base/stable/$(major)
+SVN := https://svn0.us-west.freebsd.org/base/stable/$(major)
#SVN := https://svn0.us-west.freebsd.org/base/head
SOURCE = zfsutils
@@ -50,7 +50,7 @@
MAKEFLAGS=$(BSD_MAKEFLAGS) \
COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
-export SHLIB_MAJOR = 1
+export SHLIB_MAJOR = 2
export SHLIBDIR = ./
get-orig-source:
@@ -121,6 +121,7 @@
build-libzfs: build-libzfs-stamp
build-libzfs-stamp: \
+ build-libavl \
build-libnvpair \
build-libumem \
build-libuutil \
More information about the Glibc-bsd-commits
mailing list