diff options
| author | markd <markd> | 2011-01-30 01:33:44 +0000 |
|---|---|---|
| committer | markd <markd> | 2011-01-30 01:33:44 +0000 |
| commit | cc1b7584656bf53f2e671abb81d5ed093443f2b4 (patch) | |
| tree | 516f4d9b8253138e402a2f7e96fb65ee47f457af /mail/imap-uw/patches | |
| parent | 23d5b06c0c6d8260160f778db35d67c73eae7fdd (diff) | |
| download | pkgsrc-cc1b7584656bf53f2e671abb81d5ed093443f2b4.tar.gz | |
Fix build with newer heimdal.
Diffstat (limited to 'mail/imap-uw/patches')
| -rw-r--r-- | mail/imap-uw/patches/patch-af | 7 | ||||
| -rw-r--r-- | mail/imap-uw/patches/patch-aj | 4 | ||||
| -rw-r--r-- | mail/imap-uw/patches/patch-al | 9 |
3 files changed, 11 insertions, 9 deletions
diff --git a/mail/imap-uw/patches/patch-af b/mail/imap-uw/patches/patch-af index a1013f36a43..12144d846ba 100644 --- a/mail/imap-uw/patches/patch-af +++ b/mail/imap-uw/patches/patch-af @@ -1,14 +1,15 @@ -$NetBSD: patch-af,v 1.7 2007/08/03 17:03:30 obache Exp $ +$NetBSD: patch-af,v 1.8 2011/01/30 01:33:44 markd Exp $ --- src/osdep/unix/kerb_mit.c.orig 2006-08-31 01:40:15.000000000 +0000 +++ src/osdep/unix/kerb_mit.c -@@ -26,9 +26,15 @@ +@@ -26,9 +26,16 @@ * Last Edited: 30 August 2006 */ +#ifdef HEIMDAL_KRB5 +#include <gssapi/gssapi.h> -+#include <krb5/krb5.h> ++#include <gssapi/gssapi_krb5.h> ++#include <krb5.h> +#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE +#else #define PROTOTYPE(x) x diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj index 3bd13e1a999..4ab931b8636 100644 --- a/mail/imap-uw/patches/patch-aj +++ b/mail/imap-uw/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.13 2007/08/03 17:03:30 obache Exp $ +$NetBSD: patch-aj,v 1.14 2011/01/30 01:33:44 markd Exp $ --- src/osdep/unix/Makefile.gss.orig 2007-04-05 02:20:04.000000000 +0000 +++ src/osdep/unix/Makefile.gss @@ -7,7 +7,7 @@ $NetBSD: patch-aj,v 1.13 2007/08/03 17:03:30 obache Exp $ GSSINCLUDE=$(GSSDIR)/include GSSLIB=$(GSSDIR)/lib -GSSCFLAGS= -I$(GSSINCLUDE) -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -DKRB5_DEPRECATED=1 -+GSSCFLAGS= -I$(GSSINCLUDE) -I$(GSSDIR)/include/krb5 -DKRB5_DEPRECATED=1 ++GSSCFLAGS= -I$(GSSINCLUDE) -I$(GSSDIR)/include/krb5 GSSOLDLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err GSSNEWLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al index 8bf589303ee..8c2b5f67b52 100644 --- a/mail/imap-uw/patches/patch-al +++ b/mail/imap-uw/patches/patch-al @@ -1,14 +1,15 @@ -$NetBSD: patch-al,v 1.7 2007/08/03 17:03:30 obache Exp $ +$NetBSD: patch-al,v 1.8 2011/01/30 01:33:44 markd Exp $ --- src/c-client/auth_gss.c.orig 2006-08-30 23:37:16.000000000 +0000 +++ src/c-client/auth_gss.c -@@ -26,6 +26,14 @@ +@@ -26,6 +26,15 @@ * Last Edited: 30 August 2006 */ +#ifdef HEIMDAL_KRB5 +#include <gssapi/gssapi.h> -+#include <krb5/krb5.h> ++#include <gssapi/gssapi_krb5.h> ++#include <krb5.h> +#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE +#else +#include <gssapi/gssapi_generic.h> @@ -17,7 +18,7 @@ $NetBSD: patch-al,v 1.7 2007/08/03 17:03:30 obache Exp $ long auth_gssapi_valid (void); long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder, -@@ -64,15 +72,32 @@ long auth_gssapi_valid (void) +@@ -64,15 +73,32 @@ long auth_gssapi_valid (void) OM_uint32 smn; gss_buffer_desc buf; gss_name_t name; |