Clean up, rev-bump to fix perms on ssmtp binary (#233027)

(Portage version: 2.2_rc3/cvs/Linux 2.6.25-gentoo-r6 x86_64)

6 files changed, 13 insertions, 231 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index d084807d0085..525aaaee74bc 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/ssmtp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.53 2008/07/13 18:57:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.54 2008/07/27 08:04:08 dertobi123 Exp $
+
+*ssmtp-2.62-r1 (27 Jul 2008)
+
+  27 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/ssmtp-2.60.4-md5.patch, -files/ssmtp-2.60.7-logfile.patch,
+  -ssmtp-2.61-r30.ebuild, -ssmtp-2.61-r31.ebuild, -ssmtp-2.62.ebuild,
+  +ssmtp-2.62-r1.ebuild:
+  Clean up, rev-bump to fix perms on ssmtp binary (#233027)
 
   13 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org> ssmtp-2.62.ebuild:
   Add eautoreconf
diff --git a/mail-mta/ssmtp/files/ssmtp-2.60.4-md5.patch b/mail-mta/ssmtp/files/ssmtp-2.60.4-md5.patch
deleted file mode 100644
index 07e0ba0568b2..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.60.4-md5.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -rup ssmtp-2.60/Makefile.in ssmtp-2.60-gentoo/Makefile.in
---- ssmtp-2.60/Makefile.in	2003-08-21 13:27:23.000000000 +1200
-+++ ssmtp-2.60-gentoo/Makefile.in	2003-08-21 13:30:41.000000000 +1200
-@@ -23,7 +23,7 @@ INSTALLED_REVALIASES_FILE=$(REVALIASES_F
- # Programs
- GEN_CONFIG=$(srcdir)/generate_config
- 
--SRCS=ssmtp.c arpadate.c base64.c
-+SRCS=ssmtp.c arpadate.c base64.c @SRCS@
- 
- OBJS=$(SRCS:.c=.o)
- 
-diff -rup ssmtp-2.60/configure ssmtp-2.60-gentoo/configure
---- ssmtp-2.60/configure	2003-08-21 13:27:23.000000000 +1200
-+++ ssmtp-2.60-gentoo/configure	2003-08-21 13:31:54.000000000 +1200
-@@ -1503,6 +1503,7 @@ s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-+s%@SRCS@%$SRCS%g
- s%@exec_prefix@%$exec_prefix%g
- s%@prefix@%$prefix%g
- s%@program_transform_name@%$program_transform_name%g
-diff -rup ssmtp-2.60/ssmtp.c ssmtp-2.60-gentoo/ssmtp.c
---- ssmtp-2.60/ssmtp.c	2003-08-21 13:27:23.000000000 +1200
-+++ ssmtp-2.60-gentoo/ssmtp.c	2003-08-21 13:31:20.000000000 +1200
-@@ -1257,7 +1257,7 @@ int ssmtp(char *argv[])
- 	/* Try to log in if username was supplied */
- 	if(auth_user) {
- #ifdef MD5AUTH
--		if(auth_pass == (char *)NULL)
-+		if(auth_pass == (char *)NULL) {
- 			auth_pass = strdup("");
- 		}
- 
-@@ -1271,7 +1271,7 @@ int ssmtp(char *argv[])
- 			strncpy(challenge, strchr(buf,' ') + 1, sizeof(challenge));
- 
- 			memset(buf, 0, sizeof(buf));
--			crammd5(challenge, authUsername, authPassword, buf);
-+			crammd5(challenge, auth_user, auth_pass, buf);
- 		}
- 		else {
- #endif
diff --git a/mail-mta/ssmtp/files/ssmtp-2.60.7-logfile.patch b/mail-mta/ssmtp/files/ssmtp-2.60.7-logfile.patch
deleted file mode 100644
index 6c261860942e..000000000000
--- a/mail-mta/ssmtp/files/ssmtp-2.60.7-logfile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nrup ssmtp-2.60/ssmtp.c ssmtp-2.60-solar/ssmtp.c
---- ssmtp-2.60/ssmtp.c	2004-04-15 17:03:24.000000000 -0400
-+++ ssmtp-2.60-solar/ssmtp.c	2004-04-23 02:55:27.000000000 -0400
-@@ -100,18 +100,20 @@ void log_event(int priority, char *forma
- {
- 	char buf[(BUF_SZ + 1)];
- 	va_list ap;
--
-+#if (defined (LOGFILE) && defined(LOGFILE_FILENAME))
-+	FILE *fp;
-+#endif
- 	va_start(ap, format);
- 	(void)vsnprintf(buf, BUF_SZ, format, ap);
- 	va_end(ap);
- 
--#ifdef LOGFILE
--	if((fp = fopen("/tmp/ssmtp.log", "a")) != (FILE *)NULL) {
-+#if (defined (LOGFILE) && defined(LOGFILE_FILENAME))      
-+	if((fp = fopen(LOGFILE_FILENAME, "a")) != (FILE *)NULL) {
- 		(void)fprintf(fp, "%s\n", buf);
- 		(void)fclose(fp);
- 	}
- 	else {
--		(void)fprintf(stderr, "Can't write to /tmp/ssmtp.log\n");
-+		(void)fprintf(stderr, "Can't write to "LOGFILE_FILENAME"\n");
- 	}
- #endif
- 
-diff -Nrup ssmtp-2.60/ssmtp.h ssmtp-2.60-solar/ssmtp.h
---- ssmtp-2.60/ssmtp.h	2002-09-27 09:18:24.000000000 -0400
-+++ ssmtp-2.60-solar/ssmtp.h	2004-04-23 02:55:59.000000000 -0400
-@@ -22,6 +22,10 @@
- #define MAXARGS  _POSIX_ARG_MAX
- #endif
- 
-+#if (defined (LOGFILE) && !defined(LOGFILE_FILENAME))
-+#define LOGFILE_FILENAME "/dev/stdout"
-+#endif
-+
- typedef enum {False, True} bool_t;
- 
- struct string_list {
diff --git a/mail-mta/ssmtp/ssmtp-2.61-r30.ebuild b/mail-mta/ssmtp/ssmtp-2.61-r30.ebuild
deleted file mode 100644
index de6b1d2e4790..000000000000
--- a/mail-mta/ssmtp/ssmtp-2.61-r30.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.61-r30.ebuild,v 1.3 2006/10/22 00:37:52 ticho Exp $
-
-inherit eutils mailer
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="ssl ipv6 md5sum"
-
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	# Respect LDFLAGS (bug #152197)
-	sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in
-
-	econf \
-		--sysconfdir=/etc/ssmtp \
-		$(use_enable ssl) \
-		$(use_enable ipv6 inet6) \
-		$(use_enable md5sum md5auth) \
-		|| die
-	make clean || die
-	make etcdir=/etc || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosbin ssmtp || die
-	fperms 755 /usr/sbin/ssmtp
-
-	doman ssmtp.8
-	dodoc INSTALL README TLS CHANGELOG_OLD
-	newdoc ssmtp.lsm DESC
-
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-
-	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"
-
-	if use mailwrapper ; then
-		dosym /usr/sbin/ssmtp /usr/bin/sendmail.ssmtp
-		mailer_install_conf
-	else
-		dosym /usr/sbin/ssmtp /usr/lib/sendmail
-		dosym /usr/sbin/ssmtp /usr/bin/sendmail
-		dosym /usr/sbin/ssmtp /usr/bin/mailq
-		dosym /usr/sbin/ssmtp /usr/bin/newaliases
-	fi
-}
diff --git a/mail-mta/ssmtp/ssmtp-2.61-r31.ebuild b/mail-mta/ssmtp/ssmtp-2.61-r31.ebuild
deleted file mode 100644
index 2f2ab09c0220..000000000000
--- a/mail-mta/ssmtp/ssmtp-2.61-r31.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.61-r31.ebuild,v 1.4 2006/10/22 00:37:52 ticho Exp $
-
-inherit eutils toolchain-funcs mailer
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="ssl ipv6 md5sum"
-
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/ssmtp-2.61
-
-src_unpack() {
-	unpack "${A}" ; cd "${S}"
-
-	epatch "${FILESDIR}"/ssmtp-2.61-bug127592.patch
-
-	# Respect LDFLAGS (bug #152197)
-	sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in
-}
-
-src_compile() {
-	tc-export CC LD
-
-	econf \
-		--sysconfdir=/etc/ssmtp \
-		$(use_enable ssl) \
-		$(use_enable ipv6 inet6) \
-		$(use_enable md5sum md5auth) \
-		|| die
-	make clean || die
-	make etcdir=/etc || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosbin ssmtp || die
-	fperms 755 /usr/sbin/ssmtp
-
-	doman ssmtp.8
-	dodoc INSTALL README TLS CHANGELOG_OLD
-	newdoc ssmtp.lsm DESC
-
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-
-	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"
-
-	if use mailwrapper ; then
-		dosym /usr/sbin/ssmtp /usr/bin/sendmail.ssmtp
-		mailer_install_conf
-	else
-		dosym /usr/sbin/ssmtp /usr/lib/sendmail
-		dosym /usr/sbin/ssmtp /usr/bin/sendmail
-		dosym /usr/sbin/ssmtp /usr/sbin/sendmail
-		dosym /usr/sbin/ssmtp /usr/bin/mailq
-		dosym /usr/sbin/ssmtp /usr/bin/newaliases
-	fi
-}
diff --git a/mail-mta/ssmtp/ssmtp-2.62.ebuild b/mail-mta/ssmtp/ssmtp-2.62-r1.ebuild
index 3ec17f8b8f59..152cc4cdd27f 100644
--- a/mail-mta/ssmtp/ssmtp-2.62.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.62-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.62.ebuild,v 1.7 2008/07/13 18:57:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.62-r1.ebuild,v 1.1 2008/07/27 08:04:08 dertobi123 Exp $
 
 inherit eutils toolchain-funcs autotools
 
@@ -83,6 +83,9 @@ src_install() {
 	fowners root:ssmtp /etc/ssmtp/ssmtp.conf
 	fperms 640 /etc/ssmtp/ssmtp.conf
 
+	fowners root:ssmtp /usr/sbin/ssmtp
+	fperms 750 /usr/sbin/ssmtp
+
 	dosym /usr/sbin/ssmtp /usr/lib/sendmail
 	dosym /usr/sbin/ssmtp /usr/bin/sendmail
 	dosym /usr/sbin/ssmtp /usr/sbin/sendmail