Revbump, add patches for Darwin/Solaris, bump to EAPI-3, add prefix support & keywords, die on failure, cleanup

Package-Manager: portage-v2.2_rc67-80-ge064530/cvs/Linux i686

6 files changed, 201 insertions, 3 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index 3e0f1078cc90..d2ae4e38bfb6 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-mta/ssmtp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.93 2009/12/09 19:24:18 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.94 2010/04/25 23:28:42 abcd Exp $
+
+*ssmtp-2.62-r8 (25 Apr 2010)
+
+  25 Apr 2010; Jonathan Callen <abcd@gentoo.org>
+  +files/ssmtp-2.61-darwin7.patch, +ssmtp-2.62-r8.ebuild,
+  +files/ssmtp-2.62-darwin-crypto.patch,
+  +files/ssmtp-2.62-solaris-basename-conflict.patch:
+  Revbump, add patches for Darwin/Solaris, bump to EAPI-3, add prefix
+  support & keywords, die on failure, cleanup
 
   09 Dec 2009; nixnut <nixnut@gentoo.org> ssmtp-2.62-r7.ebuild:
   ppc stable #282907
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index 4f1dc35985d0..41e94be64130 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,14 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CVE-2008-3962-r2.patch 649 RMD160 bca92bab9b8ac1f832e0c2533f5b0ab02cdb0a48 SHA1 235a5fc08cee4c059e0b9bb6c213089a54796abd SHA256 90b337f4e87ac01f84c5e032f75161a9c4d57d566422bc8bdc4d4064e1c5dc16
 AUX CVE-2008-3962.patch 293 RMD160 5e61ae056d707337d8f3d4a5e18e35ca1fd2217e SHA1 ebab9f9636b83b4b151d852baa7a1b90b2871871 SHA256 48367c82bdb77d26b144954eb908de56494999154ed6399b0cd148be340fb231
 AUX mailer.conf 349 RMD160 1cad356faa6ee30e7bed9d70754487cac8f088e5 SHA1 4ab7aeef9fcaa021cff2845ffdac1ccb65dddfa4 SHA256 7b04fc27f8ca41b586ae68cbeffb509c2408afcc592462b617fba78b5d7aa88a
 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 316 RMD160 729b371f657007e5a9eb3e14639e0e0590c16833 SHA1 e37eeb004b5774fac829c9bce02cb6ce7527c0ef SHA256 c2ff05a23382ec6a2aa6ead62d67279b6349a6d76112da786d0a34ebabfa4cf8
 AUX ssmtp-2.62-from_format_fix.patch 543 RMD160 a4289a8eda3c0f5f03e3fcd5823ddb3cd6d89930 SHA1 72ba0f392714b39e237cee97ad9582dc3456a9fb SHA256 8d48bd527cda1e8c9fda7e80b6cb7d403a009d8a9576a6ca7f358245e34abcf9
 AUX ssmtp-2.62-maxsysuid-conf.patch 667 RMD160 9a515e40aedc8eb8784cc7bb9b75b55536877f42 SHA1 af175c8fd039fcd7a125b2c3f3eba80bd69006dd SHA256 634d8e1e66d9a1c13aa4b75de37194899d12ed069b7cd651c3f49e361745b99e
 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.62.orig.tar.gz 57127 RMD160 1c16b2d50224f4d29813a34f87a3480e66892b36 SHA1 5c15aafb252f6cb11e4b93140a1457b6cb0d0fb8 SHA256 e2a0a5379cd0bbb0b4b0304abeba7a8f60aa85275982c5d7930c319e7f284ed1
 EBUILD ssmtp-2.62-r6.ebuild 2801 RMD160 b389470b8f0914dc110eab894b64b86c236d496c SHA1 685690497e8caae4fd213641b91beea66afa1dac SHA256 580ecd9acca25df3d6f8515bc701ce35fe184ab745b7a36b2306105ccb292a16
 EBUILD ssmtp-2.62-r7.ebuild 2854 RMD160 d7c37d6790cd9f89902d8373704082bf2652d5ba SHA1 4c5afe268567adefe40a8e1b14b4d6dbf2070510 SHA256 ada39f83a41dd0f8773ba9b2a47bc600366b2ef0b3af6ff6969beeed4fcb6b6a
