From 4cbe8e72c103202ca01275ed6b128c8610a5a5bd Mon Sep 17 00:00:00 2001
From: Luk Claes <luk@debian.org>
Date: Fri, 25 May 2012 19:46:34 +0200
Subject: [PATCH] Update other patches.
---
debian/changelog | 1 +
debian/patches/11-532048-reduce-verbosity.patch | 2 +-
debian/patches/17-multiarch-kerberos-paths.patch | 2 +-
debian/patches/series | 1 -
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 54eef7c..ace5d5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nfs-utils (1:1.2.6-1) UNRELEASED; urgency=low
* New upstream version
- Remove 18-dont-use-PAGE_SIZE.patch: merged upstream.
+ - Update other patches.
* Check for blank exports file (Closes: #673798).
-- Luk Claes <luk@debian.org> Fri, 25 May 2012 19:16:54 +0200
diff --git a/debian/patches/11-532048-reduce-verbosity.patch b/debian/patches/11-532048-reduce-verbosity.patch
index ecb2bb1..c303c8b 100644
--- a/debian/patches/11-532048-reduce-verbosity.patch
+++ b/debian/patches/11-532048-reduce-verbosity.patch
@@ -37,7 +37,7 @@ Steve Langasek <steve.langasek@canonical.com>
}
if (!authgss_get_private_data(auth, &pd)) {
-- printerr(0, "WARNING: Failed to obtain authentication "
+- printerr(1, "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);
diff --git a/debian/patches/17-multiarch-kerberos-paths.patch b/debian/patches/17-multiarch-kerberos-paths.patch
index 6f3365c..92f01c1 100644
--- a/debian/patches/17-multiarch-kerberos-paths.patch
+++ b/debian/patches/17-multiarch-kerberos-paths.patch
@@ -7,7 +7,7 @@
+ MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || true`
if test "$K5CONFIG" != ""; then
KRBCFLAGS=`$K5CONFIG --cflags`
- KRBLIBS=`$K5CONFIG --libs gssapi`
+ KRBLIBS=`$K5CONFIG --libs`
@@ -38,6 +39,7 @@
\( -f $dir/lib/libgssapi_krb5.a -o \
-f $dir/lib64/libgssapi_krb5.a -o \
diff --git a/debian/patches/series b/debian/patches/series
index 14b84c1..e05755b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
11-532048-reduce-verbosity.patch
16-mount.nfs.man-update-distinction-between-fstype.patch
17-multiarch-kerberos-paths.patch
-18-dont-use-PAGE_SIZE.patch
--
2.39.5