[Glibc-bsd-commits] r4076 - in trunk/zfsutils/debian: . patches

Robert Millan rmh at alioth.debian.org
Sat Feb 4 13:37:43 UTC 2012 

Author: rmh
Date: 2012-02-04 13:37:43 +0000 (Sat, 04 Feb 2012)
New Revision: 4076

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/control
   trunk/zfsutils/debian/patches/03_glibc_namespace.diff
   trunk/zfsutils/debian/patches/14_bootloader_advice.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
Log:
New upstream release.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2012-02-04 13:16:32 UTC (rev 4075)
+++ trunk/zfsutils/debian/changelog	2012-02-04 13:37:43 UTC (rev 4076)
@@ -1,12 +1,15 @@
-zfsutils (8.3~svn226546-7) UNRELEASED; urgency=low
+zfsutils (9.0-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
+  [ Robert Millan ]
   * zfsutils.cron.daily: Fix to avoid listing children file systems'
     snapshots as candidates for removal.
   * zfsutils.cron.daily: Remove verbose output.
   * Remove X-Start-Before & X-Stop-After (no longer needed since ZVOL
     subsystem is not started by userland anymore).
 
- -- Robert Millan <rmh at debian.org>  Fri, 03 Feb 2012 22:47:53 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 04 Feb 2012 13:33:17 +0100
 
 zfsutils (8.3~svn226546-6) unstable; urgency=low
 

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2012-02-04 13:16:32 UTC (rev 4075)
+++ trunk/zfsutils/debian/control	2012-02-04 13:37:43 UTC (rev 4076)
@@ -4,7 +4,9 @@
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Robert Millan <rmh at debian.org>, Arno Töll <debian at toell.net>
 Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), freebsd-buildutils, libbsd-dev (>= 0.1.4),
+Build-Depends: debhelper (>= 7.0.50~),
+ freebsd-buildutils (>= 9.0-5~),
+ libbsd-dev (>= 0.1.4),
  libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51), libgeom-dev, libsbuf-dev,
  zlib1g-dev
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/zfsutils/

Modified: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff	2012-02-04 13:16:32 UTC (rev 4075)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff	2012-02-04 13:37:43 UTC (rev 4076)
@@ -112,7 +112,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 @@
+@@ -717,7 +717,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/14_bootloader_advice.diff
===================================================================
--- trunk/zfsutils/debian/patches/14_bootloader_advice.diff	2012-02-04 13:16:32 UTC (rev 4075)
+++ trunk/zfsutils/debian/patches/14_bootloader_advice.diff	2012-02-04 13:37:43 UTC (rev 4076)
@@ -8,7 +8,7 @@
 
 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
 +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-@@ -4123,11 +4123,11 @@
+@@ -4249,11 +4249,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
-@@ -2445,11 +2445,11 @@
+@@ -2473,11 +2473,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/gratuitous_dependencies.diff
===================================================================
--- trunk/zfsutils/debian/patches/gratuitous_dependencies.diff	2012-02-04 13:16:32 UTC (rev 4075)
+++ trunk/zfsutils/debian/patches/gratuitous_dependencies.diff	2012-02-04 13:37:43 UTC (rev 4076)
@@ -11,8 +11,8 @@
  	fsshare.c \
 --- a/cddl/lib/libzpool/Makefile
 +++ b/cddl/lib/libzpool/Makefile
-@@ -56,7 +56,7 @@
- CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_ARCH}/include
+@@ -57,7 +57,7 @@
+ CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
  
  DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
 -LDADD=		-lmd -lpthread -lz
@@ -22,7 +22,7 @@
  NO_PROFILE=
 --- a/cddl/sbin/zfs/Makefile
 +++ b/cddl/sbin/zfs/Makefile