-MISC ChangeLog 17234 RMD160 494f32120d8e140b20a613d936e22dbfb01909c0 SHA1 72dfc97b4783fb5655748f366ad21932643d2dd2 SHA256 5fe2db02ec710110d1f47e5239e9319736f833437401a85a58590b1cb5dcdc6a
+EBUILD ssmtp-2.62-r8.ebuild 3146 RMD160 5201edac3f6d43e35df1126acc865c53074a0b4b SHA1 8214709f3faec03442f87d07ee2cca4009b5e04b SHA256 a17329c09932a7ec815d95fc345a0e2de3177139e9903b4b45d324b291fe590e
+MISC ChangeLog 17580 RMD160 a8f862f4be0668900d0a8ae1f1fbce12691ea32a SHA1 14e190317345f60ca9f1c78b5d49308f35743445 SHA256 067685cb3caad4ae121e5072f1d955995dade1b2112ef5edcf08d06f880507f3
 MISC metadata.xml 291 RMD160 2e697d312e59fe9a8a198f5d79f0b20c29abb633 SHA1 b6498cb6d5b33475440898598dfc05f3a7c554a7 SHA256 547e579723c831c40d6184225f181e11e949cf8310a3433d6ece7ee61fc23887
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvU0DYACgkQOypDUo0oQOqyiwCgq91kZeeVGzO48Umm03wpYxDa
+8yoAn36i5+Df18QwpeGwfZdr/67Tg9D8
+=s2aX
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch b/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch
new file mode 100644
index 000000000000..8f6aaec76c4b
--- /dev/null
+++ b/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch
@@ -0,0 +1,10 @@
+--- ssmtp-2.61/ssmtp.c
++++ ssmtp-2.61/ssmtp.c
+@@ -14,6 +14,7 @@
+ */
+ #define VERSION "2.60.4"
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <sys/param.h>
diff --git a/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch b/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch
new file mode 100644
index 000000000000..202efda9c9b1
--- /dev/null
+++ b/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch
@@ -0,0 +1,18 @@
+Fix linking error:
+
+Undefined symbols:
+  "_X509_free", referenced from:
+      _smtp_open in ssmtp.o
+ld: symbol(s) not found
+
+
+--- configure.in
++++ configure.in
+@@ -53,6 +53,7 @@
+ if test x$enableval = xyes ; then
+ 	AC_DEFINE(HAVE_SSL)
+ 	LIBS="$LIBS -lssl"
++	AC_SEARCH_LIBS([X509_free], [crypto])
+ fi
+ enableval=""
+ 
diff --git a/mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch b/mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch
new file mode 100644
index 000000000000..362ba5948fa8
--- /dev/null
+++ b/mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch
@@ -0,0 +1,38 @@
+This function overshadows the one from libc on Solaris, and guess what,
+is hence never called.  Since the original one has an entirely different
+contract, it results in unconditional segfaults lateron, so always use
+the internal copy as it's small enough not to care.
+
+--- ssmtp.c
++++ ssmtp.c
+@@ -223,11 +223,10 @@
+ 	exit(1);
+ }
+ 
+-#ifndef _GNU_SOURCE
+ /*
+-basename() -- Return last element of path
++xbasename() -- Return last element of path
+ */
+-char *basename(char *str)
++char *xbasename(char *str)
+ {
+ 	char *p;
+ 
+@@ -238,7 +237,6 @@
+ 
+ 	return(strdup(p));
+ }
+-#endif /* _GNU_SOURCE */
+ 
+ /*
+ strip_pre_ws() -- Return pointer to first non-whitespace character
+@@ -2058,7 +2056,7 @@
+ 	(void)signal(SIGTTOU, SIG_IGN);
+ 
+ 	/* Set the globals */
+-	prog = basename(argv[0]);
++	prog = xbasename(argv[0]);
+ 
+ 	hostname = xgethostname();
+ 
diff --git a/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild b/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild
new file mode 100644
index 000000000000..efd36bde0fff
--- /dev/null
+++ b/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild,v 1.1 2010/04/25 23:28:42 abcd Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs 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.gz"
+
+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-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl ipv6 md5sum maxsysuid"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+	net-mail/mailbase
+	!net-mail/mailwrapper
+	!virtual/mta"
+PROVIDE="virtual/mta"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	enewgroup ssmtp
+}
+
+src_prepare() {
+	# Allow to specify the last used system user id, bug #231866
+	if use maxsysuid; then
+		epatch "${FILESDIR}"/${P}-maxsysuid.patch
+		epatch "${FILESDIR}"/${P}-maxsysuid-conf.patch
+	fi
+
+	#
+	epatch "${FILESDIR}/${P}-from_format_fix.patch"
+
+	# CVE-2008-3962
+	epatch "${FILESDIR}/CVE-2008-3962-r2.patch"
+
+	# Fix AuthPass parsing (bug #238724)
+	epatch "${FILESDIR}/${P}-authpass.patch"
+
+	epatch "${FILESDIR}/${PN}-2.61-darwin7.patch"
+	epatch "${FILESDIR}/${P}-strndup.patch"
+	epatch "${FILESDIR}/${P}-darwin-crypto.patch"
+	epatch "${FILESDIR}/${P}-solaris-basename-conflict.patch"
+	eautoreconf
+
+	# Respect LDFLAGS (bug #152197)
+	sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in
+}
+
+src_configure() {
+	tc-export CC LD
+
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/ssmtp \
+		$(use_enable ssl) \
+		$(use_enable ipv6 inet6) \
+		$(use_enable md5sum md5auth)
+}
+
+src_compile() {
+	make clean || die
+	make 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
+}