From 150ae7150fa0e8b2250c93c0eb406caa4bed5277 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 17 Jan 2007 15:10:42 +0100 Subject: [PATCH] Imported Debian patch 1.0.11~git-20060117-1 --- debian/changelog | 16 +++++++ debian/copyright | 8 ++-- .../05-refuse-non-ident-maptypes.patch | 12 +++--- .../patches/08-dont-build-getkversion.patch | 30 ++++++------- debian/patches/11-root-on-krb5-mounts.patch | 43 +++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 85 insertions(+), 25 deletions(-) create mode 100644 debian/patches/11-root-on-krb5-mounts.patch diff --git a/debian/changelog b/debian/changelog index fe5799d..c737af3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +nfs-utils (1:1.0.11~git-20060117-1) experimental; urgency=low + + * New upstream snapshot; only minor changes. + * Update debian/copyright with the new version number and date. + * Fix a typo in debian/copyright; we need () around the autogen.sh line. + * Remove an extraneous slash that git thinks shouldn't be there. + * Update patches for new upstream release: + * 05-refuse-non-ident-maptypes.patch: Hunk offset and fuzz, refreshed. + * 08-dont-build-getkversion.patch: Hunk offset, refreshed. + * debian/patches/11-root-on-krb5-mounts.patch: New patch (imported and + refreshed), from Antti Tapaninen (via Timo Aaltonen); changes root to map + to root/host@REALM instead of nfs/host@REALM on krb5-enabled mounts. Fixes + issues where root would get mapped to nobody. (Closes: #407264) + + -- Steinar H. Gunderson Wed, 17 Jan 2007 15:10:42 +0100 + nfs-utils (1:1.0.11~git-20060105-2) experimental; urgency=low * 08-dont-build-getkversion.patch: We missed tools/Makefile.in on last diff --git a/debian/copyright b/debian/copyright index a3d9a19..910768b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,11 @@ This package was debianized by Chip Salzenberg on Fri, 3 Dec 1999 20:00:00 -0800 -This is a git snapshot, downloaded January 5th, 2007 using +This is a git snapshot, downloaded January 17th, 2007 using the following commands: - cg-clone git://git.linux-nfs.org/pub/linux/nfs-utils/ nfs-utils-1.0.11\~git-20060105/ - cd nfs-utils-1.0.11\~git-20060105/ && sh ./autogen.sh - tar --exclude=.git -zcf nfs-utils_1.0.11~git-20060105.orig.tar.gz nfs-utils-1.0.11\~git-20060105 + cg-clone git://git.linux-nfs.org/pub/linux/nfs-utils/ nfs-utils-1.0.11\~git-20060117 + ( cd nfs-utils-1.0.11\~git-20060117/ && sh ./autogen.sh ) + tar --exclude=.git -zcf nfs-utils_1.0.11~git-20060117.orig.tar.gz nfs-utils-1.0.11\~git-20060117 Regular releases are avilable from http://sourceforge.net/projects/nfs/. diff --git a/debian/patches/05-refuse-non-ident-maptypes.patch b/debian/patches/05-refuse-non-ident-maptypes.patch index 7154af3..c2c93f4 100644 --- a/debian/patches/05-refuse-non-ident-maptypes.patch +++ b/debian/patches/05-refuse-non-ident-maptypes.patch @@ -1,9 +1,9 @@ -Index: nfs-utils-1.0.11~git-20060105/utils/mountd/cache.c +Index: nfs-utils-1.0.11~git-20060117/utils/mountd/cache.c =================================================================== ---- nfs-utils-1.0.11~git-20060105.orig/utils/mountd/cache.c -+++ nfs-utils-1.0.11~git-20060105/utils/mountd/cache.c -@@ -375,6 +375,12 @@ void cache_export(nfs_export *exp) - { +--- nfs-utils-1.0.11~git-20060117.orig/utils/mountd/cache.c ++++ nfs-utils-1.0.11~git-20060117/utils/mountd/cache.c +@@ -377,6 +377,12 @@ int cache_export(nfs_export *exp) + int err; FILE *f; + if (exp->m_export.e_maptype != CLE_MAP_IDENT) { @@ -14,4 +14,4 @@ Index: nfs-utils-1.0.11~git-20060105/utils/mountd/cache.c + f = fopen("/proc/net/rpc/auth.unix.ip/channel", "w"); if (!f) - return; + return -1; diff --git a/debian/patches/08-dont-build-getkversion.patch b/debian/patches/08-dont-build-getkversion.patch index db80383..b5339be 100644 --- a/debian/patches/08-dont-build-getkversion.patch +++ b/debian/patches/08-dont-build-getkversion.patch @@ -1,7 +1,7 @@ -Index: nfs-utils-1.0.11~git-20060105/configure.in +Index: nfs-utils-1.0.11~git-20060117/configure.in =================================================================== ---- nfs-utils-1.0.11~git-20060105.orig/configure.in -+++ nfs-utils-1.0.11~git-20060105/configure.in +--- nfs-utils-1.0.11~git-20060117.orig/configure.in ++++ nfs-utils-1.0.11~git-20060117/configure.in @@ -319,7 +319,6 @@ AC_CONFIG_FILES([ support/nfs/Makefile tools/Makefile @@ -10,10 +10,10 @@ Index: nfs-utils-1.0.11~git-20060105/configure.in tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile -Index: nfs-utils-1.0.11~git-20060105/tools/Makefile.am +Index: nfs-utils-1.0.11~git-20060117/tools/Makefile.am =================================================================== ---- nfs-utils-1.0.11~git-20060105.orig/tools/Makefile.am -+++ nfs-utils-1.0.11~git-20060105/tools/Makefile.am +--- nfs-utils-1.0.11~git-20060117.orig/tools/Makefile.am ++++ nfs-utils-1.0.11~git-20060117/tools/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in @@ -21,11 +21,11 @@ Index: nfs-utils-1.0.11~git-20060105/tools/Makefile.am +SUBDIRS = getiversion locktest rpcdebug rpcgen nlmtest MAINTAINERCLEANFILES = Makefile.in -Index: nfs-utils-1.0.11~git-20060105/configure +Index: nfs-utils-1.0.11~git-20060117/configure =================================================================== ---- nfs-utils-1.0.11~git-20060105.orig/configure -+++ nfs-utils-1.0.11~git-20060105/configure -@@ -28736,7 +28736,7 @@ AM_CFLAGS="$my_am_cflags" +--- nfs-utils-1.0.11~git-20060117.orig/configure ++++ nfs-utils-1.0.11~git-20060117/configure +@@ -28722,7 +28722,7 @@ AM_CFLAGS="$my_am_cflags" ACLOCAL_AMFLAGS="-I $ac_macro_dir \$(ACLOCAL_FLAGS)" @@ -34,7 +34,7 @@ Index: nfs-utils-1.0.11~git-20060105/configure cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -29371,7 +29371,6 @@ do +@@ -29357,7 +29357,6 @@ do "support/nfs/Makefile") CONFIG_FILES="$CONFIG_FILES support/nfs/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "tools/getiversion/Makefile") CONFIG_FILES="$CONFIG_FILES tools/getiversion/Makefile" ;; @@ -42,11 +42,11 @@ Index: nfs-utils-1.0.11~git-20060105/configure "tools/locktest/Makefile") CONFIG_FILES="$CONFIG_FILES tools/locktest/Makefile" ;; "tools/nlmtest/Makefile") CONFIG_FILES="$CONFIG_FILES tools/nlmtest/Makefile" ;; "tools/rpcdebug/Makefile") CONFIG_FILES="$CONFIG_FILES tools/rpcdebug/Makefile" ;; -Index: nfs-utils-1.0.11~git-20060105/tools/Makefile.in +Index: nfs-utils-1.0.11~git-20060117/tools/Makefile.in =================================================================== ---- nfs-utils-1.0.11~git-20060105.orig/tools/Makefile.in -+++ nfs-utils-1.0.11~git-20060105/tools/Makefile.in -@@ -207,7 +207,7 @@ statduser = @statduser@ +--- nfs-utils-1.0.11~git-20060117.orig/tools/Makefile.in ++++ nfs-utils-1.0.11~git-20060117/tools/Makefile.in +@@ -204,7 +204,7 @@ statduser = @statduser@ statedir = @statedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ diff --git a/debian/patches/11-root-on-krb5-mounts.patch b/debian/patches/11-root-on-krb5-mounts.patch new file mode 100644 index 0000000..a8c4d21 --- /dev/null +++ b/debian/patches/11-root-on-krb5-mounts.patch @@ -0,0 +1,43 @@ +Index: nfs-utils-1.0.11~git-20060117/utils/gssd/krb5_util.c +=================================================================== +--- nfs-utils-1.0.11~git-20060117.orig/utils/gssd/krb5_util.c ++++ nfs-utils-1.0.11~git-20060117/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; + +@@ -496,13 +499,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)) ) { +@@ -714,7 +717,7 @@ gssd_refresh_krb5_machine_creds(void) + printerr(0, "Do you have a valid keytab entry for " + "%s/@ 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 3c87e9b..e892c40 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 08-dont-build-getkversion.patch 09-manpage-paths-fixup.patch 10-ccachedir-off-by-one.patch +11-root-on-krb5-mounts.patch -- 2.39.5