-@@ -22,6 +22,6 @@
+@@ -23,6 +23,6 @@
  
  DPADD=	${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
  	${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
@@ -32,7 +32,7 @@
  .include <bsd.prog.mk>
 --- a/cddl/sbin/zpool/Makefile
 +++ b/cddl/sbin/zpool/Makefile
-@@ -27,6 +27,6 @@
+@@ -28,6 +28,6 @@
  
  DPADD=	${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
  	${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
@@ -42,17 +42,17 @@
  .include <bsd.prog.mk>
 --- a/cddl/usr.bin/zinject/Makefile
 +++ b/cddl/usr.bin/zinject/Makefile
-@@ -20,6 +20,6 @@
+@@ -21,6 +21,6 @@
  
  DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- 	${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
+ 	${LIBZFS} ${LIBZPOOL}
 -LDADD=	-lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
-+LDADD= -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
-@@ -18,7 +18,7 @@
+@@ -19,7 +19,7 @@
  
  DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
  	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
@@ -63,12 +63,12 @@
  
 --- a/cddl/usr.sbin/zdb/Makefile
 +++ b/cddl/usr.sbin/zdb/Makefile
-@@ -22,7 +22,7 @@
+@@ -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
  
- CSTD=	c99
  
+ .include <bsd.prog.mk>

Modified: trunk/zfsutils/debian/patches/libmd_static.diff
===================================================================
--- trunk/zfsutils/debian/patches/libmd_static.diff	2012-02-04 13:16:32 UTC (rev 4075)
+++ trunk/zfsutils/debian/patches/libmd_static.diff	2012-02-04 13:37:43 UTC (rev 4076)
@@ -15,7 +15,7 @@
  
  SRCS=	deviceid.c \
  	fsshare.c \
-@@ -57,5 +58,6 @@
+@@ -58,5 +59,6 @@
  CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
  CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
  CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
@@ -24,20 +24,20 @@
  .include <bsd.lib.mk>
 --- a/cddl/lib/libzpool/Makefile
 +++ b/cddl/lib/libzpool/Makefile
-@@ -54,13 +54,15 @@
- CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/thread
- CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/sys
- CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_ARCH}/include
-+CFLAGS+=	-I${.CURDIR}/../../../lib/libmd
+@@ -57,12 +57,15 @@
+ CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
  
  DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
 -LDADD=		-lmd -lpthread -lz -lumem -lnvpair -lbsd -lrt
-+LDADD=		-lpthread -lz -lumem -lnvpair -lbsd -lrt
++LDADD=		     -lpthread -lz -lumem -lnvpair -lbsd -lrt
  
  LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
  LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
  LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
+ 
++CFLAGS+= -I${.CURDIR}/../../../lib/libmd
 +LDADD+= ${.CURDIR}/../../../lib/libmd/libmd.a
- 
++
  # atomic.S doesn't like profiling.
  NO_PROFILE=
+ 

Modified: trunk/zfsutils/debian/patches/makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/makefile.diff	2012-02-04 13:16:32 UTC (rev 4075)
+++ trunk/zfsutils/debian/patches/makefile.diff	2012-02-04 13:37:43 UTC (rev 4076)
@@ -6,9 +6,9 @@
  
 +LDADD= -lpthread -lrt -lbsd
 +
+ WARNS?=	0
  CFLAGS+= -DNATIVE_BUILD
  CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 --- a/cddl/lib/libzfs/Makefile
 +++ b/cddl/lib/libzfs/Makefile
 @@ -7,7 +7,12 @@
@@ -27,8 +27,8 @@
  	fsshare.c \
 --- a/cddl/lib/libzpool/Makefile
 +++ b/cddl/lib/libzpool/Makefile
-@@ -56,7 +56,11 @@
- CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_ARCH}/include
+@@ -57,7 +57,11 @@
+ CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
  
  DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
 -LDADD=		-lmd -lpthread -lz -lumem -lnvpair -lavl
@@ -42,7 +42,7 @@
  NO_PROFILE=
 --- a/cddl/sbin/zfs/Makefile
 +++ b/cddl/sbin/zfs/Makefile
-@@ -22,6 +22,12 @@
+@@ -23,6 +23,12 @@
  
  DPADD=	${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
  	${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
@@ -58,7 +58,7 @@
  .include <bsd.prog.mk>
 --- a/cddl/sbin/zpool/Makefile
 +++ b/cddl/sbin/zpool/Makefile
-@@ -27,6 +27,12 @@
+@@ -28,6 +28,12 @@
  
  DPADD=	${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
  	${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
@@ -74,24 +74,21 @@
  .include <bsd.prog.mk>
 --- a/cddl/usr.bin/zinject/Makefile
 +++ b/cddl/usr.bin/zinject/Makefile
-@@ -20,6 +20,13 @@
+@@ -23,4 +23,11 @@
+ 	${LIBZFS} ${LIBZPOOL}
+ LDADD=	      -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
  
- DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- 	${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
--LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
-+LDADD=	-lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool -lbsd
-+
++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/libzpool
 +
- 
  .include <bsd.prog.mk>
 --- a/cddl/usr.bin/ztest/Makefile
 +++ b/cddl/usr.bin/ztest/Makefile
-@@ -18,7 +18,12 @@
+@@ -19,7 +19,12 @@
  
  DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
  	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
@@ -107,16 +104,15 @@
  
 --- a/cddl/usr.sbin/zdb/Makefile
 +++ b/cddl/usr.sbin/zdb/Makefile
-@@ -24,6 +24,12 @@
+@@ -27,5 +27,11 @@
  	${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
  LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -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/libzpool
-+
- CSTD=	c99
  
  .include <bsd.prog.mk>

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2012-02-04 13:16:32 UTC (rev 4075)
+++ trunk/zfsutils/debian/patches/series	2012-02-04 13:37:43 UTC (rev 4076)
@@ -1,6 +1,6 @@
 # Mergeable material
 gratuitous_dependencies.diff
-manpage_hyphens.diff
+#manpage_hyphens.diff
 
 # Unclassified
 01_glibc_kludge.diff
@@ -19,6 +19,6 @@
 
 # Debian-specific
 makefile.diff
-manpage_debian_specifics.diff
+#manpage_debian_specifics.diff
 libmd_static.diff
 fix_realpath_abuse.diff

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2012-02-04 13:16:32 UTC (rev 4075)
+++ trunk/zfsutils/debian/rules	2012-02-04 13:37:43 UTC (rev 4076)
@@ -10,8 +10,9 @@
 export DH_OPTIONS
 
 CFLAGS = -Wall -Wno-unknown-pragmas -g -pipe -fPIC -I. \
-         -D_GNU_SOURCE -DNEED_SOLARIS_BOOLEAN -D'__FBSDID(string)=' \
-         -D__va_list=__builtin_va_list
+         -D_GNU_SOURCE -DNEED_SOLARIS_BOOLEAN \
+	-isystem /usr/include/freebsd \
+	-D__va_list=__builtin_va_list
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -26,9 +27,9 @@
 major           := $(shell echo $(version) | sed -e 's/\..*//g')
 revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
 
-#SVN		:= http://svn.freebsd.org/base/release/$(version).0
+SVN		:= http://svn.freebsd.org/base/release/$(version).0
 #SVN		:= http://svn.freebsd.org/base/releng/$(version)
-SVN		:= http://svn.freebsd.org/base/stable/$(major)
+#SVN		:= http://svn.freebsd.org/base/stable/$(major)
 #SVN		:= http://svn.freebsd.org/base/head
 
 SOURCE = zfsutils
@@ -72,7 +73,7 @@
 	         cddl/usr.bin/ztest \
 	         cddl/usr.sbin/zdb \
 	         ; do \
-	    svn export $(SVN)/$$i -r $(svn_revision) $(ORIGDIR)/$$i ; \
+	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
 	rm -f $(ORIGDIR)/cddl/compat/opensolaris/include/alloca.h
 	rm -f $(ORIGDIR)/cddl/compat/opensolaris/include/stdlib.h

More information about the Glibc-bsd-commits mailing list