+nfs-utils (1:1.2.0-2) unstable; urgency=low
+
+ * Merge from Ubuntu
+ * Rename 101-reduce-verbosity.diff to 11-532048-reduce-verbosity.patch
+ * Fix syslog verbosity with expired kerberos creds; closes: #532048
+ 11-532048-reduce-verbosity.patch
+
+ -- Anibal Monsalve Salazar <anibal@debian.org> Tue, 09 Jun 2009 10:50:33 +1000
+
+nfs-utils (1:1.2.0-1ubuntu1) karmic; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - 101-reduce-verbosity.diff: Reduce verbosity
+ * Dropped changes:
+ - Adjust initscripts version dependency; the Debian package now depends
+ on a newer version anyway
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 06 Jun 2009 01:19:54 +0000
+
nfs-utils (1:1.2.0-1) unstable; urgency=low
* New upstream release
-- Anibal Monsalve Salazar <anibal@debian.org> Fri, 06 Mar 2009 13:36:45 +1100
+nfs-utils (1:1.1.4-1ubuntu1) jaunty; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - Adjust initscripts version dependancy.
+ - 101-reduce-verbosity.diff: Reduce verbosity
+ * Drop 100-gssd-use-kernel-supported-enctypes.diff on advice from
+ upstream. "This patch isn't needed. There is still no code in the kernel to
+ return the enctype information and, as it turns out, the way we're
+ going to get this information from the kernel has changed. (Which is
+ why this has never gone upstream.)"
+
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 04 Dec 2008 14:37:39 -0800
+
nfs-utils (1:1.1.4-1) unstable; urgency=low
* New upstream release. Patch status:
-- Steinar H. Gunderson <sesse@debian.org> Fri, 11 Jul 2008 18:45:45 +0200
+nfs-utils (1:1.1.2-4ubuntu2) jaunty; urgency=low
+
+ * Add patch to reduce verbosity (LP: #293705)
+
+ -- Andrew Pollock <apollock@google.com> Tue, 04 Nov 2008 09:38:48 -0800
+
+nfs-utils (1:1.1.2-4ubuntu1) intrepid; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - Update maintainer to Ubuntu
+ - Adjust initscripts version dependancy.
+ - 100-gssd-use-kernel-supported-enctypes.diff:
+ Allow to use encryption types that the kernel supports, not just
+ des-cbc-crc. This patch was dropped by mistake when merging. Start the
+ numbering from 100 to more easily distinguish which patches are ours.
+
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 19 Jun 2008 20:05:51 -0700
+
nfs-utils (1:1.1.2-4) unstable; urgency=low
* 04-eacces-is-a-permanent-error.patch: New patch mirroring upstream git;
-- Steinar H. Gunderson <sesse@debian.org> Fri, 25 Apr 2008 18:26:12 +0200
+nfs-utils (1:1.1.2-2ubuntu2.1) hardy-proposed; urgency=low
+
+ * 101-mount-EACCES-is-forever.diff:
+ Patch from upstream to recognize "permission denied" as a permanent
+ error, instead of retrying the mount until the connection timeout is
+ reached. LP: #214041.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 07 May 2008 17:56:04 +0000
+
+nfs-utils (1:1.1.2-2ubuntu2) hardy; urgency=low
+
+ * 100-gssd-use-kernel-supported-enctypes.diff:
+ Allow to use encryption types that the kernel supports, not just
+ des-cbc-crc. This patch was dropped by mistake when merging. Start the
+ numbering from 100 to more easily distinguish which patches are ours.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Wed, 02 Apr 2008 23:10:01 +0300
+
+nfs-utils (1:1.1.2-2ubuntu1) hardy; urgency=low
+
+ * New upstream version (LP: #131789, #208021)
+ * Merge from Debian unstable, remaining changes:
+ - Change the Maintainer address.
+ - Adjust initscripts version dependancy.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 01 Apr 2008 18:02:05 +0300
+
nfs-utils (1:1.1.2-2) unstable; urgency=low
* Remove ${misc:Depends} from binary variables -- it is not used, and not
-- Anibal Monsalve Salazar <anibal@debian.org> Sat, 08 Jul 2006 14:26:40 +1000
-
nfs-utils (1:1.0.8+1.0.9pre1-4) unstable; urgency=low
* Back out having separate mount.nfs; this is in line with upstream, who
--- /dev/null
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532048
+
+The nfs-utils package in Ubuntu has been patched to reduce the default log
+verbosity in the case of expired Kerberos credentials, for the reasons
+described here:
+
+https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/293705
+
+Please consider applying the attached patch to Debian as well.
+
+Andrew Pollock said he was submitting this patch upstream, but there doesn't
+seem to be any evidence that it's been included yet in 1.2.0.
+
+Steve Langasek <steve.langasek@canonical.com>
+
+--- a/utils/gssd/gssd_proc.c 2009-06-03 00:43:05.000000000 +1000
++++ b/utils/gssd/gssd_proc.c 2009-06-09 11:04:24.000000000 +1000
+@@ -548,7 +548,7 @@ do_error_downcall(int k5_fd, uid_t uid,
+ unsigned int timeout = 0;
+ int zero = 0;
+
+- printerr(1, "doing error downcall\n");
++ printerr(2, "doing error downcall\n");
+
+ if (WRITE_BYTES(&p, end, uid)) goto out_err;
+ if (WRITE_BYTES(&p, end, timeout)) goto out_err;
+@@ -816,7 +816,7 @@ handle_krb5_upcall(struct clnt_info *clp
+ char **dirname;
+ int create_resp = -1;
+
+- printerr(1, "handling krb5 upcall\n");
++ printerr(2, "handling krb5 upcall\n");
+
+ token.length = 0;
+ token.value = NULL;
+@@ -949,7 +949,7 @@ handle_spkm3_upcall(struct clnt_info *cl
+ }
+
+ if (!authgss_get_private_data(auth, &pd)) {
+- printerr(0, "WARNING: Failed to obtain authentication "
++ printerr(2, "WARNING: Failed to obtain authentication "
+ "data for user with uid %d for server %s\n",
+ uid, clp->servername);
+ goto out_return_error;
+--- a/utils/gssd/gss_util.c 2009-06-03 00:43:05.000000000 +1000
++++ b/utils/gssd/gss_util.c 2009-06-09 11:04:24.000000000 +1000
+@@ -126,7 +126,7 @@ display_status_1(char *m, u_int32_t code
+ "gss_display_status called from %s\n", m);
+ break;
+ } else {
+- printerr(0, "ERROR: GSS-API: (%s) error in %s(): %s\n",
++ printerr(2, "ERROR: GSS-API: (%s) error in %s(): %s\n",
+ typestr, m, (char *)msg.value);
+ }
+