Imported Debian patch 1.0.10-1

diff --git a/debian/README.Debian.nfsv4 b/debian/README.Debian.nfsv4
index 9d3adc8a5148428448911ddade6cf20cabcec1bd..7e1aeafce4f1a6642360069cb2e8ad1439634d8c 100644 (file)
--- a/debian/README.Debian.nfsv4
+++ b/debian/README.Debian.nfsv4
@@ -8,10 +8,7 @@ to experiment, make sure you have:
    want to use CITI's patch set from http://www.citi.umich.edu/projects/nfsv4/linux/ .
  - a recent enough version of nfs-utils on both client and server (you probably
    have on at least one of them, since you're reading this file!).
- - a patched mount, which will hopefully enter the archive soon at the time of
-   writing -- otherwise, you'll have to enable the patch in the Debian package
-   yourself and rebuild it. (It is not enabled by default, since the current version
-   of the patch breaks mounting against NFSv2-only servers, such as nfs-user-server.)
+ - enabled idmapd on both sides (see /etc/default/nfs-common).
 
 The export structure might be a bit confusing if you're already familiar with
 NFSv2 or NFSv3. The biggest difference is that you will need to export an explicit
@@ -37,15 +34,21 @@ server to be bind mounts, ie.:
 or in /etc/fstab:
 
   /srv/music /nfs4/music none bind 0 0
-  
+
+Note that this special export structure might be handled transparently by
+rpc.mountd at some time in the future, in which case you will probably get the
+traditional (NFSv3-style) behaviour if and only if you have no share with
+fsid=0.
+
 If you do not wish to use host-based authentication, you can specify "gss/krb5"
 instead of a hostname to get Kerberos-based authentication instead. For this, 
 you will need an "nfs/hostname@REALM" entry in /etc/krb5.keytab, as well as
-rpc.gssd running on both the client and the server (enable it manually in
-/etc/default/nfs-common if the autodetection fails).
+rpc.gssd running on both client and rpc.svcgssd on the server (enable them
+manually in /etc/default/nfs-common and /etc/default/nfs-kernel-server if the
+autodetection fails).
 
 If you use "gss/krb5i", you will also get integrity (ie. authentication), and
 with "gss/krb5p", you'll also get privacy (ie.  encryption). Make sure your
 kernel supports this; not all kernels do.
 
- -- Steinar H. Gunderson <sesse@debian.org>, Wed, 05 Apr 2006 18:09:47 +0200
+ -- Steinar H. Gunderson <sesse@debian.org>, Wed, 06 Sep 2006 00:32:38 +0200

diff --git a/debian/changelog b/debian/changelog
index 855d9610fbee798d13d391a2d46b924861a74eb9..06cfa359267f97e46f39f59daa552d2cf7eb15ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+nfs-utils (1:1.0.10-1) unstable; urgency=low
+
+  * New upstream release.
+    * Fixes issues with missing write_oid() function. (Closes: #386117)
+  * Drop versioned dependency on libnfsidmap1, now that libnfsidmap-dev has
+    fixed shlibs. This makes it possible to build against libnfsidmap2.
+    (Closes: #386116)
+  * Update README.Debian.nfsv4.
+    * Remove the part about a patched mount; the NFSv4 patch has been enabled
+      in mount for some time.
+    * Note that the special export structure might go away in the future.
+    * Note that you will need idmapd and possibly gssd/svcgssd enabled.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed,  6 Sep 2006 00:30:32 +0200
+
 nfs-utils (1:1.0.9-12) unstable; urgency=low
 
   * Really remove dependency on sysvinit.

diff --git a/debian/control b/debian/control
index 71a8050cbd501757b4157c720faa4443de5fb349..81fa43016c27e95bbeeb4b33aa2909801e15a138 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Description: Kernel NFS server support
 
 Package: nfs-common
 Architecture: any
-Depends: portmap, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}, libnfsidmap1 (>= 0.16-3)
+Depends: portmap, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}
 Provides: nfs-client
 Conflicts: nfs-client
 Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5)