Version bump; move patches to tarball; simplify ebuild. The md5sum (misnamed) and maxsysuid USE flags are gone (enabled by default); package builds with parallel make; automake is not used (faster src_prepare); add optional support for GnuTLS for those not wanting to use OpenSSL.

Package-Manager: portage-2.2.0_alpha17/cvs/Linux x86_64

4 files changed, 110 insertions, 21 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index 18fe7c31c5f2..51dc4aac68bb 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-mta/ssmtp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.105 2011/01/18 12:32:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.106 2011/01/19 13:49:42 flameeyes Exp $
+
+*ssmtp-2.64 (19 Jan 2011)
+
+  19 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/ssmtp-2.61-bug127592.patch, +ssmtp-2.64.ebuild:
+  Version bump; move patches to tarball; simplify ebuild. The md5sum (misnamed)
+  and maxsysuid USE flags are gone (enabled by default); package builds with
+  parallel make; automake is not used (faster src_prepare); add optional
+  support for GnuTLS for those not wanting to use OpenSSL.
 
   18 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> -ssmtp-2.62-r6.ebuild,
   -ssmtp-2.62-r7.ebuild, -files/CVE-2008-3962.patch, -files/mailer.conf:
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index c47746df3880..9cae80add9cb 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA1
 
 AUX CVE-2008-3962-r2.patch 649 RMD160 bca92bab9b8ac1f832e0c2533f5b0ab02cdb0a48 SHA1 235a5fc08cee4c059e0b9bb6c213089a54796abd SHA256 90b337f4e87ac01f84c5e032f75161a9c4d57d566422bc8bdc4d4064e1c5dc16
-AUX ssmtp-2.61-bug127592.patch 385 RMD160 61f877e742bbf23e13056884bccae5a22a17fe75 SHA1 27a4aafc3cbffd11c6427e5ac02c3484396091ef SHA256 256a783b5e73b9914cb49854b367ce9f5781d8664cd640e6b0b9d0b5f6948edc
 AUX ssmtp-2.61-darwin7.patch 194 RMD160 45a0b135de548b0d1c42be61c4925d2d41411ff4 SHA1 068ff9d600a299524066e1f1050785693e7d6449 SHA256 d79e8a34ed46168bf0e5a05b56f4f62f65a334e893a12b53bf1642db29051dd5
 AUX ssmtp-2.62-authpass.patch 389 RMD160 edff4efbd796f49364fb78499a16c48280047218 SHA1 415cdd30d8c96b1d0ed9b04b92642c2f65546d28 SHA256 b51392e40f4b22f4bb48e159059fc33a6cad6964d9445c3adabf1f65e65ae17d
 AUX ssmtp-2.62-darwin-crypto.patch 306 RMD160 22a85dc723bd3e4468a2c84ce63768847e9af2b6 SHA1 e94b96982371d2aeefc3e5b9e90a752af69eebee SHA256 249787eddebef81d9eeee7f2d012a370bf25ddb6364cef67ba9aaf41af5c3214
@@ -11,14 +10,17 @@ AUX ssmtp-2.62-maxsysuid-conf.patch 667 RMD160 9a515e40aedc8eb8784cc7bb9b75b5553
 AUX ssmtp-2.62-maxsysuid.patch 1185 RMD160 a6a4a1dc23a74170b52e84a1e34149258e08b7b6 SHA1 9da033da95e9ac04046969d60914cd64f1405e47 SHA256 49201b47eb88e860d0a07777aa895127c2415bc170faacdefc376c221a595961
 AUX ssmtp-2.62-solaris-basename-conflict.patch 836 RMD160 832fff541bd43e59c0f6cc8abedf99463f70b156 SHA1 392b36d436f9897956e6d856652afd4f1c90f383 SHA256 791476ebc0b35daeba271d563f2e75d5dd3169dc2bb163ba6934bfa0f2f3f2c7
 AUX ssmtp-2.62-strndup.patch 682 RMD160 d56434a83ec6bb49cafb67846e0082551d1a3be3 SHA1 9b8328c8ea1410683dd13cc770582658e33d716e SHA256 2ce7b4526db527656bfb9cde41f940e5da23b9fb2089a6b5b9bd4bae6dfa07ab
+DIST ssmtp-2.64-patches-1.tar.bz2 3954 RMD160 68423fea87a3632d4798ec15e09762b6fec3f18b SHA1 8e44dbdc6ad5404eaed605e7e805fbb05936d341 SHA256 f4c3bdc74b74a98a5542841950b7a7c95afbaba6c3ef2c60713bc767291ef116
 DIST ssmtp_2.62.orig.tar.gz 57127 RMD160 1c16b2d50224f4d29813a34f87a3480e66892b36 SHA1 5c15aafb252f6cb11e4b93140a1457b6cb0d0fb8 SHA256 e2a0a5379cd0bbb0b4b0304abeba7a8f60aa85275982c5d7930c319e7f284ed1
+DIST ssmtp_2.64.orig.tar.bz2 52501 RMD160 ea6472e52a499c39d1d8ce7e13add9d8e9accbfb SHA1 db0cc6b4f82ab8b4c79335933db9c4db706324d1 SHA256 22c37dc90c871e8e052b2cab0ad219d010fa938608cd66b21c8f3c759046fa36
 EBUILD ssmtp-2.62-r8.ebuild 3153 RMD160 d7df7e6ea8e912ba6c5314829de4f0c90e715630 SHA1 b20062092b2a6d7dc6507613975bb762c91e0a27 SHA256 f8ae3804a0cd8a73e059188a6ace8462d57ce1818c5d93c16a9a66d7c2e02d1b
