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

--- 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])
       ]
      )
-    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
 
 fi
diff -ur nfs-utils-1.0.8/utils/gssd/context.c nfs-utils-1.0.8.heimdal/utils/gssd/context.c
--- nfs-utils-1.0.8/utils/gssd/context.c	2006-03-28 02:48:27.000000000 +0200
+++ nfs-utils-1.0.8.heimdal/utils/gssd/context.c	2006-05-05 20:03:21.000000000 +0200
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
-#include <gssapi/gssapi.h>
+#include <gssapi.h>
 #include <rpc/rpc.h>
 #include <rpc/auth_gss.h>
 #include "gss_util.h"
diff -ur nfs-utils-1.0.8/utils/gssd/context_mit.c nfs-utils-1.0.8.heimdal/utils/gssd/context_mit.c
--- nfs-utils-1.0.8/utils/gssd/context_mit.c	2006-04-10 01:51:59.000000000 +0200
+++ nfs-utils-1.0.8.heimdal/utils/gssd/context_mit.c	2006-05-05 20:05:28.000000000 +0200
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
-#include <gssapi/gssapi.h>
+#include <gssapi.h>
 #include <rpc/rpc.h>
 #include <rpc/auth_gss.h>
 #include "gss_util.h"
diff -ur nfs-utils-1.0.8/utils/gssd/context_spkm3.c nfs-utils-1.0.8.heimdal/utils/gssd/context_spkm3.c
--- nfs-utils-1.0.8/utils/gssd/context_spkm3.c	2006-04-10 01:51:59.000000000 +0200
+++ nfs-utils-1.0.8.heimdal/utils/gssd/context_spkm3.c	2006-05-05 20:05:36.000000000 +0200
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
-#include <gssapi/gssapi.h>
+#include <gssapi.h>
 #include <rpc/rpc.h>
 #include <rpc/auth_gss.h>
 #include "gss_util.h"
diff -ur nfs-utils-1.0.8/utils/gssd/gss_oids.c nfs-utils-1.0.8.heimdal/utils/gssd/gss_oids.c
--- nfs-utils-1.0.8/utils/gssd/gss_oids.c	2005-08-26 03:20:13.000000000 +0200
+++ nfs-utils-1.0.8.heimdal/utils/gssd/gss_oids.c	2006-05-05 20:03:44.000000000 +0200
@@ -29,7 +29,7 @@
 */
 
 #include <sys/types.h>
-#include <gssapi/gssapi.h>
+#include <gssapi.h>
 
 /* from kerberos source, gssapi_krb5.c */
 gss_OID_desc krb5oid =
diff -ur nfs-utils-1.0.8/utils/gssd/gss_util.c nfs-utils-1.0.8.heimdal/utils/gssd/gss_util.c
--- nfs-utils-1.0.8/utils/gssd/gss_util.c	2005-08-26 03:27:18.000000000 +0200
+++ nfs-utils-1.0.8.heimdal/utils/gssd/gss_util.c	2006-05-05 20:04:08.000000000 +0200
@@ -72,7 +72,7 @@
 #include <sys/param.h>
 #include <netdb.h>
 #include <fcntl.h>
-#include <gssapi/gssapi.h>
+#include <gssapi.h>
 #if defined(HAVE_KRB5) && !defined(GSS_C_NT_HOSTBASED_SERVICE)
 #include <gssapi/gssapi_generic.h>
 #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
diff -ur nfs-utils-1.0.8/utils/gssd/gssd.h nfs-utils-1.0.8.heimdal/utils/gssd/gssd.h
--- nfs-utils-1.0.8/utils/gssd/gssd.h	2006-03-28 02:50:03.000000000 +0200
+++ nfs-utils-1.0.8.heimdal/utils/gssd/gssd.h	2006-05-05 20:04:27.000000000 +0200
@@ -33,7 +33,7 @@
 
 #include <sys/types.h>
 #include <sys/queue.h>
-#include <gssapi/gssapi.h>
+#include <gssapi.h>
 
 #define MAX_FILE_NAMELEN	32
 #define FD_ALLOC_BLOCK		32
diff -ur nfs-utils-1.0.8/utils/gssd/gssd_proc.c nfs-utils-1.0.8.heimdal/utils/gssd/gssd_proc.c
--- nfs-utils-1.0.8/utils/gssd/gssd_proc.c	2006-04-10 11:57:20.000000000 +0200
+++ nfs-utils-1.0.8.heimdal/utils/gssd/gssd_proc.c	2006-05-05 20:04:35.000000000 +0200
@@ -59,7 +59,7 @@
 #include <signal.h>
 #include <unistd.h>
 #include <errno.h>
