From: Anibal Monsalve Salazar Date: Fri, 2 Jun 2006 09:08:11 +0000 (+1000) Subject: Imported Debian patch 1.0.8-2 X-Git-Tag: debian/1%1.0.8-2^0 X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=5c3ed18c263cd01878d0314763d670a05d5ac284 Imported Debian patch 1.0.8-2 --- diff --git a/debian/changelog b/debian/changelog index 269b33e..df5b8fc 100644 --- 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 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 Thu, 1 Jun 2006 01:59:39 +0200 diff --git a/debian/control b/debian/control index 531f665..a8e6f17 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: standard Section: net Maintainer: Anibal Monsalve Salazar Uploaders: Steinar H. Gunderson , Daniel Baumann -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 45c637d..915964a 100644 --- 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 341c538..1c66d78 100644 --- 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 f7dbc25..c8b244d 100644 --- 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 27d18c5..5d2c329 100644 --- 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 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 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 0c5b9de..9729fa3 100755 --- 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 cd49a3b..c3ba997 100644 --- 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 9067e24..f4ea200 100644 --- 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