mailwrapper fixes

6 files changed, 111 insertions, 14 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index c4498b58e4f2..fb6586387af3 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1 2004/05/30 09:56:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.2 2004/05/30 22:15:10 g2boojum Exp $
+
+*ssmtp-2.60.7-r1 (30 May 2004)
+
+  30 May 2004; Grant Goodyear <g2boojum@gentoo.org> ssmtp-2.60.4-r2.ebuild,
+  +ssmtp-2.60.7-r1.ebuild, ssmtp-2.60.7.ebuild:
+  Made mailwrapper an optional dep w/ USE=mailwrapper.
+  Also fixed up which docs get installed.
 
 *ssmtp-2.48 (30 May 2004)
 
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index f419a97e417e..e37055afb467 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,16 +1,19 @@
-MD5 a41c23b0e819103587c928d735b2ed39 ChangeLog 4884
-MD5 70c2b6d79e32213a5cffa638a06189ce ssmtp-2.38.14-r1.ebuild 1468
-MD5 14099b3d6bb3dcef8d93d2ceadafbe32 ssmtp-2.48.ebuild 1545
-MD5 082ac1a5502c506e524d0a8f76721641 ssmtp-2.60.4.ebuild 2262
+MD5 7e39bba1bad31e93ac518b19743dddb2 ssmtp-2.60.4.ebuild 2261
+MD5 18c63c940f12676092a1942e90b4240f ssmtp-2.60.4-r2.ebuild 2461
+MD5 66334db6bc252cf02763dc76f1cf68d6 ssmtp-2.48.ebuild 1545
+MD5 b5a98099a361bb6f5f6cded2ae2610a7 .ssmtp-2.60.7-r1.ebuild.swp 12288
+MD5 117b3ae783e9ef6962fbd4f6cac80bd2 ssmtp-2.60.7-r1.ebuild 2546
+MD5 863687d9fe25980b7cc1e341cd67288e ssmtp-2.60.7.ebuild 2460
+MD5 f8e8ecf013db170a00ed454662f5c8ac ChangeLog 5246
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 10c62e050bf226c8f084363a3b07d4ee ssmtp-2.60.4-r2.ebuild 2455
-MD5 f0447534c99aaed8f67e9262499a2fbc ssmtp-2.60.7.ebuild 2455
-MD5 0c220581f9fe43f95d74864b63cf5121 files/digest-ssmtp-2.38.14-r1 64
+MD5 0d2b3acb3bf13a1f82b0759a06ed0410 ssmtp-2.38.14-r1.ebuild 1468
+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 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
+MD5 c833680953ba9941d33fc14dda62532b files/digest-ssmtp-2.60.7-r1 63
 MD5 0ed5447f4d8fd89fa31f23b361c37f59 files/mailer.conf 1026
-MD5 c833680953ba9941d33fc14dda62532b files/digest-ssmtp-2.60.7 63
-MD5 5208fda9912caf3afd94108e6276167e files/ssmtp-2.60.7-logfile.patch 1256
diff --git a/mail-mta/ssmtp/files/digest-ssmtp-2.60.7-r1 b/mail-mta/ssmtp/files/digest-ssmtp-2.60.7-r1
new file mode 100644
index 000000000000..6130713dbd95
--- /dev/null
+++ b/mail-mta/ssmtp/files/digest-ssmtp-2.60.7-r1
@@ -0,0 +1 @@
+MD5 2e3b3f1403d4ae1a7373f80db2f3923e ssmtp_2.60.7.tar.gz 60727
diff --git a/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild
index 3b8a184dbea8..515afb96899d 100644
--- a/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.4-r2.ebuild,v 1.1 2004/05/30 09:56:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild,v 1.2 2004/05/30 22:15:10 g2boojum Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ IUSE="ssl ipv6 md5sum"
 
 DEPEND="virtual/glibc
 	ssl? ( dev-libs/openssl )"
-RDEPEND="net-mail/mailwrapper
+RDEPEND="=net-mail/mailwrapper-0.1
 	net-mail/mailbase
 	ssl? ( dev-libs/openssl )"
 PROVIDE="virtual/mta"
diff --git a/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild b/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild
new file mode 100644
index 000000000000..fdee10cd7068
--- /dev/null
+++ b/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild
@@ -0,0 +1,86 @@
+# 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.7-r1.ebuild,v 1.1 2004/05/30 22:15:10 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.1 )
+	net-mail/mailbase
+	ssl? ( dev-libs/openssl )"
+PROVIDE="virtual/mta"
+
+S=${WORKDIR}/ssmtp-2.60
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/ssmtp-2.60.7-logfile.patch
+	use ssl && epatch ${FILESDIR}/starttls.diff
+	use md5sum && epatch ${FILESDIR}/ssmtp-2.60.4-md5.patch
+}
+
+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
+	insinto /etc
+	use mailwrapper && 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
+}
diff --git a/mail-mta/ssmtp/ssmtp-2.60.7.ebuild b/mail-mta/ssmtp/ssmtp-2.60.7.ebuild
index 9c6388ee5003..98d7ed52ec66 100644
--- a/mail-mta/ssmtp/ssmtp-2.60.7.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.60.7.ebuild
@@ -1,6 +1,6 @@
 # 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.7.ebuild,v 1.1 2004/05/30 09:56:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.7.ebuild,v 1.2 2004/05/30 22:15:10 g2boojum Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ IUSE="ssl ipv6 md5sum"
 
 DEPEND="virtual/glibc
 	ssl? ( dev-libs/openssl )"
-RDEPEND="net-mail/mailwrapper
+RDEPEND="=net-mail/mailwrapper-0.1
 	net-mail/mailbase
 	ssl? ( dev-libs/openssl )"
 PROVIDE="virtual/mta"