Subject: Re: CVS commit: pkgsrc/mail/fetchmail
To: Thorsten Frueauf <milano@zhadum.de>
From: Dieter Baron <dillo@danbala.tuwien.ac.at>
List: pkgsrc-changes
Date: 05/30/2005 17:47:24
hi,

> 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)

.if !empty(PKG_OPTIONS:Mgssapi)
.  if !empty(PKG_OPTIONS:kerberos4)
PKG_FAIL_REASON="Options gssapi and kerberos4 are incompatible"
.  endif

>  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?

  (Silently ignoring selected options can be quite confusing for the
user.)  Otherwise it looks fine.

						yours,
						dillo