[patch] Fix pine compilation to accommodate both mit-krb5 and heimdal

pine-kerberos.patch (text/plain), 1.46 KB, created by Alexander Dubov on 2010-02-19 05:34:11 UTC

diff -ur pine4.64.orig/imap/src/osdep/unix/kerb_mit.c pine4.64/imap/src/osdep/unix/kerb_mit.c
--- pine4.64.orig/imap/src/osdep/unix/kerb_mit.c	2003-10-18 02:39:42.000000000 +1000
+++ pine4.64/imap/src/osdep/unix/kerb_mit.c	2010-02-19 16:17:29.670979913 +1100
@@ -19,8 +19,8 @@
  */
 
 #define PROTOTYPE(x) x
-#include <gssapi/gssapi_generic.h>
-#include <gssapi/gssapi_krb5.h>
+#include <gssapi.h>
+#include <krb5.h>
 
 
 long kerberos_server_valid (void);
diff -ur pine4.64.orig/imap/src/osdep/unix/Makefile.gss pine4.64/imap/src/osdep/unix/Makefile.gss
--- pine4.64.orig/imap/src/osdep/unix/Makefile.gss	2003-03-05 14:29:59.000000000 +1100
+++ pine4.64/imap/src/osdep/unix/Makefile.gss	2010-02-19 16:17:55.018811222 +1100
@@ -20,12 +20,12 @@
 
 # Extended flags needed for additional authenticators.  You may need to modify.
 
-GSSDIR=/usr/local
+GSSDIR=/usr
 GSSCFLAGS= -I$(GSSDIR)/include -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name
-GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
-GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
+GSSFLAGS= -L$(GSSDIR)/lib -lgssglue -lkrb5 -lcom_err
 
 gss:	# GSSAPI Kerberos V flags
 	echo $(GSSCFLAGS) >> OSCFLAGS
-	sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
+	echo $(GSSFLAGS) >> LDFLAGS
+	sh -c '(test -f $(GSSDIR)/lib/libgssapi_krb5.so) && echo -lgssapi_krb5 || echo -lgssapi' >> LDFLAGS
 	echo "#include \"kerb_mit.c\"" >> auths.c