New revision that uses mailwrapper.

7 files changed, 135 insertions, 12 deletions

diff --git a/net-mail/ssmtp/ChangeLog b/net-mail/ssmtp/ChangeLog
index 20d57a0aa8c5..dbdcd42bf9f5 100644
--- a/net-mail/ssmtp/ChangeLog
+++ b/net-mail/ssmtp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/ssmtp
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ChangeLog,v 1.20 2004/03/14 19:22:56 tgall Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ChangeLog,v 1.21 2004/03/17 22:24:22 g2boojum Exp $
+
+*ssmtp-2.60.4-r1 (17 Mar 2004)
+
+  17 Mar 2004; Grant Goodyear <g2boojum@hotmail.com> ssmtp-2.60.4-r1.ebuild,
+  files/mailer.conf:
+  New revision that uses mailwrapper.
 
   14 Mar 2004; Tom Gall <tgall@gentoo.org> ssmtp-2.60.4.ebuild:
   mark ppc64 stable
diff --git a/net-mail/ssmtp/Manifest b/net-mail/ssmtp/Manifest
index bab64c0c6937..43bae879ebeb 100644
--- a/net-mail/ssmtp/Manifest
+++ b/net-mail/ssmtp/Manifest
@@ -1,10 +1,13 @@
-MD5 668be06c6436e7e34bea4bf838d790a4 ChangeLog 2990
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 9d260a5e3ba800b7fe887088118a3a2f ssmtp-2.38.14-r1.ebuild 1489
-MD5 7bed62a361053ce9a229630b9a064346 ssmtp-2.48.ebuild 1566
 MD5 43dae1ddb8c819f22c66ee376684a0bf ssmtp-2.60.4.ebuild 2246
-MD5 0c220581f9fe43f95d74864b63cf5121 files/digest-ssmtp-2.38.14-r1 64
+MD5 e71dd4913d6541d297157be220b3a88f ssmtp-2.48.ebuild 1566
+MD5 e857edc041c54c6c0543242944265db7 ssmtp-2.60.4-r1.ebuild 2504
+MD5 5a7c2c28744905495735544beef5bf55 ChangeLog 3162
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 b472b7b272a6ca524b636c605f387dd5 ssmtp-2.38.14-r1.ebuild 1489
 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 f466deeaec0316507961656f37af7000 files/ssmtp-2.60.4-md5.patch 1509
 MD5 93225fbc5fd7b8e5500c7b1c85b63fdf files/starttls.diff 4277
+MD5 f466deeaec0316507961656f37af7000 files/ssmtp-2.60.4-md5.patch 1509
+MD5 a57abd57dc7b801340b6db41c80fab11 files/digest-ssmtp-2.60.4-r1 64
+MD5 ea0e6140c42fed1c3f3d70a5e5d0ef4b files/mailer.conf 755
diff --git a/net-mail/ssmtp/files/digest-ssmtp-2.60.4-r1 b/net-mail/ssmtp/files/digest-ssmtp-2.60.4-r1
new file mode 100644
index 000000000000..5a7840ef2d23
--- /dev/null
+++ b/net-mail/ssmtp/files/digest-ssmtp-2.60.4-r1
@@ -0,0 +1 @@
+MD5 88fff70f14a001e09b713aa6326162cf ssmtp_2.60.4.tar.gz 160073
diff --git a/net-mail/ssmtp/files/mailer.conf b/net-mail/ssmtp/files/mailer.conf
new file mode 100644
index 000000000000..7cd1b7f764ca
--- /dev/null
+++ b/net-mail/ssmtp/files/mailer.conf
@@ -0,0 +1,24 @@
+#	$OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
+#
+# Execute the "real" sendmail program from ssmtp, 
+# named /usr/sbin/ssmtp
+#
+sendmail	/usr/sbin/ssmtp
+mailq		/usr/sbin/ssmtp
+newaliases	/usr/sbin/ssmtp
+#
+# Execute the "real" sendmail program from postfix, 
+# named /usr/sbin/sendmail.postfix
+#
+#sendmail	/usr/sbin/sendmail.postfix
+#send-mail	/usr/sbin/sendmail.postfix
+#mailq		/usr/sbin/sendmail.postfix
+#newaliases	/usr/sbin/sendmail.postfix
+# Execute the "real" sendmail program, named /usr/sbin/sendmail
+#
+#sendmail	/usr/sbin/sendmail.sendmail
+#send-mail	/usr/sbin/sendmail.sendmail
+#mailq		/usr/sbin/sendmail.sendmail
+#newaliases	/usr/sbin/sendmail.sendmail
+#hoststat	/usr/sbin/sendmail.sendmail
+#purgestat	/usr/sbin/sendmail.sendmail
diff --git a/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild b/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild
index f2344fd7f36a..cac1279f68a2 100644
--- a/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild
+++ b/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild,v 1.20 2003/09/05 02:28:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild,v 1.21 2004/03/17 22:24:22 g2boojum Exp $
 
 S=${WORKDIR}/${P}
 
diff --git a/net-mail/ssmtp/ssmtp-2.48.ebuild b/net-mail/ssmtp/ssmtp-2.48.ebuild
index dddeca25ac74..3a2e4cd8571c 100644
--- a/net-mail/ssmtp/ssmtp-2.48.ebuild
+++ b/net-mail/ssmtp/ssmtp-2.48.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.48.ebuild,v 1.13 2004/02/22 16:29:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.48.ebuild,v 1.14 2004/03/17 22:24:22 g2boojum Exp $
 
 DESCRIPTION="Extremely simple MTA to get mail off the system to a
 Mailhub"
diff --git a/net-mail/ssmtp/ssmtp-2.60.4-r1.ebuild b/net-mail/ssmtp/ssmtp-2.60.4-r1.ebuild
new file mode 100644
index 000000000000..97787cdbaa5b
--- /dev/null
+++ b/net-mail/ssmtp/ssmtp-2.60.4-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.60.4-r1.ebuild,v 1.1 2004/03/17 22:24:22 g2boojum Exp $
+
+DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
+SRC_URI="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/${P/-/_}.tar.gz"
+HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ia64 ppc64"
+LICENSE="GPL-2"
+IUSE="ssl ipv6 md5sum"
+
+DEPEND="virtual/glibc
+	ssl? ( dev-libs/openssl )"
+RDEPEND="net-mail/mailwrapper
+	net-mail/mailbase
+	ssl? ( dev-libs/openssl )"
+PROVIDE="virtual/mta"
+
+S=${WORKDIR}/ssmtp-2.60
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	use ssl && epatch ${FILESDIR}/starttls.diff
+	use md5sum && epatch ${FILESDIR}/ssmtp-2.60.4-md5.patch
+}
+
+src_compile() {
+	local myconf
+
+	myconf="$( use_enable ssl ) \
+		$( use_enable ipv6 inet6 ) \
+		$( use_enable md5sum md5suth )"
+
+	econf \
+		--sysconfdir=/etc/ssmtp \
+		${myconf} || 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
+	#dosym /usr/sbin/ssmtp /usr/sbin/sendmail
+	#Removing the /usr/lib/sendmail symlink for multiple-mta support.
+	#dosym /usr/sbin/ssmtp /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
+	newdoc ssmtp-2.60.lsm
+	insinto /etc/ssmtp
+	doins ssmtp.conf revaliases
+	insinto /etc
+	doins ${FILESDIR}/mailer.conf
+
+	# 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
+}
+
+
+