Moving to mail-mta/ssmtp

17 files changed, 0 insertions, 792 deletions

diff --git a/net-mail/ssmtp/ChangeLog b/net-mail/ssmtp/ChangeLog
deleted file mode 100644
index b6a5ab6f4f04..000000000000
--- a/net-mail/ssmtp/ChangeLog
+++ /dev/null
@@ -1,135 +0,0 @@
-# ChangeLog for net-mail/ssmtp
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ChangeLog,v 1.36 2004/04/27 21:14:25 agriffis Exp $
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ssmtp-2.60.4.ebuild:
-  Add inherit eutils
-
-  25 Apr 2004; Tom Gall <tgall@gentoo.org> ssmtp-2.60.7.ebuild:
-  Stable on ppc64
-
-  25 Apr 2004; Michael McCabe <randy@gentoo.org> ssmtp-2.60.7.ebuild:
-  Marked stable on s390
-
-  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> ssmtp-2.60.7.ebuild:
-  Stable on alpha and ia64
-
-  25 Apr 2004; Brandon Hale <tseng@gentoo.org> ssmtp-2.60.7.ebuild:
-  Stable on x86
-
-  25 Apr 2004; Joshua Kinard <kumba@gentoo.org> ssmtp-2.60.7.ebuild:
-  Marked stable on mips.
-
-  24 Apr 2004; Jason Wever <weeve@gentoo.org> ssmtp-2.60.7.ebuild:
-  Stable on sparc wrt bug #47918.
-
-  24 Apr 2004; Luca Barbato <lu_zero@gentoo.org> ssmtp-2.60.7.ebuild:
-  Marked ppc
-
-  23 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> ssmtp-2.60.7.ebuild:
-  Stable on alpha.
-
-  23 Apr 2004; Travis Tilley <lv@gentoo.org> ssmtp-2.60.7.ebuild:
-  marked stable on amd64. see bug #47918 for more information
-
-*ssmtp-2.60.7 (23 Apr 2004)
-
-  23 Apr 2004; <solar@gentoo.org> ssmtp-2.60.7.ebuild:
-  Format String Vulnerabilities. security bug #47918 + Fix broken/insecure
-  logfile handling bug #48435
-
-*ssmtp-2.60.4-r2 (13 Apr 2004)
-
-  13 Apr 2004; Grant Goodyear <g2boojum@hotmail.com> ssmtp-2.60.4-r1.ebuild,
-  ssmtp-2.60.4-r2.ebuild, files/mailer.conf:
-  New revision that installs a mailer.conf file w/ send-mail defined.
-  Closes bug 47714.
-
-  01 Apr 2004; <randy@gentoo.org> ssmtp-2.60.4-r1.ebuild:
-  adding s390 to keywords
-
-  17 Mar 2004; Grant Goodyear <g2boojum@hotmail.com> ssmtp-2.60.4-r1.ebuild:
-  Put /usr/lib/sendmail symlink back in.
-
-  17 Mar 2004; Grant Goodyear <g2boojum@hotmail.com> ssmtp-2.60.4-r1.ebuild:
-  Fixed missing 'inherit eutils'; thanks iggy!
-
-*ssmtp-2.60.4-r1 (17 Mar 2004)
-
-  17 Mar 2004; Grant Goodyear <g2boojum@hotmail.com> ssmtp-2.60.4-r1.ebuild,
-  files/mailer.conf:
-  New revision that uses mailwrapper.
-
-  14 Mar 2004; Tom Gall <tgall@gentoo.org> ssmtp-2.60.4.ebuild:
-  mark ppc64 stable
-
-  29 Sep 2003; Marius Mauch <genone@gentoo.org> ssmtp-2.60.4.ebuild,
-  files/ssmtp-2.60.4-md5.patch:
-  Added a patch so 2.60.4 compiles with USE=md5sum. thaThanks to Brandy for
-  fixing bug 25732.
-
-*ssmtp-2.60.4 (19 Sep 2003)
-
-  19 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> ssmtp-2.60.4.ebuild:
-  Version bump
-
-  09 Jul 2003; Nick Hadaway <raker@gentoo.org> ssmtp-2.60.3.ebuild:
-  Removed the auto ssl enable config generation.  See bug #22658
-
-*ssmtp-2.60.3 (09 Jun 2003)
-
-  15 Jun 2003; Joshua Kinard <kumba@gentoo.org> :
-  Fixed Security Volation -- starttls.diff missing from Manifest
-  Added local USE Flag "md5sum" since the previous "md5" was not a valid USE flag
-
-  14 Jun 2003; Nick Hadaway <raker@gentoo.org> ssmtp-2.60.3.ebuild:
-  Added some code so the config file has TLS enabled is ssl is in USE.
-  Thanks to ferdy again for this ebuild improvement.  Moved pkg_config()
-  code to pkg_postinst()
-
-  09 Jun 2003; Nick Hadaway <raker@gentoo.org> ssmtp-2.60.3.ebuild,
-  files/digest-ssmtp-2.60.3, files/starttls.diff:
-  Version bump.  Major features added upstream and included in the
-  ebuild.  Many thanks to ferdy@ferdyx.org for the updates.
-
-  20 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Added arm to keywords.
-
-  12 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
-  Added hppa to keywords.
-
-*ssmtp-2.48 (02 Feb 2003)
-
-  25 Jul 2003; Guy Lartin <gmsoft@gentoo.org> ssmtp-2.48.ebuild :
-  Marked stable on hppa.
-
-  18 Apr 2003; Jan Seidel <tuxus@gentoo.org> ssmtp-2.48.ebuild :
-  Added mips to keywords.
-
-  04 Apr 2003; Jason Wever <weeve@gentoo.org> ssmtp-2.48.ebuild:
-  Changed ~sparc keyword to sparc.
-
-  25 Mar 2003; Graham Forest <vladimir@gentoo.org> ssmtp-2.48.ebuild:
-  Marked stable on ppc
-
-  09 Mar 2003; Aron Griffis <agriffis@gentoo.org> ssmtp-2.48.ebuild:
-  Mark stable on alpha
-
-  02 Feb 2003; Nick Hadaway <raker@gentoo.org> ssmtp-2.48.ebuild,
-  files/digest-ssmtp-2.48 :
-  Version bump.  Thanks to Matsuu Takuto on bug #14726 for the heads up.
-  Added a doc which explains a little bit about the new TLS support
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*ssmtp-2.38.14-r1 (1 Feb 2002)
-
-  05 Sep 2002; Nick Hadaway <raker@gentoo.org> ssmtp-2.38.14-r1.ebuild :
-  Removed symlink.  See bug #7448.
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/net-mail/ssmtp/Manifest b/net-mail/ssmtp/Manifest
deleted file mode 100644
index f419a97e417e..000000000000
--- a/net-mail/ssmtp/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-MD5 a41c23b0e819103587c928d735b2ed39 ChangeLog 4884
-MD5 70c2b6d79e32213a5cffa638a06189ce ssmtp-2.38.14-r1.ebuild 1468
-MD5 14099b3d6bb3dcef8d93d2ceadafbe32 ssmtp-2.48.ebuild 1545
-MD5 082ac1a5502c506e524d0a8f76721641 ssmtp-2.60.4.ebuild 2262
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 10c62e050bf226c8f084363a3b07d4ee ssmtp-2.60.4-r2.ebuild 2455
-MD5 f0447534c99aaed8f67e9262499a2fbc ssmtp-2.60.7.ebuild 2455
-MD5 0c220581f9fe43f95d74864b63cf5121 files/digest-ssmtp-2.38.14-r1 64
-MD5 7acea6571783e2e8d40bb7aafad39d21 files/digest-ssmtp-2.48 62
-MD5 a57abd57dc7b801340b6db41c80fab11 files/digest-ssmtp-2.60.4 64
-MD5 93225fbc5fd7b8e5500c7b1c85b63fdf files/starttls.diff 4277
-MD5 f466deeaec0316507961656f37af7000 files/ssmtp-2.60.4-md5.patch 1509
-MD5 a57abd57dc7b801340b6db41c80fab11 files/digest-ssmtp-2.60.4-r2 64
-MD5 0ed5447f4d8fd89fa31f23b361c37f59 files/mailer.conf 1026
-MD5 c833680953ba9941d33fc14dda62532b files/digest-ssmtp-2.60.7 63
-MD5 5208fda9912caf3afd94108e6276167e files/ssmtp-2.60.7-logfile.patch 1256
diff --git a/net-mail/ssmtp/files/digest-ssmtp-2.38.14-r1 b/net-mail/ssmtp/files/digest-ssmtp-2.38.14-r1
deleted file mode 100644
index 1df109a694c6..000000000000
--- a/net-mail/ssmtp/files/digest-ssmtp-2.38.14-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1567b221a5853da63a286e90c3240601 ssmtp-2.38.14.tar.gz 72326
diff --git a/net-mail/ssmtp/files/digest-ssmtp-2.48 b/net-mail/ssmtp/files/digest-ssmtp-2.48
deleted file mode 100644
index f30b817bafd1..000000000000
--- a/net-mail/ssmtp/files/digest-ssmtp-2.48
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ec5ef00b8887cd650a8ef4addead915a ssmtp-2.48.tar.gz 162784
diff --git a/net-mail/ssmtp/files/digest-ssmtp-2.60.4 b/net-mail/ssmtp/files/digest-ssmtp-2.60.4
deleted file mode 100644
index 5a7840ef2d23..000000000000
--- a/net-mail/ssmtp/files/digest-ssmtp-2.60.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88fff70f14a001e09b713aa6326162cf ssmtp_2.60.4.tar.gz 160073
diff --git a/net-mail/ssmtp/files/digest-ssmtp-2.60.4-r2 b/net-mail/ssmtp/files/digest-ssmtp-2.60.4-r2
deleted file mode 100644
index 5a7840ef2d23..000000000000
--- a/net-mail/ssmtp/files/digest-ssmtp-2.60.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88fff70f14a001e09b713aa6326162cf ssmtp_2.60.4.tar.gz 160073
diff --git a/net-mail/ssmtp/files/digest-ssmtp-2.60.7 b/net-mail/ssmtp/files/digest-ssmtp-2.60.7
deleted file mode 100644
index 6130713dbd95..000000000000
--- a/net-mail/ssmtp/files/digest-ssmtp-2.60.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e3b3f1403d4ae1a7373f80db2f3923e ssmtp_2.60.7.tar.gz 60727
diff --git a/net-mail/ssmtp/files/mailer.conf b/net-mail/ssmtp/files/mailer.conf
deleted file mode 100644
index 453841878c06..000000000000
--- a/net-mail/ssmtp/files/mailer.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#	$OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
-#
-# Execute the "real" sendmail program from ssmtp, 
-# named /usr/sbin/ssmtp
-#
-sendmail	/usr/sbin/ssmtp
-send-mail	/usr/sbin/ssmtp
-mailq		/usr/sbin/ssmtp
-newaliases	/usr/sbin/ssmtp
-
-# Execute the "real" sendmail program from exim, 
-# named /usr/sbin/exim
-#
-#sendmail	/usr/sbin/exim
-#send-mail	/usr/sbin/exim
-#mailq		/usr/sbin/exim
-#newaliases	/usr/sbin/exim
-#rsmtp		/usr/sbin/exim
-#rmail		/usr/sbin/exim
-#mail		/usr/sbin/exim
-
-# Execute the "real" sendmail program from postfix, 
-# named /usr/sbin/sendmail.postfix
-#
-#sendmail	/usr/sbin/sendmail.postfix
-#send-mail	/usr/sbin/sendmail.postfix
-#mailq		/usr/sbin/sendmail.postfix
-#newaliases	/usr/sbin/sendmail.postfix
-
-# Execute the "real" sendmail program, named /usr/sbin/sendmail
-#
-#sendmail	/usr/sbin/sendmail.sendmail
-#send-mail	/usr/sbin/sendmail.sendmail
-#mailq		/usr/sbin/sendmail.sendmail
-#newaliases	/usr/sbin/sendmail.sendmail
-#hoststat	/usr/sbin/sendmail.sendmail
-#purgestat	/usr/sbin/sendmail.sendmail
diff --git a/net-mail/ssmtp/files/ssmtp-2.60.4-md5.patch b/net-mail/ssmtp/files/ssmtp-2.60.4-md5.patch
deleted file mode 100644
index 07e0ba0568b2..000000000000
--- a/net-mail/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/net-mail/ssmtp/files/ssmtp-2.60.7-logfile.patch b/net-mail/ssmtp/files/ssmtp-2.60.7-logfile.patch
deleted file mode 100644
index 6c261860942e..000000000000
--- a/net-mail/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/net-mail/ssmtp/files/starttls.diff b/net-mail/ssmtp/files/starttls.diff
deleted file mode 100644
index 0cd4b7a0d65c..000000000000
--- a/net-mail/ssmtp/files/starttls.diff
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -rup ssmtp-2.60/ssmtp.c ssmtp-2.60-starttls/ssmtp.c
---- ssmtp-2.60/ssmtp.c	2002-12-08 19:26:20.000000000 +0200
-+++ ssmtp-2.60-starttls/ssmtp.c	2003-06-09 00:32:24.000000000 +0300
-@@ -48,8 +48,12 @@ bool_t minus_t = False;
- bool_t minus_v = False;
- bool_t override_from = False;
- bool_t rewrite_domain = False;
-+#ifdef HAVE_SSL
- bool_t use_tls = False;			/* Use SSL to transfer mail to HUB */
-+bool_t use_starttls = False;    /* Use STARTTLS SMTP command to initiate TLS */
- bool_t use_cert = False;		/* Use a certificate to transfer SSL mail */
-+bool_t tls_initialized = False;
-+#endif
- 
- #define ARPADATE_LENGTH 32		/* Current date in RFC format */
- char arpadate[ARPADATE_LENGTH];
-@@ -878,11 +882,24 @@ bool_t read_config()
- 					use_tls = False;
- 				}
- 
--				if(log_level > 0) { 
-+				if(log_level > 0) {
- 					log_event(LOG_INFO,
- 						"Set UseTLS=\"%s\"\n", use_tls ? "True" : "False");
- 				}
- 			}
-+			else if(strcasecmp(p, "UseSTARTTLS") == 0) {
-+				if(strcasecmp(q, "YES") == 0) {
-+					use_starttls = True;
-+				}
-+				else {
-+					use_starttls = False;
-+				}
-+
-+				if(log_level > 0) {
-+					log_event(LOG_INFO,
-+						"Set UseSTARTTLS=\"%s\"\n", use_starttls ? "True" : "False");
-+				}
-+			}
- 			else if(strcasecmp(p, "UseTLSCert") == 0) {
- 				if(strcasecmp(q, "YES") == 0) {
- 					use_cert = True;
-@@ -920,8 +937,11 @@ bool_t read_config()
- /*
- smtp_open() -- Open connection to a remote SMTP listener
- */
-+void smtp_write(int fd, char *format, ...);
-+int smtp_okay(int fd, char *response);
- int smtp_open(char *host, int port)
- {
-+	char buf[(BUF_SZ + 1)];
- #ifdef INET6
- 	struct addrinfo hints, *ai0, *ai;
- 	char servname[NI_MAXSERV];
-@@ -949,7 +969,7 @@ int smtp_open(char *host, int port)
- 		return(-1);
- 	}
- 
--	if(use_cert == True) { 
-+	if(use_cert == True) {
- 		if(SSL_CTX_use_certificate_chain_file(ctx, tls_cert) <= 0) {
- 			perror("Use certfile");
- 			return(-1);
-@@ -1028,11 +1048,24 @@ int smtp_open(char *host, int port)
- 		return(-1);
- 	}
- #endif
-+	if(smtp_okay(s, buf) == False) {
-+		log_event(LOG_ERR, "Invalid response SMTP server");
-+		return(-1);
-+	}
- 
- #ifdef HAVE_SSL
- 	if(use_tls == True) {
- 		log_event(LOG_INFO, "Creating SSL connection to host");
- 
-+		if(use_starttls == True) {
-+			smtp_write(s, "STARTTLS", hostname);
-+			(void)alarm((unsigned) MEDWAIT);
-+			if(smtp_okay(s, buf) == False) {
-+				log_event(LOG_ERR, "STARTTLS failed: %s", buf);
-+				return(-1);
-+			}
-+		}
-+
- 		ssl = SSL_new(ctx);
- 		if(!ssl) {
- 			log_event(LOG_ERR, "SSL not working");
-@@ -1041,12 +1074,13 @@ int smtp_open(char *host, int port)
- 		SSL_set_fd(ssl, s);
- 
- 		err = SSL_connect(ssl);
--		if(err < 0) { 
-+		if(err < 0) {
- 			perror("SSL_connect");
- 			return(-1);
- 		}
-+		tls_initialized = True;
- 
--		if(log_level > 0) { 
-+		if(log_level > 0) {
- 			log_event(LOG_INFO, "SSL connection using %s",
- 				SSL_get_cipher(ssl));
- 		}
-@@ -1070,7 +1104,7 @@ fd_getc() -- Read a character from an fd
- ssize_t fd_getc(int fd, void *c)
- {
- #ifdef HAVE_SSL
--	if(use_tls == True) { 
-+	if(use_tls == True && tls_initialized == True) {
- 		return(SSL_read(ssl, c, 1));
- 	}
- #endif
-@@ -1134,10 +1168,10 @@ int smtp_okay(int fd, char *response)
- /*
- fd_puts() -- Write characters to fd
- */
--ssize_t fd_puts(int fd, const void *buf, size_t count) 
-+ssize_t fd_puts(int fd, const void *buf, size_t count)
- {
- #ifdef HAVE_SSL
--	if(use_tls == True) { 
-+	if(use_tls == True && tls_initialized == True) {
- 		return(SSL_write(ssl, buf, count));
- 	}
- #endif
-@@ -1237,9 +1271,6 @@ int ssmtp(char *argv[])
- 	if((sock = smtp_open(mailhost, port)) == -1) {
- 		die("Cannot open %s:%d", mailhost, port);
- 	}
--	else if(smtp_okay(sock, buf) == False) {
--		die("Invalid response SMTP server");
--	}
- 
- 	/* If user supplied username and password, then try ELHO */
- 	if(auth_user) {
-diff -rup ssmtp-2.60/ssmtp.conf ssmtp-2.60-starttls/ssmtp.conf
---- ssmtp-2.60/ssmtp.conf	2001-05-08 13:22:08.000000000 +0300
-+++ ssmtp-2.60-starttls/ssmtp.conf	2003-06-09 00:35:01.000000000 +0300
-@@ -30,6 +30,10 @@ hostname=_HOSTNAME_
- # Use SSL/TLS to send secure messages to server.
- #UseTLS=YES
- 
-+# Use STARTTLS SMTP command to initiate SSL, you should enable UseTLS too
-+# for this option to work
-+UseSTARTTLS=YES
-+
- # Use SSL/TLS certificate to authenticate against smtp host.
- #UseTLSCert=YES
- 
diff --git a/net-mail/ssmtp/metadata.xml b/net-mail/ssmtp/metadata.xml
deleted file mode 100644
index 51f94e3fbe0e..000000000000
--- a/net-mail/ssmtp/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-mail</herd>
-</pkgmetadata>
diff --git a/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild b/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild
deleted file mode 100644
index fea6d6088027..000000000000
--- a/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.38.14-r1.ebuild,v 1.22 2004/04/16 05:40:15 vapier Exp $
-
-DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
-SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/system/mail/mta/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa"
-
-DEPEND="virtual/glibc"
-RDEPEND="!virtual/mta
-	net-mail/mailbase"
-PROVIDE="virtual/mta"
-
-src_compile() {
-	make clean || die
-	make ${MAKEOPTS} || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosbin ssmtp
-	chmod 755 ${D}/usr/sbin/ssmtp
-	dosym /usr/sbin/ssmtp /usr/bin/mailq
-	dosym /usr/sbin/ssmtp /usr/bin/newaliases
-	# Removed symlink due to conflict with mailx
-	# See bug #7448
-	#dosym /usr/sbin/ssmtp /usr/bin/mail
-	dosym /usr/sbin/ssmtp /usr/sbin/sendmail
-	dosym /usr/sbin/ssmtp /usr/lib/sendmail
-	doman ssmtp.8
-	dosym /usr/share/man/man8/ssmtp.8 /usr/share/man/man8/sendmail.8
-	dodoc CHANGELOG INSTALL MANIFEST README
-	newdoc ssmtp.lsm DESC
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-}
-
-pkg_config() {
-	local conffile="/etc/ssmtp/ssmtp.conf"
-	local hostname=`hostname -f`
-	local domainame=`hostname -d`
-	mv ${conffile} ${conffile}.orig
-	sed -e "s:rewriteDomain\=:rewriteDomain\=${domainame}:g" \
-		-e "s:_HOSTNAME_:${hostname}:" \
-		-e "s:\=mail:\=mail.${domainame}:g" \
-		${conffile}.orig > ${conffile}
-
-}
diff --git a/net-mail/ssmtp/ssmtp-2.48.ebuild b/net-mail/ssmtp/ssmtp-2.48.ebuild
deleted file mode 100644
index cbcb059df5df..000000000000
--- a/net-mail/ssmtp/ssmtp-2.48.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.48.ebuild,v 1.15 2004/04/16 05:40:15 vapier Exp $
-
-DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
-HOMEPAGE="ftp://metalab.unc.edu/pub/Linux/system/mail/mta/"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/mail/mta/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa mips amd64"
-IUSE=""
-
-DEPEND="virtual/glibc"
-RDEPEND="!virtual/mta
-	net-mail/mailbase"
-PROVIDE="virtual/mta"
-
-src_compile() {
-	make clean || die
-	make ${MAKEOPTS} || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/sbin /usr/lib
-	dosbin ssmtp
-	chmod 755 ${D}/usr/sbin/ssmtp
-	dosym /usr/sbin/ssmtp /usr/bin/mailq
-	dosym /usr/sbin/ssmtp /usr/bin/newaliases
-	# Removed symlink due to conflict with mailx
-	# See bug #7448
-	#dosym /usr/sbin/ssmtp /usr/bin/mail
-	dosym /usr/sbin/ssmtp /usr/sbin/sendmail
-	dosym /usr/sbin/ssmtp /usr/lib/sendmail
-	doman ssmtp.8
-	dosym /usr/share/man/man8/ssmtp.8 /usr/share/man/man8/sendmail.8
-	dodoc INSTALL README TLS
-	newdoc ssmtp-2.48.lsm DESC
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-}
-
-pkg_config() {
-
-	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}
-}
diff --git a/net-mail/ssmtp/ssmtp-2.60.4-r2.ebuild b/net-mail/ssmtp/ssmtp-2.60.4-r2.ebuild
deleted file mode 100644
index 5616e854a653..000000000000
--- a/net-mail/ssmtp/ssmtp-2.60.4-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.60.4-r2.ebuild,v 1.2 2004/04/16 05:40:15 vapier 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/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ia64 ppc64 s390"
-IUSE="ssl ipv6 md5sum"
-
-DEPEND="virtual/glibc
-	ssl? ( dev-libs/openssl )"
-RDEPEND="net-mail/mailwrapper
-	net-mail/mailbase
-	ssl? ( dev-libs/openssl )"
-PROVIDE="virtual/mta"
-
-S=${WORKDIR}/ssmtp-2.60
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	use ssl && epatch ${FILESDIR}/starttls.diff
-	use md5sum && epatch ${FILESDIR}/ssmtp-2.60.4-md5.patch
-}
-
-src_compile() {
-	local myconf
-
-	myconf="$( use_enable ssl ) \
-		$( use_enable ipv6 inet6 ) \
-		$( use_enable md5sum md5suth )"
-
-	econf \
-		--sysconfdir=/etc/ssmtp \
-		${myconf} || 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
-	#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 INSTALL README TLS
-	newdoc ssmtp-2.60.lsm
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-	insinto /etc
-	doins ${FILESDIR}/mailer.conf
-
-	# 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
-}
diff --git a/net-mail/ssmtp/ssmtp-2.60.4.ebuild b/net-mail/ssmtp/ssmtp-2.60.4.ebuild
deleted file mode 100644
index ec1fddb6428d..000000000000
--- a/net-mail/ssmtp/ssmtp-2.60.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.60.4.ebuild,v 1.7 2004/04/27 21:14:25 agriffis 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/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ia64 ppc64"
-IUSE="ssl ipv6 md5sum"
-
-DEPEND="virtual/glibc
-	ssl? ( dev-libs/openssl )"
-RDEPEND="!virtual/mta
-	net-mail/mailbase
-	ssl? ( dev-libs/openssl )"
-PROVIDE="virtual/mta"
-
-S=${WORKDIR}/ssmtp-2.60
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	use ssl && epatch ${FILESDIR}/starttls.diff
-	use md5sum && epatch ${FILESDIR}/ssmtp-2.60.4-md5.patch
-}
-
-src_compile() {
-	local myconf
-
-	myconf="$( use_enable ssl ) \
-		$( use_enable ipv6 inet6 ) \
-		$( use_enable md5sum md5suth )"
-
-	econf \
-		--sysconfdir=/etc/ssmtp \
-		${myconf} || 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/ssmtp /usr/bin/mailq
-	dosym /usr/sbin/ssmtp /usr/bin/newaliases
-	# Removed symlink due to conflict with mailx
-	# See bug #7448
-	#dosym /usr/sbin/ssmtp /usr/bin/mail
-	dosym /usr/sbin/ssmtp /usr/sbin/sendmail
-	dosym /usr/sbin/ssmtp /usr/lib/sendmail
-	doman ssmtp.8
-	dosym /usr/share/man/man8/ssmtp.8 /usr/share/man/man8/sendmail.8
-	dodoc INSTALL README TLS
-	newdoc ssmtp-2.60.lsm
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-
-	# 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
-}
diff --git a/net-mail/ssmtp/ssmtp-2.60.7.ebuild b/net-mail/ssmtp/ssmtp-2.60.7.ebuild
deleted file mode 100644
index e2e61c74079c..000000000000
--- a/net-mail/ssmtp/ssmtp-2.60.7.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ssmtp/ssmtp-2.60.7.ebuild,v 1.11 2004/04/26 03:53:58 vapier 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/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
-IUSE="ssl ipv6 md5sum"
-
-DEPEND="virtual/glibc
-	ssl? ( dev-libs/openssl )"
-RDEPEND="net-mail/mailwrapper
-	net-mail/mailbase
-	ssl? ( dev-libs/openssl )"
-PROVIDE="virtual/mta"
-
-S=${WORKDIR}/ssmtp-2.60
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/ssmtp-2.60.7-logfile.patch
-	use ssl && epatch ${FILESDIR}/starttls.diff
-	use md5sum && epatch ${FILESDIR}/ssmtp-2.60.4-md5.patch
-}
-
-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
-	#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 INSTALL README TLS
-	newdoc ssmtp-2.60.lsm
-	insinto /etc/ssmtp
-	doins ssmtp.conf revaliases
-	insinto /etc
-	doins ${FILESDIR}/mailer.conf
-
-	# 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
-}