+nfs-utils (1:1.2.5-1) UNRELEASED; urgency=low
+
+ * New upstream version
+ - deleted: 13-preserve-explicit-port-2049.patch
+ - deleted: 17-Fix-statd.8-manpage-syntax-visible.patch
+ - deleted: 18-Fix-nfsiostat.8-manpage-syntax-missing-.I.patch
+ - deleted: 19-exports.man-Fix-comment-syntax.patch
+ - deleted: 20-nfs.man-Fix-fstab-example.patch
+ - deleted: 22-start-statd-Use-bash.patch
+ - deleted: 23-nfs.man-escape-nroff-for-proper-rendering.patch
+
+ -- Luk Claes <luk@debian.org> Sun, 02 Oct 2011 17:01:07 +0200
+
nfs-utils (1:1.2.4-2) UNRELEASED; urgency=low
[ Luk Claes ]
+++ /dev/null
-From: Ben Hutchings <ben@decadent.org.uk>
-Subject: [PATCH] mount.nfs: Preserve any explicit port=2049 option
-
-This addresses Debian bug #582003.
---- nfs-utils-1.2.2.orig/utils/mount/stropts.c
-+++ nfs-utils-1.2.2/utils/mount/stropts.c
-@@ -434,8 +434,8 @@
- if (po_append(options, new_option) == PO_FAILED)
- return 0;
-
-- po_remove_all(options, "port");
-- if (nfs_pmap->pm_port != NFS_PORT) {
-+ if (po_remove_all(options, "port") == PO_FOUND ||
-+ nfs_pmap->pm_port != NFS_PORT) {
- snprintf(new_option, sizeof(new_option) - 1,
- "port=%lu", nfs_pmap->pm_port);
- if (po_append(options, new_option) == PO_FAILED)
+++ /dev/null
->From eb0f1c1ccb60ebed6c959088467f5bf8bfcaedc9 Mon Sep 17 00:00:00 2001
-From: Simon Paillard <spaillard@debian.org>
-Date: Wed, 27 Apr 2011 00:15:49 +0200
-Subject: [PATCH] Fix statd.8 manpage syntax 'visible'
-
----
- utils/statd/statd.man | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/utils/statd/statd.man b/utils/statd/statd.man
-index ca00e24..3209a50 100644
---- a/utils/statd/statd.man
-+++ b/utils/statd/statd.man
-@@ -347,8 +347,8 @@ of the requesting lock manager.
- TI-RPC is a pre-requisite for supporting NFS on IPv6.
- If TI-RPC support is built into
- .BR rpc.statd ,
--it attempts to start listeners on network transports marked
--'visible' in
-+it attempts to start listeners on network transports marked 'visible'
-+in
- .IR /etc/netconfig .
- As long as at least one network transport listener starts successfully,
- .B rpc.statd
---
-1.7.2.5
-
+++ /dev/null
->From 00a47ffac69bd0a9331f899cdc04728fb567519d Mon Sep 17 00:00:00 2001
-From: Simon Paillard <spaillard@debian.org>
-Date: Wed, 27 Apr 2011 00:22:45 +0200
-Subject: [PATCH 2/2] Fix nfsiostat.8 manpage syntax missing .I
-
----
- tools/nfs-iostat/nfsiostat.man | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/nfs-iostat/nfsiostat.man b/tools/nfs-iostat/nfsiostat.man
-index 99e04fb..3ec245d 100644
---- a/tools/nfs-iostat/nfsiostat.man
-+++ b/tools/nfs-iostat/nfsiostat.man
-@@ -24,7 +24,7 @@ parameter is
- specified, the value of
- .I <count>
- determines the number of reports generated at
--. <interval>
-+.I <interval>
- seconds apart. if the interval parameter is
- specified without the
- .I <count>
---
-1.7.2.5
-
+++ /dev/null
-From: Ben Hutchings <ben@decadent.org.uk>
-Subject: [PATCH] exports.man: Fix comment syntax
-
-Using three single-quotes for a comment sort of works because it
-results in invoking a nonexistent macro, but it results in a huge
-number of warnings when trying to validate the man page.
-
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-
---- a/utils/exportfs/exports.man
-+++ b/utils/exportfs/exports.man
-@@ -80,25 +80,25 @@ For example, either `/255.255.252.0' or `/22' appended
- character (not to be confused with the
- .I wildcard
- entry above) and will match all clients.
--'''.TP
--'''.B =public
--'''This is a special ``hostname'' that identifies the given directory name
--'''as the public root directory (see the section on WebNFS in
--'''.BR nfsd (8)
--'''for a discussion of WebNFS and the public root handle). When using this
--'''convention,
--'''.B =public
--'''must be the only entry on this line, and must have no export options
--'''associated with it. Note that this does
--'''.I not
--'''actually export the named directory; you still have to set the exports
--'''options in a separate entry.
--'''.PP
--'''The public root path can also be specified by invoking
--'''.I nfsd
--'''with the
--'''.B \-\-public\-root
--'''option. Multiple specifications of a public root will be ignored.
-+.\".TP
-+.\".B =public
-+.\"This is a special ``hostname'' that identifies the given directory name
-+.\"as the public root directory (see the section on WebNFS in
-+.\".BR nfsd (8)
-+.\"for a discussion of WebNFS and the public root handle). When using this
-+.\"convention,
-+.\".B =public
-+.\"must be the only entry on this line, and must have no export options
-+.\"associated with it. Note that this does
-+.\".I not
-+.\"actually export the named directory; you still have to set the exports
-+.\"options in a separate entry.
-+.\".PP
-+.\"The public root path can also be specified by invoking
-+.\".I nfsd
-+.\"with the
-+.\".B \-\-public\-root
-+.\"option. Multiple specifications of a public root will be ignored.
- .PP
- If a client matches more than one of the specifications above, then
- the first match from the above list order takes precedence - regardless of
-@@ -311,24 +311,24 @@ with ACL support (i.e. by default,
- .I no_acl
- is off).
-
--'''.TP
--'''.I noaccess
--'''This makes everything below the directory inaccessible for the named
--'''client. This is useful when you want to export a directory hierarchy to
--'''a client, but exclude certain subdirectories. The client's view of a
--'''directory flagged with noaccess is very limited; it is allowed to read
--'''its attributes, and lookup `.' and `..'. These are also the only entries
--'''returned by a readdir.
--'''.TP
--'''.IR link_relative
--'''Convert absolute symbolic links (where the link contents start with a
--'''slash) into relative links by prepending the necessary number of ../'s
--'''to get from the directory containing the link to the root on the
--'''server. This has subtle, perhaps questionable, semantics when the file
--'''hierarchy is not mounted at its root.
--'''.TP
--'''.IR link_absolute
--'''Leave all symbolic link as they are. This is the default operation.
-+.\".TP
-+.\".I noaccess
-+.\"This makes everything below the directory inaccessible for the named
-+.\"client. This is useful when you want to export a directory hierarchy to
-+.\"a client, but exclude certain subdirectories. The client's view of a
-+.\"directory flagged with noaccess is very limited; it is allowed to read
-+.\"its attributes, and lookup `.' and `..'. These are also the only entries
-+.\"returned by a readdir.
-+.\".TP
-+.\".IR link_relative
-+.\"Convert absolute symbolic links (where the link contents start with a
-+.\"slash) into relative links by prepending the necessary number of ../'s
-+.\"to get from the directory containing the link to the root on the
-+.\"server. This has subtle, perhaps questionable, semantics when the file
-+.\"hierarchy is not mounted at its root.
-+.\".TP
-+.\".IR link_absolute
-+.\"Leave all symbolic link as they are. This is the default operation.
-
- .TP
- .IR mountpoint= path
-@@ -411,21 +411,21 @@ and can be turned off with
- .IR no_root_squash .
- .PP
- By default,
--'''.B nfsd
--'''tries to obtain the anonymous uid and gid by looking up user
--'''.I nobody
--'''in the password file at startup time. If it isn't found, a uid and gid
-+.\".B nfsd
-+.\"tries to obtain the anonymous uid and gid by looking up user
-+.\".I nobody
-+.\"in the password file at startup time. If it isn't found, a uid and gid
- .B exportfs
- chooses a uid and gid
- of 65534 for squashed access. These values can also be overridden by
- the
- .IR anonuid " and " anongid
- options.
--'''.PP
--'''In addition to this,
--'''.B nfsd
--'''lets you specify arbitrary uids and gids that should be mapped to user
--'''nobody as well.
-+.\".PP
-+.\"In addition to this,
-+.\".B nfsd
-+.\"lets you specify arbitrary uids and gids that should be mapped to user
-+.\"nobody as well.
- Finally, you can map all user requests to the
- anonymous uid by specifying the
- .IR all_squash " option.
-@@ -490,7 +490,7 @@ is supposedly that of user joe).
- /srv/www \-sync,rw server @trusted @external(ro)
- /foo 2001:db8:9:e54::/64(rw) 192.0.2.0/24(rw)
- /build buildhost[0-9].local.domain(rw)
--'''/pub/private (noaccess)
-+.\"/pub/private (noaccess)
- .fi
- .PP
- The first line exports the entire filesystem to machines master and trusty.
-@@ -508,21 +508,21 @@
- all three mounts with the `sync' option enabled. The seventh line exports
- a directory to both an IPv6 and an IPv4 subnet. The eighth line demonstrates
- a character class wildcard match.
--''' The last line denies all NFS clients
--'''access to the private directory.
--'''.SH CAVEATS
--'''Unlike other NFS server implementations, this
--'''.B nfsd
--'''allows you to export both a directory and a subdirectory thereof to
--'''the same host, for instance
--'''.IR /usr " and " /usr/X11R6 .
--'''In this case, the mount options of the most specific entry apply. For
--'''instance, when a user on the client host accesses a file in
--'''.IR /usr/X11R6 ,
--'''the mount options given in the
--'''.I /usr/X11R6
--'''entry apply. This is also true when the latter is a wildcard or netgroup
--'''entry.
-+.\" The last line denies all NFS clients
-+.\"access to the private directory.
-+.\".SH CAVEATS
-+.\"Unlike other NFS server implementations, this
-+.\".B nfsd
-+.\"allows you to export both a directory and a subdirectory thereof to
-+.\"the same host, for instance
-+.\".IR /usr " and " /usr/X11R6 .
-+.\"In this case, the mount options of the most specific entry apply. For
-+.\"instance, when a user on the client host accesses a file in
-+.\".IR /usr/X11R6 ,
-+.\"the mount options given in the
-+.\".I /usr/X11R6
-+.\"entry apply. This is also true when the latter is a wildcard or netgroup
-+.\"entry.
- .SH FILES
- /etc/exports
- /etc/exports.d
-@@ -532,17 +532,17 @@ all three mounts with the `sync' option enabled.
- .BR mountd (8),
- .BR nfsd (8),
- .BR showmount (8).
--'''.SH DIAGNOSTICS
--'''An error parsing the file is reported using syslogd(8) as level NOTICE from
--'''a DAEMON whenever
--'''.BR nfsd (8)
--'''or
--'''.BR mountd (8)
--'''is started up. Any unknown
--'''host is reported at that time, but often not all hosts are not yet known
--'''to
--'''.BR named (8)
--'''at boot time, thus as hosts are found they are reported
--'''with the same
--'''.BR syslogd (8)
--'''parameters.
-+.\".SH DIAGNOSTICS
-+.\"An error parsing the file is reported using syslogd(8) as level NOTICE from
-+.\"a DAEMON whenever
-+.\".BR nfsd (8)
-+.\"or
-+.\".BR mountd (8)
-+.\"is started up. Any unknown
-+.\"host is reported at that time, but often not all hosts are not yet known
-+.\"to
-+.\".BR named (8)
-+.\"at boot time, thus as hosts are found they are reported
-+.\"with the same
-+.\".BR syslogd (8)
-+.\"parameters.
+++ /dev/null
-From: Ben Hutchings <ben@decadent.org.uk>
-Subject: [PATCH] nfs.man: Fix macro use for fstab examples
-
-The groff macros for filling (word-wrapping) and tabulation control are
-lower-case, but are written in upper-case here and so have been ignored.
-
-Change the .NF and .FI lines to lower-case.
-
-Change the .TA lines to lower-case and fix the tab stops to work both
-on a terminal and in Postscript output.
-
-Delete the .SP line where .sp would be redundant.
-
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-
---- a/utils/mount/nfs.man
-+++ b/utils/mount/nfs.man
-@@ -46,11 +46,10 @@
- The fifth and sixth fields on each line are not used
- by NFS, thus conventionally each contain the digit zero. For example:
- .P
--.SP
--.NF
--.TA 2.5i +0.75i +0.75i +1.0i
-+.nf
-+.ta 8n +14n +14n +9n +20n
- server:path /mountpoint fstype option,option,... 0 0
--.FI
-+.fi
- .P
- The server's hostname and export pathname
- are separated by a colon, while
-@@ -857,40 +856,40 @@
- file causes the mount command to negotiate
- reasonable defaults for NFS behavior.
- .P
--.NF
--.TA 2.5i +0.7i +0.7i +.7i
-+.nf
-+.ta 8n +16n +6n +6n +30n
- server:/export /mnt nfs defaults 0 0
--.FI
-+.fi
- .P
- Here is an example from an /etc/fstab file for an NFS version 2 mount over UDP.
- .P
--.NF
--.TA 2.5i +0.7i +0.7i +.7i
-+.nf
-+.ta 8n +16n +6n +6n +30n
- server:/export /mnt nfs nfsvers=2,proto=udp 0 0
--.FI
-+.fi
- .P
- Try this example to mount using NFS version 4 over TCP
- with Kerberos 5 mutual authentication.
- .P
--.NF
--.TA 2.5i +0.7i +0.7i +.7i
-+.nf
-+.ta 8n +16n +6n +6n +30n
- server:/export /mnt nfs4 sec=krb5 0 0
--.FI
-+.fi
- .P
- This example can be used to mount /usr over NFS.
- .P
--.NF
--.TA 2.5i +0.7i +0.7i +.7i
-+.nf
-+.ta 8n +16n +6n +6n +30n
- server:/export /usr nfs ro,nolock,nocto,actimeo=3600 0 0
--.FI
-+.fi
- .P
- This example shows how to mount an NFS server
- using a raw IPv6 link-local address.
- .P
--.NF
--.TA 2.5i +0.7i +0.7i +.7i
-+.nf
-+.ta 8n +40n +5n +4n +9n
- [fe80::215:c5ff:fb3e:e2b1%eth0]:/export /mnt nfs defaults 0 0
--.FI
-+.fi
- .SH "TRANSPORT METHODS"
- NFS clients send requests to NFS servers via
- Remote Procedure Calls, or
+++ /dev/null
-Index: nfs-utils/utils/statd/start-statd
-===================================================================
---- nfs-utils.orig/utils/statd/start-statd 2011-06-07 12:23:35.000000000 +0200
-+++ nfs-utils/utils/statd/start-statd 2011-06-07 12:23:40.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh -p
-+#!/bin/bash -p
- # nfsmount calls this script when mounting a filesystem with locking
- # enabled, but when statd does not seem to be running (based on
- # /var/run/rpc.statd.pid).
+++ /dev/null
->From 09a8a502769a110703bf7424037728d987f50f57 Mon Sep 17 00:00:00 2001
-From: Simon Paillard <spaillard@debian.org>
-Date: Tue, 2 Aug 2011 00:13:31 +0200
-Subject: [PATCH] nfs.man: escape ' nroff for proper rendering
-
----
- utils/mount/nfs.man | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/utils/mount/nfs.man b/utils/mount/nfs.man
-index be91a25..639c931 100644
---- a/utils/mount/nfs.man
-+++ b/utils/mount/nfs.man
-@@ -753,7 +753,7 @@ is specified, the client assumes that POSIX locks are local and uses NLM
- sideband protocol to lock files when flock locks are used.
- .IP
- To support legacy flock behavior similar to that of NFS clients < 2.6.12, use
--'local_lock=flock'. This option is required when exporting NFS mounts via
-+\'local_lock=flock\'. This option is required when exporting NFS mounts via
- Samba as Samba maps Windows share mode locks as flock. Since NFS clients >
- 2.6.12 implement flock by emulating POSIX locks, this will result in
- conflicting locks.
---
-1.7.2.5
-
02-524255-manpages.patch
03-handle-mtab-symlink.patch
11-532048-reduce-verbosity.patch
-13-preserve-explicit-port-2049.patch
16-mount.nfs.man-update-distinction-between-fstype.patch
-17-Fix-statd.8-manpage-syntax-visible.patch
-18-Fix-nfsiostat.8-manpage-syntax-missing-.I.patch
-19-exports.man-Fix-comment-syntax.patch
-20-nfs.man-Fix-fstab-example.patch
-22-start-statd-Use-bash.patch
-23-nfs.man-escape-nroff-for-proper-rendering.patch
projects / nfs-utils.git / commitdiff