Subject: Re: CVS commit: pkgsrc/mail/fetchmail
To: Dieter Baron <dillo@danbala.ifoer.tuwien.ac.at>
From: Thorsten Frueauf <milano@zhadum.de>
List: pkgsrc-changes
Date: 05/30/2005 16:41:25
Hello Dieter, Jukka et al,

>   I think this is wrong.  If PKG_OPTIONS contains both gssapi and
> kerberos, gssapi will now be disabled.
> 
>   Instead of changing PKG_OPTIONS, I would enable kerberos support if
> kerberos or gssapi is selected:

Ok, since we know that gssapi needs kerberos V (e.g. does not work with
kerberos IV), how about the following change:

--- snip ---
--- options.mk-orig	Mon May 30 16:02:17 2005
+++ options.mk	Mon May 30 16:37:08 2005
@@ -17,8 +17,7 @@
 ###
 ### Authentication via GSSAPI (currently only over Kerberos V) support.
 ###
-.if !empty(PKG_OPTIONS:Mgssapi) && empty(PKG_OPTIONS:Mkerberos)
-PKG_OPTIONS+=		kerberos
+.if !empty(PKG_OPTIONS:Mgssapi) && empty(PKG_OPTIONS:Mkerberos4)
 CONFIGURE_ARGS+=	--with-gssapi=${KRB5BASE}
 .else
 CONFIGURE_ARGS+=	--with-gssapi=no
@@ -40,7 +39,7 @@
 ###
 ### Kerberos V support.
 ###
-.if !empty(PKG_OPTIONS:Mkerberos)
+.if !empty(PKG_OPTIONS:Mkerberos) || !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
 PKG_USE_KERBEROS=	# defined
 CONFIGURE_ARGS+=        --with-kerberos5=${KRB5BASE}
--- snip ---

Would this satisfy all cases? Jukka, can you please test this?

If it works, I will commit it.

Greets
      Thorsten