rpms/ssmtp/devel ssmtp-unitialized-strdup.patch, NONE, 1.1 ssmtp-md5auth-non-rsa, 1.1, 1.2 ssmtp-password-leak.patch, 1.1, 1.2 ssmtp.spec, 1.16, 1.17

[Manuel Wolfshant]

Author: wolfy

Update of /cvs/pkgs/rpms/ssmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29469

Modified Files:
	ssmtp-md5auth-non-rsa ssmtp-password-leak.patch ssmtp.spec 
Added Files:
	ssmtp-unitialized-strdup.patch 
Log Message:
fix CVE-2008-3962 
cleanup existing patches


ssmtp-unitialized-strdup.patch:

--- NEW FILE ssmtp-unitialized-strdup.patch ---
--- ssmtp-2.61/ssmtp.c.orig	2008-09-11 18:04:07.000000000 +0300
+++ ssmtp-2.61/ssmtp.c	2008-09-11 18:07:14.000000000 +0300
@@ -489,6 +489,11 @@ char *from_format(char *str, bool_t over
 				die("from_format() -- snprintf() failed");
 			}
 		}
+		else {
+			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
+				die("from_format() -- snprintf() failed");
+			}
+		}
 	}
 
 #if 0


Index: ssmtp-md5auth-non-rsa
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/devel/ssmtp-md5auth-non-rsa,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-md5auth-non-rsa	17 Oct 2007 00:09:53 -0000	1.1
+++ ssmtp-md5auth-non-rsa	11 Sep 2008 16:22:38 -0000	1.2
@@ -7391,38 +7391,3 @@
  
  	for (i = 0; i < MD5_DIGEST_LEN; i++) {
  		digascii[2 * i] = hextab[digest[i] >> 4];
-diff -Nupr ssmtp-2.61.orig/ssmtp.c.orig ssmtp-2.61/ssmtp.c.orig
---- ssmtp-2.61.orig/ssmtp.c.orig	2007-10-17 02:20:25.000000000 +0300
-+++ ssmtp-2.61/ssmtp.c.orig	2007-10-17 02:29:11.000000000 +0300
-@@ -708,6 +708,10 @@ void header_save(char *str)
- 		else if(strncasecmp(ht->string, "Bcc:", 4) == 0) {
- 			p = (ht->string + 4);
- 			rcpt_parse(p);
-+                        /* Undo adding the header to the list: */
-+                        free(ht->string);
-+                        ht->string = NULL;
-+                        return;
- 		}
- 		else if(strncasecmp(ht->string, "CC:", 3) == 0) {
- 			p = (ht->string + 3);
-@@ -1406,6 +1410,7 @@ int ssmtp(char *argv[])
- 	struct passwd *pw;
- 	int i, sock;
- 	uid_t uid;
-+	bool_t minus_v_save;
- 	int timeout = 0;
- 
- 	outbytes = 0;
-@@ -1522,7 +1527,12 @@ int ssmtp(char *argv[])
- #ifdef MD5AUTH
- 		}
- #endif
-+		/* We do NOT want the password output to STDERR
-+		 * even base64 encoded.*/
-+		minus_v_save = minus_v;
-+		minus_v = False;
- 		outbytes += smtp_write(sock, "%s", buf);
-+		minus_v = minus_v_save;
- 		(void)alarm((unsigned) MEDWAIT);
- 
- 		if(smtp_okay(sock, buf) == False) {

ssmtp-password-leak.patch:

Index: ssmtp-password-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/devel/ssmtp-password-leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ssmtp-password-leak.patch	8 Dec 2006 00:09:53 -0000	1.1
+++ ssmtp-password-leak.patch	11 Sep 2008 16:22:38 -0000	1.2
@@ -1,6 +1,6 @@
 --- ssmtp-2.61.redhat/ssmtp.c	2006-12-08 01:25:35.000000000 +0200
 +++ ssmtp-2.61.debian/ssmtp.c	2006-12-08 01:24:25.000000000 +0200
-@@ -1404,6 +1406,7 @@
+@@ -1406,6 +1404,7 @@
  	struct passwd *pw;
  	int i, sock;
  	uid_t uid;
@@ -8,7 +8,7 @@
  	int timeout = 0;
  
  	outbytes = 0;
-@@ -1520,7 +1523,12 @@
+@@ -1522,7 +1521,12 @@
  #ifdef MD5AUTH
  		}
  #endif


Index: ssmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ssmtp/devel/ssmtp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ssmtp.spec	2 Aug 2008 05:29:03 -0000	1.16
+++ ssmtp.spec	11 Sep 2008 16:22:38 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.5%{?dist}.4
+Release:	11.6%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -16,8 +16,9 @@
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340803
 # replaces RSA's md5 with a GPL compatible implementation
 Patch6:		%{name}-md5auth-non-rsa
+Patch7:		%{name}-unitialized-strdup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       %{_sbindir}/sendmail
+Provides:	%{_sbindir}/sendmail
 Requires(post):	%{_sbindir}/alternatives
 Requires(preun):	%{_sbindir}/alternatives
 BuildRequires:	openssl-devel
@@ -42,6 +43,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 
 %build
@@ -115,6 +117,10 @@
 
 
 %changelog
+* Thu Sep 11 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.6
+- patch to fix CVE-2008-3962 (courtesy https://bugs.gentoo.org/127592)
+- cleanup of other patches, make build with fuzz=0
+
 * Sat Aug 02 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.5.4
 - work around rpmbuild more strict syntax checker