Attachment 165535 Details for Bug 206220 – mail/mutt Makefile patch for GSSAPI Uses system

[patch] mail/mutt Makefile patch for GSSAPI Uses system

0001-switch-mutt-GSSAPI-handling-to-Uses-framework.patch (text/plain), 3.21 KB, created by Phil Pennock on 2016-01-14 01:57:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Phil Pennock

Created: 2016-01-14 01:57:21 UTC

Size: 3.21 KB

patch

obsolete

>From 75df69dac393c7dba357cc47c0d26ec48631a3d6 Mon Sep 17 00:00:00 2001
>From: Phil Pennock <pdp@spodhuis.org>
>Date: Thu, 14 Jan 2016 01:45:24 +0000
>Subject: [PATCH] switch mutt GSSAPI handling to Uses framework
>
>Without this, Heimdal from Ports doesn't get used, so we end up with
>base-system Heimdal and base-system OpenSSL but also OpenSSL from Ports,
>so two versions of libcrypto in one address-space, which leads to
>environment corruption problems when shelling out.
>
>This switches to using the Uses framework in the standard way.
>
>It has been tested with Heimdal from Ports, but not other combinations.
>---
> mail/mutt/Makefile | 32 ++++++++++++--------------------
> 1 file changed, 12 insertions(+), 20 deletions(-)
>
>diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
>index a1d21ea..01ff6c5 100644
>--- a/mail/mutt/Makefile
>+++ b/mail/mutt/Makefile
>@@ -59,7 +59,7 @@ PLIST_SUB+=	XML="@comment "
> PLIST_SUB+=	NNTP="@comment "
> .else
> OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
>-		GPGME GREETING_PATCH GSSAPI HTML ICONV IDN IFDEF_PATCH \
>+		GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
> 		IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
> 		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
> 		MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \
>@@ -67,9 +67,10 @@ OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
> 		SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \
> 		TOKYOCABINET TRASH_PATCH URLVIEW XML
> 
>-OPTIONS_SINGLE=	SCREEN
>+OPTIONS_SINGLE=	GSSAPI SCREEN
> OPTIONS_RADIO=	SPELL
> OPTIONS_RADIO_SPELL=	ASPELL ISPELL
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
> OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
> 
> COMPRESSED_FOLDERS_DESC=	Compressed folders
>@@ -136,6 +137,15 @@ SLANG_VARS=	PKGMESSAGE=${FILESDIR}/pkg-message.slang
> 
> NCURSES_USES=	ncurses
> 
>+# Handle GSSAPI from various places
>+GSSAPI_BASE_USES=   gssapi
>+GSSAPI_BASE_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+GSSAPI_HEIMDAL_USES=gssapi:heimdal
>+GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+GSSAPI_MIT_USES=    gssapi:mit
>+GSSAPI_MIT_CONFIGURE_ON= --with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
>+GSSAPI_NONE_CONFIGURE_ON= --without-gss
>+
> NLS_USES=	gettext
> NLS_CONFIGURE_OFF=	--disable-nls
> 
>@@ -227,24 +237,6 @@ pre-build::
> 			-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
> 		${BUILD_WRKSRC}/Makefile
> 
>-.if ${PORT_OPTIONS:MGSSAPI}
>-.if exists(${LOCALBASE}/bin/krb5-config)
>-LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
>-CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
>-.elif exists(${KRB5_HOME}/bin/krb5-config)
>-LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
>-CONFIGURE_ARGS+=	--with-gss=${KRB5_HOME}
>-LDFLAGS+=		-L${KRB5_HOME}/lib -Wl,-rpath=${KRB5_HOME}/lib -ltinfow
>-.elif exists(${HEIMDAL_HOME}/bin/krb5-config)
>-LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
>-CONFIGURE_ARGS+=	--with-gss=${HEIMDAL_HOME}
>-LDFLAGS+=		-L${HEIMDAL_HOME}/lib -Wl,-rpath=${HEIMDAL_HOME}/lib -ltinfow
>-.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
>-CONFIGURE_ARGS+=	--with-gss
>-WITH_KRB5_SYS=yes
>-.endif
>-.endif
>-
> LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
> CFLAGS+=		${CFLAGS_ADD}
> LDFLAGS+=		${LDFLAGS_ADD}
>-- 
>2.7.0
>

Actions: View | Diff

Attachments on bug 206220: 165535 | 166102 | 166110 | 166225