-#include <gssapi/gssapi.h>
+#include <gssapi.h>
 #include <netdb.h>
 
 #include "gssd.h"
diff -ur nfs-utils-1.0.8/utils/gssd/krb5_util.c nfs-utils-1.0.8.heimdal/utils/gssd/krb5_util.c
--- nfs-utils-1.0.8/utils/gssd/krb5_util.c	2006-03-28 02:50:03.000000000 +0200
+++ nfs-utils-1.0.8.heimdal/utils/gssd/krb5_util.c	2006-05-05 20:04:53.000000000 +0200
@@ -107,7 +107,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <time.h>
-#include <gssapi/gssapi.h>
+#include <gssapi.h>
 #ifdef USE_PRIVATE_KRB5_FUNCTIONS
 #include <gssapi/gssapi_krb5.h>
 #endif
diff -ur nfs-utils-1.0.8/utils/gssd/svcgssd.h nfs-utils-1.0.8.heimdal/utils/gssd/svcgssd.h
--- nfs-utils-1.0.8/utils/gssd/svcgssd.h	2006-03-27 02:30:09.000000000 +0200
+++ nfs-utils-1.0.8.heimdal/utils/gssd/svcgssd.h	2006-05-05 20:05:02.000000000 +0200
@@ -33,7 +33,7 @@
 
 #include <sys/types.h>
 #include <sys/queue.h>
-#include <gssapi/gssapi.h>
+#include <gssapi.h>
 
 void handle_nullreq(FILE *f);
 void gssd_run(void);
Commit	Line	Data
2da61068 JR	1	--- nfs-utils-1.0.8/configure.in~ 2006-05-05 19:55:12.000000000 +0200
	2	+++ nfs-utils-1.0.8/configure.in 2006-05-05 19:57:11.000000000 +0200
	3	@@ -157,7 +157,8 @@
	4	variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])
	5	]
	6	)
	7	- PKG_CHECK_MODULES([GSSAPI], [libgssapi >= 0.9])
	8	+ AC_CHECK_LIB(gssapi, main, [GSSAPI_LIBS="-lgssapi"], [AC_MSG_ERROR([Unable to locate libgssapi])])
	9	+ AC_SUBST(GSSAPI_LIBS)
	10	fi
	11
	12	fi
	13	diff -ur nfs-utils-1.0.8/utils/gssd/context.c nfs-utils-1.0.8.heimdal/utils/gssd/context.c
	14	--- nfs-utils-1.0.8/utils/gssd/context.c 2006-03-28 02:48:27.000000000 +0200
	15	+++ nfs-utils-1.0.8.heimdal/utils/gssd/context.c 2006-05-05 20:03:21.000000000 +0200
	16	@@ -32,7 +32,7 @@
	17	#include <stdio.h>
	18	#include <syslog.h>
	19	#include <string.h>
	20	-#include <gssapi/gssapi.h>
	21	+#include <gssapi.h>
	22	#include <rpc/rpc.h>
	23	#include <rpc/auth_gss.h>
	24	#include "gss_util.h"
	25	diff -ur nfs-utils-1.0.8/utils/gssd/context_mit.c nfs-utils-1.0.8.heimdal/utils/gssd/context_mit.c
	26	--- nfs-utils-1.0.8/utils/gssd/context_mit.c 2006-04-10 01:51:59.000000000 +0200
	27	+++ nfs-utils-1.0.8.heimdal/utils/gssd/context_mit.c 2006-05-05 20:05:28.000000000 +0200
	28	@@ -32,7 +32,7 @@
	29	#include <stdio.h>
	30	#include <syslog.h>
	31	#include <string.h>
	32	-#include <gssapi/gssapi.h>
	33	+#include <gssapi.h>
	34	#include <rpc/rpc.h>
	35	#include <rpc/auth_gss.h>
	36	#include "gss_util.h"
	37	diff -ur nfs-utils-1.0.8/utils/gssd/context_spkm3.c nfs-utils-1.0.8.heimdal/utils/gssd/context_spkm3.c
	38	--- nfs-utils-1.0.8/utils/gssd/context_spkm3.c 2006-04-10 01:51:59.000000000 +0200
	39	+++ nfs-utils-1.0.8.heimdal/utils/gssd/context_spkm3.c 2006-05-05 20:05:36.000000000 +0200
	40	@@ -32,7 +32,7 @@
	41	#include <stdio.h>
	42	#include <syslog.h>
	43	#include <string.h>
	44	-#include <gssapi/gssapi.h>
	45	+#include <gssapi.h>
	46	#include <rpc/rpc.h>
	47	#include <rpc/auth_gss.h>
	48	#include "gss_util.h"
	49	diff -ur nfs-utils-1.0.8/utils/gssd/gss_oids.c nfs-utils-1.0.8.heimdal/utils/gssd/gss_oids.c
	50	--- nfs-utils-1.0.8/utils/gssd/gss_oids.c 2005-08-26 03:20:13.000000000 +0200
	51	+++ nfs-utils-1.0.8.heimdal/utils/gssd/gss_oids.c 2006-05-05 20:03:44.000000000 +0200
	52	@@ -29,7 +29,7 @@
	53	*/
	54
	55	#include <sys/types.h>
	56	-#include <gssapi/gssapi.h>
	57	+#include <gssapi.h>
	58
	59	/* from kerberos source, gssapi_krb5.c */
	60	gss_OID_desc krb5oid =
	61	diff -ur nfs-utils-1.0.8/utils/gssd/gss_util.c nfs-utils-1.0.8.heimdal/utils/gssd/gss_util.c
	62	--- nfs-utils-1.0.8/utils/gssd/gss_util.c 2005-08-26 03:27:18.000000000 +0200
	63	+++ nfs-utils-1.0.8.heimdal/utils/gssd/gss_util.c 2006-05-05 20:04:08.000000000 +0200
	64	@@ -72,7 +72,7 @@
