Update 2.64 patchset to include the Solaris patch instead of having it in $FILESDIR; simplify prefix handling by not doing any permission handling there (it would otherwise create a security issue); rename configure.in for compatibility with future autoconf. Remove old version and its patches.

(Portage version: 2.2.0_alpha117/cvs/Linux x86_64)

13 files changed, 28 insertions, 463 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index a71951321184..8d0be6e3ecc2 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for mail-mta/ssmtp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.123 2012/06/04 21:13:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.124 2012/07/15 11:44:43 flameeyes Exp $
+
+  15 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/CVE-2008-3962-r2.patch, -files/ssmtp-2.61-darwin7.patch,
+  -files/ssmtp-2.62-authpass.patch, -files/ssmtp-2.62-darwin-crypto.patch,
+  -files/ssmtp-2.62-from_format_fix.patch,
+  -files/ssmtp-2.62-maxsysuid-conf.patch, -files/ssmtp-2.62-maxsysuid.patch,
+  -files/ssmtp-2.62-solaris-basename-conflict.patch,
+  -files/ssmtp-2.62-strndup.patch, -files/ssmtp-2.64-uint32_t.patch,
+  -ssmtp-2.62-r8.ebuild, ssmtp-2.64-r2.ebuild:
+  Update 2.64 patchset to include the Solaris patch instead of having it in
+  $FILESDIR; simplify prefix handling by not doing any permission handling there
+  (it would otherwise create a security issue); rename configure.in for
+  compatibility with future autoconf.  Remove old version and its patches.
 
   04 Jun 2012; Zac Medico <zmedico@gentoo.org> ssmtp-2.62-r8.ebuild,
   ssmtp-2.64-r2.ebuild:
