fix for USE=md5sum

4 files changed, 54 insertions, 4 deletions

diff --git a/net-mail/ssmtp/ChangeLog b/net-mail/ssmtp/ChangeLog
index 9f6aa662a430..4a4cf698f42f 100644
--- a/net-mail/ssmtp/ChangeLog
+++ b/net-mail/ssmtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/ssmtp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ChangeLog,v 1.18 2003/09/19 12:50:44 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ChangeLog,v 1.19 2003/09/29 09:07:08 genone Exp $
+
+  29 Sep 2003; Marius Mauch <genone@gentoo.org> ssmtp-2.60.4.ebuild,
+  files/ssmtp-2.60.4-md5.patch:
+  Added a patch so 2.60.4 compiles with USE=md5sum. thaThanks to Brandy for
+  fixing bug 25732.
 
 *ssmtp-2.60.4 (19 Sep 2003)
 
diff --git a/net-mail/ssmtp/Manifest b/net-mail/ssmtp/Manifest
index 5bd60075fe67..079d8f071c81 100644
--- a/net-mail/ssmtp/Manifest
+++ b/net-mail/ssmtp/Manifest
@@ -1,6 +1,6 @@
-MD5 591e9638fc36ded25450b90ad438183d ssmtp-2.60.4.ebuild 2245
+MD5 ed82f418fd46d3d28a1e5c6a2bf4d165 ssmtp-2.60.4.ebuild 2246
 MD5 a49ccfcccd8e1546ebd0e54b71ec2e19 ssmtp-2.48.ebuild 1570
-MD5 51fc9e143cc72ee94c7b54f83be3814f ChangeLog 2703
+MD5 b32a9da2ca74b4f32be752e2e76d7f0d ChangeLog 2906
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 9d260a5e3ba800b7fe887088118a3a2f ssmtp-2.38.14-r1.ebuild 1489
 MD5 7acea6571783e2e8d40bb7aafad39d21 files/digest-ssmtp-2.48 62
diff --git a/net-mail/ssmtp/files/ssmtp-2.60.4-md5.patch b/net-mail/ssmtp/files/ssmtp-2.60.4-md5.patch
new file mode 100644
index 000000000000..07e0ba0568b2
--- /dev/null
+++ b/net-mail/ssmtp/files/ssmtp-2.60.4-md5.patch
@@ -0,0 +1,44 @@
+diff -rup ssmtp-2.60/Makefile.in ssmtp-2.60-gentoo/Makefile.in
+--- ssmtp-2.60/Makefile.in	2003-08-21 13:27:23.000000000 +1200
++++ ssmtp-2.60-gentoo/Makefile.in	2003-08-21 13:30:41.000000000 +1200
+@@ -23,7 +23,7 @@ INSTALLED_REVALIASES_FILE=$(REVALIASES_F
+ # Programs
+ GEN_CONFIG=$(srcdir)/generate_config
+ 
+-SRCS=ssmtp.c arpadate.c base64.c
++SRCS=ssmtp.c arpadate.c base64.c @SRCS@
+ 
+ OBJS=$(SRCS:.c=.o)
+ 
+diff -rup ssmtp-2.60/configure ssmtp-2.60-gentoo/configure
+--- ssmtp-2.60/configure	2003-08-21 13:27:23.000000000 +1200
++++ ssmtp-2.60-gentoo/configure	2003-08-21 13:31:54.000000000 +1200
+@@ -1503,6 +1503,7 @@ s%@FFLAGS@%$FFLAGS%g
+ s%@DEFS@%$DEFS%g
+ s%@LDFLAGS@%$LDFLAGS%g
+ s%@LIBS@%$LIBS%g
++s%@SRCS@%$SRCS%g
+ s%@exec_prefix@%$exec_prefix%g
+ s%@prefix@%$prefix%g
+ s%@program_transform_name@%$program_transform_name%g
+diff -rup ssmtp-2.60/ssmtp.c ssmtp-2.60-gentoo/ssmtp.c
+--- ssmtp-2.60/ssmtp.c	2003-08-21 13:27:23.000000000 +1200
++++ ssmtp-2.60-gentoo/ssmtp.c	2003-08-21 13:31:20.000000000 +1200
+@@ -1257,7 +1257,7 @@ int ssmtp(char *argv[])
+ 	/* Try to log in if username was supplied */
+ 	if(auth_user) {
+ #ifdef MD5AUTH
+-		if(auth_pass == (char *)NULL)
++		if(auth_pass == (char *)NULL) {
+ 			auth_pass = strdup("");
+ 		}
+ 
+@@ -1271,7 +1271,7 @@ int ssmtp(char *argv[])
+ 			strncpy(challenge, strchr(buf,' ') + 1, sizeof(challenge));
+ 
+ 			memset(buf, 0, sizeof(buf));
+-			crammd5(challenge, authUsername, authPassword, buf);
++			crammd5(challenge, auth_user, auth_pass, buf);
+ 		}
+ 		else {
+ #endif
diff --git a/net-mail/ssmtp/ssmtp-2.60.4.ebuild b/net-mail/ssmtp/ssmtp-2.60.4.ebuild
index 4f41be539640..96a28fab7901 100644
--- a/net-mail/ssmtp/ssmtp-2.60.4.ebuild
+++ b/net-mail/ssmtp/ssmtp-2.60.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.60.4.ebuild,v 1.2 2003/09/21 04:34:07 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.60.4.ebuild,v 1.3 2003/09/29 09:07:08 genone Exp $
 
 DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
 SRC_URI="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/${P/-/_}.tar.gz"
@@ -24,6 +24,7 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	use ssl && epatch ${FILESDIR}/starttls.diff
+	use md5sum && epatch ${FILESDIR}/ssmtp-2.60.4-md5.patch
 }
 
 src_compile() {