From 981269944643eeb13200feafa873a2dd3947bda3 Mon Sep 17 00:00:00 2001 From: markd Date: Sun, 30 Jan 2011 01:33:44 +0000 Subject: Fix build with newer heimdal. --- mail/imap-uw/Makefile | 6 +++--- mail/imap-uw/distinfo | 8 ++++---- mail/imap-uw/patches/patch-af | 7 ++++--- mail/imap-uw/patches/patch-aj | 4 ++-- mail/imap-uw/patches/patch-al | 9 +++++---- 5 files changed, 18 insertions(+), 16 deletions(-) (limited to 'mail') diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index e377750fdb4..710adda0483 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.133 2010/04/20 12:52:00 seanb Exp $ +# $NetBSD: Makefile,v 1.134 2011/01/30 01:33:44 markd Exp $ # # ATTENTION: # The Kerberos support in this software is known to be problematic. If you @@ -26,8 +26,8 @@ USE_LIBTOOL= yes MAKE_ENV+= LIBTOOL=libtool MAKE_ENV+= LTCOMPILE="libtool --tag=CC --mode=compile" MAKE_ENV+= LTLINK="libtool --tag=CC --mode=link" -LTINSTALL_PROGRAM= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} -LTINSTALL_LIB= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_LIB} +LTINSTALL_PROGRAM= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --tag=CC --mode=install ${INSTALL_PROGRAM} +LTINSTALL_LIB= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --tag=CC --mode=install ${INSTALL_LIB} WRKSRC= ${WRKDIR}/${DISTNAME:S/2$//} diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo index 0a0e7001b40..77097bfd04a 100644 --- a/mail/imap-uw/distinfo +++ b/mail/imap-uw/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2010/01/25 23:04:49 tron Exp $ +$NetBSD: distinfo,v 1.40 2011/01/30 01:33:44 markd Exp $ SHA1 (imap-2007e.tar.Z) = 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70 RMD160 (imap-2007e.tar.Z) = 7d6af203419975f763d7ec17b6a4544c94490b50 @@ -8,12 +8,12 @@ SHA1 (patch-ab) = c7985a2db4d4b5c8d2644492b2e48f8ebe2d64b1 SHA1 (patch-ac) = eab1435fdf7ab59ea8afbde949a92dd756e6aea3 SHA1 (patch-ad) = d817dca51413bb8d228c2fabadffa3b924dff11d SHA1 (patch-ae) = 85e0917ce1934f6789bbce45ad5321e28cf294d9 -SHA1 (patch-af) = 38d3d020109076403becf691a8eb288ccabd9f70 +SHA1 (patch-af) = cacfbf5a3196551a7e45833d2f98f35ea8027506 SHA1 (patch-ag) = 4152c1c618bf78f63668070e26e8feb0f7df91ed SHA1 (patch-ah) = ca68ec33fbf8ac4138669588b32098eb4f156f75 SHA1 (patch-ai) = 312d2bd29be2f8fc03c24a635afcb0ca4ae33832 -SHA1 (patch-aj) = d9edbd39d552b70561c8df8d1d34568cec528cf9 -SHA1 (patch-al) = f85551692a8e7e6d7bbdba9aed4850e3a434058b +SHA1 (patch-aj) = 961d90bf0eab651678f5bf04f19742cc4c0ecde3 +SHA1 (patch-al) = 12505cddefa74742fbd7769f953d7bdf3e09145c SHA1 (patch-am) = f0c5d250d69976c85537c9b8080365e8c2391c9d SHA1 (patch-ao) = b23f356cdeaccd996fd2d11b23da265b6b0df49f SHA1 (patch-ap) = 3cd56196e6bc770e4398b97ba5a73f724af2a225 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 -+#include ++#include ++#include +#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 -+#include ++#include ++#include +#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE +#else +#include @@ -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; -- cgit v1.2.3