- really fixed this time

[packages/nfs-utils.git] / nfs-utils-heimdal.patch

diff --git a/nfs-utils-heimdal.patch b/nfs-utils-heimdal.patch
index 6b558f58c7012f25e6ddffea4371b4e66e7a6d6f..857823a4b26a252877646f8b208d8c711ea9e5c4 100644 (file)
--- a/nfs-utils-heimdal.patch
+++ b/nfs-utils-heimdal.patch
@@ -1,10 +1,10 @@
---- nfs-utils-1.0.8/configure.in~      2006-05-05 19:55:12.000000000 +0200
-+++ nfs-utils-1.0.8/configure.in       2006-05-05 19:57:11.000000000 +0200
-@@ -157,7 +157,8 @@
-        variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])
+--- nfs-utils-1.0.9/configure.in.orig  2006-07-17 12:23:46.164440000 +0200
++++ nfs-utils-1.0.9/configure.in       2006-07-18 13:06:53.474440000 +0200
+@@ -164,7 +164,8 @@
+        AC_MSG_ERROR([variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])
        ]
       )
--    PKG_CHECK_MODULES([GSSAPI], [libgssapi >= 0.9])
+-    PKG_CHECK_MODULES(GSSAPI, libgssapi >= 0.9)
 +    AC_CHECK_LIB(gssapi, main, [GSSAPI_LIBS="-lgssapi"], [AC_MSG_ERROR([Unable to locate libgssapi])])
 +    AC_SUBST(GSSAPI_LIBS)
      fi
@@ -118,3 +118,47 @@ diff -ur nfs-utils-1.0.8/utils/gssd/svcgssd.h nfs-utils-1.0.8.heimdal/utils/gssd
  
  void handle_nullreq(FILE *f);
  void gssd_run(void);
+--- nfs-utils-1.0.11/utils/gssd/svcgssd_mech2file.c.orig       2007-02-25 20:42:02.000000000 +0100
++++ nfs-utils-1.0.11/utils/gssd/svcgssd_mech2file.c    2007-03-10 23:57:23.421385359 +0100
+@@ -36,7 +36,7 @@
+ 
+ #include "config.h"
+ 
+-#include <gssapi/gssapi.h>
++#include <gssapi.h>
+ #include <string.h>
+ 
+ 
+--- nfs-utils-1.0.12/utils/gssd/gssd.h~        2007-03-20 19:16:11.000000000 +0100
++++ nfs-utils-1.0.12/utils/gssd/gssd.h 2007-03-20 19:28:43.000000000 +0100
+@@ -47,7 +47,7 @@
+ #define GSSD_DEFAULT_CRED_DIR                 "/tmp"
+ #define GSSD_DEFAULT_CRED_PREFIX              "krb5cc_"
+ #define GSSD_DEFAULT_MACHINE_CRED_SUFFIX      "machine"
+-#define GSSD_DEFAULT_KEYTAB_FILE              "/etc/krb5.keytab"
++#define GSSD_DEFAULT_KEYTAB_FILE              "/etc/heimdal/krb5.keytab"
+ #define GSSD_SERVICE_NAME                     "nfs"
+ #define GSSD_SERVICE_NAME_LEN                 3
+ 
+--- nfs-utils-1.0.12/utils/gssd/gssd.man~      2007-02-27 05:55:40.000000000 +0100
++++ nfs-utils-1.0.12/utils/gssd/gssd.man       2007-03-20 19:29:18.000000000 +0100
+@@ -31,7 +31,7 @@
+ to use the keys for principals nfs/hostname in
+ .I keytab
+ to obtain machine credentials.
+-The default value is "/etc/krb5.keytab".
++The default value is "/etc/heimdal/krb5.keytab".
+ .\".TP
+ .\".B -m
+ .\"Ordinarily,
+--- nfs-utils-1.0.12/utils/gssd/svcgssd.c~     2007-02-27 05:55:40.000000000 +0100
++++ nfs-utils-1.0.12/utils/gssd/svcgssd.c      2007-03-20 19:29:27.000000000 +0100
+@@ -232,7 +232,7 @@
+                 printerr(0, "unable to obtain root (machine) credentials\n");
+                 printerr(0, "do you have a keytab entry for "
+                           "nfs/<your.host>@<YOUR.REALM> in "
+-                          "/etc/krb5.keytab?\n");
++                          "/etc/heimdal/krb5.keytab?\n");
+               exit(1);
+       }
+