Version bump that fixes bug 51403.

4 files changed, 99 insertions, 1 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index fb6586387af3..6009694cedf7 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/ssmtp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.2 2004/05/30 22:15:10 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.3 2004/06/06 23:09:56 g2boojum Exp $
+
+  06 Jun 2004; Grant Goodyear <g2boojum@gentoo.org> :
+  Version bump.  Patches no longer required.  Fixes STARTTLS before ehlo bug.
 
 *ssmtp-2.60.7-r1 (30 May 2004)
 
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index 922e6e04494a..43a0b16f2530 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -6,11 +6,13 @@ MD5 a4b27cfba476c833c941bfb865ccb18c ssmtp-2.60.7.ebuild 2461
 MD5 65ffeb141034a5bd6f44223052d173dd ChangeLog 5501
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 0d2b3acb3bf13a1f82b0759a06ed0410 ssmtp-2.38.14-r1.ebuild 1468
+MD5 330c6cceafd6d7d83e6682b583267b33 ssmtp-2.60.9.ebuild 2883
 MD5 5208fda9912caf3afd94108e6276167e files/ssmtp-2.60.7-logfile.patch 1256
 MD5 7acea6571783e2e8d40bb7aafad39d21 files/digest-ssmtp-2.48 62
 MD5 0c220581f9fe43f95d74864b63cf5121 files/digest-ssmtp-2.38.14-r1 64
 MD5 a57abd57dc7b801340b6db41c80fab11 files/digest-ssmtp-2.60.4 64
 MD5 c833680953ba9941d33fc14dda62532b files/digest-ssmtp-2.60.7 63
+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 a57abd57dc7b801340b6db41c80fab11 files/digest-ssmtp-2.60.4-r2 64
diff --git a/mail-mta/ssmtp/files/digest-ssmtp-2.60.9 b/mail-mta/ssmtp/files/digest-ssmtp-2.60.9
new file mode 100644
index 000000000000..d81543477426
--- /dev/null
+++ b/mail-mta/ssmtp/files/digest-ssmtp-2.60.9
@@ -0,0 +1 @@
+MD5 28a47b520f04e055ee6f8ebf6c209234 ssmtp_2.60.9.tar.gz 66041
diff --git a/mail-mta/ssmtp/ssmtp-2.60.9.ebuild b/mail-mta/ssmtp/ssmtp-2.60.9.ebuild
new file mode 100644
index 000000000000..ec2da2c57f95
--- /dev/null
+++ b/mail-mta/ssmtp/ssmtp-2.60.9.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/06/06 23:09:56 g2boojum Exp $
+
+inherit eutils
+
+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="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="ssl ipv6 md5sum mailwrapper"
+
+DEPEND="virtual/glibc
+	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.60
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/ssmtp \
+		`use_enable ssl` \
+		`use_enable ipv6 inet6` \
+		`use_enable md5sum md5suth` \
+		|| die
+	make clean || die
+	make etcdir=/etc || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/sbin /usr/lib
+	dosbin ssmtp
+	chmod 755 ${D}/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 COPYING INSTALL README TLS CHANGELOG_OLD
+	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
+}
+
+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
+}