Imported Debian patch 1.0.8-2

diff --git a/debian/changelog b/debian/changelog
index 269b33e4e0c8290b9c9532e4f35e088b29be876b..df5b8fce01122880e1f545ebb9ad6f3d63285789 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nfs-utils (1:1.0.8-2) unstable; urgency=low
+
+  * Added missing dependency on pkg-config.
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Fri, 02 Jun 2006 19:08:11 +1000
+
 nfs-utils (1:1.0.8-1) unstable; urgency=low
 
   * New upstream version. (Closes: #364902)
@@ -11,26 +17,12 @@ nfs-utils (1:1.0.8-1) unstable; urgency=low
       needed to build nfs-utils.
     * Give DESTDIR instead of install_prefix to "make install" (install_prefix
       no longer works).
-    * Build-depend on librpcsecgss-dev and libgssapi-dev, as they are now both
-      needed. Also build-depend on pkg-config, as it is needed to detect
-      librpcsecgss-dev.
-  * No longer handle gssapi_mech.conf; it is now managed by the librpcsecgss
-    package. Remove all references to it in debian/rules.
+  * No longer handle gssapi_mech.conf via ucf; it is now managed by the
+    librpcsecgss package. Remove all references to it in debian/rules.
   * We no longer need to run autoconf as a part of debian/rules; its results
     are parts of the diff instead, as per usual packaging practices.
     * Drop the build-dependency on autoconf2.13 and autotools-dev.
     * No longer rm various autotools-generated files in the clean target.
-  * Tweaks to debian/rules:
-    * Drop --sourcedir=debian/tmp from dh_install so we can also install files
-      directly from the debian/ directory.
-    * Minimize direct uses of install; move all the ucf installation into the
-      debhelper .install files.
-    * Remove some obsolete comments.
-  * Remove empty (modulo #DEBHELPER# tokens) nhfsstone.{postinst,prerm}
-    scripts.
-  * Clear out obsolete (pre-sarge) debconf and rc.d purging from postinst
-    script. (Same as in 1:1.0.7-10, but for nfs-kernel-server too, not just
-    nfs-common.) Minor style cleanup.
 
  -- Steinar H. Gunderson <sesse@debian.org>  Thu,  1 Jun 2006 01:59:39 +0200
 

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

diff --git a/debian/nfs-common.install b/debian/nfs-common.install
index 45c637dbabcc4f2d8305fc66a189b7f0557447ca..915964aafaac717e341dda795ae1aaedafad0a29 100644 (file)
--- a/debian/nfs-common.install
+++ b/debian/nfs-common.install
@@ -1,10 +1,6 @@
-debian/tmp/usr/sbin/rpc.lockd sbin/
-debian/tmp/usr/sbin/rpc.statd sbin/
-debian/tmp/usr/sbin/showmount sbin/
-debian/tmp/usr/sbin/nfsstat
-debian/tmp/usr/sbin/rpc.gssd
-debian/tmp/usr/sbin/rpc.idmapd
-debian/idmapd.conf usr/share/nfs-common/conffiles/
-debian/idmapd.conf.md5sum usr/share/nfs-common/conffiles/
-debian/nfs-common.default usr/share/nfs-common/conffiles/
-debian/nfs-common.default.md5sum usr/share/nfs-common/conffiles/
+usr/sbin/rpc.lockd sbin/
+usr/sbin/rpc.statd sbin/
+usr/sbin/showmount sbin/
+usr/sbin/nfsstat
+usr/sbin/rpc.gssd
+usr/sbin/rpc.idmapd

diff --git a/debian/nfs-kernel-server.install b/debian/nfs-kernel-server.install
index 341c538ae646cc63522a1acbf057cfd404b16463..1c66d7897029276a95a46f52c50b01c57884ce57 100644 (file)
--- a/debian/nfs-kernel-server.install
+++ b/debian/nfs-kernel-server.install
@@ -1,7 +1,3 @@
-debian/tmp/usr/sbin/exportfs
-debian/tmp/usr/sbin/rpc.mountd
-debian/tmp/usr/sbin/rpc.nfsd
-debian/nfs-kernel-server.default /usr/share/nfs-kernel-server/conffiles/
-debian/etc.exports /usr/share/nfs-kernel-server/conffiles/
-debian/nfs-kernel-server.default.md5sum /usr/share/nfs-kernel-server/conffiles/
-debian/etc.exports.md5sum /usr/share/nfs-kernel-server/conffiles/
+usr/sbin/exportfs
+usr/sbin/rpc.mountd
+usr/sbin/rpc.nfsd

diff --git a/debian/nfs-kernel-server.postinst b/debian/nfs-kernel-server.postinst
index f7dbc259043b2bd2907fae5606e881f7401b2dea..c8b244dde88436ec3a2609876498955da5acc2a3 100644 (file)
--- a/debian/nfs-kernel-server.postinst
+++ b/debian/nfs-kernel-server.postinst
@@ -14,7 +14,15 @@ case "$1" in
        done
 
        update-rc.d nfs-kernel-server defaults 20 80 >/dev/null
-    ;;
+
+       # Remove obsolete debconf questions
+       if [ -e /usr/share/debconf/confmodule ]; then
+           . /usr/share/debconf/confmodule
+           db_unregister nfs-kernel-server/sync-default || true
+           db_unregister nfs-kernel-server/tcpwrappers-mountd || true
+           db_stop
+       fi
+       ;;
 esac
 
 act="restart"

diff --git a/debian/nhfsstone.install b/debian/nhfsstone.install
index 27d18c515303df7dab49ca6c4d44b5e2f6563c66..5d2c329f72a250db6d82bc5fa5f9ba493b064d06 100644 (file)
--- a/debian/nhfsstone.install
+++ b/debian/nhfsstone.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/sbin/nhfs*
-debian/tmp/usr/share/man/man8/nhfs*
+usr/sbin/nhfs*
+usr/share/man/man8/nhfs*

diff --git a/debian/nhfsstone.postinst b/debian/nhfsstone.postinst
new file mode 100644 (file)
index 0000000..07fe0c2
--- /dev/null
+++ b/debian/nhfsstone.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+#DEBHELPER#

diff --git a/debian/nhfsstone.prerm b/debian/nhfsstone.prerm
new file mode 100644 (file)
index 0000000..42faf6a
--- /dev/null
+++ b/debian/nhfsstone.prerm
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/rules b/debian/rules
index 0c5b9dea7ae9bcd077bf045614651b254bdba6c5..9729fa368c5755390896f6770089dd4075d98cb1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,14 +32,27 @@ binary-arch: build
        dh_clean -k
        dh_installdirs
        mkdir $(DEBTMP)
+       # Add here commands to install the files into debian/tmp
        $(MAKE) DESTDIR='$(DEBTMP)' install
-       dh_install
+       dh_install --sourcedir=debian/tmp
+       # Fixups Start Here #
+       cd debian && \
+         for f in lockd statd showmount; do \
+           perl -pi -e "s#/usr(/sbin/(rpc\\.)?$$f)#\$$1#g" \
+               tmp/usr/share/man/man8/$$f.8; \
+         done;
+       # Fixups End Here #
        
-       # Fix up the manpages
-       for f in lockd statd showmount; do \
-         perl -pi -e "s#/usr(/sbin/(rpc\\.)?$$f)#\$$1#g" \
-           debian/tmp/usr/share/man/man8/$$f.8; \
-       done;
+       # Move all files that will be managed by ucf
+       install -m 0644 debian/idmapd.conf debian/nfs-common/usr/share/nfs-common/conffiles/
+       install -m 0644 debian/nfs-common.default debian/nfs-common/usr/share/nfs-common/conffiles/
+       install -m 0644 debian/nfs-kernel-server.default debian/nfs-kernel-server/usr/share/nfs-kernel-server/conffiles/
+       install -m 0644 debian/etc.exports debian/nfs-kernel-server/usr/share/nfs-kernel-server/conffiles/
+       
+       install -m 0644 debian/idmapd.conf.md5sum debian/nfs-common/usr/share/nfs-common/conffiles/
+       install -m 0644 debian/nfs-common.default.md5sum debian/nfs-common/usr/share/nfs-common/conffiles/
+       install -m 0644 debian/nfs-kernel-server.default.md5sum debian/nfs-kernel-server/usr/share/nfs-kernel-server/conffiles/
+       install -m 0644 debian/etc.exports.md5sum debian/nfs-kernel-server/usr/share/nfs-kernel-server/conffiles/
        
        dh_installdocs -A
        dh_installdocs -pnfs-common debian/README.Debian.nfsv4

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index cd49a3b21f7f614c677440316586625e37b072d0..c3ba9970dd29bf7001eb5a4cb22bece67e1623e0 100644 (file)
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -412,9 +412,9 @@ dump(int verbose)
                                c = dumpopt(c, "mapping=ugidd");
                        else if (ep->e_maptype == CLE_MAP_FILE)
                                c = dumpopt(c, "mapping=file");
-                       if (ep->e_anonuid != 65534)
+                       if (ep->e_anonuid != -2)
                                c = dumpopt(c, "anonuid=%d", ep->e_anonuid);
-                       if (ep->e_anongid != 65534)
+                       if (ep->e_anongid != -2)
                                c = dumpopt(c, "anongid=%d", ep->e_anongid);
 
                        printf("%c\n", (c != '(')? ')' : ' ');

diff --git a/utils/idmapd/idmapd.conf.man b/utils/idmapd/idmapd.conf.man
index 9067e24c3e4039cb8ba7ec181fbdc20d246beae6..f4ea200a2b3c6b625cfc74460aad2487e8e3911c 100644 (file)
--- a/utils/idmapd/idmapd.conf.man
+++ b/utils/idmapd/idmapd.conf.man
@@ -14,9 +14,9 @@ The
 .Nm
 configuration file has two sections, initiated by the strings
 [General] and [Mapping].  Each section may contain lines of the form
-.Dl ""
+
 .Dl variable = value
-.Dl ""
+
 The variables allowed in the General section are
 .Va Verbosity,
 .Va Pipefs-Directory,
@@ -37,10 +37,13 @@ which have the same effect as the
 and
 .Fl G
 commandline options.
+
 .Sh EXAMPLES
+
 An example
 .Pa /etc/idmapd.conf
 file:
+
 .Bd -literal
 [General]
 
@@ -53,6 +56,7 @@ Domain = localdomain
 Nobody-User = nobody
 Nobody-Group = nobody
 .Ed
+
 .Sh SEE ALSO
 .Xr idmapd 8
 .\".Sh SEE ALSO