-MISC ChangeLog 18980 RMD160 c67d8334e20f940e7312a1ce6fa5b5c8fa8ea731 SHA1 636ef1df7dce8d1f691ddf53842c453c2beda06f SHA256 76ed2a8a0c9fd51b238dd49e00b143f44a494e01e849ecb279bf507a560cd6a5
+EBUILD ssmtp-2.64.ebuild 2637 RMD160 31087b311e0e8cd431dc7360434c3e91ae8aa03f SHA1 9f131c6bed3086944bb406ac0ea8bac6f8d1b3fe SHA256 0240251eae31957a45f7e6d3b08d8bb1401c371d74fdc287c0046be0109bc97e
+MISC ChangeLog 19410 RMD160 e4c80bdf2eb19837d0859ece19759464884f371c SHA1 f76c36a4931f48c62319a0fd0adce4710b81c58e SHA256 be8e55f61783290b5095a9c98ad389a66c5aa77e93eb7368c382aaf9d4302f48
 MISC metadata.xml 291 RMD160 2e697d312e59fe9a8a198f5d79f0b20c29abb633 SHA1 b6498cb6d5b33475440898598dfc05f3a7c554a7 SHA256 547e579723c831c40d6184225f181e11e949cf8310a3433d6ece7ee61fc23887
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk01iDgACgkQAiZjviIA2XhsdwCgwBH5DkDDcRRcOHCmtbEsF7xf
-FKwAoMBj+9Noge0h+lwdSMOaYoCCNAyH
-=AjV+
+iEYEARECAAYFAk02694ACgkQAiZjviIA2Xh/FQCg8L5CxgJWuvIriQV61AkH07Az
+nYQAmwaRLqh1Z5bn0qiELRfMnmVlLxnn
+=2z+r
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/ssmtp/files/ssmtp-2.61-bug127592.patch b/mail-mta/ssmtp/files/ssmtp-2.61-bug127592.patch
deleted file mode 100644
index 5d4a4229f26a..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.61-bug127592.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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.64.ebuild b/mail-mta/ssmtp/ssmtp-2.64.ebuild
new file mode 100644
index 000000000000..ed09fcbe91e9
--- /dev/null
+++ b/mail-mta/ssmtp/ssmtp-2.64.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.64.ebuild,v 1.1 2011/01/19 13:49:42 flameeyes Exp $
+
+EAPI="3"
+
+PATCHES=1
+
+WANT_AUTOMAKE=none
+
+inherit eutils autotools
+
+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.bz2
+	http://dev.gentoo.org/~flameeyes/ssmtp/${P}-patches-${PATCHES}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6 ssl gnutls"
+
+DEPEND="ssl? (
+		!gnutls? ( dev-libs/openssl )
+		gnutls? ( net-libs/gnutls )
+	)"
+RDEPEND="${DEPEND}
+	net-mail/mailbase
+	!net-mail/mailwrapper
+	!virtual/mta"
+PROVIDE="virtual/mta"
+
+pkg_setup() {
+	enewgroup ssmtp
+}
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/patches" \
+		epatch
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/ssmtp \
+		$(use_enable ssl) $(use_with gnutls) \
+		$(use_enable ipv6 inet6) \
+		--enable-md5auth
+}
+
+src_compile() {
+	emake etcdir="${EPREFIX}"/etc || die
+}
+
+src_install() {
+	dosbin ssmtp || die
+
+	doman ssmtp.8 ssmtp.conf.5 || die
+	dodoc INSTALL README TLS CHANGELOG_OLD || die
+	newdoc ssmtp.lsm DESC || die
+
+	insinto /etc/ssmtp
+	doins ssmtp.conf revaliases || die
+
+	local conffile="${ED}etc/ssmtp/ssmtp.conf"
+
+	# Sorry about the weird indentation, I couldn't figure out a cleverer way
+	# to do this without having horribly >80 char lines.
+	sed -i -e "s:^hostname=:\n# Gentoo bug #47562\\
+# Commenting the following line will force ssmtp to figure\\
+# out the hostname itself.\n\\
+# hostname=:" \
+		"${conffile}" || die "sed failed"
+
+	# Comment rewriteDomain (bug #243364)
+	sed -i -e "s:^rewriteDomain=:#rewriteDomain=:" "${conffile}"
+
+	# Set restrictive perms on ssmtp.conf as per #187841, #239197
+	# Protect the ssmtp configfile from being readable by regular users as it
+	# may contain login/password data to auth against a the mailhub used.
+	fowners root:ssmtp /etc/ssmtp/ssmtp.conf
+	fperms 640 /etc/ssmtp/ssmtp.conf
+
+	fowners root:ssmtp /usr/sbin/ssmtp
+	fperms 2711 /usr/sbin/ssmtp
+
+	dosym ../sbin/ssmtp /usr/lib/sendmail || die
+	dosym ../sbin/ssmtp /usr/bin/sendmail || die
+	dosym ssmtp /usr/sbin/sendmail || die
+	dosym ../sbin/ssmtp /usr/bin/mailq || die
+	dosym ../sbin/ssmtp /usr/bin/newaliases || die
+}