65	#include <sys/param.h>
66	#include <netdb.h>
67	#include <fcntl.h>
68	-#include <gssapi/gssapi.h>
69	+#include <gssapi.h>
70	#if defined(HAVE_KRB5) && !defined(GSS_C_NT_HOSTBASED_SERVICE)
71	#include <gssapi/gssapi_generic.h>
72	#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
73	diff -ur nfs-utils-1.0.8/utils/gssd/gssd.h nfs-utils-1.0.8.heimdal/utils/gssd/gssd.h
74	--- nfs-utils-1.0.8/utils/gssd/gssd.h 2006-03-28 02:50:03.000000000 +0200
75	+++ nfs-utils-1.0.8.heimdal/utils/gssd/gssd.h 2006-05-05 20:04:27.000000000 +0200
76	@@ -33,7 +33,7 @@
77
78	#include <sys/types.h>
79	#include <sys/queue.h>
80	-#include <gssapi/gssapi.h>
81	+#include <gssapi.h>
82
83	#define MAX_FILE_NAMELEN 32
84	#define FD_ALLOC_BLOCK 32
85	diff -ur nfs-utils-1.0.8/utils/gssd/gssd_proc.c nfs-utils-1.0.8.heimdal/utils/gssd/gssd_proc.c
86	--- nfs-utils-1.0.8/utils/gssd/gssd_proc.c 2006-04-10 11:57:20.000000000 +0200
87	+++ nfs-utils-1.0.8.heimdal/utils/gssd/gssd_proc.c 2006-05-05 20:04:35.000000000 +0200
88	@@ -59,7 +59,7 @@
89	#include <signal.h>
90	#include <unistd.h>
91	#include <errno.h>
92	-#include <gssapi/gssapi.h>
93	+#include <gssapi.h>
94	#include <netdb.h>
95
96	#include "gssd.h"
97	diff -ur nfs-utils-1.0.8/utils/gssd/krb5_util.c nfs-utils-1.0.8.heimdal/utils/gssd/krb5_util.c
98	--- nfs-utils-1.0.8/utils/gssd/krb5_util.c 2006-03-28 02:50:03.000000000 +0200
99	+++ nfs-utils-1.0.8.heimdal/utils/gssd/krb5_util.c 2006-05-05 20:04:53.000000000 +0200
100	@@ -107,7 +107,7 @@
101	#include <dirent.h>
102	#include <errno.h>
103	#include <time.h>
104	-#include <gssapi/gssapi.h>
105	+#include <gssapi.h>
106	#ifdef USE_PRIVATE_KRB5_FUNCTIONS
107	#include <gssapi/gssapi_krb5.h>
108	#endif
109	diff -ur nfs-utils-1.0.8/utils/gssd/svcgssd.h nfs-utils-1.0.8.heimdal/utils/gssd/svcgssd.h
110	--- nfs-utils-1.0.8/utils/gssd/svcgssd.h 2006-03-27 02:30:09.000000000 +0200
111	+++ nfs-utils-1.0.8.heimdal/utils/gssd/svcgssd.h 2006-05-05 20:05:02.000000000 +0200
112	@@ -33,7 +33,7 @@
113
114	#include <sys/types.h>
115	#include <sys/queue.h>
116	-#include <gssapi/gssapi.h>
117	+#include <gssapi.h>
118
119	void handle_nullreq(FILE *f);
120	void gssd_run(void);