summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authormarkd <markd>2006-02-12 19:13:49 +0000
committermarkd <markd>2006-02-12 19:13:49 +0000
commitd5c2a8ab774d9bea2a979c0daab828bcb7a7561d (patch)
treea6fe2f368a525579e2102dc5672ee0f6937f2810 /mail
parentc059e2a60525606f12f4083e763c79d8be9ae98c (diff)
downloadpkgsrc-d5c2a8ab774d9bea2a979c0daab828bcb7a7561d.tar.gz
Add option to enable GSSAPI support and patch a bug in the GSSAPI code.
Diffstat (limited to 'mail')
-rw-r--r--mail/dovecot/distinfo3
-rw-r--r--mail/dovecot/options.mk14
-rw-r--r--mail/dovecot/patches/patch-ae13
3 files changed, 27 insertions, 3 deletions
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 1cdaab6b530..ed9bb72ec5f 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2006/02/12 02:47:31 grant Exp $
+$NetBSD: distinfo,v 1.24 2006/02/12 19:13:49 markd Exp $
SHA1 (dovecot-1.0.beta3.tar.gz) = a5d1fc471c88b96e0ef9d7296b25450a1d7a1419
RMD160 (dovecot-1.0.beta3.tar.gz) = 180e694ee78b73e69995096e1598cca427f6c87d
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = be37d7ed741930e683028e6ea626aa1d312a328e
SHA1 (patch-ab) = a96efac8c8fbaf90f2706e5cb4a3288e405d946f
SHA1 (patch-ac) = 27de0de32111e351cd547cb5a9847a15e4c991a0
SHA1 (patch-ad) = c390d007c60b80a6456c42f3512afdea76e5e03c
+SHA1 (patch-ae) = b34743e2276eff0c1fc37e0fd622fdd598c0bca3
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
index b1069af9223..bc2bc8f624b 100644
--- a/mail/dovecot/options.mk
+++ b/mail/dovecot/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.14 2006/02/12 02:47:32 grant Exp $
+# $NetBSD: options.mk,v 1.15 2006/02/12 19:13:49 markd Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot
-PKG_SUPPORTED_OPTIONS= inet6 kqueue ldap mysql pam pgsql sasl sqlite
+PKG_SUPPORTED_OPTIONS= gssapi inet6 kqueue ldap mysql pam pgsql sasl sqlite
PKG_OPTIONS_OPTIONAL_GROUPS= ssl
PKG_OPTIONS_GROUP.ssl= gnutls ssl
PKG_SUGGESTED_OPTIONS= ssl
@@ -82,3 +82,13 @@ CONFIGURE_ARGS+= --with-sqlite
CONFIGURE_ARGS+= --with-ioloop=kqueue
CONFIGURE_ARGS+= --with-notify=kqueue
.endif
+
+###
+### GSSAPI support.
+###
+.if !empty(PKG_OPTIONS:Mgssapi)
+CONFIGURE_ARGS+= --with-gssapi
+. include "../../mk/krb5.buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-gssapi
+.endif
diff --git a/mail/dovecot/patches/patch-ae b/mail/dovecot/patches/patch-ae
new file mode 100644
index 00000000000..45e56192f7c
--- /dev/null
+++ b/mail/dovecot/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/02/12 19:13:49 markd Exp $
+
+--- src/auth/mech-gssapi.c.orig 2006-01-10 15:46:10.000000000 +1300
++++ src/auth/mech-gssapi.c
+@@ -138,7 +138,7 @@ static OM_uint32 obtain_service_credenti
+ return major_status;
+ }
+
+- gss_release_name(&minor_status, gss_principal);
++ gss_release_name(&minor_status, &gss_principal);
+
+ return major_status;
+ }