Add patches and fixes from bugs #127592 and #112795. Thanks to jer and flameeyes.

(Portage version: 2203-svn)

7 files changed, 218 insertions, 11 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index e26c7ecc3a49..300377a7be53 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-mta/ssmtp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.33 2006/05/06 12:10:46 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.34 2006/05/06 12:41:23 ferdy Exp $
+
+*ssmtp-2.61-r31 (06 May 2006)
+*ssmtp-2.61-r2 (06 May 2006)
+
+  06 May 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/ssmtp-2.61-bug127592.patch, +ssmtp-2.61-r2.ebuild,
+  +ssmtp-2.61-r31.ebuild:
+  Add patches and fixes from bugs #127592 and #112795. Thanks to jer and
+  flameeyes.
 
 *ssmtp-2.61-r30 (06 May 2006)
 
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index 9d1306a99255..cd01bcbe664e 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,24 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 31903666b8b249bc284d595d9fc32079 ChangeLog 9126
 MD5 c833680953ba9941d33fc14dda62532b files/digest-ssmtp-2.60.7-r1 63
 MD5 026bfafb0efdf0d7eb5e0b4164a35f7d files/digest-ssmtp-2.60.9 63
 MD5 15fdd106696fc8ccfb1b170da88df2ce files/digest-ssmtp-2.61 66
+MD5 15fdd106696fc8ccfb1b170da88df2ce files/digest-ssmtp-2.61-r2 66
 MD5 15fdd106696fc8ccfb1b170da88df2ce files/digest-ssmtp-2.61-r30 66
+MD5 15fdd106696fc8ccfb1b170da88df2ce files/digest-ssmtp-2.61-r31 66
 MD5 bcf2e5652cff099f6a6fd410a127c900 files/mailer.conf 349
 MD5 f466deeaec0316507961656f37af7000 files/ssmtp-2.60.4-md5.patch 1509
 MD5 5208fda9912caf3afd94108e6276167e files/ssmtp-2.60.7-logfile.patch 1256
+MD5 729fac89b4ece07f321ff7271fae69cb files/ssmtp-2.61-bug127592.patch 385
 MD5 93225fbc5fd7b8e5500c7b1c85b63fdf files/starttls.diff 4277
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 47980365b817fa32316d65edf07768a1 ssmtp-2.60.7-r1.ebuild 2858
 MD5 b60c6edf527e9a09a60c15d88481b74c ssmtp-2.60.9.ebuild 3121
+MD5 e5059302cc85f8b1e321f8d02c33b6b8 ssmtp-2.61-r2.ebuild 3339
 MD5 3411baf1e9efbc73605135f9f7b4344c ssmtp-2.61-r30.ebuild 1763
