Remove mail-mta/qmail

author: Michael Hanselmann <hansmi@gentoo.org> 2007-05-01 21:31:46 +0000
committer: Michael Hanselmann <hansmi@gentoo.org> 2007-05-01 21:31:46 +0000
commit: 11209cf4864a5c0a735f237e6366675366d036ba (patch)
tree: 23919992fc4cbcb2fe26fb8318f114727bd959f3 /mail-mta/qmail/files
parent: Add new src_test, and add return code patch from [ruby-core:10609] and [ruby-... (diff)
download: gentoo-2-11209cf4864a5c0a735f237e6366675366d036ba.tar.gz
gentoo-2-11209cf4864a5c0a735f237e6366675366d036ba.tar.bz2
gentoo-2-11209cf4864a5c0a735f237e6366675366d036ba.zip
69 files changed, 0 insertions, 2031 deletions
diff --git a/mail-mta/qmail/files/1.03-r14/auth-after-tls-only.patch b/mail-mta/qmail/files/1.03-r14/auth-after-tls-only.patch
deleted file mode 100644
index 603d6677c9bd..000000000000
--- a/mail-mta/qmail/files/1.03-r14/auth-after-tls-only.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -urbBw qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2003-11-30 00:09:49.000000000 -0800
-+++ qmail-1.03/qmail-smtpd.c	2003-11-30 00:20:43.000000000 -0800
-@@ -175,6 +175,7 @@
- int err_noauth() { out("504 auth type unimplemented (#5.5.1)\r\n"); return -1; }
- int err_authabrt() { out("501 auth exchange cancelled (#5.0.0)\r\n"); return -1; }
- int err_input() { out("501 malformed auth input (#5.5.4)\r\n"); return -1; }
-+int err_wantstarttls() { out("530 Must issue a STARTTLS command first (#5.7.0)\r\n"); return -1; };
- 
- stralloc greeting = {0};
- 
-@@ -480,19 +481,30 @@
-   size_buf[fmt_ulong(size_buf,(unsigned long) databytes)] = 0;
-   out("\r\n250-SIZE "); out(size_buf); 
- }
-+
-+void smtp_authout() {
-+#ifdef AUTHCRAM
-+  out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN"
-+      "\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN");
-+#else //AUTHCRAM
-+  out("\r\n250-AUTH LOGIN PLAIN"
-+      "\r\n250-AUTH=LOGIN PLAIN");
-+#endif //AUTHCRAM
-+}
-+
- void smtp_ehlo(arg) char *arg;
- {
-   smtp_greet("250-");
--#ifdef AUTHCRAM
--  out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN");
--  out("\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN");
--#else
--  out("\r\n250-AUTH LOGIN PLAIN");
--  out("\r\n250-AUTH=LOGIN PLAIN");
--#endif
- #ifdef TLS
-   if (!ssl) out("\r\n250-STARTTLS");
--#endif
-+#endif //TLS
-+
-+#ifdef TLS && TLS_BEFORE_AUTH 
-+  if(ssl) smtp_authout();
-+#else // TLS && TLS_BEFORE_AUTH
-+  smtp_authout();
-+#endif // TLS && TLS_BEFORE_AUTH
-+  
-   smtp_size();
-   out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
-   seenmail = 0; dohelo(arg);
-@@ -879,6 +891,9 @@
- {
-   int r;
- 
-+#ifdef TLS && TLS_BEFORE_AUTH
-+  if (!ssl) return err_wantstarttls();
-+#endif
-   if (*arg) {
-     if (r = b64decode(arg,str_len(arg),&user) == 1) return err_input();
-   }
-@@ -903,6 +918,9 @@
- {
-   int r, id = 0;
- 
-+#ifdef TLS && TLS_BEFORE_AUTH
-+  if (!ssl) return err_wantstarttls();
-+#endif
-   if (*arg) {
-     if (r = b64decode(arg,str_len(arg),&slop) == 1) return err_input();
-   }
-@@ -929,6 +947,10 @@
-   int i, r;
-   char *s;
- 
-+#ifdef TLS && TLS_BEFORE_AUTH
-+  if (!ssl) return err_wantstarttls();
-+#endif
-+
-   s = unique;
-   s += fmt_uint(s,getpid());
-   *s++ = '.';
diff --git a/mail-mta/qmail/files/1.03-r14/maildir-quota-fix.patch b/mail-mta/qmail/files/1.03-r14/maildir-quota-fix.patch
deleted file mode 100644
index 3d38a477f5a1..000000000000
--- a/mail-mta/qmail/files/1.03-r14/maildir-quota-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur qmail-1.03.orig/overmaildirquota.c qmail-1.03/overmaildirquota.c
---- qmail-1.03.orig/overmaildirquota.c	2003-08-28 18:44:46.000000000 -0700
-+++ qmail-1.03/overmaildirquota.c	2003-08-28 18:48:06.000000000 -0700
-@@ -12,8 +12,7 @@
- #include        <errno.h>
- #include        <sys/stat.h>
- 
--static const char rcsid[]="$Id: overquota.c,v 1.0 2002/06/09 16:21:05 mr
--sam Exp $";
-+static const char rcsid[]="$Id: maildir-quota-fix.patch,v 1.1 2004/05/30 10:50:13 robbat2 Exp $";
- 
- 
- int user_over_maildirquota( const char *dir, const char *q)
diff --git a/mail-mta/qmail/files/1.03-r14/nullenvsender-recipcount.tls.patch b/mail-mta/qmail/files/1.03-r14/nullenvsender-recipcount.tls.patch
deleted file mode 100644
index d3ce73f172f8..000000000000
--- a/mail-mta/qmail/files/1.03-r14/nullenvsender-recipcount.tls.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -urwBb qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2003-11-30 01:36:49.000000000 -0800
-+++ qmail-1.03/qmail-smtpd.c	2003-11-30 01:39:31.000000000 -0800
-@@ -153,6 +153,7 @@
- void err_brt() { out("550 sorry, this message is not deliverable (#5.7.1)\r\n"); }
- void err_bmt() { out("533 sorry, your envelope recipient has been denied (#5.7.1)\r\n"); }
- void err_nogateway() { out("553 sorry, that domain isn't in my list of allowed rcpthosts (#5.7.1)\r\n"); }
-+void err_badbounce() { out("550 sorry, bounce messages should have a single envelope recipient (#5.7.1)\r\n"); }
- #ifdef TLS
- void err_nogwcert() { out("553 no valid cert for gatewaying (#5.7.1)\r\n"); }
- #endif
-@@ -470,6 +471,7 @@
- int flagbrt; /* defined if any bad rcpts */
- stralloc mailfrom = {0};
- stralloc rcptto = {0};
-+int recipcount;
- 
- void smtp_helo(arg) char *arg;
- {
-@@ -524,6 +526,7 @@
-   if (!stralloc_copys(&rcptto,"")) die_nomem();
-   if (!stralloc_copys(&mailfrom,addr.s)) die_nomem();
-   if (!stralloc_0(&mailfrom)) die_nomem();
-+  recipcount = 0;
-   out("250 ok\r\n");
- }
- #ifdef TLS
-@@ -608,6 +611,7 @@
-   if (!stralloc_cats(&rcptto,"T")) die_nomem();
-   if (!stralloc_cats(&rcptto,addr.s)) die_nomem();
-   if (!stralloc_0(&rcptto)) die_nomem();
-+  recipcount++;
-   out("250 ok\r\n");
- }
- 
-@@ -726,6 +730,7 @@
-  
-   if (!seenmail) { err_wantmail(); return; }
-   if (!rcptto.len) { err_wantrcpt(); return; }
-+  if (mailfrom.len == 1 && recipcount > 1) { err_badbounce(); return; }
-   if (flagbrt) { err_brt(); return; }
-   seenmail = 0;
-   if (databytes) bytestooverflow = databytes + 1;
diff --git a/mail-mta/qmail/files/1.03-r14/qmail-1.03-accept-5xx.tls.patch b/mail-mta/qmail/files/1.03-r14/qmail-1.03-accept-5xx.tls.patch
deleted file mode 100644
index edc9f337a519..000000000000
--- a/mail-mta/qmail/files/1.03-r14/qmail-1.03-accept-5xx.tls.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urbBw qmail-1.03.orig/qmail-remote.c qmail-1.03/qmail-remote.c
---- qmail-1.03.orig/qmail-remote.c	2003-11-30 01:24:58.000000000 -0800
-+++ qmail-1.03/qmail-remote.c	2003-11-30 01:32:11.000000000 -0800
-@@ -382,10 +382,14 @@
-    substdio_put(&smtpto,helohost.s,helohost.len);
-    substdio_puts(&smtpto,"\r\n");
-    substdio_flush(&smtpto);
--   if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-+   code = smtpcode();
-+   if (code >= 500) quit("DConnected to "," but my name was rejected");
-+   if (code != 250) quit("ZConnected to "," but my name was rejected");
-   }
- #else
--  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-+  code = smtpcode();
-+  if (code >= 500) quit("DConnected to "," but my name was rejected");
-+  if (code != 250) quit("ZConnected to "," but my name was rejected");
- #endif
- 
-  /* SMTP AUTH client */
diff --git a/mail-mta/qmail/files/1.03-r14/qmail-1.03-qregex-memleak-fix.patch b/mail-mta/qmail/files/1.03-r14/qmail-1.03-qregex-memleak-fix.patch
deleted file mode 100644
index 8ab940f6dc72..000000000000
--- a/mail-mta/qmail/files/1.03-r14/qmail-1.03-qregex-memleak-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urBbw qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2003-11-30 00:51:16.000000000 -0800
-+++ qmail-1.03/qmail-smtpd.c	2003-11-30 00:50:54.000000000 -0800
-@@ -397,8 +397,9 @@
-   int j = 0;
-   int x = 0;
-   int negate = 0;
--  stralloc bmb = {0};
--  stralloc curregex = {0};
-+  static stralloc bmb = {0};
-+  static stralloc curregex = {0};
-+  bmb.len = curregex.len = 0;
- 
-   if (which == BMCHECK_BMF) {
-     if (!stralloc_copy(&bmb,&bmf)) die_nomem();
diff --git a/mail-mta/qmail/files/1.03-r14/qmail-gentoo-branding.patch b/mail-mta/qmail/files/1.03-r14/qmail-gentoo-branding.patch
deleted file mode 100644
index 4f353b9e0c40..000000000000
--- a/mail-mta/qmail/files/1.03-r14/qmail-gentoo-branding.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urBbw qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2003-11-30 01:41:34.000000000 -0800
-+++ qmail-1.03/qmail-smtpd.c	2003-11-30 13:35:43.000000000 -0800
-@@ -187,6 +187,7 @@
- }
- void smtp_help()
- {
-+  out("214-Gentoo Linux __PF__\r\n");
-   out("214 qmail home page: http://pobox.com/~djb/qmail.html\r\n");
- }
- void smtp_quit()
diff --git a/mail-mta/qmail/files/1.03-r14/qmail-pop3d-capa-outputfix.patch b/mail-mta/qmail/files/1.03-r14/qmail-pop3d-capa-outputfix.patch
deleted file mode 100644
index 784d8fdfbcd0..000000000000
--- a/mail-mta/qmail/files/1.03-r14/qmail-pop3d-capa-outputfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urbBw qmail-1.03.orig/qmail-pop3d.c qmail-1.03/qmail-pop3d.c
---- qmail-1.03.orig/qmail-pop3d.c	2003-11-30 00:35:33.000000000 -0800
-+++ qmail-1.03/qmail-pop3d.c	2003-11-30 00:38:47.000000000 -0800
-@@ -314,7 +314,8 @@
- 
- void pop3_capa(arg) char *arg;
- {
--  puts("+OK Capability list follows\r\n"
-+  substdio_puts(&ssout,
-+       "+OK Capability list follows\r\n"
-        "TOP\r\n"
-        "UIDL\r\n"
-        "LAST\r\n"
diff --git a/mail-mta/qmail/files/1.03-r14/qmail-pop3d-stat.tls.patch b/mail-mta/qmail/files/1.03-r14/qmail-pop3d-stat.tls.patch
deleted file mode 100644
index 8fd5c0abcbe2..000000000000
--- a/mail-mta/qmail/files/1.03-r14/qmail-pop3d-stat.tls.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urBbw qmail-1.03.orig/qmail-pop3d.c qmail-1.03/qmail-pop3d.c
---- qmail-1.03.orig/qmail-pop3d.c	2003-11-30 01:41:34.000000000 -0800
-+++ qmail-1.03/qmail-pop3d.c	2003-11-30 01:47:44.000000000 -0800
-@@ -150,12 +150,17 @@
- void pop3_stat()
- {
-   int i;
-+  int realnumm;
-   unsigned long total;
-  
--  total = 0;
--  for (i = 0;i < numm;++i) if (!m[i].flagdeleted) total += m[i].size;
-+  total = realnumm = 0;
-+  for (i = 0;i < numm;++i) 
-+      if (!m[i].flagdeleted) { 
-+          total += m[i].size;
-+          ++realnumm;
-+      }
-   substdio_puts(&ssout,"+OK ");
--  put(strnum,fmt_uint(strnum,numm));
-+  put(strnum,fmt_uint(strnum,realnumm));
-   substdio_puts(&ssout," ");
-   put(strnum,fmt_ulong(strnum,total));
-   substdio_puts(&ssout,"\r\n");
diff --git a/mail-mta/qmail/files/1.03-r14/qmail-qmailqueue-docs.patch b/mail-mta/qmail/files/1.03-r14/qmail-qmailqueue-docs.patch
deleted file mode 100644
index d4827a78ebcf..000000000000
--- a/mail-mta/qmail/files/1.03-r14/qmail-qmailqueue-docs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urBbw qmail-1.03.orig/qmail-log.5 qmail-1.03/qmail-log.5
---- qmail-1.03.orig/qmail-log.5	1998-06-15 03:53:16.000000000 -0700
-+++ qmail-1.03/qmail-log.5	2003-11-30 13:36:00.000000000 -0800
-@@ -232,6 +232,11 @@
- is unable to queue a bounce message,
- usually because the machine is almost out of memory.
- It will try again later.
-+This can also be caused by incorrect settings of
-+.B $QMAILQUEUE
-+or errors in a program or script which
-+.B $QMAILQUEUE
-+points to.
- .TP
- .B unable to stat ...
- .B qmail-send
-diff -urBbw qmail-1.03.orig/qmail-queue.8 qmail-1.03/qmail-queue.8
---- qmail-1.03.orig/qmail-queue.8	1998-06-15 03:53:16.000000000 -0700
-+++ qmail-1.03/qmail-queue.8	2003-11-30 13:36:23.000000000 -0800
-@@ -40,6 +40,12 @@
- However, the recipients probably expect to see a proper header,
- as described in
- .BR qmail-header(5) .
-+
-+Programs included with qmail which invoke
-+.B qmail-queue
-+will invoke the contents of
-+.B $QMAILQUEUE
-+instead, if that environment variable is set.
- .SH "FILESYSTEM RESTRICTIONS"
- .B qmail-queue
- imposes two constraints on the queue structure:
diff --git a/mail-mta/qmail/files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch b/mail-mta/qmail/files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch
deleted file mode 100644
index 3409116d57ab..000000000000
--- a/mail-mta/qmail/files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2003-09-01 21:47:32.000000000 -0700
-+++ qmail-1.03/qmail-smtpd.c	2003-09-01 21:48:36.000000000 -0700
-@@ -117,6 +117,7 @@
- void err_nogwcert() { out("553 no valid cert for gatewaying (#5.7.1)\r\n"); }
- #endif
- void err_unimpl() { out("502 unimplemented (#5.5.1)\r\n"); }
-+void err_size() { out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); }
- void err_syntax() { out("555 syntax error (#5.5.4)\r\n"); }
- void err_wantmail() { out("503 MAIL first (#5.5.1)\r\n"); }
- void err_wantrcpt() { out("503 RCPT first (#5.5.1)\r\n"); }
-@@ -296,6 +297,40 @@
-   return 1;
- }
- 
-+int sizelimit(arg)
-+char *arg;
-+{
-+  int i;
-+  long r;
-+  unsigned long sizebytes = 0;
-+
-+  i = str_chr(arg,'<');
-+  if (arg[i])
-+    arg += i + 1;
-+  else {
-+    arg += str_chr(arg,':');
-+    if (*arg == ':') ++arg;
-+    while (*arg == ' ') ++arg;
-+  }
-+
-+  arg += str_chr(arg,' ');
-+  if (*arg == ' ') while (*arg == ' ') ++arg;
-+  else return 1;
-+
-+  i = str_chr(arg,'=');
-+  arg[i] = 0;
-+  if (case_equals(arg,"SIZE")) {
-+    arg += i;
-+    while (*++arg && *arg > 47 && *arg < 58) {
-+      sizebytes *= 10;
-+      sizebytes += *arg - 48;
-+    }
-+    r = databytes - sizebytes;
-+    if (r < 0) return 0;
-+  }
-+  return 1;
-+}
-+
- int bmcheck(which) int which;
- {
-   int i = 0;
-@@ -351,6 +386,12 @@
-   smtp_greet("250 "); out("\r\n");
-   seenmail = 0; dohelo(arg);
- }
-+char size_buf[FMT_ULONG];
-+void smtp_size()
-+{
-+  size_buf[fmt_ulong(size_buf,(unsigned long) databytes)] = 0;
-+  out("\r\n250-SIZE "); out(size_buf); 
-+}
- void smtp_ehlo(arg) char *arg;
- {
-   smtp_greet("250-");
-@@ -364,6 +405,7 @@
- #ifdef TLS
-   if (!ssl) out("\r\n250-STARTTLS");
- #endif
-+  smtp_size();
-   out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
-   seenmail = 0; dohelo(arg);
- }
-@@ -375,6 +417,7 @@
- void smtp_mail(arg) char *arg;
- {
-   if (!addrparse(arg)) { err_syntax(); return; }
-+  if (databytes && !sizelimit(arg)) { err_size(); return; }
-   if (bmfok) flagbarfbmf = bmcheck(BMCHECK_BMF);
-   seenmail = 1;
-   if (!stralloc_copys(&rcptto,"")) die_nomem();
diff --git a/mail-mta/qmail/files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch b/mail-mta/qmail/files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch
deleted file mode 100644
index e6aab720418c..000000000000
--- a/mail-mta/qmail/files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur -x '*.*orig' qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2003-09-01 21:51:08.000000000 -0700
-+++ qmail-1.03/qmail-smtpd.c	2003-09-01 21:52:12.000000000 -0700
-@@ -119,6 +119,7 @@
- void err_unimpl() { out("502 unimplemented (#5.5.1)\r\n"); }
- void err_size() { out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); }
- void err_syntax() { out("555 syntax error (#5.5.4)\r\n"); }
-+void err_relay() { out("553 we don't relay (#5.7.1)\r\n"); }
- void err_wantmail() { out("503 MAIL first (#5.5.1)\r\n"); }
- void err_wantrcpt() { out("503 RCPT first (#5.5.1)\r\n"); }
- void err_noop() { out("250 ok\r\n"); }
-@@ -374,6 +375,21 @@
-   return r;
- }
- 
-+int addrrelay()
-+{
-+  int j;
-+  j = addr.len;
-+  while(--j >= 0)
-+    if (addr.s[j] == '@') break;
-+  if (j < 0) j = addr.len;
-+  while(--j >= 0) {
-+    if (addr.s[j] == '@') return 1;
-+    if (addr.s[j] == '%') return 1;
-+    if (addr.s[j] == '!') return 1;
-+  }
-+  return 0;
-+}
-+
- 
- int seenmail = 0;
- int flagbarfbmf; /* defined if seenmail */
-@@ -434,6 +450,7 @@
- void smtp_rcpt(arg) char *arg; {
-   if (!seenmail) { err_wantmail(); return; }
-   if (!addrparse(arg)) { err_syntax(); return; }
-+  if (addrrelay()) { err_relay(); return; }
-   if ((!flagbarfbmf) && (bmtok)) { flagbarfbmt = bmcheck(BMCHECK_BMT); }
-   if (flagbarfbmf) {
-     strerr_warn4("qmail-smtpd: badmailfrom: ",mailfrom.s," at ",remoteip,0);
diff --git a/mail-mta/qmail/files/1.03-r14/smtp-auth-close3.patch b/mail-mta/qmail/files/1.03-r14/smtp-auth-close3.patch
deleted file mode 100644
index e259bbf27977..000000000000
--- a/mail-mta/qmail/files/1.03-r14/smtp-auth-close3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2003-08-11 20:37:16.000000000 -0700
-+++ qmail-1.03/qmail-smtpd.c	2003-08-11 20:39:52.000000000 -0700
-@@ -519,14 +519,18 @@
-   if (!stralloc_0(&resp)) die_nomem();
- 
-   if (fd_copy(2,1) == -1) return err_pipe();
--  close(3);
-+  //close(3);
-   if (pipe(pi) == -1) return err_pipe();
--  if (pi[0] != 3) return err_pipe();
-+  //if (pi[0] != 3) return err_pipe();
-   switch(child = fork()) {
-     case -1:
-       return err_fork();
-     case 0:
-       close(pi[1]);
-+      if (pi[0] != 3) {
-+        close(3);
-+	if (0 > dup2(pi[0],3)) _exit(1);
-+      }
-       sig_pipedefault();
-       execvp(*childargs, childargs);
-       _exit(1);
diff --git a/mail-mta/qmail/files/1.03-r15/Makefile-relaymxlookup.patch b/mail-mta/qmail/files/1.03-r15/Makefile-relaymxlookup.patch
deleted file mode 100644
index f56006eabdb1..000000000000
--- a/mail-mta/qmail/files/1.03-r15/Makefile-relaymxlookup.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- qmail-1.03.orig/Makefile	2004-12-15 22:35:11.000000000 +0100
-+++ qmail-1.03/Makefile	2004-12-15 22:44:26.008337731 +0100
-@@ -1450,11 +1450,12 @@
- load qmail-qmtpd.o rcpthosts.o control.o constmap.o received.o \
- date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a open.a \
- getln.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a \
--str.a fs.a auto_qmail.o
-+str.a fs.a auto_qmail.o dns.o ip.o ipalloc.o ipme.o byte_diff.o
- 	./load qmail-qmtpd rcpthosts.o control.o constmap.o \
- 	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
- 	datetime.a open.a getln.a sig.a case.a env.a stralloc.a \
--	alloc.a substdio.a error.a str.a fs.a auto_qmail.o 
-+	alloc.a substdio.a error.a fs.a auto_qmail.o dns.o \
-+	`cat dns.lib` ip.o ipalloc.o ipme.o byte_diff.o str.a
- 
- qmail-qmtpd.0: \
- qmail-qmtpd.8
-@@ -1617,13 +1618,13 @@
- timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
- date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
- open.a sig.a case.a env.a stralloc.a alloc.a strerr.a substdio.a error.a str.a \
--fs.a auto_qmail.o base64.o socket.lib
-+fs.a auto_qmail.o base64.o socket.lib dns.o ip.o ipalloc.o
- 	./load qmail-smtpd qregex.o rcpthosts.o commands.o timeoutread.o \
- 	timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
- 	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
- 	datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
--	alloc.a strerr.a substdio.a error.a str.a fs.a auto_qmail.o base64.o  `cat \
--	socket.lib` -lssl -lcrypto
-+	alloc.a strerr.a substdio.a error.a fs.a auto_qmail.o base64.o  `cat \
-+	socket.lib` -lssl -lcrypto dns.o str.a `cat dns.lib`
- 
- qmail-smtpd.0: \
- qmail-smtpd.8
-@@ -1760,7 +1761,7 @@
- 
- rcpthosts.o: \
- compile rcpthosts.c cdb.h uint32.h byte.h open.h error.h control.h \
--constmap.h stralloc.h gen_alloc.h rcpthosts.h
-+constmap.h stralloc.h gen_alloc.h rcpthosts.h dns.h ipalloc.h ipme.h
- 	./compile rcpthosts.c
- 
- qregex.o: \
diff --git a/mail-mta/qmail/files/1.03-r15/qmail-macos-dns-fix.patch b/mail-mta/qmail/files/1.03-r15/qmail-macos-dns-fix.patch
deleted file mode 100644
index b7a4df8e1fca..000000000000
--- a/mail-mta/qmail/files/1.03-r15/qmail-macos-dns-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u qmail-1.03.orig/dns.c qmail-1.03/dns.c
---- qmail-1.03.orig/dns.c	Tue Aug 31 21:27:34 2004
-+++ qmail-1.03/dns.c	Tue Aug 31 21:41:50 2004
-@@ -3,6 +3,7 @@
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-+#include <arpa/nameser_compat.h>
- #include <resolv.h>
- #include <errno.h>
- extern int res_query();
diff --git a/mail-mta/qmail/files/1.03-r15/qmail-pop3d-top-outputfix.patch b/mail-mta/qmail/files/1.03-r15/qmail-pop3d-top-outputfix.patch
deleted file mode 100644
index cdc4a710b280..000000000000
--- a/mail-mta/qmail/files/1.03-r15/qmail-pop3d-top-outputfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uBbwr qmail-1.03.orig/qmail-pop3d.c qmail-1.03/qmail-pop3d.c
---- qmail-1.03.orig/qmail-pop3d.c       2003-11-30 23:45:22.000000000 -0800
-+++ qmail-1.03/qmail-pop3d.c    2003-11-30 23:43:13.000000000 -0800
-@@ -312,9 +312,9 @@
-   fd = open_read(m[i].fn);
-   if (fd == -1) { err_nosuch(); return; }
-   /* okay(); */
--  puts("+OK ");
-+  substdio_puts(&ssout,"+OK ");
-   put(strnum,fmt_ulong(strnum,m[i].size));
--  puts(" octets\r\n");
-+  substdio_puts(&ssout," octets\r\n");
-   flush();
-   substdio_fdbuf(&ssmsg,read,fd,ssmsgbuf,sizeof(ssmsgbuf));
-   blast(&ssmsg,limit);
diff --git a/mail-mta/qmail/files/1.03-r15/spawn-alloc-h.patch b/mail-mta/qmail/files/1.03-r15/spawn-alloc-h.patch
deleted file mode 100644
index fbf79aa867e9..000000000000
--- a/mail-mta/qmail/files/1.03-r15/spawn-alloc-h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- spawn.c.orig        2004-10-19 12:09:28.071384468 -0400
-+++ spawn.c     2004-10-19 12:10:18.340941456 -0400
-@@ -1,5 +1,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include "alloc.h"
- #include "sig.h"
- #include "wait.h"
- #include "substdio.h"
-
diff --git a/mail-mta/qmail/files/1.03-r15/tlsbeforeauth-fix.patch b/mail-mta/qmail/files/1.03-r15/tlsbeforeauth-fix.patch
deleted file mode 100644
index c7e8c21afb52..000000000000
--- a/mail-mta/qmail/files/1.03-r15/tlsbeforeauth-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2004-01-30 21:32:02.923302000 +0100
-+++ qmail-1.03/qmail-smtpd.c	2004-01-30 21:32:16.412351168 +0100
-@@ -563,7 +563,7 @@
-   if (!ssl) out("\r\n250-STARTTLS");
- #endif //TLS
- 
--#ifdef TLS && TLS_BEFORE_AUTH 
-+#if defined(TLS) && defined(TLS_BEFORE_AUTH)
-   if(ssl) smtp_authout();
- #else // TLS && TLS_BEFORE_AUTH
-   smtp_authout();
-@@ -1019,7 +1019,7 @@
- {
-   int r;
- 
--#ifdef TLS && TLS_BEFORE_AUTH
-+#if defined(TLS) && defined(TLS_BEFORE_AUTH)
-   if (!ssl) return err_wantstarttls();
- #endif
-   if (*arg) {
-@@ -1046,7 +1046,7 @@
- {
-   int r, id = 0;
- 
--#ifdef TLS && TLS_BEFORE_AUTH
-+#if defined(TLS) && defined(TLS_BEFORE_AUTH)
-   if (!ssl) return err_wantstarttls();
- #endif
-   if (*arg) {
-@@ -1075,7 +1075,7 @@
-   int i, r;
-   char *s;
- 
--#ifdef TLS && TLS_BEFORE_AUTH
-+#if defined(TLS) && defined(TLS_BEFORE_AUTH)
-   if (!ssl) return err_wantstarttls();
- #endif
- 
diff --git a/mail-mta/qmail/files/1.03-r16/Makefile-relaymxlookup.patch b/mail-mta/qmail/files/1.03-r16/Makefile-relaymxlookup.patch
deleted file mode 100644
index 044e16c6ab60..000000000000
--- a/mail-mta/qmail/files/1.03-r16/Makefile-relaymxlookup.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- qmail-1.03.orig/Makefile	2005-01-06 15:49:11.587196496 +0100
-+++ qmail-1.03/Makefile	2005-01-06 16:16:17.527016072 +0100
-@@ -1436,11 +1450,12 @@
- load qmail-qmtpd.o rcpthosts.o control.o constmap.o received.o \
- date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a open.a \
- getln.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a \
--str.a fs.a auto_qmail.o
-+str.a fs.a auto_qmail.o dns.o ip.o ipalloc.o ipme.o byte_diff.o
- 	./load qmail-qmtpd rcpthosts.o control.o constmap.o \
- 	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
- 	datetime.a open.a getln.a sig.a case.a env.a stralloc.a \
--	alloc.a substdio.a error.a str.a fs.a auto_qmail.o 
-+	alloc.a substdio.a error.a fs.a auto_qmail.o dns.o \
-+	`cat dns.lib` ip.o ipalloc.o ipme.o byte_diff.o str.a
- 
- qmail-qmtpd.0: \
- qmail-qmtpd.8
-@@ -1603,14 +1618,14 @@
- timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
- date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
- open.a sig.a case.a env.a stralloc.a alloc.a strerr.a substdio.a error.a str.a \
--fs.a auto_qmail.o base64.o socket.lib
-+fs.a auto_qmail.o base64.o socket.lib dns.o ip.o ipalloc.o
- 	./load qmail-smtpd qregex.o rcpthosts.o commands.o timeoutread.o \
- 	timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
- 	tls.o ssl_timeoutio.o ndelay.a -L/usr/local/ssl/lib -lssl -lcrypto \
- 	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
- 	datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
--	alloc.a strerr.a substdio.a error.a str.a fs.a auto_qmail.o base64.o  `cat \
--	socket.lib`
-+	alloc.a strerr.a substdio.a error.a fs.a auto_qmail.o base64.o  `cat \
-+	socket.lib` dns.o str.a `cat dns.lib`
- 
- qmail-smtpd.0: \
- qmail-smtpd.8
-@@ -1746,7 +1761,7 @@
- 
- rcpthosts.o: \
- compile rcpthosts.c cdb.h uint32.h byte.h open.h error.h control.h \
--constmap.h stralloc.h gen_alloc.h rcpthosts.h
-+constmap.h stralloc.h gen_alloc.h rcpthosts.h dns.h ipalloc.h ipme.h
- 	./compile rcpthosts.c
- 
- qregex.o: \
diff --git a/mail-mta/qmail/files/1.03-r16/auth-after-tls-only.patch b/mail-mta/qmail/files/1.03-r16/auth-after-tls-only.patch
deleted file mode 100644
index 9d61824d3f8d..000000000000
--- a/mail-mta/qmail/files/1.03-r16/auth-after-tls-only.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --unidirectional-new-file -ur qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2005-01-06 00:42:51.960376640 +0100
-+++ qmail-1.03/qmail-smtpd.c	2005-01-06 00:53:58.174096760 +0100
-@@ -150,6 +150,7 @@
- int err_noauth() { out("504 auth type unimplemented (#5.5.1)\r\n"); return -1; }
- int err_authabrt() { out("501 auth exchange canceled (#5.0.0)\r\n"); return -1; }
- int err_input() { out("501 malformed auth input (#5.5.4)\r\n"); return -1; }
-+int err_wantstarttls() { out("530 Must issue a STARTTLS command first (#5.7.0)\r\n"); return -1; };
- void err_authfail() { out("535 authentication failed (#5.7.1)\r\n"); }
- 
- stralloc greeting = {0};
-@@ -494,6 +495,13 @@
-   seenmail = 0; dohelo(arg);
-   if (bhelook) flagbarfbhelo = bmcheck(BMCHECK_BHELO);
- }
-+void smtp_authout() {
-+#ifdef CRAM_MD5
-+  out("250-AUTH LOGIN PLAIN CRAM-MD5\r\n");
-+#else
-+  out("250-AUTH LOGIN PLAIN\r\n");
-+#endif
-+}
- /* ESMTP extensions are published here */
- void smtp_ehlo(arg) char *arg;
- {
-@@ -504,12 +512,12 @@
-   if (!ssl) out("\r\n250-STARTTLS");
- #endif
-   out("\r\n250-PIPELINING\r\n250-8BITMIME\r\n");
--  out("250-SIZE "); out(size); out("\r\n");
--#ifdef CRAM_MD5
--  out("250 AUTH LOGIN PLAIN CRAM-MD5\r\n");
-+#if defined(TLS) && defined(TLS_BEFORE_AUTH)
-+  if(ssl) smtp_authout();
- #else
--  out("250 AUTH LOGIN PLAIN\r\n");
-+  smtp_authout();
- #endif
-+  out("250 SIZE "); out(size); out("\r\n");
-   seenmail = 0; dohelo(arg);
-   if (bhelook) flagbarfbhelo = bmcheck(BMCHECK_BHELO);
- }
-@@ -796,6 +804,9 @@
- {
-   int r;
- 
-+#if defined(TLS) && defined(TLS_BEFORE_AUTH)
-+  if (!ssl) return err_wantstarttls();
-+#endif
-   if (*arg) {
-     if (r = b64decode(arg,str_len(arg),&user) == 1) return err_input();
-   }
-@@ -820,6 +831,9 @@
- {
-   int r, id = 0;
- 
-+#if defined(TLS) && defined(TLS_BEFORE_AUTH)
-+  if (!ssl) return err_wantstarttls();
-+#endif
-   if (*arg) {
-     if (r = b64decode(arg,str_len(arg),&resp) == 1) return err_input();
-   }
-@@ -846,6 +860,10 @@
-   int i, r;
-   char *s;
- 
-+#if defined(TLS) && defined(TLS_BEFORE_AUTH)
-+  if (!ssl) return err_wantstarttls();
-+#endif
-+
-   s = unique;                                           /* generate challenge */
-   s += fmt_uint(s,getpid());
-   *s++ = '.';
diff --git a/mail-mta/qmail/files/1.03-r16/double-bounce-trim.patch b/mail-mta/qmail/files/1.03-r16/double-bounce-trim.patch
deleted file mode 100644
index ad434bb150e2..000000000000
--- a/mail-mta/qmail/files/1.03-r16/double-bounce-trim.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-If you don't want doublebounces to hit your queue a second time
-(because you have, say, ten million mailboxes and as much legitimate
-email traffic and more spam), the following patch will immediately
-discard bouncing bounces.  Note that doublebounceto must start with a
-blank line; that is, it must have one newline in it.  A totally empty
-file means "use the default of 'posthamster'".
-
-This version was rewritten by Charles Cazabon from my original patch
-to include a man page, turn the patch around in the right direction,
-and emit its own message for the logfile.
-
-Apply this patch as so:
-
-cd /usr/local/src/qmail-1.03
-patch <doublebounce-trim.patch
-
-diff -urN qmail-1.03.orig/qmail-send.9 qmail-1.03.nodoublebounce/qmail-send.9
---- qmail-1.03.orig/qmail-send.9        Mon Jun 15 04:53:16 1998
-+++ qmail-1.03.nodoublebounce/qmail-send.9      Tue Sep  9 12:59:04 2003
-@@ -115,6 +115,10 @@
- (If that bounces,
- .B qmail-send
- gives up.)
-+As a special case, if the first line of
-+.IR doublebounceto
-+is blank (contains a single linefeed), qmail-send will not queue
-+the double-bounce at all.
- .TP 5
- .I envnoathost
- Presumed domain name for addresses without @ signs.
-diff -urN qmail-1.03.orig/qmail-send.c qmail-1.03.nodoublebounce/qmail-send.c
---- qmail-1.03.orig/qmail-send.c        Mon Jun 15 04:53:16 1998
-+++ qmail-1.03.nodoublebounce/qmail-send.c      Tue Sep  9 13:02:43 2003
-@@ -683,6 +683,8 @@
-   }
-  if (str_equal(sender.s,"#@[]"))
-    log3("triple bounce: discarding ",fn2.s,"\n");
-+ else if (!*sender.s && *doublebounceto.s == '@')
-+   log3("double bounce: discarding ",fn2.s,"\n");
-  else
-   {
-    if (qmail_open(&qqt) == -1)
-
---9jxsPFA5p3P2qPhR--
diff --git a/mail-mta/qmail/files/1.03-r16/famd-dnotify.patch b/mail-mta/qmail/files/1.03-r16/famd-dnotify.patch
deleted file mode 100644
index e967c68a61eb..000000000000
--- a/mail-mta/qmail/files/1.03-r16/famd-dnotify.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- qmail-1.03.orig/qmail-local.c	2005-01-07 23:04:13.890397800 +0100
-+++ qmail-1.03/qmail-local.c	2005-01-07 23:05:59.023415152 +0100
-@@ -139,8 +139,9 @@
-  if (close(fd) == -1) goto fail; /* NFS dorks */
- 
-  if (link(fntmptph,fnnewtph) == -1) goto fail;
-- if ((fd = open(fnnewtph, O_RDONLY)) < 0 ||
--     fsync(fd) < 0 || close(fd) < 0) goto fail;
-+ if ((fd = open(fnnewtph, O_RDONLY)) >= 0) {
-+  if (fsync(fd) < 0 || close(fd) < 0) goto fail;
-+ }
-    
-    /* if it was error_exist, almost certainly successful; i hate NFS */
-  tryunlinktmp(); _exit(0);
diff --git a/mail-mta/qmail/files/1.03-r16/fix-manpages.patch b/mail-mta/qmail/files/1.03-r16/fix-manpages.patch
deleted file mode 100644
index 8dcbb6e63e95..000000000000
--- a/mail-mta/qmail/files/1.03-r16/fix-manpages.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -ur qmail-1.03.orig/FILES qmail-1.03/FILES
---- qmail-1.03.orig/FILES	2005-09-12 23:40:59.000000000 +0200
-+++ qmail-1.03/FILES	2005-09-12 23:41:21.000000000 +0200
-@@ -66,7 +66,7 @@
- maildirmake.1
- maildirwatch.1
- mailsubj.1
--mbox.5
-+qmail-mbox.5
- preline.1
- qbiff.1
- qmail-clean.8
-@@ -428,6 +428,5 @@
- maildir.5
- maildir.h
- maildir.c
--tcp-environ.5
- constmap.h
- constmap.c
-diff -ur qmail-1.03.orig/maildir.5 qmail-1.03/maildir.5
---- qmail-1.03.orig/maildir.5	2005-09-12 23:40:59.000000000 +0200
-+++ qmail-1.03/maildir.5	2005-09-12 23:41:07.000000000 +0200
-@@ -235,5 +235,5 @@
- environment variable
- as the name of the user's primary mail directory.
- .SH "SEE ALSO"
--mbox(5),
-+qmail-mbox(5),
- qmail-local(8)
-diff -ur qmail-1.03.orig/Makefile qmail-1.03/Makefile
---- qmail-1.03.orig/Makefile	2005-09-12 23:40:59.000000000 +0200
-+++ qmail-1.03/Makefile	2005-09-12 23:41:53.000000000 +0200
-@@ -984,12 +984,12 @@
- preline.0 condredirect.0 bouncesaying.0 except.0 maildirmake.0 \
- maildir2mbox.0 maildirwatch.0 qmail.0 qmail-limits.0 qmail-log.0 \
- qmail-control.0 qmail-header.0 qmail-users.0 dot-qmail.0 \
--qmail-command.0 tcp-environ.0 maildir.0 mbox.0 addresses.0 \
-+qmail-command.0 maildir.0 qmail-mbox.0 addresses.0 \
- envelopes.0 forgeries.0
- 
--mbox.0: \
--mbox.5
--	nroff -man mbox.5 > mbox.0
-+qmail-mbox.0: \
-+qmail-mbox.5
-+	nroff -man qmail-mbox.5 > qmail-mbox.0
- 
- myctime.o: \
- compile myctime.c datetime.h fmt.h myctime.h
-@@ -1852,7 +1852,7 @@
- auto_patrn.h conf-users conf-groups auto_uids.h auto_usera.h extra.h \
- addresses.5 except.1 bouncesaying.1 condredirect.1 dot-qmail.9 \
- envelopes.5 forgeries.7 forward.1 maildir2mbox.1 maildirmake.1 \
--maildirwatch.1 mailsubj.1 mbox.5 preline.1 qbiff.1 qmail-clean.8 \
-+maildirwatch.1 mailsubj.1 qmail-mbox.5 preline.1 qbiff.1 qmail-clean.8 \
- qmail-command.8 qmail-control.9 qmail-getpw.9 qmail-header.5 \
- qmail-inject.8 qmail-limits.9 qmail-local.8 qmail-log.5 \
- qmail-lspawn.8 qmail-newmrh.9 qmail-newu.9 qmail-pop3d.8 \
-@@ -1915,7 +1915,7 @@
- ipalloc.h ipalloc.c select.h1 select.h2 trysysel.c ndelay.h ndelay.c \
- ndelay_off.c direntry.3 direntry.h1 direntry.h2 trydrent.c prot.h \
- prot.c chkshsgr.c warn-shsgr tryshsgr.c ipme.h ipme.c trysalen.c \
--maildir.5 maildir.h maildir.c tcp-environ.5 constmap.h constmap.c \
-+maildir.5 maildir.h maildir.c constmap.h constmap.c \
- update_tmprsadh
- 	shar -m `cat FILES` > shar
- 	chmod 400 shar
-@@ -2171,10 +2171,6 @@
- scan.h subgetopt.h ip.h dns.h byte.h remoteinfo.h exit.h case.h
- 	./compile tcp-env.c
- 
--tcp-environ.0: \
--tcp-environ.5
--	nroff -man tcp-environ.5 > tcp-environ.0
--
- tcpto.o: \
- compile tcpto.c tcpto.h open.h lock.h seek.h now.h datetime.h ip.h \
- byte.h datetime.h readwrite.h
-diff -ur qmail-1.03.orig/preline.1 qmail-1.03/preline.1
---- qmail-1.03.orig/preline.1	2005-09-12 23:40:59.000000000 +0200
-+++ qmail-1.03/preline.1	2005-09-12 23:41:07.000000000 +0200
-@@ -53,5 +53,5 @@
- .B Return-Path
- line.
- .SH "SEE ALSO"
--mbox(5),
-+qmail-mbox(5),
- qmail-command(8)
-diff -ur qmail-1.03.orig/qmail-mbox.5 qmail-1.03/qmail-mbox.5
---- qmail-1.03.orig/qmail-mbox.5	2005-09-12 23:40:59.000000000 +0200
-+++ qmail-1.03/qmail-mbox.5	2005-09-12 23:41:07.000000000 +0200
-@@ -1,4 +1,4 @@
--.TH mbox 5
-+.TH qmail-mbox 5
- .SH "NAME"
- mbox \- file containing mail messages
- .SH "INTRODUCTION"
-diff -ur qmail-1.03.orig/TARGETS qmail-1.03/TARGETS
---- qmail-1.03.orig/TARGETS	2005-09-12 23:40:59.000000000 +0200
-+++ qmail-1.03/TARGETS	2005-09-12 23:41:33.000000000 +0200
-@@ -395,9 +395,8 @@
- dot-qmail.5
- dot-qmail.0
- qmail-command.0
--tcp-environ.0
- maildir.0
--mbox.0
-+qmail-mbox.0
- addresses.0
- envelopes.0
- forgeries.0
diff --git a/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch b/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch
deleted file mode 100644
index e141ddc1abf7..000000000000
--- a/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- qmail-1.03.orig/qmail-smtpd.c       2004-11-19 09:00:53.000000000 +0100
-+++ qmail-1.03/qmail-smtpd.c    2004-12-11 19:06:23.185045688 +0100
-@@ -1006,7 +1006,6 @@
-   if (!stralloc_0(&pass)) die_nomem();
-   if (!stralloc_0(&resp)) die_nomem();
-
--  if (fd_copy(2,1) == -1) return err_pipe();
-   //close(3);
-   if (pipe(pi) == -1) return err_pipe();
-   //if (pi[0] != 3) return err_pipe();
-@@ -1014,6 +1013,7 @@
-     case -1:
-       return err_fork();
-     case 0:
-+      if (fd_copy(2,1) == -1) _exit(1);
-       close(pi[1]);
-       if (pi[0] != 3) {
-         close(3);
diff --git a/mail-mta/qmail/files/1.03-r16/invalid-envelope-sender-log.patch b/mail-mta/qmail/files/1.03-r16/invalid-envelope-sender-log.patch
deleted file mode 100644
index e4657baf60e4..000000000000
--- a/mail-mta/qmail/files/1.03-r16/invalid-envelope-sender-log.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- qmail-smtpd.c.orig	2005-07-13 12:42:16.998697299 +0200
-+++ qmail-smtpd.c	2005-07-13 12:42:35.393412418 +0200
-@@ -621,7 +621,9 @@
-   }
- 
-   switch(mfcheck()) {
--    case DNS_HARD: err_hmf(); return;
-+    case DNS_HARD:
-+        strerr_warn4("qmail-smtpd: invalid envelope sender: <",addr.s,"> at ",remoteip,0);
-+        err_hmf(); return;
-     case DNS_SOFT: err_smf(); return;
-     case DNS_MEM: die_nomem();
-   }
diff --git a/mail-mta/qmail/files/1.03-r16/nullenvsender-recipcount.tls.patch b/mail-mta/qmail/files/1.03-r16/nullenvsender-recipcount.tls.patch
deleted file mode 100644
index 56406de21e88..000000000000
--- a/mail-mta/qmail/files/1.03-r16/nullenvsender-recipcount.tls.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --unidirectional-new-file -ur qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2005-01-06 01:22:13.841316160 +0100
-+++ qmail-1.03/qmail-smtpd.c	2005-01-06 01:25:34.862756256 +0100
-@@ -132,6 +132,7 @@
-   out(" (#5.7.1)\r\n");
- }
- #endif
-+void err_badbounce() { out("550 sorry, bounce messages should have a single envelope recipient (#5.7.1)\r\n"); }
- void err_unimpl() { out("502 unimplemented (#5.5.1)\r\n"); }
- void err_syntax() { out("555 syntax error (#5.5.4)\r\n"); }
- void err_relay() { out("553 we don't relay (#5.7.1)\r\n"); }
-@@ -429,6 +430,7 @@
- stralloc rcptto = {0};
- stralloc fuser = {0};
- stralloc mfparms = {0};
-+int recipcount;
- 
- int mailfrom_size(arg) char *arg;
- {
-@@ -541,6 +543,7 @@
-   if (!stralloc_copys(&rcptto,"")) die_nomem();
-   if (!stralloc_copys(&mailfrom,addr.s)) die_nomem();
-   if (!stralloc_0(&mailfrom)) die_nomem();
-+  recipcount = 0;
-   out("250 ok\r\n");
- }
- void smtp_rcpt(arg) char *arg; {
-@@ -580,6 +583,7 @@
-   if (!stralloc_cats(&rcptto,"T")) die_nomem();
-   if (!stralloc_cats(&rcptto,addr.s)) die_nomem();
-   if (!stralloc_0(&rcptto)) die_nomem();
-+  recipcount++;
-   out("250 ok\r\n");
- }
- 
-@@ -696,6 +700,7 @@
-  
-   if (!seenmail) { err_wantmail(); return; }
-   if (!rcptto.len) { err_wantrcpt(); return; }
-+  if (mailfrom.len == 1 && recipcount > 1) { err_badbounce(); return; }
-   if (flagbrt) { err_brt(); return; }
-   seenmail = 0;
-   if (databytes) bytestooverflow = databytes + 1;
diff --git a/mail-mta/qmail/files/1.03-r16/qmail-1.03-accept-5xx.tls.patch b/mail-mta/qmail/files/1.03-r16/qmail-1.03-accept-5xx.tls.patch
deleted file mode 100644
index 212cab39ba11..000000000000
--- a/mail-mta/qmail/files/1.03-r16/qmail-1.03-accept-5xx.tls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --unidirectional-new-file -ur qmail-1.03.orig/qmail-remote.c qmail-1.03/qmail-remote.c
---- qmail-1.03.orig/qmail-remote.c	2005-01-06 01:17:21.706727368 +0100
-+++ qmail-1.03/qmail-remote.c	2005-01-06 01:18:45.802942800 +0100
-@@ -553,7 +553,9 @@
-   if (!smtps)
- #endif
-  
--  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-+  code = smtpcode();
-+  if (code >= 500) quit("DConnected to "," but greeting failed");
-+  if (code != 220) quit("ZConnected to "," but greeting failed");
-  
- #ifdef EHLO
- # ifdef TLS
-@@ -580,7 +582,9 @@
-   substdio_put(&smtpto,helohost.s,helohost.len);
-   substdio_puts(&smtpto,"\r\n");
-   substdio_flush(&smtpto);
--  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-+  code = smtpcode();
-+  if (code >= 500) quit("DConnected to "," but my name was rejected");
-+  if (code != 250) quit("ZConnected to "," but my name was rejected");
-  
- #ifdef EHLO
-   }
diff --git a/mail-mta/qmail/files/1.03-r16/qmail-1.03-env-servercert.patch b/mail-mta/qmail/files/1.03-r16/qmail-1.03-env-servercert.patch
deleted file mode 100644
index 132992b332e4..000000000000
--- a/mail-mta/qmail/files/1.03-r16/qmail-1.03-env-servercert.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nru qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2005-06-06 00:32:59.000000000 +0300
-+++ qmail-1.03/qmail-smtpd.c	2005-06-06 08:18:58.051312616 +0300
-@@ -1314,6 +1314,11 @@
-   stralloc saciphers = {0};
-   X509_STORE *store;
-   X509_LOOKUP *lookup;
-+  const char *servercert;
-+
-+  /* if set, use servercert selected through SMTP_SERVERCERT env var */
-+  servercert = env_get("SMTP_SERVERCERT");
-+  if (!servercert) servercert = SERVERCERT;
- 
-   SSL_library_init();
- 
-@@ -1321,7 +1326,7 @@
-   ctx = SSL_CTX_new(SSLv23_server_method());
-   if (!ctx) { tls_err("unable to initialize ctx"); return; }
- 
--  if (!SSL_CTX_use_certificate_chain_file(ctx, SERVERCERT))
-+  if (!SSL_CTX_use_certificate_chain_file(ctx, servercert))
-     { SSL_CTX_free(ctx); tls_err("missing certificate"); return; }
-   SSL_CTX_load_verify_locations(ctx, CLIENTCA, NULL);
- 
-@@ -1343,7 +1348,7 @@
-   if (!myssl) { tls_err("unable to initialize ssl"); return; }
- 
-   /* this will also check whether public and private keys match */
--  if (!SSL_use_RSAPrivateKey_file(myssl, SERVERCERT, SSL_FILETYPE_PEM))
-+  if (!SSL_use_RSAPrivateKey_file(myssl, servercert, SSL_FILETYPE_PEM))
-     { SSL_free(myssl); tls_err("no valid RSA private key"); return; }
- 
-   ciphers = env_get("TLSCIPHERS");
diff --git a/mail-mta/qmail/files/1.03-r16/qmail-logmail.patch b/mail-mta/qmail/files/1.03-r16/qmail-logmail.patch
deleted file mode 100644
index 2bf83808f73c..000000000000
--- a/mail-mta/qmail/files/1.03-r16/qmail-logmail.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- extra.h.orig	2005-05-01 13:47:56.569619968 +0200
-+++ extra.h	2005-05-01 13:48:03.214609776 +0200
-@@ -1,7 +1,7 @@
- #ifndef EXTRA_H
- #define EXTRA_H
- 
--#define QUEUE_EXTRA ""
--#define QUEUE_EXTRALEN 0
-+#define QUEUE_EXTRA "Tlog\0"
-+#define QUEUE_EXTRALEN 5
- 
- #endif
diff --git a/mail-mta/qmail/files/1.03-r16/qmail-remote-auth-log-fix.patch b/mail-mta/qmail/files/1.03-r16/qmail-remote-auth-log-fix.patch
deleted file mode 100644
index 5d54021d6abd..000000000000
--- a/mail-mta/qmail/files/1.03-r16/qmail-remote-auth-log-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qmail-remote.c.orig	2005-08-12 22:04:43.000000000 +0200
-+++ qmail-remote.c	2005-08-12 22:09:01.000000000 +0200
-@@ -638,6 +638,8 @@
-       substdio_put(&smtpto,sender.s,sender.len);
-       substdio_puts(&smtpto,">\r\n");
-       substdio_flush(&smtpto);
-+	  if(!stralloc_copys(&auth_status, "Delivered with authenticated connection to \n")) temp_nomem();
-+	  if(!stralloc_0(&auth_status)) temp_nomem();
-     } else {
-       no_supported_auth();
-       mail_without_auth();
diff --git a/mail-mta/qmail/files/1.03-r16/qmail-smtpd-relay-reject.gentoo.patch b/mail-mta/qmail/files/1.03-r16/qmail-smtpd-relay-reject.gentoo.patch
deleted file mode 100644
index 2ef8612e229c..000000000000
--- a/mail-mta/qmail/files/1.03-r16/qmail-smtpd-relay-reject.gentoo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- qmail-1.03.orig/qmail-smtpd.c	2005-01-05 23:08:02.724271992 +0100
-+++ qmail-1.03/qmail-smtpd.c	2005-01-05 23:09:00.374507824 +0100
-@@ -94,6 +94,7 @@
- #endif
- void err_unimpl() { out("502 unimplemented (#5.5.1)\r\n"); }
- void err_syntax() { out("555 syntax error (#5.5.4)\r\n"); }
-+void err_relay() { out("553 we don't relay (#5.7.1)\r\n"); }
- void err_wantmail() { out("503 MAIL first (#5.5.1)\r\n"); }
- void err_wantrcpt() { out("503 RCPT first (#5.5.1)\r\n"); }
- void err_noop() { out("250 ok\r\n"); }
-@@ -331,6 +332,20 @@
-   return r;
- }
- 
-+int addrrelay()
-+{
-+  int j;
-+  j = addr.len;
-+  while(--j >= 0)
-+    if (addr.s[j] == '@') break;
-+  if (j < 0) j = addr.len;
-+  while(--j >= 0) {
-+    if (addr.s[j] == '@') return 1;
-+    if (addr.s[j] == '%') return 1;
-+    if (addr.s[j] == '!') return 1;
-+  }
-+  return 0;
-+}
- 
- int seenmail = 0;
- int flagbarfbmf; /* defined if seenmail */
-@@ -451,6 +466,7 @@
- void smtp_rcpt(arg) char *arg; {
-   if (!seenmail) { err_wantmail(); return; }
-   if (!addrparse(arg)) { err_syntax(); return; }
-+  if (addrrelay()) { err_relay(); return; }
-   if (flagbarfbhelo) {
-     strerr_warn4("qmail-smtpd: badhelo: <",helohost.s,"> at ",remoteip,0);
-     err_bhelo();
diff --git a/mail-mta/qmail/files/1.03-r16/smtpplugins b/mail-mta/qmail/files/1.03-r16/smtpplugins
deleted file mode 100644
index db9df2647515..000000000000
--- a/mail-mta/qmail/files/1.03-r16/smtpplugins
+++ /dev/null
@@ -1,27 +0,0 @@
-# smtpplugins sample file
-# none of these plugins is installed by default
-# Paths are relative to the qmail home dir.
-# #f you want your plugin to be executed by system shell, add ':' just before
-# plugin path. this is slightly slower than normal mode.
-#
-# you may disable qmail-spp by setting NOSPP environmental variable - for
-# example using tcprules
-#
-# see http://qmail-spp.sourceforge.net/doc/
-
-[auth]
-#plugins/onlycrammd5
-
-[helo]
-#:plugins/badhelo example.com spammers.com
-
-[mail]
-#:plugins/rbl relays.ordb.org
-#plugins/blacklisted
-#plugins/spf
-#plugins/dnsmx-check
-
-[rcpt]
-#plugins/exists
-#plugins/tarpit
-
diff --git a/mail-mta/qmail/files/1.03-r16/starttls-recordio.patch b/mail-mta/qmail/files/1.03-r16/starttls-recordio.patch
deleted file mode 100644
index 6fcc228f87cd..000000000000
--- a/mail-mta/qmail/files/1.03-r16/starttls-recordio.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- qmail-smtpd.c.bak	2004-10-17 19:44:53.659697177 +0200
-+++ qmail-smtpd.c	2004-10-17 19:46:21.040994357 +0200
-@@ -806,7 +806,8 @@
-   out("220 ready for tls\r\n"); flush();
- 
-   if(!(ssl=SSL_new(ctx))) die_read();
--  SSL_set_fd(ssl,0);
-+  SSL_set_rfd(ssl,0);
-+  SSL_set_wfd(ssl,1);
-   if(SSL_accept(ssl)<=0) die_read();
-   substdio_fdbuf(&ssout,SSL_write,ssl,ssoutbuf,sizeof(ssoutbuf));
- 
diff --git a/mail-mta/qmail/files/1.03-r16/tls-fix.patch b/mail-mta/qmail/files/1.03-r16/tls-fix.patch
deleted file mode 100644
index 6a9a430652cc..000000000000
--- a/mail-mta/qmail/files/1.03-r16/tls-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- tls.c.orig	2006-09-05 21:45:09.000000000 +0200
-+++ tls.c	2006-09-05 21:45:17.000000000 +0200
-@@ -2,6 +2,7 @@
- #include "error.h"
- #include <openssl/ssl.h>
- #include <openssl/err.h>
-+#include <string.h>
- 
- int smtps = 0;
- SSL *ssl = NULL;
-@@ -9,7 +10,6 @@
- void ssl_free(SSL *myssl) { SSL_shutdown(myssl); SSL_free(myssl); }
- void ssl_exit(int status) { if (ssl) ssl_free(ssl); _exit(status); }
- 
--const char *strerror(int);
- const char *ssl_error()
- {
-   int r = ERR_get_error();
diff --git a/mail-mta/qmail/files/1.03-r16/virtual-domain-outgoing-IP-address.patch b/mail-mta/qmail/files/1.03-r16/virtual-domain-outgoing-IP-address.patch
deleted file mode 100644
index f1c3d13f8adc..000000000000
--- a/mail-mta/qmail/files/1.03-r16/virtual-domain-outgoing-IP-address.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -u -r qmail-1.03.orig/qmail-qmqpc.c qmail-1.03/qmail-qmqpc.c
---- qmail-1.03.orig/qmail-qmqpc.c	2005-07-19 22:25:48.000000000 +0200
-+++ qmail-1.03/qmail-qmqpc.c	2005-07-19 22:34:27.000000000 +0200
-@@ -109,7 +109,7 @@
-   qmqpfd = socket(AF_INET,SOCK_STREAM,0);
-   if (qmqpfd == -1) die_socket();
- 
--  if (timeoutconn(qmqpfd,&ip,PORT_QMQP,10) != 0) {
-+  if (timeoutconn(qmqpfd,&ip,(struct ip_address*)0,PORT_QMQP,10) != 0) {
-     lasterror = 73;
-     if (errno == error_timeout) lasterror = 72;
-     close(qmqpfd);
-diff -u -r qmail-1.03.orig/qmail-remote.c qmail-1.03/qmail-remote.c
---- qmail-1.03.orig/qmail-remote.c	2005-07-19 22:25:48.000000000 +0200
-+++ qmail-1.03/qmail-remote.c	2005-07-20 14:51:20.000000000 +0200
-@@ -52,6 +52,9 @@
- stralloc auth_b64_pass = {0};
- stralloc auth_status = {0};
- 
-+stralloc smtphost = {0};
-+ipalloc smtpip = {0};
-+
- saa reciplist = {0};
- 
- struct ip_address partner;
-@@ -904,6 +907,20 @@
-  
-   if (!saa_readyplus(&reciplist,0)) temp_nomem();
-   if (ipme_init() != 1) temp_oserr();
-+  
-+  // 'canonhost' now should contain the canonical name of the sender's host.
-+  // Most of the time this is a local domain name, but sometimes the domain
-+  // name of a forwarded email.
-+  if(!stralloc_copy(&smtphost, &canonhost)) temp_nomem();
-+  dns_ip(&smtpip, &smtphost);
-+
-+  // Check if the obtained SMTP IP address is one of the addresses
-+  // on this machine. If it is, set 'helohost' to 'smtphost'.
-+  if(smtpip.len > 0 && ipme_is(&smtpip.ix->ip)) {
-+    stralloc_copy(&helohost, &smtphost);
-+  }else{
-+    byte_zero(smtpip.ix->ip.d, sizeof(smtpip.ix->ip.d));
-+  }
-  
-   flagallaliases = 1;
-   recips = argv + 3;
-@@ -951,7 +968,7 @@
-     if (smtpfd == -1) temp_oserr();
-  
-     if (qmtp_priority(ip.ix[i].pref)) {
--      if (timeoutconn(smtpfd,&ip.ix[i].ip,(unsigned int) qmtp_port,timeoutconnect) == 0) {
-+      if (timeoutconn(smtpfd,&ip.ix[i].ip,&smtpip.ix->ip,(unsigned int) qmtp_port,timeoutconnect) == 0) {
- 	tcpto_err(&ip.ix[i].ip,0);
- 	partner = ip.ix[i].ip;
- 	qmtp(); /* does not return */
-@@ -960,7 +977,7 @@
-       smtpfd = socket(AF_INET,SOCK_STREAM,0);
-       if (smtpfd == -1) temp_oserr();
-     }
--    if (timeoutconn(smtpfd,&ip.ix[i].ip,(unsigned int) smtp_port,timeoutconnect) == 0) {
-+    if (timeoutconn(smtpfd,&ip.ix[i].ip,&smtpip.ix->ip,(unsigned int) smtp_port,timeoutconnect) == 0) {
-       tcpto_err(&ip.ix[i].ip,0);
-       partner = ip.ix[i].ip;
- #ifdef TLS
-diff -u -r qmail-1.03.orig/remoteinfo.c qmail-1.03/remoteinfo.c
---- qmail-1.03.orig/remoteinfo.c	2005-07-19 22:25:48.000000000 +0200
-+++ qmail-1.03/remoteinfo.c	2005-07-19 22:33:05.000000000 +0200
-@@ -49,7 +49,7 @@
-   byte_copy(&sin.sin_addr,4,ipl);
-   sin.sin_port = 0;
-   if (bind(s,(struct sockaddr *) &sin,sizeof(sin)) == -1) { close(s); return 0; }
--  if (timeoutconn(s,ipr,113,timeout) == -1) { close(s); return 0; }
-+  if (timeoutconn(s,ipr,ipl,113,timeout) == -1) { close(s); return 0; }
-   fcntl(s,F_SETFL,fcntl(s,F_GETFL,0) & ~O_NDELAY);
-  
-   len = 0;
-diff -u -r qmail-1.03.orig/timeoutconn.c qmail-1.03/timeoutconn.c
---- qmail-1.03.orig/timeoutconn.c	2005-07-19 22:25:48.000000000 +0200
-+++ qmail-1.03/timeoutconn.c	2005-07-20 14:27:50.000000000 +0200
-@@ -10,9 +10,10 @@
- #include "byte.h"
- #include "timeoutconn.h"
- 
--int timeoutconn(s,ip,port,timeout)
-+int timeoutconn(s,ip,localip,port,timeout)
- int s;
- struct ip_address *ip;
-+struct ip_address *localip;
- unsigned int port;
- int timeout;
- {
-@@ -22,6 +23,17 @@
-   fd_set wfds;
-   struct timeval tv;
-  
-+  // If 'smtpip' != 0.0.0.0 bind () it as outgoing SMTP IP address.
-+  if(localip && (localip->d[0] || localip->d[1] || localip->d[2] || localip->d[3])) {
-+    byte_zero(&sin, sizeof(sin));
-+    byte_copy(&sin.sin_addr.s_addr, 4, localip);
-+    sin.sin_family = AF_INET;
-+
-+    // Don't return if it doesn't work out. Otherwise, it would
-+    // fail if the user uses the moreipme functionality.
-+    bind(s, (struct sockaddr*)&sin, sizeof(sin));
-+  }
-+  
-   byte_zero(&sin,sizeof(sin));
-   byte_copy(&sin.sin_addr,4,ip);
-   x = (char *) &sin.sin_port;
diff --git a/mail-mta/qmail/files/99qmail b/mail-mta/qmail/files/99qmail
deleted file mode 100644
index d9d929e4892b..000000000000
--- a/mail-mta/qmail/files/99qmail
+++ /dev/null
@@ -1,4 +0,0 @@
-PATH="/var/qmail/bin"
-ROOTPATH="/var/qmail/bin"
-CONFIG_PROTECT="/var/qmail/control /var/qmail/alias"
-QMAIL_CONTROLDIR=/var/qmail/control
diff --git a/mail-mta/qmail/files/conf-common b/mail-mta/qmail/files/conf-common
deleted file mode 100644
index 6967de7783be..000000000000
--- a/mail-mta/qmail/files/conf-common
+++ /dev/null
@@ -1,57 +0,0 @@
-# Common Configuration file for all qmail daemons
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-common,v 1.3 2005/02/14 12:26:31 robbat2 Exp $
-
-# Qmail User IDS to run daemons as
-QMAILDUID=`id -u qmaild`
-NOFILESGID=`id -g qmaild`
-QMAILLUID=`id -u qmaill`
-
-# Qmail Control Dir (this is actually set in /etc/env.d/99qmail)
-#QMAIL_CONTROLDIR=/var/qmail/control
-
-# Host and port to listen on
-# We listen on the IPv4 local ip by default
-TCPSERVER_HOST=0.0.0.0
-TCPSERVER_PORT=${SERVICE}
-
-# you do not need to specify -x, -c, -u or -g in this variable as those are
-# added later
-TCPSERVER_OPTS="-p -v"
-
-#  This tells tcpserver where to file the rules cdb file
-[ -d /etc/tcprules.d/ ] && TCPSERVER_RULESCDB=/etc/tcprules.d/tcp.qmail-${SERVICE}.cdb
-[ ! -f "${TCPSERVER_RULESCDB}" ] && TCPSERVER_RULESCDB=/etc/tcp.${SERVICE}.cdb
-
-# we limit data and stack segments to 8mbytes, you may need to raise this if
-# you are using a filter in QMAILQUEUE
-SOFTLIMIT_OPTS="-m 16000000"
-
-# We don't have anything to set QMAILQUEUE to at the moment, so we leave it
-# alone Generally it is best to add this in your appropriate (usually SMTP) cdb
-# files /etc/tcp.*.cdb OR /etc/tcprules.d/tcp.qmail-*.cdb instead of on a
-# global basis, as otherwise outgoing mail will be checked (because qmail-queue
-# is used for most parts of qmail) You can also enable this per-server by just
-# placing it into the other configuration files by placing the line there
-# instead. Please note that the export part is important.
-#export QMAILQUEUE=""
-
-# tcpserver maximum concurrency, defaults to 40 in tcpserver
-# this controls the maximum number of incoming connections that it will accept
-[ -e ${QMAIL_CONTROLDIR}/concurrencyincoming ] && MAXCONN=$(<${QMAIL_CONTROLDIR}/concurrencyincoming) || MAXCONN=40
-
-# logging directives
-LOG_OPTS="t" # 't' is for timestamp
-LOG_MAXSIZE=2500000 # defalts to '99999' if empty
-LOG_MAXCOUNT=10 # defaults to '10' if empty
-
-# build LOG_OPTS from this
-[ -n "${LOG_MAXSIZE}" ] && LOG_OPTS="${LOG_OPTS} s${LOG_MAXSIZE}"
-[ -n "${LOG_MAXCOUNT}" ] && LOG_OPTS="${LOG_OPTS} n${LOG_MAXCOUNT}"
-
-# directory to log to
-LOG_DEST=/var/log/qmail/qmail-${SERVICE}d
-
-# BIG FAT WARNING:
-# If you disable this by uncommenting it you will turn _off_ the configuration
-# sanity check do so at your own risk!
-#QMAIL_DISABLE_SANITY_CHECK=1
diff --git a/mail-mta/qmail/files/conf-pop3d b/mail-mta/qmail/files/conf-pop3d
deleted file mode 100644
index f8af8220f08b..000000000000
--- a/mail-mta/qmail/files/conf-pop3d
+++ /dev/null
@@ -1,29 +0,0 @@
-# Configuration file for qmail-pop3d
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-pop3d,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
-
-# Stuff to run before tcpserver
-#QMAIL_TCPSERVER_PRE=""
-# Stuff to run before the authenticator
-#QMAIL_POP3_PREAUTH=""
-# Stuff to run after the user has authenticated successfully
-#QMAIL_POP3_POSTAUTH=""
-
-# this should contain the FQDN of your server
-# by default it pulls the value from qmail
-# which should be correct
-QMAIL_POP3_POP3HOST="$(<${QMAIL_CONTROLDIR}/me)"
-
-# If you want POP3 before SMTP, and you are using this POP3 daemon
-# uncomment the next two lines
-#QMAIL_TCPSERVER_PRE="${QMAIL_TCPSERVER_PRE} envdir /etc/relay-ctrl relay-ctrl-chdir"
-#QMAIL_POP3_POSTAUTH="${QMAIL_POP3_POSTAUTH} /usr/bin/relay-ctrl-allow"
-
-# This controls what password authentication tool POP3 uses
-# It must support DJB's checkpassword interface (http://cr.yp.to/checkpwd.html)
-QMAIL_POP3_CHECKPASSWORD="/bin/checkpassword"
-# cmd5checkpw only validates passwords from /etc/poppasswd
-#QMAIL_POP3_CHECKPASSWORD="/bin/cmd5checkpw"
-
-# The name of the maildir in each user's directory.
-# This should be the same thing that defaultdelivery points to
-QMAIL_MAILDIR=".maildir"
diff --git a/mail-mta/qmail/files/conf-qmqpd b/mail-mta/qmail/files/conf-qmqpd
deleted file mode 100644
index 5328c26caf3c..000000000000
--- a/mail-mta/qmail/files/conf-qmqpd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Configuration file for qmail-qmqpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-qmqpd,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
-
-# Stuff to run before tcpserver
-#QMAIL_TCPSERVER_PRE=""
-# Stuff to run qmail-qmqpd
-#QMAIL_QMQP_PRE=""
-# Stuff to after qmail-qmqpd
-#QMAIL_QMQP_POST=""
-
-# this turns off the IDENT grab attempt on connecting
-TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
-
-# I don't trust /etc/services to have obscure ports
-TCPSERVER_PORT=628
diff --git a/mail-mta/qmail/files/conf-qmtpd b/mail-mta/qmail/files/conf-qmtpd
deleted file mode 100644
index e8ebcd1790f4..000000000000
--- a/mail-mta/qmail/files/conf-qmtpd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration file for qmail-qmtpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-qmtpd,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
-
-# For more information on making your servers talk QMTP
-# see http://cr.yp.to/im/mxps.html
-
-# Stuff to run before tcpserver
-#QMAIL_TCPSERVER_PRE=""
-# Stuff to run qmail-qmtpd
-#QMAIL_QMTP_PRE=""
-# Stuff to after qmail-qmtpd
-#QMAIL_QMTP_POST=""
-
-# this turns off the IDENT grab attempt on connecting
-TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
-
-# I don't trust /etc/services to have obscure ports
-TCPSERVER_PORT=209
diff --git a/mail-mta/qmail/files/conf-send b/mail-mta/qmail/files/conf-send
deleted file mode 100644
index d35f782f10d3..000000000000
--- a/mail-mta/qmail/files/conf-send
+++ /dev/null
@@ -1,6 +0,0 @@
-# Configuration file for qmail-send
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-send,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
-
-# directory to log to
-# override conf-common on this
-LOG_DEST=/var/log/qmail/qmail-send
diff --git a/mail-mta/qmail/files/conf-smtpd b/mail-mta/qmail/files/conf-smtpd
deleted file mode 100644
index 446334d737dc..000000000000
--- a/mail-mta/qmail/files/conf-smtpd
+++ /dev/null
@@ -1,43 +0,0 @@
-# Configuration file for qmail-smtpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-smtpd,v 1.4 2005/01/28 08:15:18 hansmi Exp $
-
-# Stuff to run before tcpserver
-#QMAIL_TCPSERVER_PRE=""
-# Stuff to run qmail-smtpd
-#QMAIL_SMTP_PRE=""
-# Stuff to after qmail-smtpd
-#QMAIL_SMTP_POST=""
-
-# this turns off the IDENT grab attempt on connecting
-TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
-
-# fixcrio inserts missing CRs at the ends of lines. See:
-# http://cr.yp.to/ucspi-tcp/fixcrio.html
-# http://cr.yp.to/docs/smtplf.html
-# DO NOT enable this, when you are using SSL/TLS (USE=ssl)!
-#QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} fixcrio"
-
-# You might want to use rblsmtpd with this, but you need to fill in a RBL server here first
-# see http://cr.yp.to/ucspi-tcp/rblsmtpd.html for more details
-#QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} rblsmtpd -r RBL-SERVER"
-
-# If you are interested in providing POP or IMAP before SMTP type relaying,
-# emerge relay-ctrl, then uncomment the next 2 lines
-#QMAIL_TCPSERVER_PRE="${QMAIL_TCPSERVER_PRE} envdir /etc/relay-ctrl relay-ctrl-chdir"
-#QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} relay-ctrl-check"
-# In /etc/courier-imap/authdaemonrc add the next line to the end:
-#authmodulelist="${authmodulelist} relay-ctrl-allow"
-# Then in /etc/courier-imap/{imapd,imapd-ssl,pop3d,pop3d-ssl}
-# Add this at the end
-#PRERUN="${PRERUN} envdir /etc/relay-ctrl relay-ctrl-chdir"
-
-# This next block is for SMTP-AUTH 
-# This provides the LOGIN, PLAIN and CRAM-MD5 types
-# the 'cmd5checkpw' used in $QMAIL_SMTP_AUTHCHECKPASSWORD supports CRAM-MD5
-# and reads it's data from /etc/poppasswd
-# see the manpage for cmd5checkpw for details on the passwords
-# uncomment the next four lines to enable SMTP-AUTH
-#QMAIL_SMTP_AUTHHOST=$(<${QMAIL_CONTROLDIR}/me)
-#[ -z "${QMAIL_SMTP_POST}" ] && QMAIL_SMTP_POST=/bin/true
-#QMAIL_SMTP_CHECKPASSWORD="/bin/cmd5checkpw"
-#QMAIL_SMTP_POST="${QMAIL_SMTP_AUTHHOST} ${QMAIL_SMTP_CHECKPASSWORD} ${QMAIL_SMTP_POST}"
diff --git a/mail-mta/qmail/files/conf-smtpd-r16 b/mail-mta/qmail/files/conf-smtpd-r16
deleted file mode 100644
index 5a4eba5211f3..000000000000
--- a/mail-mta/qmail/files/conf-smtpd-r16
+++ /dev/null
@@ -1,51 +0,0 @@
-# Configuration file for qmail-smtpd
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/conf-smtpd-r16,v 1.2 2005/08/14 11:01:44 hansmi Exp $
-
-# Stuff to run before tcpserver
-#QMAIL_TCPSERVER_PRE=""
-# Stuff to run qmail-smtpd
-#QMAIL_SMTP_PRE=""
-# Stuff to after qmail-smtpd
-#QMAIL_SMTP_POST=""
-
-# this turns off the IDENT grab attempt on connecting
-TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
-
-# fixcrio inserts missing CRs at the ends of lines. See:
-# http://cr.yp.to/ucspi-tcp/fixcrio.html
-# http://cr.yp.to/docs/smtplf.html
-# DO NOT enable this when you are using SSL/TLS (USE=ssl)!
-#QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} fixcrio"
-
-# You might want to use rblsmtpd with this, but you need to fill in a RBL
-# server here first, see http://cr.yp.to/ucspi-tcp/rblsmtpd.html for more
-# details
-#QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} rblsmtpd -r RBL-SERVER"
-
-# If you are interested in providing POP or IMAP before SMTP type relaying,
-# emerge relay-ctrl, then uncomment the next 2 lines
-#QMAIL_TCPSERVER_PRE="${QMAIL_TCPSERVER_PRE} envdir /etc/relay-ctrl relay-ctrl-chdir"
-#QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} relay-ctrl-check"
-# In /etc/courier-imap/authdaemonrc add the next line to the end:
-#authmodulelist="${authmodulelist} relay-ctrl-allow"
-# Then in /etc/courier-imap/{imapd,imapd-ssl,pop3d,pop3d-ssl}
-# Add this at the end
-#PRERUN="${PRERUN} envdir /etc/relay-ctrl relay-ctrl-chdir"
-
-# This next block is for SMTP-AUTH 
-
-# WARNING: If you've installed qmail with USE=noauthcram, and you want to use
-# the following programs, you proably need to install them.
-
-# Example using cmd5checkpw
-# See the manpage for cmd5checkpw for details on the passwords
-#QMAIL_SMTP_CHECKPASSWORD="/bin/cmd5checkpw"
-
-# Example for checkpassword-pam (emerge checkpassword-pam)
-# Don't forget to make /usr/bin/checkpassword-pam sticky (see README.auth)
-#QMAIL_SMTP_CHECKPASSWORD="/usr/bin/checkpassword-pam -s system-auth"
-
-[[ -n "${QMAIL_SMTP_CHECKPASSWORD}" ]] && {
-	[[ -z "${QMAIL_SMTP_POST}" ]] && QMAIL_SMTP_POST=/bin/true
-	QMAIL_SMTP_POST="${QMAIL_SMTP_CHECKPASSWORD} ${QMAIL_SMTP_POST}"
-}
diff --git a/mail-mta/qmail/files/config-sanity-check b/mail-mta/qmail/files/config-sanity-check
deleted file mode 100644
index 848d12a2b7c8..000000000000
--- a/mail-mta/qmail/files/config-sanity-check
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Configuration Sanity Checking for qmail
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/config-sanity-check,v 1.3 2005/01/10 00:17:34 robbat2 Exp $
-# This is intended solely to stop qmail eating up all your hard disk space with logs
-
-CONFIG_SANITY_GOOD=1
-
-# check simple stuff first
-if [ -z "${QMAILDUID}" -o -z "${NOFILESGID}" -o -z "${SERVICE}" -o -z "${QMAILLUID}" ]; then
-    echo "SERVICE(${SERVICE}), QMAILDUID(${QMAILDUID}), NOFILESGID(${NOFILESGID}) or QMAILLUID(${QMAILLUID}) is unset in $0"
-    CONFIG_SANITY_GOOD=0
-fi
-
-if [ -z "${LOG_OPTS}" -o -z "${LOG_DEST}" ]; then
-    echo "LOG_OPTS: ${LOG_OPTS}"
-    echo "LOG_DEST: ${LOG_DEST}"
-    echo "Error in logging setup!"
-    CONFIG_SANITY_GOOD=0
-fi
-
-if [ "${SERVICE}" = "smtp" -a ! -f ${QMAIL_CONTROLDIR}/rcpthosts -a -z "${QMAIL_DISABLE_SANITY_CHECK}" ]; then
-    echo "No /var/qmail/control/rcpthosts!"
-    echo "Refusing to start SMTP listener because it'll create an open relay"
-    CONFIG_SANITY_GOOD=0
-fi
-
-if [ "${SERVICE}" != "send" -a ! -f "${TCPSERVER_RULESCDB}" ]; then
-    echo "No CDB file found (${TCPSERVER_RULESCDB})"
-    CONFIG_SANITY_GOOD=0
-fi
-
-if [ ! "${CONFIG_SANITY_GOOD}" -eq "1" ]; then
-	echo "Some error detected in ${SERVICE}, sleeping for 90 seconds for safety"
-    sleep 90s
-    exit 1
-fi
-
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r15 b/mail-mta/qmail/files/digest-qmail-1.03-r15
deleted file mode 100644
index 01098d5a2504..000000000000
--- a/mail-mta/qmail/files/digest-qmail-1.03-r15
+++ /dev/null
@@ -1,75 +0,0 @@
-MD5 ad597c93426c0938fdb36d853fbcf40d 08-capa.diff 1323
-RMD160 f3cebee7fd74ea3f9ed5dd78513007d3d8463e89 08-capa.diff 1323
-SHA256 3e9e851ca40e4f51bec5471f4711660208f8919db97109d41be737abda407668 08-capa.diff 1323
-MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 9331
-RMD160 51dd7ac6cec884f402fbc7f4b78e2b11a903f73d big-concurrency.patch 9331
-SHA256 0322991955878e86af495f7317c3a4bd2e60640f9a6dd70ad501fff27242ac2f big-concurrency.patch 9331
-MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546
-RMD160 a16a429796d869b8217e42b7ddb607c95d9bbcd8 big-todo.103.patch 5546
-SHA256 afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72 big-todo.103.patch 5546
-MD5 68e7697fd61d7cd9a5a7dc88ce2ecd47 netscape-progress.patch 1457
-RMD160 d655cf381fd949e3da2e9613f38fcff987ed5ca6 netscape-progress.patch 1457
-SHA256 d91bead4dddbb33d7ae075a6ee8da883d97ee674eca92e225950429e7ca69d69 netscape-progress.patch 1457
-MD5 999e360e4b1571663b995ce51f6e056e qmail-1.03-0.0.0.0-0.2.patch 734
-RMD160 22f1e96684225b52ca99a86b13d5dfe21cd90240 qmail-1.03-0.0.0.0-0.2.patch 734
-SHA256 9de3e8b5d85441e6cb73ce6683fdd90feb29bd615b2f868b160f6f3b1c09f860 qmail-1.03-0.0.0.0-0.2.patch 734
-MD5 2bd191cca4e640e87cca79bc0405f97a qmail-1.03-moreipme-0.6pre1-gentoo.patch 13942
-RMD160 982fad816cada226b3e9e9bdc2f91d85932c9afd qmail-1.03-moreipme-0.6pre1-gentoo.patch 13942
-SHA256 822383a7e7178922ce1ebdfcf3c00e859f38c200caf6b24ce2c4c361d7057ca6 qmail-1.03-moreipme-0.6pre1-gentoo.patch 13942
-MD5 122664c38338e5ec35fcac43f33d6927 qmail-1.03-qmtpc.patch 6197
-RMD160 fd4b63b62ff56f805d1dd1eb1f3ff052ea628b43 qmail-1.03-qmtpc.patch 6197
-SHA256 f704b6c0ca3515a4bb488d14f7c94910aba4daa87420db6cd5b7ea19f17f7449 qmail-1.03-qmtpc.patch 6197
-MD5 d7151dcbeb02eea1c24c1dedffe20e0b qmail-1.03-reread-concurrency.2.patch 1129
-RMD160 1a69f593c6fc87dadd3f0b9bd62a218a3da2eeca qmail-1.03-reread-concurrency.2.patch 1129
-SHA256 1523c3313bcaae462329cd1515f143a3764ebd62fdd5b8b8696c4310b5c6dccb qmail-1.03-reread-concurrency.2.patch 1129
-MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
-RMD160 b851f273f1d365d38efd949b1efcf35768ffa30f qmail-1.03.tar.gz 220668
-SHA256 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88 qmail-1.03.tar.gz 220668
-MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104
-RMD160 437f8b3063438bbd82c59557333b3566214afa9c qmail-103.patch 2104
-SHA256 4cad53c7a6628a600c74c36bfee327db5052ca24c222d4013e4dfcd7f427653d qmail-103.patch 2104
-MD5 d566e8bd99b33efee0194e855b8d6995 qmail-date-localtime.patch.txt 2603
-RMD160 47c3ee3b7e85a3b75700810861be5eec32185935 qmail-date-localtime.patch.txt 2603
-SHA256 852aee7577edf8814c2429f82740da2a7e0b0b23516e10c4f3f7e845a47be2d5 qmail-date-localtime.patch.txt 2603
-MD5 fc00be3edc2827f1c93112d7d5147122 qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2 4524
-RMD160 5267361d7154abde63fb8aee6c5337cf67ef12e9 qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2 4524
-SHA256 0ae8c3be6cee6f3235f843e5d35c8086c221ec39901943247e7a1878e11b5227 qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2 4524
-MD5 00084ddd52a3665b65f2db20a773b382 qmail-hold-1.03.pat.gz 1596
-RMD160 d30f00a02383594a6ed74e7b7e7ec2ac157657dd qmail-hold-1.03.pat.gz 1596
-SHA256 8d829e19bb5309a08cb48a4e6135e159c1d7054b02b941ce8331c30e86056482 qmail-hold-1.03.pat.gz 1596
-MD5 1c4518f780d231bde9745cdd0fa313b2 qmail-limit-bounce-size.patch.txt 1753
-RMD160 a12cc5a7a0787270e47c3c52033eac9dbad55e8b qmail-limit-bounce-size.patch.txt 1753
-SHA256 efc453e2ddc2a3cecc964e592650ed7ad9546d719614eff8af05f7f85452cb0c qmail-limit-bounce-size.patch.txt 1753
-MD5 1d5b0aafb651ce2ad02aac6af80758c0 qmail-link-sync.patch 1403
-RMD160 2f19f8d6cb8d588221e4f1edeb66b6390f09f4cf qmail-link-sync.patch 1403
-SHA256 aa6261e00e5829938be0bd41e5ffe4c2d58720d785eaae4c0bf8fec8fc092a5d qmail-link-sync.patch 1403
-MD5 ed5c0ddb6a5cc0386b1e04ced71d26ad qmail-local-tabs.patch 505
-RMD160 e0583f136ade2919ecbc43b53db5314b93584a9e qmail-local-tabs.patch 505
-SHA256 9c7b9162d5e191f2e9fca13a3b2039ae56598e8c971eb740f90607eb37b55eb8 qmail-local-tabs.patch 505
-MD5 413be7bb5b407c2964c3275c4d596947 qmail-maildir++.patch 43512
-RMD160 78f993c11fa2e99113cb37f24bf3827314c03c79 qmail-maildir++.patch 43512
-SHA256 5cb2bc2b13e899db2aa471a98c8e6669085d862d61a1d668eb474d6f8b75b317 qmail-maildir++.patch 43512
-MD5 58d912de1ede57062fa8a3e2e0e75abf qmail-popupnofd2close.patch 401
-RMD160 6da0a2969451092e505a16e54a67b9ca17edcbaa qmail-popupnofd2close.patch 401
-SHA256 c2e8dbb2774d2e4cb849da71ee93de5af038c281ff1173c653b397244a5d943a qmail-popupnofd2close.patch 401
-MD5 d96455aaed208e9cd450d8874564781b qmail-relaymxlookup-0.3.diff 3856
-RMD160 747fcfe12472d99281e01ed5555b95207ee979d4 qmail-relaymxlookup-0.3.diff 3856
-SHA256 9f26932413cfbc0b86e69133682159cd1d187226f39ca51fb34ca4bab7a51ca7 qmail-relaymxlookup-0.3.diff 3856
-MD5 1d8b89607d35bfa409f8cfe6d23bc554 qmail-remote-auth-patch-doc.txt 1287
-RMD160 56377bb66a25ca8fcc780ec3c9c5bd0d03cb0076 qmail-remote-auth-patch-doc.txt 1287
-SHA256 610df197f4f19e7e6171d309d6f3d2cb3d35a5a921be732d181cba9ce3307905 qmail-remote-auth-patch-doc.txt 1287
-MD5 24fc1a33089faf12e00b127cd659f317 qmail-smtpd-relay-reject 1230
-RMD160 3a7e3ce34a457493895abc4e2d13317f9b35ec95 qmail-smtpd-relay-reject 1230
-SHA256 4f988af8fbc2829b1dd2b7d8cdca362b16cee7f27e020f6ca98d4cbdbd875fe9 qmail-smtpd-relay-reject 1230
-MD5 5a8d7a5863b0c56236af945dedd45754 qmailqueue-patch 2510
-RMD160 e43c14b5d8ac1a2736ce31087f662390204fe0b1 qmailqueue-patch 2510
-SHA256 52e82aaa34e9f1308b063cc986a701f67e161662e9f789bb12af03a381530f94 qmailqueue-patch 2510
-MD5 83bf5c4a4aade3c6c15faa9665ccfb71 qregex-starttls-2way-auth.patch 63825
-RMD160 254974b3ed9c79f8d224a965748854ed8adec491 qregex-starttls-2way-auth.patch 63825
-SHA256 d09b41e0dc76d06de7a913ba6a2ba0d7d1827d25e13b9ef354500c0b65340882 qregex-starttls-2way-auth.patch 63825
-MD5 4e1f2d8315e7e2a5482798c9d19fac4d sendmail-flagf.patch 863
-RMD160 8930f7c89937f9fd60b17cf355377bb9bcc8ea4e sendmail-flagf.patch 863
-SHA256 9b3951c22b98c0e5a6ebfa793f052d91dfe01d68a0ad8dc83b8e0bd60c01802e sendmail-flagf.patch 863
-MD5 598aca7a3a99426d1f49079172986b31 sendmail-ignore-N.patch 636
-RMD160 88fff7f434102f243bb40080a6a2ce4cd4557460 sendmail-ignore-N.patch 636
-SHA256 04528eaa1e5601d2585fb5deaa1662b92607e468ab10703069eaa167e8165233 sendmail-ignore-N.patch 636
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r16 b/mail-mta/qmail/files/digest-qmail-1.03-r16
deleted file mode 100644
index b7ecd795e16c..000000000000
--- a/mail-mta/qmail/files/digest-qmail-1.03-r16
+++ /dev/null
@@ -1,84 +0,0 @@
-MD5 ad597c93426c0938fdb36d853fbcf40d 08-capa.diff 1323
-RMD160 f3cebee7fd74ea3f9ed5dd78513007d3d8463e89 08-capa.diff 1323
-SHA256 3e9e851ca40e4f51bec5471f4711660208f8919db97109d41be737abda407668 08-capa.diff 1323
-MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 9331
-RMD160 51dd7ac6cec884f402fbc7f4b78e2b11a903f73d big-concurrency.patch 9331
-SHA256 0322991955878e86af495f7317c3a4bd2e60640f9a6dd70ad501fff27242ac2f big-concurrency.patch 9331
-MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546
-RMD160 a16a429796d869b8217e42b7ddb607c95d9bbcd8 big-todo.103.patch 5546
-SHA256 afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72 big-todo.103.patch 5546
-MD5 68e7697fd61d7cd9a5a7dc88ce2ecd47 netscape-progress.patch 1457
-RMD160 d655cf381fd949e3da2e9613f38fcff987ed5ca6 netscape-progress.patch 1457
-SHA256 d91bead4dddbb33d7ae075a6ee8da883d97ee674eca92e225950429e7ca69d69 netscape-progress.patch 1457
-MD5 999e360e4b1571663b995ce51f6e056e qmail-1.03-0.0.0.0-0.2.patch 734
-RMD160 22f1e96684225b52ca99a86b13d5dfe21cd90240 qmail-1.03-0.0.0.0-0.2.patch 734
-SHA256 9de3e8b5d85441e6cb73ce6683fdd90feb29bd615b2f868b160f6f3b1c09f860 qmail-1.03-0.0.0.0-0.2.patch 734
-MD5 2bd191cca4e640e87cca79bc0405f97a qmail-1.03-moreipme-0.6pre1-gentoo.patch 13942
-RMD160 982fad816cada226b3e9e9bdc2f91d85932c9afd qmail-1.03-moreipme-0.6pre1-gentoo.patch 13942
-SHA256 822383a7e7178922ce1ebdfcf3c00e859f38c200caf6b24ce2c4c361d7057ca6 qmail-1.03-moreipme-0.6pre1-gentoo.patch 13942
-MD5 122664c38338e5ec35fcac43f33d6927 qmail-1.03-qmtpc.patch 6197
-RMD160 fd4b63b62ff56f805d1dd1eb1f3ff052ea628b43 qmail-1.03-qmtpc.patch 6197
-SHA256 f704b6c0ca3515a4bb488d14f7c94910aba4daa87420db6cd5b7ea19f17f7449 qmail-1.03-qmtpc.patch 6197
-MD5 bd7d61ba21c1f1d3b134c2e8cfec81c5 qmail-1.03-r16-logrelay.diff 619
-RMD160 6d5867f3bc83bc2355ff2cd84a8f9f32b2810bb4 qmail-1.03-r16-logrelay.diff 619
-SHA256 04c006d98a0dec7f95f46aabd252dbd9f86a15e4baeee2e41c7dd5af375151d4 qmail-1.03-r16-logrelay.diff 619
-MD5 bcdb312cb6bb5f7ec41eb350a064e70b qmail-1.03-r16-mfcheck.diff 3192
-RMD160 a1c0baf33b38e446de9487acfd7da8f0ffef4cdb qmail-1.03-r16-mfcheck.diff 3192
-SHA256 0741205b0429324c69da3f3c62cc6d2c142357129214a3e2b00d46905c9a681c qmail-1.03-r16-mfcheck.diff 3192
-MD5 9b8c96c9636fe0fde3dbfbe092ee3e9b qmail-1.03-r16-spp.diff 34896
-RMD160 704160f4815c84a32a0b0ea875d409f9ced11f3c qmail-1.03-r16-spp.diff 34896
-SHA256 cbdd4dee64ce473e60387efaf1054f117eae7091ed2ebea6b263b46c381c5279 qmail-1.03-r16-spp.diff 34896
-MD5 d7151dcbeb02eea1c24c1dedffe20e0b qmail-1.03-reread-concurrency.2.patch 1129
-RMD160 1a69f593c6fc87dadd3f0b9bd62a218a3da2eeca qmail-1.03-reread-concurrency.2.patch 1129
-SHA256 1523c3313bcaae462329cd1515f143a3764ebd62fdd5b8b8696c4310b5c6dccb qmail-1.03-reread-concurrency.2.patch 1129
-MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
-RMD160 b851f273f1d365d38efd949b1efcf35768ffa30f qmail-1.03.tar.gz 220668
-SHA256 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88 qmail-1.03.tar.gz 220668
-MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104
-RMD160 437f8b3063438bbd82c59557333b3566214afa9c qmail-103.patch 2104
-SHA256 4cad53c7a6628a600c74c36bfee327db5052ca24c222d4013e4dfcd7f427653d qmail-103.patch 2104
-MD5 a6d05602399a51f6133c7ff19142b7c8 qmail-bounce-encap-20040210.patch 4238
-RMD160 cba729eef5b020132f704f5a67ec015b0ffc6f93 qmail-bounce-encap-20040210.patch 4238
-SHA256 a87f2dcb4d4c5991a34b6942f1945b99fc4d774438fda22ca51eafbe30785333 qmail-bounce-encap-20040210.patch 4238
-MD5 d566e8bd99b33efee0194e855b8d6995 qmail-date-localtime.patch.txt 2603
-RMD160 47c3ee3b7e85a3b75700810861be5eec32185935 qmail-date-localtime.patch.txt 2603
-SHA256 852aee7577edf8814c2429f82740da2a7e0b0b23516e10c4f3f7e845a47be2d5 qmail-date-localtime.patch.txt 2603
-MD5 750183fbd36b0fe7bf3e2edf9ec9ca2f qmail-gentoo-1.03-r16-badrcptto-morebadrcptto-accdias.diff.bz2 4736
-RMD160 9ef87b097278b440c2e441938ce104dfc12bba2a qmail-gentoo-1.03-r16-badrcptto-morebadrcptto-accdias.diff.bz2 4736
-SHA256 75e0162149e7db91d405d86007f62b1d8a0b7f5c577fcc31c5b363f513e53173 qmail-gentoo-1.03-r16-badrcptto-morebadrcptto-accdias.diff.bz2 4736
-MD5 00084ddd52a3665b65f2db20a773b382 qmail-hold-1.03.pat.gz 1596
-RMD160 d30f00a02383594a6ed74e7b7e7ec2ac157657dd qmail-hold-1.03.pat.gz 1596
-SHA256 8d829e19bb5309a08cb48a4e6135e159c1d7054b02b941ce8331c30e86056482 qmail-hold-1.03.pat.gz 1596
-MD5 1c4518f780d231bde9745cdd0fa313b2 qmail-limit-bounce-size.patch.txt 1753
-RMD160 a12cc5a7a0787270e47c3c52033eac9dbad55e8b qmail-limit-bounce-size.patch.txt 1753
-SHA256 efc453e2ddc2a3cecc964e592650ed7ad9546d719614eff8af05f7f85452cb0c qmail-limit-bounce-size.patch.txt 1753
-MD5 ed5c0ddb6a5cc0386b1e04ced71d26ad qmail-local-tabs.patch 505
-RMD160 e0583f136ade2919ecbc43b53db5314b93584a9e qmail-local-tabs.patch 505
-SHA256 9c7b9162d5e191f2e9fca13a3b2039ae56598e8c971eb740f90607eb37b55eb8 qmail-local-tabs.patch 505
-MD5 413be7bb5b407c2964c3275c4d596947 qmail-maildir++.patch 43512
-RMD160 78f993c11fa2e99113cb37f24bf3827314c03c79 qmail-maildir++.patch 43512
-SHA256 5cb2bc2b13e899db2aa471a98c8e6669085d862d61a1d668eb474d6f8b75b317 qmail-maildir++.patch 43512
-MD5 58d912de1ede57062fa8a3e2e0e75abf qmail-popupnofd2close.patch 401
-RMD160 6da0a2969451092e505a16e54a67b9ca17edcbaa qmail-popupnofd2close.patch 401
-SHA256 c2e8dbb2774d2e4cb849da71ee93de5af038c281ff1173c653b397244a5d943a qmail-popupnofd2close.patch 401
-MD5 d9408411822973415ff10018ff4419be qmail-relaymxlookup-0.4.diff 3728
-RMD160 9214ed9002947522d481aa7c5fe00b3ce44b36a7 qmail-relaymxlookup-0.4.diff 3728
-SHA256 b66065d403df2c0e071e686b19cbb1fc01d4a8ac75387db22b7fb87ab68657d1 qmail-relaymxlookup-0.4.diff 3728
-MD5 1d8b89607d35bfa409f8cfe6d23bc554 qmail-remote-auth-patch-doc.txt 1287
-RMD160 56377bb66a25ca8fcc780ec3c9c5bd0d03cb0076 qmail-remote-auth-patch-doc.txt 1287
-SHA256 610df197f4f19e7e6171d309d6f3d2cb3d35a5a921be732d181cba9ce3307905 qmail-remote-auth-patch-doc.txt 1287
-MD5 24fc1a33089faf12e00b127cd659f317 qmail-smtpd-relay-reject 1230
-RMD160 3a7e3ce34a457493895abc4e2d13317f9b35ec95 qmail-smtpd-relay-reject 1230
-SHA256 4f988af8fbc2829b1dd2b7d8cdca362b16cee7f27e020f6ca98d4cbdbd875fe9 qmail-smtpd-relay-reject 1230
-MD5 5a8d7a5863b0c56236af945dedd45754 qmailqueue-patch 2510
-RMD160 e43c14b5d8ac1a2736ce31087f662390204fe0b1 qmailqueue-patch 2510
-SHA256 52e82aaa34e9f1308b063cc986a701f67e161662e9f789bb12af03a381530f94 qmailqueue-patch 2510
-MD5 7179268db349cf3e40b4a45e4a83f81d qregex-starttls-2way-auth-20050523.patch 100009
-RMD160 2d5274cbdc90e26b616f13d85b48a97f42f3a956 qregex-starttls-2way-auth-20050523.patch 100009
-SHA256 456bf28a4749df179550ed838b5440b22046950ab3e544b07b1c1ee4b12c0a8f qregex-starttls-2way-auth-20050523.patch 100009
-MD5 4e1f2d8315e7e2a5482798c9d19fac4d sendmail-flagf.patch 863
-RMD160 8930f7c89937f9fd60b17cf355377bb9bcc8ea4e sendmail-flagf.patch 863
-SHA256 9b3951c22b98c0e5a6ebfa793f052d91dfe01d68a0ad8dc83b8e0bd60c01802e sendmail-flagf.patch 863
-MD5 598aca7a3a99426d1f49079172986b31 sendmail-ignore-N.patch 636
-RMD160 88fff7f434102f243bb40080a6a2ce4cd4557460 sendmail-ignore-N.patch 636
-SHA256 04528eaa1e5601d2585fb5deaa1662b92607e468ab10703069eaa167e8165233 sendmail-ignore-N.patch 636
diff --git a/mail-mta/qmail/files/dot_qmail b/mail-mta/qmail/files/dot_qmail
deleted file mode 100644
index 81a15fc5c50c..000000000000
--- a/mail-mta/qmail/files/dot_qmail
+++ /dev/null
@@ -1,3 +0,0 @@
-# Uncomment the next line for .forward support
-#|dot-forward .forward
-./.maildir/
diff --git a/mail-mta/qmail/files/dot_qmail-log b/mail-mta/qmail/files/dot_qmail-log
deleted file mode 100644
index 25725e42d50b..000000000000
--- a/mail-mta/qmail/files/dot_qmail-log
+++ /dev/null
@@ -1,9 +0,0 @@
-# Be sure to read those links before enabling anything in here:
-#   http://cr.yp.to/qmail/faq/admin.html#copies
-#   http://www.cyber-sentry.com/index.php?id=35
-#
-# Copy all mails to ~alias/.maildir/
-#./maildir/
-#
-# Pipe all mails trough logmail.sh
-#|/usr/local/bin/logmail.sh
diff --git a/mail-mta/qmail/files/errno.patch b/mail-mta/qmail/files/errno.patch
deleted file mode 100644
index f9b77b91e065..000000000000
--- a/mail-mta/qmail/files/errno.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-% diff -u3 error.h.orig error.h
---- error.h.orig	1998-06-15 06:53:16.000000000 -0400
-+++ error.h	2002-12-24 20:28:40.000000000 -0500
-@@ -1,7 +1,7 @@
- #ifndef ERROR_H
- #define ERROR_H
- 
--extern int errno;
-+#include <errno.h>
- 
- extern int error_intr;
- extern int error_nomem;
-
-
-% diff -u3 dns.c.orig dns.c
---- dns.c.orig	2002-08-09 19:20:48.000000000 -0400
-+++ dns.c	2002-12-24 20:42:46.000000000 -0500
-@@ -7,8 +7,6 @@
- #include <errno.h>
- extern int res_query();
- extern int res_search();
--extern int errno;
--extern int h_errno;
- #include "ip.h"
- #include "ipalloc.h"
- #include "fmt.h"
-
-
-% diff -u3 cdb_seek.c.orig cdb_seek.c
---- cdb_seek.c.orig	1998-06-15 06:53:16.000000000 -0400
-+++ cdb_seek.c	2002-12-24 20:42:52.000000000 -0500
-@@ -1,6 +1,5 @@
- #include <sys/types.h>
- #include <errno.h>
--extern int errno;
- #include "cdb.h"
- 
- #ifndef SEEK_SET
diff --git a/mail-mta/qmail/files/gencert.sh b/mail-mta/qmail/files/gencert.sh
deleted file mode 100644
index 6adc05fdc8b6..000000000000
--- a/mail-mta/qmail/files/gencert.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-umask 0077 ; 
-/usr/bin/openssl genrsa -out /var/qmail/control/rsa512.new 512 >/dev/null 2>&1 && \
-chown qmaild:qmail /var/qmail/control/rsa512.new && \
-/bin/mv -f /var/qmail/control/rsa512.new /var/qmail/control/rsa512.pem 
diff --git a/mail-mta/qmail/files/mkservercert b/mail-mta/qmail/files/mkservercert
deleted file mode 100644
index 42990f826549..000000000000
--- a/mail-mta/qmail/files/mkservercert
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/mkservercert,v 1.3 2005/01/03 20:55:10 hansmi Exp $
-# Self-signed certificate generator for Qmail under Gentoo
-# Robin H. Johnson <robbat2@gentoo.org> - October 17, 2003
-# Based on mkimapdcert from courier-imap.
-
-test -x /usr/bin/openssl || exit 0
-source /sbin/functions.sh
-
-filedir="/var/qmail/control"
-pemfile="${filedir}/servercert.pem"
-randfile="${filedir}/servercert.rand"
-conffile="${filedir}/servercert.cnf"
-
-# file details for pemfile
-mode="0640"
-uid="qmaild"
-gid="qmail"
-
-# expire on certifcate
-days="365"
-
-if test -f $pemfile
-then
-	eerror "$pemfile already exists."
-	exit 1
-fi
-
-ewarn "Please customize ${conffile} before continuing!"
-einfo "Press ENTER to continue, or CTRL-C to stop now."
-read
-
-# setup the temp file
-cp /dev/null $pemfile
-chmod 600 $pemfile
-chown root $pemfile
-
-cleanup() {
-	rm -f $pemfile
-	rm -f $randfile
-	exit 1
-}
-
-dd if=/dev/urandom of=${randfile} bs=64 count=1 2>/dev/null
-chmod 600 ${randfile}
-einfo "Creating self-signed certificate"
-/usr/bin/openssl req -new -x509 -days ${days} -nodes \
-	-config ${conffile} -out $pemfile -keyout $pemfile -rand ${randfile} || cleanup
-einfo "Certificate details"
-/usr/bin/openssl x509 -subject -dates -fingerprint -noout -in $pemfile || cleanup
-chown ${uid}:${gid} ${pemfile}
-chmod ${mode} ${pemfile}
-#qmail needs an extra item
-ln -s ${pemfile} ${filedir}/clientcert.pem
-rm -f $randfile
diff --git a/mail-mta/qmail/files/qmail-config-system b/mail-mta/qmail/files/qmail-config-system
deleted file mode 100644
index 55237beee7ef..000000000000
--- a/mail-mta/qmail/files/qmail-config-system
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# Configuration System for Qmail
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/qmail-config-system,v 1.3 2005/01/03 20:55:10 hansmi Exp $
-# This is a configuration system to make using and controlling the interesting parts of the qmail behavior simple
-# The only variable that needs to be set before running this is $SERVICE
-
-# this is to inherit QMAIL_CONTROLDIR
-. /etc/profile
-
-# now run
-# grab the common configuration
-[ -s ${QMAIL_CONTROLDIR}/conf-common ] && source ${QMAIL_CONTROLDIR}/conf-common
-
-# grab the per-service configuration
-[ -s ${QMAIL_CONTROLDIR}/conf-${SERVICE}d ] && source ${QMAIL_CONTROLDIR}/conf-${SERVICE}d
-# special case for qmail-send
-[ "${SERVICE}" = "send" -a -s ${QMAIL_CONTROLDIR}/conf-send ] && source ${QMAIL_CONTROLDIR}/conf-send
-
-# you may want to disable this at some point, so I give you the choice here
-if [ -s /var/qmail/bin/config-sanity-check -a -z "${QMAIL_DISABLE_SANITY_CHECK}" ]; then
-    source /var/qmail/bin/config-sanity-check
-else
-    echo "Failed to find sanity checker!"
-    sleep 30s
-    exit 1
-fi
diff --git a/mail-mta/qmail/files/qmail-genrsacert.sh b/mail-mta/qmail/files/qmail-genrsacert.sh
deleted file mode 100644
index b538d32855c6..000000000000
--- a/mail-mta/qmail/files/qmail-genrsacert.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/qmail-genrsacert.sh,v 1.6 2006/05/06 20:15:32 hansmi Exp $
-# Robin H. Johnson <robbat2@gentoo.org> - October 17, 2003
-#
-# This file generates the static temporary RSA keys needed for qmail to encrypt
-# messages. It should be run from a crontab, once a day is ok on low load
-# machines, but if you do lots of mail, once per hour is more reasonable if you
-# do NOT create the rsa512.pem, qmail will generate it on the fly for each
-# connection, which can be VERY slow.
-
-if [ -z "${ROOT}" -o "${ROOT}" = "/" ]; then
-	confdir=/var/qmail/control
-else
-	confdir=${ROOT}/var/qmail/control
-fi
-
-# the key should be 0600
-# which is readable by qmaild only!
-umaskvalue="0077"
-uid="qmaild"
-gid="qmail"
-
-umask ${umaskvalue}
-
-# If you want to renice this process, uncomment the following line
-# renice +15 "$$" >/dev/null
-
-# This is a list with bits of the generated keys. They should
-# be a power of 2 ideally and must be more than 64.
-keys="512 1024"
-
-for bits in ${keys}
-do
-	pemfile="${confdir}/rsa${bits}.pem"
-	tmpfile="${confdir}/rsa${bits}.pem.tmp"
-
-	# we need to make sure that all of the operations succeed
-	/usr/bin/openssl genrsa -out ${tmpfile} ${bits} 2>/dev/null && \
-	/bin/chown ${uid}:${gid} ${tmpfile} && \
-	/bin/mv -f ${tmpfile} ${pemfile} || exit 1
-
-	dhfile="${confdir}/dh${bits}.pem"
-	dtmpfile="${confdir}/dh${bits}.pem.tmp"
-
-	/usr/bin/openssl dhparam -2 -out ${dtmpfile} ${bits} 2>/dev/null && \
-	/bin/chown ${uid}:${gid} ${dtmpfile} && \
-	/bin/mv -f ${dtmpfile} ${dhfile} || exit 1
-done
diff --git a/mail-mta/qmail/files/rc b/mail-mta/qmail/files/rc
deleted file mode 100644
index a391b5afb966..000000000000
--- a/mail-mta/qmail/files/rc
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# gentoo qmail rc file to start qmail-start and thus qmail-send
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/rc,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
-
-exec env - PATH="/var/qmail/bin:$PATH" \
-	qmail-start "`grep -v '^#' /var/qmail/control/defaultdelivery`"
diff --git a/mail-mta/qmail/files/run-qmailpop3d b/mail-mta/qmail/files/run-qmailpop3d
deleted file mode 100644
index e6cf60a03e40..000000000000
--- a/mail-mta/qmail/files/run-qmailpop3d
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# Gentoo Startup script for qmail's POP3 daemon
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailpop3d,v 1.3 2005/01/03 20:55:10 hansmi Exp $
-#
-# If you need to edit this file, please look at editing conf-pop3d and
-# conf-common first.  If you still need to change this file, you should
-# probably file a bug on the bugzilla saying what you wanted to change so that
-# modification can be make possible via the configuration files
-SERVICE=pop3
-source /var/qmail/bin/qmail-config-system && \
-exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
-    ${QMAIL_TCPSERVER_PRE} \
-    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \
-    -c ${MAXCONN} \
-    ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
-    ${QMAIL_POP3_PREAUTH} /var/qmail/bin/qmail-popup ${QMAIL_POP3_POP3HOST} \
-    ${QMAIL_POP3_CHECKPASSWORD} ${QMAIL_POP3_POSTAUTH} \
-    /var/qmail/bin/qmail-pop3d ${QMAIL_MAILDIR} 2>&1
diff --git a/mail-mta/qmail/files/run-qmailpop3dlog b/mail-mta/qmail/files/run-qmailpop3dlog
deleted file mode 100644
index 8046922bcc87..000000000000
--- a/mail-mta/qmail/files/run-qmailpop3dlog
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Gentoo Startup script for qmail's POP3 daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailpop3dlog,v 1.4 2005/01/04 21:35:13 hansmi Exp $
-SERVICE=pop3
-source /var/qmail/bin/qmail-config-system && \
-eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/files/run-qmailqmqpd b/mail-mta/qmail/files/run-qmailqmqpd
deleted file mode 100644
index 85ffee18112f..000000000000
--- a/mail-mta/qmail/files/run-qmailqmqpd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Gentoo Startup script for qmail's QMQP daemon
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmqpd,v 1.3 2005/01/03 20:55:10 hansmi Exp $
-#
-# If you need to edit this file, please look at editing conf-qmqpd and
-# conf-common first.  If you still need to change this file, you should
-# probably file a bug on the bugzilla saying what you wanted to change so that
-# modification can be make possible via the configuration files
-SERVICE=qmqp
-source /var/qmail/bin/qmail-config-system && \
-exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
-    ${QMAIL_TCPSERVER_PRE} \
-    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \
-    -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \
-    ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
-    ${QMAIL_QMQP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_QMQP_POST} \
-    2>&1
diff --git a/mail-mta/qmail/files/run-qmailqmqpdlog b/mail-mta/qmail/files/run-qmailqmqpdlog
deleted file mode 100644
index dc95016b886a..000000000000
--- a/mail-mta/qmail/files/run-qmailqmqpdlog
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Gentoo Startup script for qmail's QMQP daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmqpdlog,v 1.4 2005/01/04 21:35:13 hansmi Exp $
-SERVICE=qmqp
-source /var/qmail/bin/qmail-config-system && \
-eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/files/run-qmailqmtpd b/mail-mta/qmail/files/run-qmailqmtpd
deleted file mode 100644
index b93094414a48..000000000000
--- a/mail-mta/qmail/files/run-qmailqmtpd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Gentoo Startup script for qmail's QMTP daemon
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmtpd,v 1.3 2005/01/03 20:55:10 hansmi Exp $
-#
-# If you need to edit this file, please look at editing conf-qmtpd and
-# conf-common first.  If you still need to change this file, you should
-# probably file a bug on the bugzilla saying what you wanted to change so that
-# modification can be make possible via the configuration files
-SERVICE=qmtp
-source /var/qmail/bin/qmail-config-system && \
-exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
-    ${QMAIL_TCPSERVER_PRE} \
-    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \
-    -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \
-    ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
-    ${QMAIL_QMTP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_QMTP_POST} \
-    2>&1
diff --git a/mail-mta/qmail/files/run-qmailqmtpdlog b/mail-mta/qmail/files/run-qmailqmtpdlog
deleted file mode 100644
index a08cd232782e..000000000000
--- a/mail-mta/qmail/files/run-qmailqmtpdlog
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Gentoo Startup script for qmail's QMTP daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmtpdlog,v 1.4 2005/01/04 21:35:13 hansmi Exp $
-SERVICE=qmtp
-source /var/qmail/bin/qmail-config-system && \
-eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/files/run-qmailsend b/mail-mta/qmail/files/run-qmailsend
deleted file mode 100644
index d24ad8c1dcb7..000000000000
--- a/mail-mta/qmail/files/run-qmailsend
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# Gentoo qmail rc booter
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsend,v 1.3 2005/01/03 20:55:10 hansmi Exp $
-exec /var/qmail/rc
diff --git a/mail-mta/qmail/files/run-qmailsendlog b/mail-mta/qmail/files/run-qmailsendlog
deleted file mode 100644
index a4d5379fd1c3..000000000000
--- a/mail-mta/qmail/files/run-qmailsendlog
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Gentoo Startup script for qmail's send daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsendlog,v 1.3 2005/01/04 21:35:13 hansmi Exp $
-SERVICE=send
-source /var/qmail/bin/qmail-config-system && \
-eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/files/run-qmailsmtpd b/mail-mta/qmail/files/run-qmailsmtpd
deleted file mode 100644
index 5075cca4a265..000000000000
--- a/mail-mta/qmail/files/run-qmailsmtpd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Gentoo Startup script for qmail's SMTP daemon
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsmtpd,v 1.3 2005/01/03 20:55:10 hansmi Exp $
-#
-# If you need to edit this file, please look at editing conf-smtpd and
-# conf-common first.  If you still need to change this file, you should
-# probably file a bug on the bugzilla saying what you wanted to change so that
-# modification can be make possible via the configuration files
-SERVICE=smtp
-source /var/qmail/bin/qmail-config-system && \
-exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
-    ${QMAIL_TCPSERVER_PRE} \
-    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \
-    -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \
-    ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
-    ${QMAIL_SMTP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_SMTP_POST} \
-    2>&1
diff --git a/mail-mta/qmail/files/run-qmailsmtpdlog b/mail-mta/qmail/files/run-qmailsmtpdlog
deleted file mode 100644
index 1a0056bcb87e..000000000000
--- a/mail-mta/qmail/files/run-qmailsmtpdlog
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Gentoo Startup script for qmail's SMTP daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsmtpdlog,v 1.4 2005/01/04 21:35:13 hansmi Exp $
-SERVICE=smtp
-source /var/qmail/bin/qmail-config-system && \
-eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/files/servercert.cnf b/mail-mta/qmail/files/servercert.cnf
deleted file mode 100644
index 7bbb7de1d9f7..000000000000
--- a/mail-mta/qmail/files/servercert.cnf
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/servercert.cnf,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
-# Robin H. Johnson <robbat2@gentoo.org> - October 17, 2003
-# This is the openssl config file to generate keys for qmail
-# It is read by mkservercert
-
-[ req ]
-# you can increase this value, but be aware that it will make things much slower
-# this should be a power of 2!
-default_bits = 1024
-# leave the rest of these alone!
-encrypt_key = yes
-distinguished_name = req_dn
-x509_extensions = cert_type
-prompt = no
-
-[ req_dn ]
-# 2-Letter ISO country code
-C=US
-# FULL name of state/province/district
-# NO abbreviations!
-ST=Alabama
-# FULL name of city
-# NO abbreviations!
-L=Mobile
-# Full Name of your organization
-# NO abbreviations!
-O=Foobar Systems
-# Leave this alone unless specifically need to change it!
-OU=Automatically-generated Qmail SMTP SSL key
-# This should be a FQDN that resolves to the IP of your server
-CN=localhost
-# This should be the email address for the administrator of the server
-emailAddress=postmaster@localhost
-
-# Leave this alone!
-[ cert_type ]
-nsCertType = server
diff --git a/mail-mta/qmail/files/tcp.pop3.sample b/mail-mta/qmail/files/tcp.pop3.sample
deleted file mode 100644
index 55df788cf074..000000000000
--- a/mail-mta/qmail/files/tcp.pop3.sample
+++ /dev/null
@@ -1,6 +0,0 @@
-# to update the database after changing this file, run:
-# tcprules /etc/tcprules.d/tcp.qmail-pop3.cdb /etc/tcprules.d/.tcp.qmail-pop3.tmp < /etc/tcprules.d/tcp.qmail-pop3
-# Allow any client to connect to us via POP3
-# If people are abusing POP3 such as denial-of-service on POP3, 
-# you can add their ips here to block them out
-:allow
diff --git a/mail-mta/qmail/files/tcp.qmqp.sample b/mail-mta/qmail/files/tcp.qmqp.sample
deleted file mode 100644
index da21632c950e..000000000000
--- a/mail-mta/qmail/files/tcp.qmqp.sample
+++ /dev/null
@@ -1,8 +0,0 @@
-# to update the database after changing this file, run:
-# tcprules /etc/tcprules.d/tcp.qmail-qmqp.cdb /etc/tcprules.d/.tcp.qmail-qmqp.tmp < /etc/tcprules.d/tcp.qmail-qmqp
-# QMQP is a bulk protocol
-# and we don't want spam to ever come by it
-# and it is intended to go between a few servers only
-# so we don't trust any default people with it
-# see /etc/tcprules.d/tcp.qmail-smtp for more info
-:deny
diff --git a/mail-mta/qmail/files/tcp.qmtp.sample b/mail-mta/qmail/files/tcp.qmtp.sample
deleted file mode 100644
index 48f77ca4e442..000000000000
--- a/mail-mta/qmail/files/tcp.qmtp.sample
+++ /dev/null
@@ -1,15 +0,0 @@
-# to update the database after changing this file, run:
-# tcprules /etc/tcprules.d/tcp.qmail-qmtp.cdb /etc/tcprules.d/.tcp.qmail-qmtp.tmp < /etc/tcprules.d/tcp.qmail-qmtp
-# We trust QMTP connections just as SMTP by default
-# see /etc/tcprules.d/tcp.qmail-smtp for more info
-# allow relaying from localhost
-127.0.0.1:allow,RELAYCLIENT="",RBLSMTPD=""
-# everybody else is not allowed to relay, and is subject to RBLSMTPD checks
-:allow
-
-# If you are using qmail-scanner, this line here is the correct one to use
-# instead (comment out the above ':allow' line FIRST) and applies that script
-# to any mail coming in that is not from a host allowed to relay. You can
-# change the value of the variable to any other value you desire to use custom
-# scripts for example.
-#:allow,QMAILQUEUE="/var/qmail/bin/qmail-scanner-queue.pl"
diff --git a/mail-mta/qmail/files/tcp.smtp.sample b/mail-mta/qmail/files/tcp.smtp.sample
deleted file mode 100644
index a53d3b651d1a..000000000000
--- a/mail-mta/qmail/files/tcp.smtp.sample
+++ /dev/null
@@ -1,90 +0,0 @@
-# to update the database after changing this file, run:
-# tcprules /etc/tcprules.d/tcp.qmail-smtp.cdb /etc/tcprules.d/.tcp.qmail-smtp.tmp < /etc/tcprules.d/tcp.qmail-smtp
-#------------------------------------------------------
-# DESCRIPTION OF THE RULES TO REMIND ME OF HOW THIS FILE WORKS
-#
-# If you set 'allow', this means that our mail server will allow
-# the specified IP range to make a TCP connection to our server
-#
-# If you set 'deny', this means that our mail server will not allow
-# the specified IP range to make a TCP connection to our server
-#
-# If you set RELAYCLIENT="", this means that the listed IP range is 
-# allowed to relay mail through our server
-#
-# If you dont set RELAYCLIENT="", this means that the listed IP range
-# will not be able to relay mail through our server
-#
-# If you set RBLSMTPD="", this means that the listed IP ranges will
-# not be checked against any of the RBL databases
-#
-# If you set RBLSMTPD="some text here", this means that an RBL lookup
-# wont be performed, but the mail will be rejected with the specified
-# text as a 4xx temp error message
-#
-# If you set RBLSMTPD="-some text here", this means that an RBL lookup
-# wont be performed, but the mail will be rejected with the specified
-# text as a 5xx perm error message
-#
-# If you do not set RBLSMTPD="" or ="some text", then an RBL lookup
-# will be performed. If the lookup is successful, then RBLSMTPD will
-# return your custom error message (as specified in the -r parameter
-# in smtpd supervise script)
-#
-#-----------------------------------------------------
-# HERE ARE THE RULES! :
-#-----------------------------------------------------
-# BYPASS OPEN RELAY CHECKING FOR THESE IPS :
-#
-# These IPs are ones that we have setup so that they arent RBL checked.
-# We have done this because these particular servers are RBL listed,
-# and for whatever reason they can't/won't fix their open relay problem,
-# and we still want to be able to receive mail from them.
-# 
-# reminder text goes here for this entry so we know the story...
-#111.111.111.111:allow,RBLSMTPD=""
-# reminder text goes here for this entry so we know the story...
-#222.222.222.222:allow,RBLSMTPD=""
-#
-#-----------------------------------------------------------------
-# DONT ALLOW THESE IPS TO SEND MAIL TO US :
-#
-# mailXX.offermail.net connecting regularly and sending invalid
-# format messages causing exit with status 256 (bare linefeed normally)
-# entry added 15/12/2001
-# after looking at the mail coming from these servers it was found to be spam
-#216.242.75.100-116:allow,RBLSMTPD="-Connections from this IP have been banned."
-#
-# heaps of spam from replyto of *@freeamateurhotties.com dec2001
-#64.228.127.:allow,RBLSMTPD="-Connections refused due to spam from freeamateurhotties.com"
-#154.20.94.:allow,RBLSMTPD="-Connections refused due to spam from freeamateurhotties.com"
-#209.151.132.:allow,RBLSMTPD="-Connections refused due to spam from freeamateurhotties.com"
-#216.18.85.:allow,RBLSMTPD="-Connections refused due to spam from freeamateurhotties.com"
-#
-#-----------------------------------------------------------------
-# ALLOW THESE IPS TO RELAY MAIL THROUGH OUR SERVER
-#
-# Local class-c's from our LAN are allowed to relay,
-# and we wont bother doing any RBL checking.
-#123.123.123.:allow,RELAYCLIENT="",RBLSMTPD=""
-#123.111.111.:allow,RELAYCLIENT="",RBLSMTPD=""
-#
-# Connections from localhost are allowed to relay 
-# (because the WebMail server runs on localhost),
-# and obviously there is no point trying to perform an RBL check.
-127.0.0.1:allow,RELAYCLIENT="",RBLSMTPD=""
-#
-#-----------------------------------------------------------------
-# ALLOW EVERYONE ELSE TO SEND US MAIL
-#
-# Everyone else can make connections to our server,
-# but not allowed to relay
-# RBL lookups are performed
-:allow
-
-# If you are using qmail-scanner, this line here is the correct one to use
-# instead (comment out the above ':allow' line FIRST) and applies that script
-# to any mail coming in that is not from a host allowed to relay. You can
-# change the value of the variable to any other value you desire to use custom
-# scripts for example.
-#:allow,QMAILQUEUE="/var/qmail/bin/qmail-scanner-queue.pl"
diff --git a/mail-mta/qmail/files/tcprules.d-Makefile.qmail b/mail-mta/qmail/files/tcprules.d-Makefile.qmail
deleted file mode 100644
index e8d17abae974..000000000000
--- a/mail-mta/qmail/files/tcprules.d-Makefile.qmail
+++ /dev/null
@@ -1,3 +0,0 @@
-QMAIL_CDBS = tcp.qmail-pop3.cdb  tcp.qmail-qmqp.cdb  tcp.qmail-qmtp.cdb  tcp.qmail-smtp.cdb
-CDBS += $(QMAIL_CDBS)
-qmail: $(QMAIL_CDBS)
author	Michael Hanselmann <hansmi@gentoo.org>	2007-05-01 21:31:46 +0000
committer	Michael Hanselmann <hansmi@gentoo.org>	2007-05-01 21:31:46 +0000
commit	11209cf4864a5c0a735f237e6366675366d036ba (patch)
tree	23919992fc4cbcb2fe26fb8318f114727bd959f3 /mail-mta/qmail/files
parent	Add new src_test, and add return code patch from [ruby-core:10609] and [ruby-... (diff)
download	gentoo-2-11209cf4864a5c0a735f237e6366675366d036ba.tar.gz gentoo-2-11209cf4864a5c0a735f237e6366675366d036ba.tar.bz2 gentoo-2-11209cf4864a5c0a735f237e6366675366d036ba.zip