Imported Debian patch 1.0.9-11

diff --git a/debian/changelog b/debian/changelog
index b0e9f46a48e765b4ef262e425e07da1aa5dc70d6..9de7ec0466ffe09467bdc126881cd531ccf6494a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+nfs-utils (1:1.0.9-11) unstable; urgency=low
+
+  * In the exports man page, document that there might be sensitive non-root
+    gids as well as uids, for instance gid staff. (Closes: #385377)
+  * Remove unnecessary dependency on sysvinit, in line with the Ubuntu
+    packages.
+  * Change the versioned build-dependency on librpcsecgss-dev (>= 0.14-2)
+    to a build-conflict on 0.14-1, as that is the only version, and it's
+    easier for backports and other distributions without the new version of
+    librpcsecgss.
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Thu, 31 Aug 2006 01:53:45 +0200
+
 nfs-utils (1:1.0.9-10) unstable; urgency=low
 
   * The -n option (short option for --no-tcp) to rpc.mountd was set

diff --git a/debian/control b/debian/control
index b25ecd789a7be3a397e105faea72c15b346dcfae..13dd965242eedc19ac115bf7a067155a9e676fd9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Priority: standard
 Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssapi-dev, librpcsecgss-dev (>= 0.14-2), perl, pkg-config
+Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssapi-dev, librpcsecgss-dev, perl, pkg-config
+Build-Conflicts: librpcsecgss-dev (= 0.14-1)
 Standards-Version: 3.7.2
 
 Package: nfs-kernel-server

diff --git a/utils/exportfs/exports.man b/utils/exportfs/exports.man
index 1d10d04295c0356c02b57ce3a57100db7f35ec16..4cddc793d24b69c1eab0781cd01e58d327119e24 100644 (file)
--- a/utils/exportfs/exports.man
+++ b/utils/exportfs/exports.man
@@ -395,8 +395,11 @@ Here's the complete list of mapping options:
 .TP
 .IR root_squash
 Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does
-not apply to any other uids that might be equally sensitive, such as user
-.IR bin .
+not apply to any other uids or gids that might be equally sensitive, such as
+user
+.IR bin 
+or group
+.IR staff .
 .TP
 .IR no_root_squash
 Turn off root squashing. This option is mainly useful for diskless clients.