Imported Debian patch 1.0.12-2

diff --git a/debian/changelog b/debian/changelog
index d7130176e82afc6ab6fb84bbf5e5ffcf75d9e6e9..a1230265aeb8e9181bc36c69025730b768675c03 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nfs-utils (1:1.0.12-2) unstable; urgency=medium
+
+  * Drop 11-root-on-krb5-mounts.patch, as it causes problems with backward
+    compatibility. (Closes: #407264, but also probably reopens it at the same
+    time...).
+  * Add an explicit versioned dependency on libblkid1, since the version in
+    sarge lacks the blkid_probe_all_new symbol and the shlibs does not add
+    the versioned dependency by itself. (Closes: #413057)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Fri,  2 Mar 2007 19:54:06 +0100
+
 nfs-utils (1:1.0.12-1) unstable; urgency=high
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index d7d5c66d9ecf5760ce5ca9716ed83129a8c5af84..a9ea110f6a38472d7fcaab009c3577c945138ca0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 Package: nfs-kernel-server
 Priority: optional
 Architecture: any
-Depends: nfs-common (>= 1:1.0.8-1), ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}
+Depends: nfs-common (>= 1:1.0.8-1), ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}, libblkid1 (>= 1.39+1.40-WIP-2006.11.14+dfsg-1)
 Provides: knfs, nfs-server
 Conflicts: knfs, nfs-server
 Replaces: knfs, nfs-server

diff --git a/debian/patches/11-root-on-krb5-mounts.patch b/debian/patches/11-root-on-krb5-mounts.patch
deleted file mode 100644 (file)
index 5d8c301..0000000
--- a/debian/patches/11-root-on-krb5-mounts.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: nfs-utils-1.0.11~git-20070212/utils/gssd/krb5_util.c
-===================================================================
---- nfs-utils-1.0.11~git-20070212.orig/utils/gssd/krb5_util.c
-+++ nfs-utils-1.0.11~git-20070212/utils/gssd/krb5_util.c
-@@ -120,6 +120,9 @@
- #include "gss_oids.h"
- #include "krb5_util.h"
- 
-+#define GSSD_MACHINE_CRED_NAME "root"
-+#define GSSD_MACHINE_CRED_NAME_LEN 4
-+
- /* Global list of principals/cache file names for machine credentials */
- struct gssd_k5_kt_princ *gssd_k5_kt_princ_list = NULL;
- 
-@@ -490,13 +493,13 @@ gssd_process_krb5_keytab(krb5_context co
-               printerr(2, "Processing keytab entry for principal '%s'\n",
-                        pname);
- #ifdef HAVE_KRB5
--              if ( (kte.principal->data[0].length == GSSD_SERVICE_NAME_LEN) &&
--                   (strncmp(kte.principal->data[0].data, GSSD_SERVICE_NAME,
--                            GSSD_SERVICE_NAME_LEN) == 0) &&
-+              if ( (kte.principal->data[0].length == GSSD_MACHINE_CRED_NAME_LEN) &&
-+                   (strncmp(kte.principal->data[0].data, GSSD_MACHINE_CRED_NAME,
-+                            GSSD_MACHINE_CRED_NAME_LEN) == 0) &&
- #else
--              if ( (strlen(kte.principal->name.name_string.val[0]) == GSSD_SERVICE_NAME_LEN) &&
--                   (strncmp(kte.principal->name.name_string.val[0], GSSD_SERVICE_NAME,
--                            GSSD_SERVICE_NAME_LEN) == 0) &&
-+              if ( (strlen(kte.principal->name.name_string.val[0]) == GSSD_MACHINE_CRED_NAME_LEN) &&
-+                   (strncmp(kte.principal->name.name_string.val[0], GSSD_MACHINE_CRED_NAME,
-+                            GSSD_MACHINE_CRED_NAME_LEN) == 0) &&
-                             
- #endif
-                    (!gssd_have_realm_ple((void *)&kte.principal->realm)) ) {
-@@ -708,7 +711,7 @@ gssd_refresh_krb5_machine_creds(void)
-                       printerr(0, "Do you have a valid keytab entry for "
-                                   "%s/<your.host>@<YOUR.REALM> in "
-                                   "keytab file %s ?\n",
--                                  GSSD_SERVICE_NAME, keytabfile);
-+                                  GSSD_MACHINE_CRED_NAME, keytabfile);
-                       printerr(0, "Continuing without (machine) credentials "
-                                   "- nfs4 mounts with Kerberos will fail\n");
-               }

diff --git a/debian/patches/series b/debian/patches/series
index 30f711835cfe55d4dcbeb584c030e9ebf51b28d0..36a7d978c5338cc9266afcb9a3a9b0dd183541e6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 02-document-debian-init-scripts.patch
-11-root-on-krb5-mounts.patch