Cleanup, fix from Header when no gecos is available (#282907)

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 37 insertions, 5 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index 137ed4e2fbcb..edbcee307fd0 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/ssmtp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.85 2009/07/27 22:06:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.86 2009/10/17 17:37:59 dertobi123 Exp $
+
+*ssmtp-2.62-r7 (17 Oct 2009)
+
+  17 Oct 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -ssmtp-2.62-r4.ebuild, +ssmtp-2.62-r7.ebuild,
+  +files/ssmtp-2.62-from_format_fix.patch:
+  Cleanup, fix from Header when no gecos is available (#282907)
 
   27 Jul 2009; Markus Meier <maekke@gentoo.org> ssmtp-2.62-r6.ebuild:
   amd64 stable, bug #259472
diff --git a/mail-mta/ssmtp/files/ssmtp-2.62-from_format_fix.patch b/mail-mta/ssmtp/files/ssmtp-2.62-from_format_fix.patch
new file mode 100644
index 000000000000..119cea2c29f8
--- /dev/null
+++ b/mail-mta/ssmtp/files/ssmtp-2.62-from_format_fix.patch
@@ -0,0 +1,22 @@
+--- ssmtp.c.old	2009-09-11 11:51:01.000000000 +0200
++++ ssmtp.c	2009-09-11 11:52:10.000000000 +0200
+@@ -455,7 +455,7 @@
+ */
+ char *from_format(char *str, bool_t override_from)
+ {
+-	char buf[(BUF_SZ + 1)];
++	char buf[(BUF_SZ + 1)] = "";
+ 
+ 	if(override_from) {
+ 		if(minus_f) {
+@@ -484,6 +484,10 @@
+ 			if(snprintf(buf, BUF_SZ, "\"%s\" <%s>", gecos, str) == -1) {
+ 				die("from_format() -- snprintf() failed");
+ 			}
++		} else {
++			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
++				die("from_format() -- snprintf() failed");
++			}
+ 		}
+ 	}
+ 
diff --git a/mail-mta/ssmtp/ssmtp-2.62-r4.ebuild b/mail-mta/ssmtp/ssmtp-2.62-r7.ebuild
index 46c8b0506ea0..1e1fca7ed79c 100644
--- a/mail-mta/ssmtp/ssmtp-2.62-r4.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.62-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.62-r4.ebuild,v 1.9 2009/03/17 10:51:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.62-r7.ebuild,v 1.1 2009/10/17 17:37:59 dertobi123 Exp $
 
 inherit eutils toolchain-funcs autotools
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="ssl ipv6 md5sum maxsysuid"
 
 DEPEND="ssl? ( dev-libs/openssl )"
@@ -36,8 +36,11 @@ src_unpack() {
 		epatch "${FILESDIR}"/${P}-maxsysuid-conf.patch
 	fi
 
+	# 
+	epatch "${FILESDIR}/${P}-from_format_fix.patch"
+
 	# CVE-2008-3962
-	epatch "${FILESDIR}/CVE-2008-3962.patch"
+	epatch "${FILESDIR}/CVE-2008-3962-r2.patch"
 
 	# Fix AuthPass parsing (bug #238724)
 	epatch "${FILESDIR}/${P}-authpass.patch"
@@ -67,7 +70,7 @@ src_install() {
 	dosbin ssmtp || die
 	fperms 755 /usr/sbin/ssmtp
 
-	doman ssmtp.8
+	doman ssmtp.8 ssmtp.conf.5
 	dodoc INSTALL README TLS CHANGELOG_OLD
 	newdoc ssmtp.lsm DESC