Bug 103924 - mail/mutt, mail/mutt-devel: Add kerberos (GSSAPI) support
Summary: mail/mutt, mail/mutt-devel: Add kerberos (GSSAPI) support
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Shaun Amott
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-10-03 04:20 UTC by Shaun Amott
Modified: 2006-10-03 15:20 UTC (History)
0 users

See Also:


Attachments
mutt.diff (1014 bytes, patch)
2006-10-03 04:20 UTC, Shaun Amott
no flags Details | Diff
file.diff (1002 bytes, patch)
2006-10-03 04:20 UTC, Shaun Amott
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Shaun Amott freebsd_committer 2006-10-03 04:20:18 UTC
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.
Comment 1 Edwin Groothuis freebsd_committer 2006-10-03 04:20:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->shaun

Submitter has GNATS access
Comment 2 Edwin Groothuis freebsd_committer 2006-10-03 04:20:32 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback
Comment 3 Udo.Schweigert 2006-10-03 12:24:12 UTC
On Tue, Oct 03, 2006 at 04:18:37 +0100, Shaun Amott wrote:
> 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.
> 

The patch breaks other knobs. I'm working on a solution, please stay tuned.

Best regards

-- 
Udo Schweigert, Siemens AG   | Voice      : +49 89 636 42170
CT IC CERT, Siemens CERT     | Fax        : +49 89 636 41166
D-81730 Muenchen / Germany   | email      : udo.schweigert@siemens.com
Comment 4 Udo.Schweigert 2006-10-03 12:57:57 UTC
Here are the improved patches.

Best regards

-- 
Udo Schweigert, Siemens AG   | Voice      : +49 89 636 42170
CT IC CERT, Siemens CERT     | Fax        : +49 89 636 41166
D-81730 Muenchen / Germany   | email      : udo.schweigert@siemens.com


=============================================================================
mail/mutt: 
diff -ru  /usr/ports/mail/mutt/Makefile ./Makefile
--- /usr/ports/mail/mutt/Makefile	Mon Sep 18 15:00:56 2006
+++ ./Makefile	Tue Oct  3 13:26:39 2006
@@ -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
 
@@ -139,6 +146,11 @@
 
 pre-configure::
 	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
+.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
 
 # XXX
 # this should be done automagically by aclocal but ....

=============================================================================
mail/mutt-devel:
diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	Mon Sep 18 15:00:58 2006
+++ ./Makefile	Tue Oct  3 13:29:41 2006
@@ -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
 
@@ -441,6 +448,11 @@
 
 pre-configure::
 	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
+.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}"
Comment 5 dfilter service freebsd_committer 2006-10-03 15:11:40 UTC
shaun       2006-10-03 14:11:30 UTC

  FreeBSD ports repository

  Modified files:
    mail/mutt            Makefile 
    mail/mutt-devel      Makefile 
  Log:
  - Add Kerberos (GSSAPI) support to mutt and mutt-devel.
  
  PR:             ports/103924
  Submitted by:   shaun (me)
  Approved by:    Udo Schweigert <Udo.Schweigert@siemens.com> (maintainer)
  
  Revision  Changes    Path
  1.274     +13 -0     ports/mail/mutt-devel/Makefile
  1.173     +13 -0     ports/mail/mutt/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 6 Shaun Amott freebsd_committer 2006-10-03 15:12:22 UTC
State Changed
From-To: feedback->closed

Committed with tweak provided by maintainer. I also added an extra line 
that should have been in the original patch.