diff --git a/mail-mta/ssmtp/files/CVE-2008-3962-r2.patch b/mail-mta/ssmtp/files/CVE-2008-3962-r2.patch
deleted file mode 100644
index dad814a17a9d..000000000000
--- a/mail-mta/ssmtp/files/CVE-2008-3962-r2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ssmtp.c.orig	2009-02-18 15:17:23.000000000 +0200
-+++ ssmtp.c	2009-02-18 15:19:54.000000000 +0200
-@@ -1376,7 +1376,7 @@
- 	ssize_t outbytes = 0;
- 
- 	va_start(ap, format);
--	if(vsnprintf(buf, (BUF_SZ - 2), format, ap) == -1) {
-+	if(vsnprintf(buf, BUF_SZ, format, ap) == -1) {
- 		die("smtp_write() -- vsnprintf() failed");
- 	}
- 	va_end(ap);
-@@ -1643,7 +1643,7 @@
- 
- 	/* don't hang forever when reading from stdin */
- 	while(!feof(stdin) && timeout < MEDWAIT) {
--		if (!fgets(buf, sizeof(buf), stdin)) {
-+		if (!fgets(buf, sizeof(buf)-2, stdin)) {
- 			/* if nothing was received, then no transmission
- 			 * over smtp should be done */
- 			sleep(1);
diff --git a/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch b/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch
deleted file mode 100644
index 8f6aaec76c4b..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-authpass.patch b/mail-mta/ssmtp/files/ssmtp-2.62-authpass.patch
deleted file mode 100644
index 5d6aae9a5104..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.62-authpass.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ssmtp.c	2008-09-26 02:13:48.000000000 -0600
-+++ ssmtp.c.new	2008-09-26 02:15:41.000000000 -0600
-@@ -1056,7 +1042,8 @@
- 				}
- 			}
- 			else if(strcasecmp(p, "AuthPass") == 0 && !auth_pass) {
--				if((auth_pass = strdup(q)) == (char *)NULL) {
-+				auth_pass = firsttok(&rightside, " \n\t");
-+				if(auth_pass  == (char *)NULL) {
- 					die("parse_config() -- strdup() failed");
- 				}
- 
diff --git a/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch b/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch
deleted file mode 100644
index 94b52d60a883..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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,6 @@
- if test x$enableval = xyes ; then
- 	AC_DEFINE(HAVE_SSL)
--	LIBS="$LIBS -lssl"
-+	LIBS="$LIBS -lssl -lcrypto"
- fi
- enableval=""
- 
diff --git a/mail-mta/ssmtp/files/ssmtp-2.62-from_format_fix.patch b/mail-mta/ssmtp/files/ssmtp-2.62-from_format_fix.patch
deleted file mode 100644
index 119cea2c29f8..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.62-from_format_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ssmtp.c.old	2009-09-11 11:51:01.000000000 +0200
-+++ ssmtp.c	2009-09-11 11:52:10.000000000 +0200
-@@ -455,7 +455,7 @@
- */
- char *from_format(char *str, bool_t override_from)
- {
--	char buf[(BUF_SZ + 1)];
-+	char buf[(BUF_SZ + 1)] = "";
- 
- 	if(override_from) {
- 		if(minus_f) {
-@@ -484,6 +484,10 @@
- 			if(snprintf(buf, BUF_SZ, "\"%s\" <%s>", gecos, str) == -1) {
- 				die("from_format() -- snprintf() failed");
- 			}
-+		} else {
-+			if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
-+				die("from_format() -- snprintf() failed");
-+			}
- 		}
- 	}
- 
diff --git a/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid-conf.patch b/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid-conf.patch
deleted file mode 100644
index 8e51c5e3c3e4..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid-conf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ssmtp.orig.conf	2004-07-23 00:58:48.000000000 -0500
-+++ ssmtp.conf	2008-07-14 14:11:34.000000000 -0500
-@@ -2,10 +2,13 @@
- # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
- #
- 
--# The person who gets all mail for userids < 1000
-+# The person who gets all mail for userids < MinUserId
- # Make this empty to disable rewriting.
- root=postmaster
- 
-+# All mail delivered to userid >= MinUserId goes to user, not root.
-+#MinUserId=1000
-+
- # The place where the mail goes. The actual machine name is required
- # no MX records are consulted. Commonly mailhosts are named mail.domain.com
- # The example will fit if you are in domain.com and your mailhub is so named.
diff --git a/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid.patch b/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid.patch
deleted file mode 100644
index fef53c4116b5..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.62-maxsysuid.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- ssmtp.orig.c	2004-07-23 00:58:48.000000000 -0500
-+++ ssmtp.c	2008-07-14 16:03:08.000000000 -0500
-@@ -76,6 +76,7 @@ int log_level = 1;
- #else
- int log_level = 0;
- #endif
-+int minuserid = MAXSYSUID+1;
- int port = 25;
- #ifdef INET6
- int p_family = PF_UNSPEC;		/* Protocol family used in SMTP connection */
-@@ -641,7 +642,7 @@ char *rcpt_remap(char *str)
- {
- 	struct passwd *pw;
- 	if((root==NULL) || strlen(root)==0 || strchr(str, '@') ||
--		((pw = getpwnam(str)) == NULL) || (pw->pw_uid > MAXSYSUID)) {
-+		((pw = getpwnam(str)) == NULL) || (pw->pw_uid >= minuserid)) {
- 		return(append_domain(str));	/* It's not a local systems-level user */
- 	}
- 	else {
-@@ -814,6 +815,17 @@ bool_t read_config()
- 					log_event(LOG_INFO, "Set Root=\"%s\"\n", root);
- 				}
- 			}
-+			else if(strcasecmp(p, "MinUserId") == 0) {
-+				if((r = strdup(q)) == (char *)NULL) {
-+					die("parse_config() -- strdup() failed");
-+				}
-+
-+				minuserid = atoi(r);
-+
-+				if(log_level > 0) {
-+					log_event(LOG_INFO, "Set MinUserId=\"%d\"\n", minuserid);
-+				}
-+			}
- 			else if(strcasecmp(p, "MailHub") == 0) {
- 				if((mailhost = strdup(q)) == (char *)NULL) {
- 					die("parse_config() -- strdup() failed");
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
deleted file mode 100644
index 362ba5948fa8..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/files/ssmtp-2.62-strndup.patch b/mail-mta/ssmtp/files/ssmtp-2.62-strndup.patch
deleted file mode 100644
index a4434ebf08bb..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.62-strndup.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Compensate for platforms that don't have strndup, like Solaris
-
---- configure.in
-+++ configure.in
-@@ -30,7 +30,7 @@
- dnl Checks for library functions.
- AC_TYPE_SIGNAL
- AC_FUNC_VPRINTF
--AC_CHECK_FUNCS(gethostname socket strdup strstr)
-+AC_CHECK_FUNCS(gethostname socket strdup strndup strstr)
- 
- dnl Check for optional features
- AC_ARG_ENABLE(logfile, 
---- ssmtp.c
-+++ ssmtp.c
-@@ -842,7 +842,16 @@
- 	if (!rest) {
- 		return NULL;
- 	}
-+#ifdef HAVE_STRNDUP
- 	tok=strndup(*s,rest-(*s));
-+#else
-+	{
-+		size_t len = rest - (*s);
-+		tok = malloc(sizeof(char) * (len + 1));
-+		memcpy(tok, *s, len);
-+		tok[len] = '\0';
-+	}
-+#endif
- 	if (!tok) {
- 		die("firsttok() -- strndup() failed");
- 	}
diff --git a/mail-mta/ssmtp/files/ssmtp-2.64-uint32_t.patch b/mail-mta/ssmtp/files/ssmtp-2.64-uint32_t.patch
deleted file mode 100644
index cc4ab466e6f0..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.64-uint32_t.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Use C99 standard's uint32_t
-
---- md5auth/md5.h
-+++ md5auth/md5.h
-@@ -23,10 +23,12 @@
- documentation and/or software.
-  */
- 
-+#include <stdint.h>
-+
- /* MD5 context. */
- typedef struct {
--  u_int32_t state[4];                                   /* state (ABCD) */
--  u_int32_t count[2];        /* number of bits, modulo 2^64 (lsb first) */
-+  uint32_t state[4];                                   /* state (ABCD) */
-+  uint32_t count[2];        /* number of bits, modulo 2^64 (lsb first) */
-   unsigned char buffer[64];                         /* input buffer */
- } MD5_CTX;
- 
---- md5auth/md5c.c
-+++ md5auth/md5c.c
-@@ -46,11 +46,11 @@
- #define S43 15
- #define S44 21
- 
--static void MD5Transform PROTO_LIST ((u_int32_t [4], unsigned char [64]));
-+static void MD5Transform PROTO_LIST ((uint32_t [4], unsigned char [64]));
- static void Encode PROTO_LIST
--  ((unsigned char *, u_int32_t *, unsigned int));
-+  ((unsigned char *, uint32_t *, unsigned int));
- static void Decode PROTO_LIST
--  ((u_int32_t *, unsigned char *, unsigned int));
-+  ((uint32_t *, unsigned char *, unsigned int));
- static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int));
- static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int));
- 
-@@ -75,22 +75,22 @@
- Rotation is separate from addition to prevent recomputation.
-  */
- #define FF(a, b, c, d, x, s, ac) { \
-- (a) += F ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
-+ (a) += F ((b), (c), (d)) + (x) + (uint32_t)(ac); \
-  (a) = ROTATE_LEFT ((a), (s)); \
-  (a) += (b); \
-   }
- #define GG(a, b, c, d, x, s, ac) { \
-- (a) += G ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
-+ (a) += G ((b), (c), (d)) + (x) + (uint32_t)(ac); \
-  (a) = ROTATE_LEFT ((a), (s)); \
-  (a) += (b); \
-   }
- #define HH(a, b, c, d, x, s, ac) { \
-- (a) += H ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
-+ (a) += H ((b), (c), (d)) + (x) + (uint32_t)(ac); \
-  (a) = ROTATE_LEFT ((a), (s)); \
-  (a) += (b); \
-   }
- #define II(a, b, c, d, x, s, ac) { \
-- (a) += I ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
-+ (a) += I ((b), (c), (d)) + (x) + (uint32_t)(ac); \
-  (a) = ROTATE_LEFT ((a), (s)); \
-  (a) += (b); \
-   }
-@@ -124,10 +124,10 @@
-   index = (unsigned int)((context->count[0] >> 3) & 0x3F);
- 
-   /* Update number of bits */
--  if ((context->count[0] += ((u_int32_t)inputLen << 3))
--   < ((u_int32_t)inputLen << 3))
-+  if ((context->count[0] += ((uint32_t)inputLen << 3))
-+   < ((uint32_t)inputLen << 3))
-  context->count[1]++;
--  context->count[1] += ((u_int32_t)inputLen >> 29);
-+  context->count[1] += ((uint32_t)inputLen >> 29);
- 
-   partLen = 64 - index;
- 
-@@ -184,10 +184,10 @@
- /* MD5 basic transformation. Transforms state based on block.
-  */
- static void MD5Transform (state, block)
--u_int32_t state[4];
-+uint32_t state[4];
- unsigned char block[64];
- {
--  u_int32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-+  uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];
- 
-   Decode (x, block, 64);
- 
-@@ -273,12 +273,12 @@
-   MD5_memset ((POINTER)x, 0, sizeof (x));
- }
- 
--/* Encodes input (u_int32_t) into output (unsigned char). Assumes len is
-+/* Encodes input (uint32_t) into output (unsigned char). Assumes len is
-   a multiple of 4.
-  */
- static void Encode (output, input, len)
- unsigned char *output;
--u_int32_t *input;
-+uint32_t *input;
- unsigned int len;
- {
-   unsigned int i, j;
-@@ -291,19 +291,19 @@
-   }
- }
- 
--/* Decodes input (unsigned char) into output (u_int32_t). Assumes len is
-+/* Decodes input (unsigned char) into output (uint32_t). Assumes len is
-   a multiple of 4.
-  */
- static void Decode (output, input, len)
--u_int32_t *output;
-+uint32_t *output;
- unsigned char *input;
- unsigned int len;
- {
-   unsigned int i, j;
- 
-   for (i = 0, j = 0; j < len; i++, j += 4)
-- output[i] = ((u_int32_t)input[j]) | (((u_int32_t)input[j+1]) << 8) |
--   (((u_int32_t)input[j+2]) << 16) | (((u_int32_t)input[j+3]) << 24);
-+ output[i] = ((uint32_t)input[j]) | (((uint32_t)input[j+1]) << 8) |
-+   (((uint32_t)input[j+2]) << 16) | (((uint32_t)input[j+3]) << 24);
- }
- 
- /* Note: Replace "for loop" with standard memcpy if possible.
diff --git a/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild b/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild
deleted file mode 100644
index 1d2505022bbd..000000000000
--- a/mail-mta/ssmtp/ssmtp-2.62-r8.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2012 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.11 2012/06/04 21:13:39 zmedico Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs autotools user
-
-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-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
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/nbsmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail"
-
-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
-}
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
index ec25abe4a57a..a64f805edc7e 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild,v 1.12 2012/06/04 21:13:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild,v 1.13 2012/07/15 11:44:43 flameeyes Exp $
 
 EAPI="4"
 
-PATCHSET=2
+PATCHSET=3
 
 WANT_AUTOMAKE=none
 
@@ -44,14 +44,18 @@ RDEPEND="${DEPEND}
 REQUIRED_USE="gnutls? ( ssl )"
 
 pkg_setup() {
-	enewgroup ssmtp
+	if ! use prefix; then
+		enewgroup ssmtp
+	fi
 }
 
 src_prepare() {
 	EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/patches" \
 		epatch
 
-	epatch "${FILESDIR}"/${P}-uint32_t.patch
+	# let's start by not using configure.in anymore as future autoconf
+	# versions will not support it.
+	mv configure.in configure.ac || die
 
 	eautoconf
 }
@@ -94,11 +98,12 @@ src_install() {
 	# 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.
-	use prefix || fowners root:ssmtp /etc/ssmtp/ssmtp.conf
-	fperms 640 /etc/ssmtp/ssmtp.conf
-
-	use prefix || fowners root:ssmtp /usr/sbin/ssmtp
-	fperms 2711 /usr/sbin/ssmtp
+	if ! use prefix; then
+		fowners root:ssmtp /etc/ssmtp/ssmtp.conf
+		fperms 640 /etc/ssmtp/ssmtp.conf
+		fowners root:ssmtp /usr/sbin/ssmtp
+		fperms 2711 /usr/sbin/ssmtp
+	fi
 
 	if use mta; then
 		dosym ../sbin/ssmtp /usr/lib/sendmail