ports/54592: [PATCH] mail/mutt-devel: fix APOP, mark SASL as broken

[Bruce M Simpson]

The following reply was made to PR ports/54592; it has been noted by GNATS.

From: Bruce M Simpson <bms at spc.org>
To: FreeBSD-gnats-submit at FreeBSD.org, freebsd-ports-bugs at FreeBSD.org
Cc:  
Subject: Re: ports/54592: [PATCH] mail/mutt-devel: fix APOP, mark SASL as broken
Date: Thu, 17 Jul 2003 20:11:13 +0100

 --sm4nu43k4a2Rpi4c
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Patch enclosed.
 
 BMS
 
 --sm4nu43k4a2Rpi4c
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="muttfix.col.patch"
 
 Generated by diffcoll on Thu 17 Jul 2003 20:07:04 BST
 
 diff -uN ports/mail/mutt-devel/Makefile.orig ports/mail/mutt-devel/Makefile
 --- /usr/ports/mail/mutt-devel/Makefile.orig	Thu Jul 17 19:50:16 2003
 +++ /usr/ports/mail/mutt-devel/Makefile	Thu Jul 17 20:03:43 2003
 @@ -75,7 +75,7 @@
  
  PORTNAME=	mutt-devel
  PORTVERSION=	1.5.4
 -PORTREVISION?=	4
 +PORTREVISION?=	5
  CATEGORIES+=	mail ipv6
  .if defined(WITH_MUTT_NNTP)
  CATEGORIES+=	news
 @@ -177,6 +177,7 @@
  USE_OPENSSL=	yes
  .endif
  .if defined(WITH_MUTT_CYRUS_SASL)
 +BROKEN=		"mutt-devel's SASL code appears to be broken"
  LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
  .endif
  .if ! defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT)
 
 diff -uN ports/mail/mutt-devel/files/patch-pop_auth.c.orig ports/mail/mutt-devel/files/patch-pop_auth.c
 --- /usr/ports/mail/mutt-devel/files/patch-pop_auth.c.orig	Thu Jul 17 19:50:09 2003
 +++ /usr/ports/mail/mutt-devel/files/patch-pop_auth.c	Thu Jul 17 19:46:27 2003
 @@ -0,0 +1,19 @@
 +--- pop_auth.c.orig	Thu Jul 17 19:42:53 2003
 ++++ pop_auth.c	Thu Jul 17 19:46:01 2003
 +@@ -206,12 +206,12 @@
 +   mutt_message _("Authenticating (APOP)...");
 + 
 +   /* Compute the authentication hash to send to the server */
 +-  MD5Init (&mdContext);
 +-  MD5Update (&mdContext, (unsigned char *)pop_data->timestamp,
 ++  MD5_Init (&mdContext);
 ++  MD5_Update (&mdContext, (unsigned char *)pop_data->timestamp,
 + 	     strlen (pop_data->timestamp));
 +-  MD5Update (&mdContext, (unsigned char *)pop_data->conn->account.pass,
 ++  MD5_Update (&mdContext, (unsigned char *)pop_data->conn->account.pass,
 + 	     strlen (pop_data->conn->account.pass));
 +-  MD5Final (digest, &mdContext);
 ++  MD5_Final (digest, &mdContext);
 + 
 +   for (i = 0; i < sizeof (digest); i++)
 +     sprintf (hash + 2 * i, "%02x", digest[i]);
 
 
 --sm4nu43k4a2Rpi4c--