Resolving #47562.

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index 5760e42c9fa0de433c4d144d6c3a62d4c3d629ba..f0429bf66de3dd9a5cde956a5f9863d2e74ee96f 100644 (file)
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/ssmtp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.14 2004/07/28 05:41:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.15 2004/12/25 20:37:50 slarti Exp $
+
+  25 Dec 2004; Tom Martin <slarti@gentoo.org> ssmtp-2.60.9.ebuild:
+  Resolve bug 47562, by commenting out hostname=_HOSTNAME_ by default,
+  forcing ssmtp to determine the hostname for itself. Thanks to Sascha
+  Silbe <sascha@silbe.org> for reporting.
 
   28 Jul 2004; Joshua Kinard <kumba@gentoo.org> ssmtp-2.60.9.ebuild:
   Marked stable on mips.
@@ -80,7 +85,7 @@
   24 Apr 2004; Luca Barbato <lu_zero@gentoo.org> ssmtp-2.60.7.ebuild:
   Marked ppc
 
-  23 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> ssmtp-2.60.7.ebuild:
+  23 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> ssmtp-2.60.7.ebuild:
   Stable on alpha.
 
   23 Apr 2004; Travis Tilley <lv@gentoo.org> ssmtp-2.60.7.ebuild:

diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index da3d41cd23c17e4a0abaa8b0a03ea2fb29c25f69..a483b8b99e2390183ddb382b52834ce7b6a327af 100644 (file)
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1d2fd8e9f77526c07ab8bdbb1c552d73 ChangeLog 6795
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 3451923e5f0d6b8215b0fb98e3f9a452 ssmtp-2.60.7-r1.ebuild 2856
-MD5 5d884e4ed47f5a61505b6ded4e297fbd ssmtp-2.60.9.ebuild 2662
-MD5 c833680953ba9941d33fc14dda62532b files/digest-ssmtp-2.60.7-r1 63
-MD5 dcdea1d356b76c170296921577f29378 files/mailer.conf 1488
-MD5 f466deeaec0316507961656f37af7000 files/ssmtp-2.60.4-md5.patch 1509
+MD5 19dd7ca14c6281fdd1532741c4cb9f90 ChangeLog 7049
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 f45ac61bc70f2029372e888140622ec5 ssmtp-2.60.9.ebuild 3125
 MD5 5208fda9912caf3afd94108e6276167e files/ssmtp-2.60.7-logfile.patch 1256
-MD5 93225fbc5fd7b8e5500c7b1c85b63fdf files/starttls.diff 4277
 MD5 026bfafb0efdf0d7eb5e0b4164a35f7d files/digest-ssmtp-2.60.9 63
+MD5 93225fbc5fd7b8e5500c7b1c85b63fdf files/starttls.diff 4277
+MD5 f466deeaec0316507961656f37af7000 files/ssmtp-2.60.4-md5.patch 1509
+MD5 c833680953ba9941d33fc14dda62532b files/digest-ssmtp-2.60.7-r1 63
+MD5 dcdea1d356b76c170296921577f29378 files/mailer.conf 1488
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBULlRHTu7gpaalycRAuXpAKDQ1PIh5ZPa13jT5czCdhheDWI8cACeIC+H
-YEW66czUQsbOGJSLzifGxkk=
-=BhWo
+iD8DBQFBzdA8CHk4+ZoBpvsRAkN6AJ46D3ECllra4+iqhezQVOXXZvOnSACfRq2y
+28Ew8SSjfbKR56t4JDuQOsk=
+=WzqU
 -----END PGP SIGNATURE-----

diff --git a/mail-mta/ssmtp/ssmtp-2.60.9.ebuild b/mail-mta/ssmtp/ssmtp-2.60.9.ebuild
index 94826f84345e7f15bd8d3bbad0a9c8165fa364ef..160fd3a703505c2e62efe65a8f9327dd6193f4aa 100644 (file)
--- a/mail-mta/ssmtp/ssmtp-2.60.9.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.60.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.9.ebuild,v 1.12 2004/09/21 23:29:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.9.ebuild,v 1.13 2004/12/25 20:37:50 slarti Exp $
 
 inherit eutils
 
@@ -79,6 +79,18 @@ src_install() {
        #else
        #        mv ${conffile}.pre ${conffile}
        #fi
+
+       # set up config file, v2. Bug 47562
+       local conffile="${D}/etc/ssmtp/ssmtp.conf"
+       mv "${conffile}" "${conffile}.orig"
+       # Sorry about the weird indentation, I couldn't figure out a cleverer way
+       # to do this without having horribly >80 char lines.
+       sed -e "s:^hostname=:\n# Gentoo bug #47562\\
+# Commenting the following line will force ssmtp to figure\\
+# out the hostname itself.\n\\
+# hostname=:" \
+               "${conffile}.orig" > "${conffile}" \
+               || die "sed failed"
 }
 
 pkg_postinst() {