[Glibc-bsd-commits] r3090 - in trunk: . zfsutils zfsutils/debian zfsutils/debian/patches
Tuco Xyz
tuco-guest at alioth.debian.org
Wed Jul 28 21:15:57 UTC 2010
Author: tuco-guest
Date: 2010-07-28 21:15:55 +0000 (Wed, 28 Jul 2010)
New Revision: 3090
Added:
trunk/zfsutils/
trunk/zfsutils/debian/
trunk/zfsutils/debian/README.source
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/compat
trunk/zfsutils/debian/control
trunk/zfsutils/debian/copyright
trunk/zfsutils/debian/libnvpair-dev.install
trunk/zfsutils/debian/libnvpair0.install
trunk/zfsutils/debian/libuutil-dev.install
trunk/zfsutils/debian/libuutil0.install
trunk/zfsutils/debian/libzfs-dev.install
trunk/zfsutils/debian/libzfs0.install
trunk/zfsutils/debian/patches/
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/series
trunk/zfsutils/debian/rules
trunk/zfsutils/debian/zfsutils.install
Log:
Commit zfsutils
Added: trunk/zfsutils/debian/README.source
===================================================================
--- trunk/zfsutils/debian/README.source (rev 0)
+++ trunk/zfsutils/debian/README.source 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Added: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog (rev 0)
+++ trunk/zfsutils/debian/changelog 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,270 @@
+freebsd-libs (8.0-5) unstable; urgency=low
+
+ [ Guillem Jover ]
+ * Use kfreebsd-any instead of explicit architecture list.
+
+ [ Aurelien Jarno ]
+ * Add libgeom0 and libipx2 udeb packages.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 28 Jun 2010 23:10:06 +0200
+
+freebsd-libs (8.0-4) unstable; urgency=low
+
+ * libusb2-dev: add a libusb-1.0.so -> libusb.so symlink to make
+ configure scripts happy.
+ * Add patches/13_libusb-update.diff from upstream to update the API.
+ * Add udeb package to libusb2's shlib.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 08 Jan 2010 14:17:42 +0100
+
+freebsd-libs (8.0-3) unstable; urgency=low
+
+ [ Petr Salinger ]
+ * bump build-depends on kfreebsd-kernel-headers to (>= 0.45)
+ * add libusb2 and libusb2-dev packages
+
+ [ Aurelien Jarno ]
+ * Make libusb2-dev conflict with libusb-dev.
+ * Add a libusb2-udev package.
+ * Add pkg-config files matching libusb 0.1/libusb 1.0.
+ * Add a libusb-config script matching libusb 0.1.
+ * Make libusb2-dev provides libusb-1.0-0-dev.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 09 Dec 2009 02:03:24 +0100
+
+freebsd-libs (8.0-2) unstable; urgency=low
+
+ * Bump build-depends on kfreebsd-kernel-headers to (>= 0.43).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 28 Nov 2009 22:42:32 +0100
+
+freebsd-libs (8.0-1) unstable; urgency=low
+
+ [ Petr Salinger ]
+ * based on FreeBSD 8.0
+ * change packages name to reflect SONAME changes:
+ - libusbhid3 -> libusbhid4
+ - libkiconv3 -> libkiconv4
+ - libdevstat6 -> libdevstat7
+ * add libmemstat3 and libmemstat-dev packages
+ * add libnetgraph4 and libnetgraph-dev packages
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 28 Nov 2009 10:42:15 +0100
+
+freebsd-libs (7.2-4) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * Fix description of libgeom-dev.
+ * libkvm0: use our own copy of getbootfile().
+ * Fix dependency between lib and -dev packages.
+ * Add README.source.
+ * Bumped Standards-Version to 3.8.3.
+
+ [ Petr Salinger ]
+ * Build-depends on libc0.1-dev (>= 2.10) instead of libfreebsd-dev.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 27 Oct 2009 20:44:22 +0100
+
+freebsd-libs (7.2-3) unstable; urgency=low
+
+ * Remove unnecessary linkages with libfreebsd.
+ * Bumped Standards-Version to 3.8.2 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 04 Aug 2009 08:29:46 +0200
+
+freebsd-libs (7.2-2) unstable; urgency=low
+
+ * Tighten build-depends on kfreebsd-kernel-headers.
+ * Remove n_un union workarounds.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 15 Jun 2009 10:47:08 +0200
+
+freebsd-libs (7.2-1) unstable; urgency=low
+
+ [ Guillem Jover ]
+ * Use $(filter ...) instead of $(findstring ...) to extract space separated
+ options from DEB_BUILD_OPTIONS.
+ * Line wrap Build-Depends and Depends fields longer than 80 chars.
+
+ [ Petr Salinger ]
+ * based on FreeBSD 7.2
+ * add Vcs-* fields into debian/control.
+
+ [ Aurelien Jarno ]
+ * Tighten build-depends on libbsd-dev.
+ * Use SVN server instead of the deprecated CVS server in get-orig-source.
+ * Add -D'__FBSDID(string)=' to CFLAGS, drop debian/patches/00_fbsdid.diff
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 06 Jun 2009 22:15:03 +0200
+
+freebsd-libs (7.1-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * Don't use a tar in tar build system:
+ - Remove fetch
+ - Add a get-orig-source target.
+ - Use quilt to manage patches.
+ - Remove build-depends on kfreebsd-source-7.1.
+ - Update patches accordingly.
+ * Change patch level to -p1.
+ * Fix a few bashisms in debian/rules.
+ * Fix parallel build support in debian/rules.
+ * Install more manpages.
+ * Switch to debhelper 5.
+ * Bumped Standards-Version to 3.8.1 (no changes).
+ * Update debian/copyright.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 07 Apr 2009 16:59:04 +0200
+
+freebsd-libs (7.1-1) unreleased; urgency=low
+
+ [ Petr Salinger ]
+ * based on FreeBSD 7.1
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 05 Jan 2009 10:53:31 +0100
+
+freebsd-libs (7.0-1) unreleased; urgency=low
+
+ [ Petr Salinger ]
+ * based on FreeBSD 7.0
+ * Change packages name to reflect SONAME changes:
+ - libusbhid2 -> libusbhid3
+ - libkiconv2 -> libkiconv3
+ - libdevstat5 -> libdevstat6
+ * Make it buildable with gcc-4.2
+
+ [ Aurelien Jarno ]
+ * Don't ship useless manpages.
+ * Bumped Standards-Version to 3.8.0 (no changes).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 11 Jan 2008 10:53:31 +0100
+
+freebsd-libs (6.3-1) unreleased; urgency=low
+
+ [ Petr Salinger ]
+ * based on FreeBSD 6.3
+ * new binary packages libdevstat5 and libdevstat-dev
+
+ [ Aurelien Jarno ]
+ * Bumped Standards-Version to 3.7.3 (no changes).
+ * Change ${Source-Version} into ${binary:Version}.
+ * Don't use ${shlibs:Depends} for -dev packages.
+ * Only link with needed libraries.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Thu, 10 Jan 2008 18:23:48 +0100
+
+freebsd-libs (6.2-1) unreleased; urgency=low
+
+ [ Petr Salinger ]
+ * based on FreeBSD 6.2
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 15 Jan 2007 13:42:46 +0100
+
+freebsd-libs (6.1-2) unreleased; urgency=low
+
+ [ Petr Salinger ]
+ * revert r1694, these libraries are located in /lib/,
+ but dev symlink pointed to /usr/lib/
+ breaks many packages using libkvm-dev or libgeom-dev
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 28 Nov 2006 17:09:28 +0100
+
+freebsd-libs (6.1-1) unreleased; urgency=low
+
+ [ Petr Salinger ]
+ * based on FreeBSD 6.1
+
+ [ Aurelien Jarno ]
+ * Bumped Standards-Version to 3.7.2 (no changes).
+ * Change packages name to reflect SONAME changes:
+ - libusbhid1 -> libusbhid2
+ - libkiconv1 -> libkiconv2
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 25 Oct 2006 16:49:43 +0200
+
+freebsd-libs (5.4+1-3) UNRELEASED; urgency=low
+
+ * Add libkiconv (patch from Andraz).
+
+ -- Robert Millan <rmh at aybabtu.com> Thu, 4 May 2006 17:14:34 +0200
+
+freebsd-libs (5.4+1-2) unreleased; urgency=low
+
+ * Link libgeom with librt (to get clock_gettime).
+
+ -- Robert Millan <rmh at aybabtu.com> Wed, 19 Apr 2006 11:17:18 +0200
+
+freebsd-libs (5.4+1-1) unreleased; urgency=low
+
+ * Add libgeom.
+ * Major patch and variable cleanup/refactor to sanitise SHLIB_MAJOR and
+ SHLIBDIR overrides.
+
+ -- Robert Millan <rmh at aybabtu.com> Wed, 19 Apr 2006 10:32:23 +0200
+
+freebsd-libs (5.4-8) unreleased; urgency=low
+
+ * First build on amd64.
+ * Lots of cleanup:
+ - Remove functions that are in libfreebsd
+ - Use dynamic regexps to get rid of many patch hunks.
+ - Reenable most commented code (thanks to new functions in libfreebsd).
+
+ -- Robert Millan <rmh at aybabtu.com> Wed, 29 Mar 2006 20:38:08 +0200
+
+freebsd-libs (5.4-7) unreleased; urgency=low
+
+ * Add kfreebsd-amd64.
+ * Add missing libgdbm-dev to Build-Depends.
+ * Move shared object so /lib (unfucks freebsd-utils).
+
+ -- Robert Millan <rmh at aybabtu.com> Sat, 25 Mar 2006 21:01:49 +0100
+
+freebsd-libs (5.4-6) unreleased; urgency=low
+
+ * Added libipx.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 20 Dec 2005 23:18:51 +0100
+
+freebsd-libs (5.4-5) unreleased; urgency=low
+
+ * Renamed libsrbuf to libfreebsd and added nlist.
+ * Added libkvm from old package freebsd-kvm-5.2.1. Some parts are still
+ disabled, but less than in the previous version.
+ * Ship a shared library, so that packages will benefit from improvements
+ of the library.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 20 Dec 2005 20:56:06 +0100
+
+freebsd-libs (5.4-4) unreleased; urgency=low
+
+ * Bumped Standard-Versions to 3.6.2 (no changes).
+ * Improved descriptions.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 20 Dec 2005 01:51:03 +0100
+
+freebsd-libs (5.4-3) unreleased; urgency=low
+
+ * libusbhid: include <bsd/bsd.h> and link with -lbsd.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 18 Dec 2005 04:57:17 +0100
+
+freebsd-libs (5.4-2) unreleased; urgency=low
+
+ * Added libusbhid1 and libusbhid-dev.
+ * Updated libcam to version 5.4.
+ * Provide a copyright file.
+ * Get the necessary files directly from kfreebsd-source-5.4.
+ * Make -dev packages depends on libc0.1-dev | libc-dev.
+ * Ship some missing manpages.
+ * Build with -02.
+ * Added myself to uploaders.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 18 Dec 2005 03:59:30 +0100
+
+freebsd-libs (5.4-1) unreleased; urgency=low
+
+ * Initial release.
+
+ -- Robert Millan <rmh at aybabtu.com> Fri, 12 Aug 2005 12:04:07 +0200
+
Added: trunk/zfsutils/debian/compat
===================================================================
--- trunk/zfsutils/debian/compat (rev 0)
+++ trunk/zfsutils/debian/compat 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1 @@
+5
Added: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control (rev 0)
+++ trunk/zfsutils/debian/control 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,61 @@
+Source: freebsd-libs
+Section: libs
+Priority: optional
+Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
+Uploaders: Aurelien Jarno <aurel32 at debian.org>
+Build-Depends: debhelper (>= 5.0.0), quilt, freebsd-buildutils, libbsd-dev (>= 0.1.4),
+ libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.50), libexpat-dev,
+ libavl-dev, libgeom-dev, libsbuf-dev
+Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-libs/
+Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-libs/
+Standards-Version: 3.8.3
+
+Package: libzfs0
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD ZFS library
+ The ZFS library provides support for managing ZFS filesystems.
+
+Package: libzfs-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libzfs0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Description: Development files for libzfs
+ This package contains the header files and static library needed to
+ compile applications that use libzfs.
+
+Package: libuutil0
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenSolaris userland utility library
+ This package contains the OpenSolaris userland utility library.
+
+Package: libuutil-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libuutil0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Description: Development files for libuutil
+ This package contains the header files and static library needed to
+ compile applications that use libuutil.
+
+Package: libnvpair0
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenSolaris name-value pair library
+ This package contains the OpenSolaris libnvpair library, for managing
+ name-value pairs.
+
+Package: libnvpair-dev
+Section: libdevel
+Architecture: kfreebsd-any
+Depends: libnvpair0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Description: Development files for libnvpair
+ This package contains the header files and static library needed to
+ compile applications that use libnvpair.
+
+Package: zfsutils
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: command-line tools to manage ZFS filesystems
+ This package provides the zfs and zpool commands to create and administer
+ ZFS filesystems.
Added: trunk/zfsutils/debian/copyright
===================================================================
--- trunk/zfsutils/debian/copyright (rev 0)
+++ trunk/zfsutils/debian/copyright 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,239 @@
+This package was debianized by Robert Millan <rmh at aybabtu.com> on
+Fri, 12 Aug 2005 12:04:07 +0200.
+
+It was downloaded from http://www.freebsd.org/
+ src/lib/libcam
+ src/lib/libdevstat
+ src/lib/libgeom
+ src/lib/libipx
+ src/lib/libkiconv
+ src/lib/libkvm
+ src/lib/libsbuf
+ src/lib/libusbhid
+ src/sys/cam
+ src/sys/kern/subr_sbuf.c
+
+
+Copyrights:
+ Copyright (C) 1986, 1989, 1991, 1992, 1993 The Regents of the University of California.
+ Copyright (C) 1990 Open Software Foundation, Grenoble, FRANCE
+ Copyright (C) 1992 TRW Financial Systems
+ Copyright (C) 1994, 1995 Carnegie-Mellon University
+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 NetBSD/pc98 porting staff
+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Naofumi HONDA
+ Copyright (C) 1996 Wolfgang Solfrank
+ Copyright (C) 1996 TooLs GmbH
+ Copyright (C) 1996 Jason R. Thorpe <thorpej at and.com>
+ Copyright (C) 1997, 1998, 1999, 2001, 2002 Justin T. Gibbs
+ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Kenneth D. Merry
+ Copyright (C) 1999 Matthew Dillon
+ Copyright (C) 1999 Lennart Augustsson <augustss at netbsd.org>
+ Copyright (C) 1999, 2000 Matthew Jacob
+ Copyright (C) 2000, 2001 MITSUNAGA Noriaki, NOKUBI Hirotaka and TAKAHASHI Yoshihiro.
+ Copyright (C) 2000, 2003 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav
+ Copyright (C) 2000-2001 Boris Popov
+ Copyright (C) 2001 Thomas Moestl
+ Copyright (C) 2002 Nate Lawson
+ Copyright (C) 2003 Ryuichiro Imura
+ Copyright (C) 2005 Olivier Houchard
+ Copyright (C) 2006 Peter Wemm
+ Copyright (C) 2007 Pawel Jakub Dawidek <pjd at FreeBSD.org>
+ Copyright (C) 2007 Scott Long
+ Copyright (C) 2008 Yahoo!, Inc.
+
+
+Licenses:
+
+ Files:
+ lib/libcam/camlib.c
+ lib/libcam/camlib.h
+ lib/libcam/scsi_cmdparse.c
+ lib/libgeom/geom_ctl.c
+ lib/libgeom/geom_getxml.c
+ lib/libgeom/geom_stats.c
+ lib/libgeom/geom_util.c
+ lib/libgeom/geom_xml2tree.c
+ lib/libgeom/libgeom.h
+ lib/libkiconv/quirks.c
+ lib/libkiconv/quirks.h
+ lib/libkiconv/xlat16_iconv.c
+ lib/libkiconv/xlat16_sysctl.c
+ lib/libkvm/kvm_cptime.c
+ lib/libkvm/kvm_getswapinfo.3
+ lib/libkvm/kvm_getswapinfo.c
+ lib/libkvm/kvm_minidump_amd64.c
+ lib/libkvm/kvm_minidump_i386.c
+ lib/libkvm/kvm_pcpu.c
+ lib/libusbhid/data.c
+ lib/libusbhid/descr.c
+ lib/libusbhid/parse.c
+ lib/libusbhid/usage.c
+ lib/libusbhid/usbhid.h
+ lib/libusbhid/usbvar.h
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ -------------------------------------------------------------------
+ Files:
+ lib/libcam/cam.3
+ lib/libcam/cam_cdbparse.3
+ lib/libdevstat/devstat.3
+ lib/libdevstat/devstat.c
+ lib/libdevstat/devstat.h
+ lib/libgeom/libgeom.3
+ lib/libipx/ipx.3
+ lib/libkiconv/kiconv.3
+ lib/libkvm/kvm_getcptime.3
+ lib/libkvm/kvm_getpcpu.3
+ lib/libusbhid/usbhid.3
+ sys/cam/scsi/scsi_dvcfg.h
+ sys/cam/scsi/scsi_low.c
+ sys/cam/scsi/scsi_low.h
+ sys/cam/scsi/scsi_low_pisa.c
+ sys/cam/scsi/scsi_low_pisa.h
+ sys/kern/subr_sbuf.c
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ -------------------------------------------------------------------
+ Files:
+ lib/libipx/ipx_addr.c
+ lib/libipx/ipx_ntoa.c
+ lib/libkvm/kvm.3
+ lib/libkvm/kvm_amd64.c
+ lib/libkvm/kvm_arm.c
+ lib/libkvm/kvm.c
+ lib/libkvm/kvm_file.c
+ lib/libkvm/kvm_geterr.3
+ lib/libkvm/kvm_getfiles.3
+ lib/libkvm/kvm_getloadavg.3
+ lib/libkvm/kvm_getloadavg.c
+ lib/libkvm/kvm_getprocs.3
+ lib/libkvm/kvm.h
+ lib/libkvm/kvm_i386.c
+ lib/libkvm/kvm_nlist.3
+ lib/libkvm/kvm_open.3
+ lib/libkvm/kvm_private.h
+ lib/libkvm/kvm_proc.c
+ lib/libkvm/kvm_read.3
+ lib/libkvm/kvm_sparc64.c
+ lib/libkvm/kvm_sparc.c
+ sys/cam/cam.c
+ sys/cam/cam_ccb.h
+ sys/cam/cam_debug.h
+ sys/cam/cam.h
+ sys/cam/cam_periph.c
+ sys/cam/cam_periph.h
+ sys/cam/cam_queue.c
+ sys/cam/cam_queue.h
+ sys/cam/cam_sim.c
+ sys/cam/cam_sim.h
+ sys/cam/cam_xpt.c
+ sys/cam/cam_xpt.h
+ sys/cam/cam_xpt_periph.h
+ sys/cam/cam_xpt_sim.h
+ sys/cam/scsi/scsi_all.c
+ sys/cam/scsi/scsi_cd.c
+ sys/cam/scsi/scsi_cd.h
+ sys/cam/scsi/scsi_da.c
+ sys/cam/scsi/scsi_pass.c
+ sys/cam/scsi/scsi_pass.h
+ sys/cam/scsi/scsi_pt.c
+ sys/cam/scsi/scsi_pt.h
+ sys/cam/scsi/scsi_sa.c
+ sys/cam/scsi/scsi_sa.h
+ sys/cam/scsi/scsi_ses.c
+ sys/cam/scsi/scsi_ses.h
+ sys/cam/scsi/scsi_sg.c
+ sys/cam/scsi/scsi_targ_bh.c
+ sys/cam/scsi/scsi_target.c
+ sys/cam/scsi/scsi_targetio.h
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 4. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ -------------------------------------------------------------------
+ Files: sys/cam/scsi/scsi_da.h
+
+ Permission to use, copy, modify, and distribute this software and
+ its documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appears in all copies and
+ that both the copyright notice and this permission notice appear in
+ supporting documentation, and that the name of OSF or Open Software
+ Foundation not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior
+ permission.
+
+ OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+ IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
+ NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ -------------------------------------------------------------------
+ Files:
+ sys/cam/scsi/scsi_iu.h
+ sys/cam/scsi/scsi_message.h
+
+ These files are in the public domain.
Added: trunk/zfsutils/debian/libnvpair-dev.install
===================================================================
--- trunk/zfsutils/debian/libnvpair-dev.install (rev 0)
+++ trunk/zfsutils/debian/libnvpair-dev.install 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,2 @@
+usr/lib/libnvpair*.a
+usr/lib/libnvpair.so
Added: trunk/zfsutils/debian/libnvpair0.install
===================================================================
--- trunk/zfsutils/debian/libnvpair0.install (rev 0)
+++ trunk/zfsutils/debian/libnvpair0.install 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1 @@
+usr/lib/libnvpair*.so.* lib
Added: trunk/zfsutils/debian/libuutil-dev.install
===================================================================
--- trunk/zfsutils/debian/libuutil-dev.install (rev 0)
+++ trunk/zfsutils/debian/libuutil-dev.install 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,2 @@
+usr/lib/libuutil*.a
+usr/lib/libuutil.so
Added: trunk/zfsutils/debian/libuutil0.install
===================================================================
--- trunk/zfsutils/debian/libuutil0.install (rev 0)
+++ trunk/zfsutils/debian/libuutil0.install 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1 @@
+usr/lib/libuutil*.so.* lib
Added: trunk/zfsutils/debian/libzfs-dev.install
===================================================================
--- trunk/zfsutils/debian/libzfs-dev.install (rev 0)
+++ trunk/zfsutils/debian/libzfs-dev.install 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,2 @@
+usr/lib/libzfs*.a
+usr/lib/libzfs.so
Added: trunk/zfsutils/debian/libzfs0.install
===================================================================
--- trunk/zfsutils/debian/libzfs0.install (rev 0)
+++ trunk/zfsutils/debian/libzfs0.install 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1 @@
+usr/lib/libzfs*.so.* lib
Added: trunk/zfsutils/debian/patches/01_glibc_kludge.diff
===================================================================
--- trunk/zfsutils/debian/patches/01_glibc_kludge.diff (rev 0)
+++ trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,96 @@
+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
+@@ -89,7 +89,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 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
+@@ -92,6 +92,9 @@
+ iov = NULL;
+ iovlen = 0;
+ build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1);
++#ifndef __DECONST
++#define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var))
++#endif
+ 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
+@@ -31,7 +31,7 @@
+ #include <libintl.h>
+ #include <limits.h>
+ #include <string.h>
+-#include <stdlib.h>
++#include </usr/include/stdlib.h>
+ #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
+@@ -32,7 +32,31 @@
+
+ #include_next <rpc/xdr.h>
+
+-#ifndef _KERNEL
++/* Copied from the FreeBSD version of <rpc/xdr.h> */
++#ifdef __GLIBC__
++/*
++ * These are XDR control operators
++ */
++
++#define XDR_GET_BYTES_AVAIL 1
++#define XDR_PEEK 2
++#define XDR_SKIPBYTES 3
++
++struct xdr_bytesrec {
++ bool_t xc_is_last_record;
++ size_t xc_num_avail;
++};
++
++typedef struct xdr_bytesrec xdr_bytesrec;
++#endif
++
++#if defined(__GLIBC__)
++
++/* GNU libc doesn't implement XDR control method */
++#define XDR_CONTROL(xdrs, req, op) (1)
++#define xdr_control(xdrs, req, op) XDR_CONTROL(xdrs, req, op)
++
++#elif !defined(_KERNEL)
+
+ #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
+@@ -66,7 +66,7 @@
+ typedef int major_t;
+
+ #else
+-#ifdef NEED_SOLARIS_BOOLEAN
++#if 1 //def NEED_SOLARIS_BOOLEAN
+ #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
+@@ -34,6 +34,7 @@
+ #pragma ident "%Z%%M% %I% %E% SMI"
+
+ #include <sys/types.h>
++//#include_next <sys/debug.h>
+
+ #ifdef __cplusplus
+ extern "C" {
Added: trunk/zfsutils/debian/patches/02_glibc_misc.diff
===================================================================
--- trunk/zfsutils/debian/patches/02_glibc_misc.diff (rev 0)
+++ trunk/zfsutils/debian/patches/02_glibc_misc.diff 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,59 @@
+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
+@@ -30,7 +30,10 @@
+ #pragma ident "%Z%%M% %I% %E% SMI"
+
+ #include <pthread.h>
++/* On GNU libc, non-POSIX facilities are in <pthread.h> */
++#ifndef __GLIBC__
+ #include <pthread_np.h>
++#endif
+ #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
+@@ -103,7 +103,7 @@
+ * High order bit is 31 (or 63 in _LP64 kernel).
+ */
+ static __inline int
+-highbit(ulong_t i)
++highbit(unsigned long i)
+ {
+ 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
+@@ -29,7 +29,12 @@
+ #ifndef _OPENSOLARIS_SYS_TIME_H_
+ #define _OPENSOLARIS_SYS_TIME_H_
+
++/* GNU libc has <sys/time.h> but no <time.h> */
++#ifdef __GLIBC__
++#include_next <time.h>
++#else
+ #include_next <sys/time.h>
++#endif
+
+ #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
+@@ -2199,11 +2199,11 @@
+ int err = 0;
+ nvstream_t nvs;
+ int nvl_endian;
+-#if BYTE_ORDER == _LITTLE_ENDIAN
++#if BYTE_ORDER == LITTLE_ENDIAN
+ int host_endian = 1;
+ #else
+ int host_endian = 0;
+-#endif /* _LITTLE_ENDIAN */
++#endif /* LITTLE_ENDIAN */
+ nvs_header_t *nvh = (void *)buf;
+
+ if (buflen == NULL || nvl == NULL ||
Added: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff (rev 0)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,124 @@
+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
+@@ -5,6 +5,9 @@
+
+ #include <sys/ccompile.h>
+
++/* GNU libc has its own dirent64 declaration */
++#ifndef __GLIBC__
+ #define dirent64 dirent
++#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
+@@ -67,7 +67,7 @@
+ * mountpoint specified in the 'skip' argument.
+ */
+ static char *
+-getline(FILE *fd, const char *skip)
++xgetline(FILE *fd, const char *skip)
+ {
+ static char line[MAXLINESIZE];
+ size_t len, skiplen;
+@@ -198,7 +198,7 @@
+
+ /* Place big, fat warning at the begining of the file. */
+ fprintf(newfd, "%s", FILE_HEADER);
+- while (oldfd != NULL && (line = getline(oldfd, mountpoint)) != NULL)
++ while (oldfd != NULL && (line = xgetline(oldfd, mountpoint)) != NULL)
+ 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
+@@ -63,7 +63,7 @@
+ }
+
+ char *
+-hasmntopt(struct mnttab *mnt, char *opt)
++solaris_hasmntopt(struct mnttab *mnt, char *opt)
+ {
+ 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
+@@ -2166,11 +2166,11 @@
+ case ZFS_PROP_NBMAND:
+ *val = getprop_uint64(zhp, prop, source);
+
+- if (hasmntopt(&mnt, mntopt_on) && !*val) {
++ if (solaris_hasmntopt(&mnt, mntopt_on) && !*val) {
+ *val = B_TRUE;
+ if (src)
+ *src = ZPROP_SRC_TEMPORARY;
+- } else if (hasmntopt(&mnt, mntopt_off) && *val) {
++ } else if (solaris_hasmntopt(&mnt, mntopt_off) && *val) {
+ *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
+@@ -463,7 +463,7 @@
+ /*ARGSUSED*/
+ int
+ vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
+- int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp)
++ int x1, int x2, solaris_rlim64_t x3, void *x4, ssize_t *residp)
+ {
+ 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
+@@ -105,8 +105,8 @@
+
+ #define ZFS_LOG(...) do { } while (0)
+
+-typedef u_longlong_t rlim64_t;
+-#define RLIM64_INFINITY ((rlim64_t)-3)
++typedef u_longlong_t solaris_rlim64_t;
++#define RLIM64_INFINITY ((solaris_rlim64_t)-3)
+
+ #ifdef ZFS_DEBUG
+ extern void dprintf_setup(int *argc, char **argv);
+@@ -438,7 +438,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,
+- offset_t offset, int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp);
++ offset_t offset, int x1, int x2, solaris_rlim64_t x3, void *x4, ssize_t *residp);
+ 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
+@@ -32,7 +32,10 @@
+ #include_next <sys/dirent.h>
+
+ typedef struct dirent dirent64_t;
++/* GNU libc has its own dirent64 declaration */
++#ifndef __GLIBC__
+ #define dirent64 dirent
++#endif
+ #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
+@@ -677,7 +677,7 @@
+ zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
+ {
+ znode_t *zp = VTOZ(vp);
+- rlim64_t limit = MAXOFFSET_T;
++ solaris_rlim64_t limit = MAXOFFSET_T;
+ ssize_t start_resid = uio->uio_resid;
+ ssize_t tx_bytes;
+ uint64_t end_size;
Added: trunk/zfsutils/debian/patches/04_stdint.diff
===================================================================
--- trunk/zfsutils/debian/patches/04_stdint.diff (rev 0)
+++ trunk/zfsutils/debian/patches/04_stdint.diff 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,36 @@
+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
+@@ -33,7 +33,7 @@
+ * This is a bag of dirty hacks to keep things compiling.
+ */
+
+-#include <sys/stdint.h>
++#include <stdint.h>
+ #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
+@@ -92,7 +92,7 @@
+
+ #include <sys/types.h>
+ #include <sys/param.h>
+-#include <sys/stdint.h>
++#include <stdint.h>
+ #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
+@@ -33,7 +33,7 @@
+ #endif
+
+ #include <sys/param.h>
+-#include <sys/stdint.h>
++#include <stdint.h>
+ #include <sys/note.h>
+ #include <sys/kernel.h>
+ #include <sys/debug.h>
Added: trunk/zfsutils/debian/patches/05_makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/05_makefile.diff (rev 0)
+++ trunk/zfsutils/debian/patches/05_makefile.diff 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,45 @@
+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
+@@ -47,5 +47,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
++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
+@@ -21,7 +21,13 @@
+
+ DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+ ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+-LDADD= -lzfs -lgeom -lbsdxml -lsbuf \
++LDADD= -lzfs -lgeom -lexpat -lsbuf \
+ -lm -lnvpair -luutil -lutil
+
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs \
++ -L${.CURDIR}/../../../cddl/lib/libnvpair \
++ -L${.CURDIR}/../../../cddl/lib/libuutil \
++ -L${.CURDIR}/../../../lib/libgeom \
++ -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
+@@ -23,7 +23,12 @@
+
+ DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+ ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+-LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \
++LDADD= -lavl -lzfs -lgeom -lexpat -lsbuf \
+ -lm -lnvpair -luutil -lutil
+
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs \
++ -L${.CURDIR}/../../../cddl/lib/libnvpair \
++ -L${.CURDIR}/../../../cddl/lib/libuutil
++
++
+ .include <bsd.prog.mk>
Added: trunk/zfsutils/debian/patches/06_mountd.diff
===================================================================
--- trunk/zfsutils/debian/patches/06_mountd.diff (rev 0)
+++ trunk/zfsutils/debian/patches/06_mountd.diff 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,29 @@
+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
+@@ -35,7 +35,6 @@
+ #include <errno.h>
+ #include <libutil.h>
+ #include <assert.h>
+-#include <pathnames.h> /* _PATH_MOUNTDPID */
+ #include <fsshare.h>
+
+ #define FILE_HEADER "# !!! DO NOT EDIT THIS FILE MANUALLY !!!\n\n"
+@@ -45,6 +44,9 @@
+ static void
+ restart_mountd(void)
+ {
++ fprintf (stderr, "warning: mountd isn't supported in "
++ "Debian GNU/kFreeBSD yet\n");
++#if 0
+ struct pidfh *pfh;
+ pid_t mountdpid;
+
+@@ -60,6 +62,7 @@
+ }
+ /* We have mountd(8) PID in mountdpid varible. */
+ kill(mountdpid, SIGHUP);
++#endif
+ }
+
+ /*
Added: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series (rev 0)
+++ trunk/zfsutils/debian/patches/series 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,6 @@
+01_glibc_kludge.diff
+02_glibc_misc.diff
+03_glibc_namespace.diff
+04_stdint.diff
+05_makefile.diff
+06_mountd.diff
Added: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules (rev 0)
+++ trunk/zfsutils/debian/rules 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,123 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+SHELL=bash
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
+SVN=svn://svn.freebsd.org/base/release/$(VERSION).0
+ORIGDIR=freebsd-libs-$(VERSION)
+PATH:=/usr/lib/freebsd:$(PATH)
+DESTDIR=$(CURDIR)/debian/tmp
+PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+export SHLIB_MAJOR=0
+export SHLIBDIR=/usr/lib
+
+get-orig-source:
+ rm -rf $(ORIGDIR)
+ for i in \
+ cddl/compat/opensolaris \
+ cddl/contrib/opensolaris \
+ sys/cddl/compat/opensolaris \
+ sys/cddl/contrib/opensolaris \
+ cddl/lib/libzfs \
+ cddl/lib/libnvpair \
+ cddl/lib/libuutil \
+ cddl/sbin/zpool \
+ cddl/sbin/zfs \
+ ; do \
+ svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
+ done
+ tar -czf ../freebsd-libs_$(VERSION).orig.tar.gz $(ORIGDIR)
+ rm -rf $(ORIGDIR)
+
+patch: patch-stamp
+patch-stamp:
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ touch $@
+
+build: build-zfs
+
+build-zfs: build-zfs-stamp
+build-zfs-stamp: patch
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libzfs
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libuutil
+ $(PMAKE) -C $(CURDIR)/cddl/sbin/zpool
+ $(PMAKE) -C $(CURDIR)/cddl/sbin/zfs
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libzfs clean
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair clean
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libuutil clean
+ $(PMAKE) -C $(CURDIR)/cddl/sbin/zpool clean
+ $(PMAKE) -C $(CURDIR)/cddl/sbin/zfs clean
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ rm -rf .pc
+ rm -f *stamp
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k -s
+ dh_installdirs -s
+
+ mkdir -p $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man3
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libzfs install
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair install
+ $(PMAKE) -C $(CURDIR)/cddl/lib/libuutil install
+ $(PMAKE) -C $(CURDIR)/cddl/sbin/zpool install
+ $(PMAKE) -C $(CURDIR)/cddl/sbin/zfs install
+
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
+ mkdir -p $(CURDIR)/debian/tmp/usr/bin
+
+ dh_install -s --list-missing --sourcedir=debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -a
+ dh_installdocs -a
+# dh_installexamples
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+# dh_installman
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+# dh_perl
+# dh_python
+ dh_makeshlibs -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: trunk/zfsutils/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/zfsutils/debian/zfsutils.install
===================================================================
--- trunk/zfsutils/debian/zfsutils.install (rev 0)
+++ trunk/zfsutils/debian/zfsutils.install 2010-07-28 21:15:55 UTC (rev 3090)
@@ -0,0 +1,2 @@
+zpool /sbin
+zfs /sbin
More information about the Glibc-bsd-commits
mailing list