diff options
| author | shattered <shattered@pkgsrc.org> | 2012-01-24 09:04:06 +0000 |
|---|---|---|
| committer | shattered <shattered@pkgsrc.org> | 2012-01-24 09:04:06 +0000 |
| commit | efead3fb808fb1897392a9fcb47203548ef7ed30 (patch) | |
| tree | 97b92a46962ec120a627a2dfc01bf8c21fd665af /mail/imap-uw | |
| parent | 0578f5c14adc1da797cf1b4e409dcf2d7da8860f (diff) | |
| download | pkgsrc-efead3fb808fb1897392a9fcb47203548ef7ed30.tar.gz | |
PR/44791 -- apply markd's patch to unbreak build with older heimdal.
Diffstat (limited to 'mail/imap-uw')
| -rw-r--r-- | mail/imap-uw/distinfo | 6 | ||||
| -rw-r--r-- | mail/imap-uw/patches/patch-af | 8 | ||||
| -rw-r--r-- | mail/imap-uw/patches/patch-al | 10 |
3 files changed, 14 insertions, 10 deletions
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo index 77097bfd04a..1d81aff9afa 100644 --- a/mail/imap-uw/distinfo +++ b/mail/imap-uw/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.40 2011/01/30 01:33:44 markd Exp $ +$NetBSD: distinfo,v 1.41 2012/01/24 09:04:06 shattered 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) = cacfbf5a3196551a7e45833d2f98f35ea8027506 +SHA1 (patch-af) = f3a7d2dad7b95940bdb7ee812ee19622cc594c75 SHA1 (patch-ag) = 4152c1c618bf78f63668070e26e8feb0f7df91ed SHA1 (patch-ah) = ca68ec33fbf8ac4138669588b32098eb4f156f75 SHA1 (patch-ai) = 312d2bd29be2f8fc03c24a635afcb0ca4ae33832 SHA1 (patch-aj) = 961d90bf0eab651678f5bf04f19742cc4c0ecde3 -SHA1 (patch-al) = 12505cddefa74742fbd7769f953d7bdf3e09145c +SHA1 (patch-al) = aeb9021e41756db7c67346212dbb441ba7d9885a 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 12144d846ba..739424bfbc1 100644 --- a/mail/imap-uw/patches/patch-af +++ b/mail/imap-uw/patches/patch-af @@ -1,14 +1,16 @@ -$NetBSD: patch-af,v 1.8 2011/01/30 01:33:44 markd Exp $ +$NetBSD: patch-af,v 1.9 2012/01/24 09:04:07 shattered Exp $ ---- src/osdep/unix/kerb_mit.c.orig 2006-08-31 01:40:15.000000000 +0000 +--- src/osdep/unix/kerb_mit.c.orig 2008-06-04 18:18:34.000000000 +0000 +++ src/osdep/unix/kerb_mit.c -@@ -26,9 +26,16 @@ +@@ -26,9 +26,18 @@ * Last Edited: 30 August 2006 */ +#ifdef HEIMDAL_KRB5 +#include <gssapi/gssapi.h> ++#ifdef GSSAPI_GSSAPI_H_ /* older heimdals use GSSAPI_H_ */ +#include <gssapi/gssapi_krb5.h> ++#endif +#include <krb5.h> +#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE +#else diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al index 8c2b5f67b52..d2b28974e6e 100644 --- a/mail/imap-uw/patches/patch-al +++ b/mail/imap-uw/patches/patch-al @@ -1,14 +1,16 @@ -$NetBSD: patch-al,v 1.8 2011/01/30 01:33:44 markd Exp $ +$NetBSD: patch-al,v 1.9 2012/01/24 09:04:07 shattered Exp $ ---- src/c-client/auth_gss.c.orig 2006-08-30 23:37:16.000000000 +0000 +--- src/c-client/auth_gss.c.orig 2008-06-04 18:18:34.000000000 +0000 +++ src/c-client/auth_gss.c -@@ -26,6 +26,15 @@ +@@ -26,6 +26,17 @@ * Last Edited: 30 August 2006 */ +#ifdef HEIMDAL_KRB5 +#include <gssapi/gssapi.h> ++#ifdef GSSAPI_GSSAPI_H_ /* older heimdals use GSSAPI_H_ */ +#include <gssapi/gssapi_krb5.h> ++#endif +#include <krb5.h> +#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE +#else @@ -18,7 +20,7 @@ $NetBSD: patch-al,v 1.8 2011/01/30 01:33:44 markd Exp $ long auth_gssapi_valid (void); long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder, -@@ -64,15 +73,32 @@ long auth_gssapi_valid (void) +@@ -64,15 +75,32 @@ long auth_gssapi_valid (void) OM_uint32 smn; gss_buffer_desc buf; gss_name_t name; |