+MD5 3cc022a8b08c9522288dcf915127964c ssmtp-2.61-r31.ebuild 1918
 MD5 151e9660d20f8886ceea81f0b44ec1de ssmtp-2.61.ebuild 3133
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEXJJbViELBEf1JB0RAp6BAJ9nFklRMMi0H11MChjSG53wRSIdYgCfczsj
-ak27YexzjF4pyxQ/s9FV/ls=
-=uJAc
------END PGP SIGNATURE-----
diff --git a/mail-mta/ssmtp/files/digest-ssmtp-2.61-r2 b/mail-mta/ssmtp/files/digest-ssmtp-2.61-r2
new file mode 100644
index 000000000000..92e3d236c0e0
--- /dev/null
+++ b/mail-mta/ssmtp/files/digest-ssmtp-2.61-r2
@@ -0,0 +1 @@
+MD5 957e6fff08625fe34f4fc33d0925bbc9 ssmtp_2.61.orig.tar.gz 53341
diff --git a/mail-mta/ssmtp/files/digest-ssmtp-2.61-r31 b/mail-mta/ssmtp/files/digest-ssmtp-2.61-r31
new file mode 100644
index 000000000000..92e3d236c0e0
--- /dev/null
+++ b/mail-mta/ssmtp/files/digest-ssmtp-2.61-r31
@@ -0,0 +1 @@
+MD5 957e6fff08625fe34f4fc33d0925bbc9 ssmtp_2.61.orig.tar.gz 53341
diff --git a/mail-mta/ssmtp/files/ssmtp-2.61-bug127592.patch b/mail-mta/ssmtp/files/ssmtp-2.61-bug127592.patch
new file mode 100644
index 000000000000..5d4a4229f26a
--- /dev/null
+++ b/mail-mta/ssmtp/files/ssmtp-2.61-bug127592.patch
@@ -0,0 +1,15 @@
+diff -u ssmtp-2.61.orig/ssmtp.c ssmtp-2.61/ssmtp.c
+--- ssmtp-2.61.orig/ssmtp.c	2004-07-22 23:58:48.000000000 -0600
++++ ssmtp-2.61/ssmtp.c	2006-05-04 22:56:35.000000000 -0600
+@@ -480,6 +480,11 @@
+ 				die("from_format() -- snprintf() failed");
+ 			}
+ 		}
++		else {
++			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
++				die("from_format() -- snprintf() failed");
++			}
++		}
+ 	}
+ 
+ #if 0
diff --git a/mail-mta/ssmtp/ssmtp-2.61-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.61-r2.ebuild
new file mode 100644
index 000000000000..c7baa22b84ab
--- /dev/null
+++ b/mail-mta/ssmtp/ssmtp-2.61-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.61-r2.ebuild,v 1.1 2006/05/06 12:41:23 ferdy Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
+HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
+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 ~x86 ~x86-fbsd"
+IUSE="ssl ipv6 md5sum mailwrapper"
+
+DEPEND="virtual/libc
+	ssl? ( dev-libs/openssl )"
+RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )
+	net-mail/mailbase
+	ssl? ( dev-libs/openssl )"
+PROVIDE="virtual/mta"
+
+S=${WORKDIR}/ssmtp-2.61
+
+src_unpack() {
+	unpack "${A}" ; cd "${S}"
+
+	epatch "${FILESDIR}"/ssmtp-2.61-bug127592.patch
+}
+
+src_compile() {
+	tc-export CC LD
+
+	econf \
+		--sysconfdir=/etc/ssmtp \
+		$(use_enable ssl) \
+		$(use_enable ipv6 inet6) \
+		$(use_enable md5sum md5auth) \
+		|| die
+	make clean || die
+	make etcdir=/etc || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/sbin /usr/lib
+	dosbin ssmtp || die
+	fperms 755 /usr/sbin/ssmtp
+	dosym /usr/sbin/sendmail /usr/bin/mailq
+	dosym /usr/sbin/sendmail /usr/bin/newaliases
+	# Removed symlink due to conflict with mailx
+	# See bug #7448
+	#dosym /usr/sbin/ssmtp /usr/bin/mail
+	#The sendmail symlink is now handled by mailwrapper if used
+	use mailwrapper || \
+		dosym /usr/sbin/ssmtp /usr/sbin/sendmail
+	dosym /usr/sbin/sendmail /usr/lib/sendmail
+	doman ssmtp.8
+	#removing the sendmail.8 symlink to support multiple installed mtas.
+	#dosym /usr/share/man/man8/ssmtp.8 /usr/share/man/man8/sendmail.8
+	dodoc INSTALL README TLS CHANGELOG_OLD
+	# This subdir has apparently disappeared in a later release:
+	# dodoc debian/{README.debian,changelog}
+	newdoc ssmtp.lsm DESC
+	insinto /etc/ssmtp
+	doins ssmtp.conf revaliases
+	if use mailwrapper
+	then
+		insinto /etc/mail
+		doins ${FILESDIR}/mailer.conf
+	fi
+
+	# Set up config file
+	# See bug #22658
+	#local conffile="/etc/ssmtp/ssmtp.conf"
+	#local hostname=`hostname -f`
+	#local domainname=`hostname -d`
+	#mv ${conffile} ${conffile}.orig
+	#sed -e "s:rewriteDomain=:rewriteDomain=${domainname}:g" \
+	#        -e "s:_HOSTNAME_:${hostname}:" \
+	#        -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \
+	#        ${conffile}.orig > ${conffile}.pre
+	#if use ssl;
+	#then
+	#        sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \
+	#                ${conffile}.pre > ${conffile}
+	#        mv ${conffile}.pre ${conffile}.orig
+	#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() {
+	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
+	then
+		einfo
+		einfo "Since you emerged ssmtp w/o mailwrapper in USE,"
+		einfo "you probably want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+}
diff --git a/mail-mta/ssmtp/ssmtp-2.61-r31.ebuild b/mail-mta/ssmtp/ssmtp-2.61-r31.ebuild
new file mode 100644
index 000000000000..e4fea64d35cb
--- /dev/null
+++ b/mail-mta/ssmtp/ssmtp-2.61-r31.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.61-r31.ebuild,v 1.1 2006/05/06 12:41:23 ferdy Exp $
+
+inherit eutils toolchain-funcs mailer
+
+DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
+HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
+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 ~x86 ~x86-fbsd"
+IUSE="ssl ipv6 md5sum"
+
+DEPEND="virtual/libc
+	ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/ssmtp-2.61
+
+src_unpack() {
+	unpack "${A}" ; cd "${S}"
+
+	epatch "${FILESDIR}"/ssmtp-2.61-bug127592.patch
+}
+
+src_compile() {
+	tc-export CC LD
+
+	econf \
+		--sysconfdir=/etc/ssmtp \
+		$(use_enable ssl) \
+		$(use_enable ipv6 inet6) \
+		$(use_enable md5sum md5auth) \
+		|| die
+	make clean || die
+	make etcdir=/etc || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/sbin /usr/lib
+	dosbin ssmtp || die
+	fperms 755 /usr/sbin/ssmtp
+
+	doman ssmtp.8
+	dodoc INSTALL README TLS CHANGELOG_OLD
+	newdoc ssmtp.lsm DESC
+
+	insinto /etc/ssmtp
+	doins ssmtp.conf revaliases
+
+	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"
+
+	if use mailwrapper ; then
+		dosym /usr/sbin/ssmtp /usr/bin/sendmail.ssmtp
+		mailer_install_conf
+	else
+		dosym /usr/sbin/ssmtp /usr/lib/sendmail
+		dosym /usr/sbin/ssmtp /usr/bin/sendmail
+		dosym /usr/sbin/ssmtp /usr/bin/mailq
+		dosym /usr/sbin/ssmtp /usr/bin/newaliases
+	fi
+}