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

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 40 insertions, 17 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/Manifest b/mail-mta/ssmtp/Manifest
index cb5b44312cff..b05b9a80beb9 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX CVE-2008-3962-r2.patch 649 RMD160 bca92bab9b8ac1f832e0c2533f5b0ab02cdb0a48 SHA1 235a5fc08cee4c059e0b9bb6c213089a54796abd SHA256 90b337f4e87ac01f84c5e032f75161a9c4d57d566422bc8bdc4d4064e1c5dc16
 AUX CVE-2008-3962.patch 293 RMD160 5e61ae056d707337d8f3d4a5e18e35ca1fd2217e SHA1 ebab9f9636b83b4b151d852baa7a1b90b2871871 SHA256 48367c82bdb77d26b144954eb908de56494999154ed6399b0cd148be340fb231
 AUX mailer.conf 349 RMD160 1cad356faa6ee30e7bed9d70754487cac8f088e5 SHA1 4ab7aeef9fcaa021cff2845ffdac1ccb65dddfa4 SHA256 7b04fc27f8ca41b586ae68cbeffb509c2408afcc592462b617fba78b5d7aa88a
 AUX ssmtp-2.61-bug127592.patch 385 RMD160 61f877e742bbf23e13056884bccae5a22a17fe75 SHA1 27a4aafc3cbffd11c6427e5ac02c3484396091ef SHA256 256a783b5e73b9914cb49854b367ce9f5781d8664cd640e6b0b9d0b5f6948edc
 AUX ssmtp-2.62-authpass.patch 389 RMD160 edff4efbd796f49364fb78499a16c48280047218 SHA1 415cdd30d8c96b1d0ed9b04b92642c2f65546d28 SHA256 b51392e40f4b22f4bb48e159059fc33a6cad6964d9445c3adabf1f65e65ae17d
+AUX ssmtp-2.62-from_format_fix.patch 543 RMD160 a4289a8eda3c0f5f03e3fcd5823ddb3cd6d89930 SHA1 72ba0f392714b39e237cee97ad9582dc3456a9fb SHA256 8d48bd527cda1e8c9fda7e80b6cb7d403a009d8a9576a6ca7f358245e34abcf9
 AUX ssmtp-2.62-maxsysuid-conf.patch 667 RMD160 9a515e40aedc8eb8784cc7bb9b75b55536877f42 SHA1 af175c8fd039fcd7a125b2c3f3eba80bd69006dd SHA256 634d8e1e66d9a1c13aa4b75de37194899d12ed069b7cd651c3f49e361745b99e
 AUX ssmtp-2.62-maxsysuid.patch 1185 RMD160 a6a4a1dc23a74170b52e84a1e34149258e08b7b6 SHA1 9da033da95e9ac04046969d60914cd64f1405e47 SHA256 49201b47eb88e860d0a07777aa895127c2415bc170faacdefc376c221a595961
 AUX ssmtp-2.62-strndup.patch 682 RMD160 d56434a83ec6bb49cafb67846e0082551d1a3be3 SHA1 9b8328c8ea1410683dd13cc770582658e33d716e SHA256 2ce7b4526db527656bfb9cde41f940e5da23b9fb2089a6b5b9bd4bae6dfa07ab
 DIST ssmtp_2.62.orig.tar.gz 57127 RMD160 1c16b2d50224f4d29813a34f87a3480e66892b36 SHA1 5c15aafb252f6cb11e4b93140a1457b6cb0d0fb8 SHA256 e2a0a5379cd0bbb0b4b0304abeba7a8f60aa85275982c5d7930c319e7f284ed1
-EBUILD ssmtp-2.62-r4.ebuild 2786 RMD160 32b9c687ab54902983409dde7363f4bac8200023 SHA1 cb3f1b3a8943986958fb318f0c277532b5d281a2 SHA256 dd8fce8b3770899fbf4756e0e9ab50b422c137297eedc77476028418a309a1ae
 EBUILD ssmtp-2.62-r6.ebuild 2801 RMD160 b389470b8f0914dc110eab894b64b86c236d496c SHA1 685690497e8caae4fd213641b91beea66afa1dac SHA256 580ecd9acca25df3d6f8515bc701ce35fe184ab745b7a36b2306105ccb292a16
-MISC ChangeLog 16265 RMD160 b4539cd9bbd6d573954820d37d3107bcf48601ae SHA1 3592ebbe466b7848b3aeecfaf1fbb93f6e0899a9 SHA256 cbb39bc1efb575f381dd65edae4632518c59da94823ffd9ff03e7a54ac9eb578
+EBUILD ssmtp-2.62-r7.ebuild 2871 RMD160 c86ed13d68476ddc71852a58a67b7740a4ae162e SHA1 0ae142f813bc85e42c9b6ac05a4ec51f75fd05a5 SHA256 f6972f23d4e880d6ecb20ebf33d5c2f9c6d580c6dd4ea0fd7b691abfaf71ad3d
+MISC ChangeLog 16511 RMD160 90a242d529475089713059cb3f48d0f83abd5403 SHA1 32398ce28689390a1f92d578d24fb89b11826adc SHA256 8f97daafb73bf9a53d4e13b58ad48fc29e201bca52b04fba0512fa239e61b2db
 MISC metadata.xml 291 RMD160 2e697d312e59fe9a8a198f5d79f0b20c29abb633 SHA1 b6498cb6d5b33475440898598dfc05f3a7c554a7 SHA256 547e579723c831c40d6184225f181e11e949cf8310a3433d6ece7ee61fc23887
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpuJPgACgkQkKaRLQcq0GJKRwCeKhNvHcnMCueIynm5GDw5bAK9
-fQkAniXvWqnAgWB+sqs4om28je0rW4YU
-=4a02
------END PGP SIGNATURE-----
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