New upstream version

* New upstream version
  - Fix host_reliable_addrinfo (Closes: #633155)
  - Allow multiple RPC listeners to share listener port number
  (Closes: #619877)
  - Add --enable-libmount-mount (Closes: #626478)
  - 12-svcgssd-document-n-option.patch applied upstream
  - 21-anticipate-RLIMIT_FSIZE.patch applied upstream

diff --git a/debian/changelog b/debian/changelog
index e654d43183df1540455e50a0d86563d61d23bbe3..f77a5562e53aae67d047d36fa4d0d2dd940f2195 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nfs-utils (1:1.2.4-1) unstable; urgency=low
+
+  * New upstream version
+    - Fix host_reliable_addrinfo (Closes: #633155)
+    - Allow multiple RPC listeners to share listener port number
+    (Closes: #619877)
+    - Add --enable-libmount-mount (Closes: #626478)
+    - 12-svcgssd-document-n-option.patch applied upstream
+    - 21-anticipate-RLIMIT_FSIZE.patch applied upstream 
+
+ -- Luk Claes <luk@debian.org>  Sat, 09 Jul 2011 15:07:34 +0200
+
 nfs-utils (1:1.2.3-3) unstable; urgency=medium
 
   [ Luk Claes ]

diff --git a/debian/patches/12-svcgssd-document-n-option.patch b/debian/patches/12-svcgssd-document-n-option.patch
deleted file mode 100644 (file)
index 437ee7a..0000000
--- a/debian/patches/12-svcgssd-document-n-option.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Alberto Gonzalez Iniesta <agi@inittab.org>
-
---- a/utils/gssd/svcgssd.man   2010-02-18 23:35:00.000000000 +1100
-+++ b/utils/gssd/svcgssd.man   2010-04-06 16:48:19.000000000 +1000
-@@ -35,6 +35,11 @@ increases the verbosity of the output (c
- .B -i
- If the nfsidmap library supports setting debug level,
- increases the verbosity of the output (can be specified multiple times).
-+.TP
-+.B -n
-+Do not search for nfs/<your.host>@<YOUR.REALM> at start up, but instead
-+accept requests for any key in the keytab file. Useful for HA clusters
-+where the NFS service hostname is different from the node hostname.
- .TP
- .B -p
- Use \fIprincipal\fR instead of the default nfs/host.domain.

diff --git a/debian/patches/21-anticipate-RLIMIT_FSIZE.patch b/debian/patches/21-anticipate-RLIMIT_FSIZE.patch
deleted file mode 100644 (file)
index cdd3767..0000000
--- a/debian/patches/21-anticipate-RLIMIT_FSIZE.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: NeilBrown <neilb@suse.de>
-Date: Mon, 23 May 2011 12:19:57 +0000 (-0400)
-Subject: Remove risk of nfs_addmntent corrupting mtab
-X-Git-Url: http://git.linux-nfs.org/?p=steved%2Fnfs-utils.git;a=commitdiff_plain;h=7a802337bfc92d0b30fe94dbd0fa231990a26161
-
-Remove risk of nfs_addmntent corrupting mtab
-
-nfs_addmntent is used to append directly to /etc/mtab.
-If the write partially fail, e.g. due to RLIMIT_FSIZE,
-truncate back to original size and return an error.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=697975
-(CVE-2011-1749) CVE-2011-1749 nfs-utils: mount.nfs fails to anticipate RLIMIT_FSIZE
-
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
-
-diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c
-index a5216fc..a2118a2 100644
---- a/support/nfs/nfs_mntent.c
-+++ b/support/nfs/nfs_mntent.c
-@@ -12,6 +12,7 @@
- #include <string.h>           /* for index */
- #include <ctype.h>            /* for isdigit */
- #include <sys/stat.h>         /* for umask */
-+#include <unistd.h>           /* for ftruncate */
- 
- #include "nfs_mntent.h"
- #include "nls.h"
-@@ -127,9 +128,11 @@ int
- nfs_addmntent (mntFILE *mfp, struct mntent *mnt) {
-       char *m1, *m2, *m3, *m4;
-       int res;
-+      off_t length;
- 
-       if (fseek (mfp->mntent_fp, 0, SEEK_END))
-               return 1;                       /* failure */
-+      length = ftell(mfp->mntent_fp);
- 
-       m1 = mangle(mnt->mnt_fsname);
-       m2 = mangle(mnt->mnt_dir);
-@@ -143,6 +146,12 @@ nfs_addmntent (mntFILE *mfp, struct mntent *mnt) {
-       free(m2);
-       free(m3);
-       free(m4);
-+      if (res >= 0) {
-+              res = fflush(mfp->mntent_fp);
-+              if (res < 0)
-+                      /* Avoid leaving a corrupt mtab file */
-+                      ftruncate(fileno(mfp->mntent_fp), length);
-+      }
-       return (res < 0) ? 1 : 0;
- }
- 

diff --git a/debian/patches/series b/debian/patches/series
index fc52841765492b88dfda70f775f21d6a96923836..04e7c5e5cfdaadb064790cd0b64fe46bf0edd3b0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,12 +2,10 @@
 02-524255-manpages.patch
 03-handle-mtab-symlink.patch
 11-532048-reduce-verbosity.patch
-12-svcgssd-document-n-option.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
-21-anticipate-RLIMIT_FSIZE.patch
 22-start-statd-Use-bash.patch

diff --git a/debian/rules b/debian/rules
index 45b060c946760a317aa149e59b1c37d80a74bbde..0eaf79217980fbabfb172a610eb47d5c9c361132 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ build-stamp:
                --mandir='$${prefix}/share/man' \
                --enable-nfsv41 \
                --enable-ipv6 \
+               --enable-tirpc \
                --with-tcp-wrappers
        $(MAKE) $(MAKEFLAGS)
        touch build-stamp