Date: Tue, 3 Oct 2006 04:18:37 +0100 From: Shaun Amott <shaun@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/103924: mail/mutt, mail/mutt-devel: Add kerberos (GSSAPI) support Message-ID: <1159845517.33841@charon.picobyte.net> Resent-Message-ID: <200610030320.k933KIxw091912@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 103924
>Category: ports
>Synopsis: mail/mutt, mail/mutt-devel: Add kerberos (GSSAPI) support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 03 03:20:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Shaun Amott
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
>Description:
The patches below enable Kerberos support in mail/mutt and
mail/mutt-devel. Since we have this in base, there is no real reason
to not compile it in by default.
>How-To-Repeat:
>Fix:
--- mutt.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/mutt/Makefile,v
retrieving revision 1.172
diff -u -r1.172 Makefile
--- Makefile 18 Jul 2006 14:44:03 -0000 1.172
+++ Makefile 3 Oct 2006 03:14:58 -0000
@@ -118,6 +118,13 @@
.if defined(WITH_MUTT_CYRUS_SASL)
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
.endif
+.if !defined(WITHOUT_GSSAPI)
+.if exists(${LOCALBASE}/bin/krb5-config)
+CONFIGURE_ARGS+= --with-gss=${LOCALBASE}
+.else
+CONFIGURE_ARGS+= --with-gss
+.endif
+.endif
MAN1= mutt.1 mutt_dotlock.1
MAN5= mbox.5 muttrc.5
@@ -140,6 +147,13 @@
pre-configure::
@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
+post-configure:
+.if !exists(${LOCALBASE}/bin/krb5-config)
+ @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h
+ @${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
+ ${WRKSRC}/imap/auth_gss.c
+.endif
+
# XXX
# this should be done automagically by aclocal but ....
# for now, this will have to do
--- mutt.diff ends here ---
--- mutt-devel.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/mutt-devel/Makefile,v
retrieving revision 1.273
diff -u -r1.273 Makefile
--- Makefile 13 Sep 2006 21:24:18 -0000 1.273
+++ Makefile 3 Oct 2006 03:15:23 -0000
@@ -373,6 +373,13 @@
.else
CONFIGURE_ARGS+= --disable-gpgme
.endif
+.if !defined(WITHOUT_GSSAPI)
+.if exists(${LOCALBASE}/bin/krb5-config)
+CONFIGURE_ARGS+= --with-gss=${LOCALBASE}
+.else
+CONFIGURE_ARGS+= --with-gss
+.endif
+.endif
PATCH_DIST_STRIP= -p1
@@ -442,6 +449,13 @@
pre-configure::
@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
+post-configure:
+.if !exists(${LOCALBASE}/bin/krb5-config)
+ @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
+ @${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
+ ${WRKSRC}/imap/auth_gss.c
+.endif
+
.if defined(MUTT_SLAVE_HTML_PAGES)
SCRIPTS_ENV+= MUTT_SLAVE_HTML_PAGES="${MUTT_SLAVE_HTML_PAGES}"
.endif
--- mutt-devel.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1159845517.33841>