ssmtp version bump closes #69999. Also update copyright headers in other ssmtp ebuilds

(Portage version: 2.0.51-r15)

6 files changed, 121 insertions, 19 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index f0429bf66de3..e83d249d322b 100644
--- 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.15 2004/12/25 20:37:50 slarti Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.16 2005/01/24 21:32:35 ferdy Exp $
+
+*ssmtp-2.61 (24 Jan 2005)
+
+  24 Jan 2005; Fernando J. Pereda <ferdy@gentoo.org> +ssmtp-2.61.ebuild:
+  Version bump, closes #69999. Reported by: Yani Ioannou <yani.ioannou@gmail.com>
 
   25 Dec 2004; Tom Martin <slarti@gentoo.org> ssmtp-2.60.9.ebuild:
   Resolve bug 47562, by commenting out hostname=_HOSTNAME_ by default,
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index a483b8b99e23..86f12e82ea95 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3451923e5f0d6b8215b0fb98e3f9a452 ssmtp-2.60.7-r1.ebuild 2856
-MD5 19dd7ca14c6281fdd1532741c4cb9f90 ChangeLog 7049
+MD5 7288c3969827f19ac9a5580a35af07fa ssmtp-2.61.ebuild 3042
+MD5 c0fb47803ae0593131a2aafb81bf8ec1 ssmtp-2.60.7-r1.ebuild 2856
+MD5 9d0411a2f0cf6f85cf29737a3a45d860 ChangeLog 7232
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 f45ac61bc70f2029372e888140622ec5 ssmtp-2.60.9.ebuild 3125
+MD5 7ae4b01449d450eb69b0a40fae1541d9 ssmtp-2.60.9.ebuild 3125
 MD5 5208fda9912caf3afd94108e6276167e files/ssmtp-2.60.7-logfile.patch 1256
+MD5 15fdd106696fc8ccfb1b170da88df2ce files/digest-ssmtp-2.61 66
 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.2.6 (GNU/Linux)
-
-iD8DBQFBzdA8CHk4+ZoBpvsRAkN6AJ46D3ECllra4+iqhezQVOXXZvOnSACfRq2y
-28Ew8SSjfbKR56t4JDuQOsk=
-=WzqU
------END PGP SIGNATURE-----
diff --git a/mail-mta/ssmtp/files/digest-ssmtp-2.61 b/mail-mta/ssmtp/files/digest-ssmtp-2.61
new file mode 100644
index 000000000000..92e3d236c0e0
--- /dev/null
+++ b/mail-mta/ssmtp/files/digest-ssmtp-2.61
@@ -0,0 +1 @@
+MD5 957e6fff08625fe34f4fc33d0925bbc9 ssmtp_2.61.orig.tar.gz 53341
diff --git a/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild b/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild
index 985c4aadc55c..a6db0db61a24 100644
--- a/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.8 2004/07/01 19:54:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild,v 1.9 2005/01/24 21:32:35 ferdy Exp $
 
 inherit eutils
 
diff --git a/mail-mta/ssmtp/ssmtp-2.60.9.ebuild b/mail-mta/ssmtp/ssmtp-2.60.9.ebuild
index 160fd3a70350..2bfbf478eb8a 100644
--- 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
+# Copyright 1999-2005 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.13 2004/12/25 20:37:50 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.9.ebuild,v 1.14 2005/01/24 21:32:35 ferdy Exp $
 
 inherit eutils
 
diff --git a/mail-mta/ssmtp/ssmtp-2.61.ebuild b/mail-mta/ssmtp/ssmtp-2.61.ebuild
new file mode 100644
index 000000000000..54281690f0f5
--- /dev/null
+++ b/mail-mta/ssmtp/ssmtp-2.61.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.61.ebuild,v 1.1 2005/01/24 21:32:35 ferdy 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/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+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_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
+
+	# 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
+}