add a patch for users using cram-md5

Package-Manager: portage-2.0.51.19

5 files changed, 50 insertions, 8 deletions

diff --git a/mail-mta/nbsmtp/ChangeLog b/mail-mta/nbsmtp/ChangeLog
index 74c71d3ec7db..d02c5506ccf5 100644
--- a/mail-mta/nbsmtp/ChangeLog
+++ b/mail-mta/nbsmtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/nbsmtp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/ChangeLog,v 1.25 2005/06/05 12:03:00 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/ChangeLog,v 1.26 2005/06/15 09:28:04 ferdy Exp $
+
+  15 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/nbsmtp-CRAM-MD5.diff, nbsmtp-0.99.ebuild, nbsmtp-0.99-r1.ebuild:
+  add a patch for users using cram-md5
 
   05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> nbsmtp-0.99.ebuild:
   Stable on ppc.
diff --git a/mail-mta/nbsmtp/Manifest b/mail-mta/nbsmtp/Manifest
index 2e637de48a2f..b79b78b91741 100644
--- a/mail-mta/nbsmtp/Manifest
+++ b/mail-mta/nbsmtp/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 62f07f89b3880777c6876773075fcb33 nbsmtp-0.99-r1.ebuild 1404
+MD5 7117dfb6011515df130151f036f766fc nbsmtp-0.99.ebuild 933
+MD5 e56eeec0f9d7417b7f16ca9806d5e3ec ChangeLog 4930
 MD5 2fc9863fa18fa7e25fedaa87a92a3c43 metadata.xml 259
-MD5 146ea4496355ecd4efc8e1e13bddcdb2 nbsmtp-0.99.ebuild 877
-MD5 06f71168de81bd0b17095ea928e25d97 ChangeLog 4764
-MD5 9dd2e50dc83a84f395ea49d77562ca65 nbsmtp-0.99-r1.ebuild 1356
-MD5 02906beafefaf79dd565570de5541a06 files/mailer.conf 348
+MD5 6649306b0229bcb3e7392bfeed69bed1 files/nbsmtp-CRAM-MD5.diff 679
 MD5 3533060b1f277b5d74140ebf8c87a9ad files/digest-nbsmtp-0.99-r1 64
+MD5 02906beafefaf79dd565570de5541a06 files/mailer.conf 348
 MD5 3533060b1f277b5d74140ebf8c87a9ad files/digest-nbsmtp-0.99 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCr/TOViELBEf1JB0RAtsUAJ9a1o1Da/s9q7S6QllzwZcO/zpVSwCdEbTL
+OMp96905jxB78XrLGgDmnao=
+=NuX7
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/nbsmtp/files/nbsmtp-CRAM-MD5.diff b/mail-mta/nbsmtp/files/nbsmtp-CRAM-MD5.diff
new file mode 100644
index 000000000000..e19438cb8bc4
--- /dev/null
+++ b/mail-mta/nbsmtp/files/nbsmtp-CRAM-MD5.diff
@@ -0,0 +1,21 @@
+Index: nbsmtp.c
+===================================================================
+RCS file: /var/cvs/nbsmtp/nbsmtp.c,v
+retrieving revision 1.139
+diff -u -B -r1.139 nbsmtp.c
+--- nbsmtp.c	12 Mar 2005 19:50:12 -0000	1.139
++++ nbsmtp.c	15 Jun 2005 09:13:56 -0000
+@@ -492,8 +492,11 @@
+ 		}
+ 
+ 		strncpy(greeting,smtp_last_message(),sizeof(greeting));
+-
+-		from64tobits(challenge,greeting);
++		
++		i = from64tobits(challenge,greeting);
++		
++		/* Make sure challenge is '\0' ended, since from64tobits doesn't do it itself */
++		challenge[i] = '\0';
+ 
+ 		hmac_md5((unsigned char*)challenge, strlen(challenge),
+ 				(unsigned char*)serverinfo->auth_pass, strlen(serverinfo->auth_pass),
diff --git a/mail-mta/nbsmtp/nbsmtp-0.99-r1.ebuild b/mail-mta/nbsmtp/nbsmtp-0.99-r1.ebuild
index 75d39cc04cb4..813a1bb40263 100644
--- a/mail-mta/nbsmtp/nbsmtp-0.99-r1.ebuild
+++ b/mail-mta/nbsmtp/nbsmtp-0.99-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-0.99-r1.ebuild,v 1.1 2005/05/02 23:43:45 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-0.99-r1.ebuild,v 1.2 2005/06/15 09:28:04 ferdy Exp $
 
-inherit mailer
+inherit eutils mailer
 
 DESCRIPTION="Extremely simple MTA to get mail off the system to a relayhost"
 SRC_URI="http://www.gentoo-es.org/~ferdy/${P}.tar.bz2"
@@ -19,6 +19,8 @@ DEPEND="virtual/libc
 src_compile() {
 	local myconf
 
+	epatch ${FILESDIR}/${PN}-CRAM-MD5.diff
+
 	econf $(use_enable ssl) \
 		$(use_enable debug) \
 		$(use_enable ipv6) \
diff --git a/mail-mta/nbsmtp/nbsmtp-0.99.ebuild b/mail-mta/nbsmtp/nbsmtp-0.99.ebuild
index ec2166ddfacd..89275160bbe3 100644
--- a/mail-mta/nbsmtp/nbsmtp-0.99.ebuild
+++ b/mail-mta/nbsmtp/nbsmtp-0.99.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-0.99.ebuild,v 1.5 2005/06/05 12:03:00 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-0.99.ebuild,v 1.6 2005/06/15 09:28:05 ferdy Exp $
+
+inherit eutils
 
 DESCRIPTION="Extremely simple MTA to get mail off the system to a relayhost"
 SRC_URI="http://www.gentoo-es.org/~ferdy/${P}.tar.bz2"
@@ -20,6 +22,8 @@ PROVIDE="virtual/mta"
 src_compile() {
 	local myconf
 
+	epatch ${FILESDIR}/${PN}-CRAM-MD5.diff
+
 	econf $(use_enable ssl) \
 		$(use_enable debug) \
 		$(use_enable ipv6) \