cleanup

18 files changed, 29 insertions, 250 deletions

diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index 4b7be01bd381..4e80a263e7e4 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -1,59 +1,42 @@
-MD5 30ae1187a48ebe4c70c38c08c5706d76 qmail-1.03-r9.ebuild 9991
+MD5 842b9a172c57f0ca597122d4253558d6 ChangeLog 4442
 MD5 875e6441f32ebb5d184c5aa1781d5596 qmail-1.03-r10.ebuild 10404
 MD5 19dd9b9232eb66c5adb8263df11c2873 qmail-1.03-r8.ebuild 8143
-MD5 842b9a172c57f0ca597122d4253558d6 ChangeLog 4442
+MD5 30ae1187a48ebe4c70c38c08c5706d76 qmail-1.03-r9.ebuild 9991
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
 MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
 MD5 48a1e168db29ab4e6c57f1ac135ee2bf files/digest-qmail-1.03-r9 323
-MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
-MD5 b350313e18d57abe9ebb0daa82bc9e5c files/1.03-r6/rc 101
-MD5 5b088a42f236a59d0bc798e3260b0ed7 files/1.03-r6/run-qmailsmtpd 231
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r6/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r6/run-qmailsmtpdlog 97
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r6/run-qmailsendlog 96
-MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r6/qmail-linksync.patch 1363
-MD5 fbfb0c39b54900cade8d4cf749327e97 files/1.03-r6/qmail-control 809
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r6/run-qmailsend 29
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r7/rc 108
-MD5 5b088a42f236a59d0bc798e3260b0ed7 files/1.03-r7/run-qmailsmtpd 231
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r7/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r7/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r7/run-qmailsmtpdlog 97
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r7/run-qmailsendlog 96
-MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r7/qmail-linksync.patch 1363
-MD5 ddedfb4aeb433167f0765875363b6fc7 files/1.03-r7/qmail-control 809
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r7/run-qmailsend 29
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
-MD5 71aa0894c118dda3405f1f847944158c files/1.03-r8/qmail-queue.patch 1512
-MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r8/run-qmailsmtpd 231
+MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r10/dot_qmail 12
+MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44
+MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r10/defaultdelivery 34
+MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r10/errno.patch 850
+MD5 a33acd5b72a4390c9b0d599a7b170ee7 files/1.03-r10/qmail-control 810
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r10/rc 108
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r10/run-qmailsend 29
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r10/run-qmailsendlog 96
+MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r10/run-qmailsmtpd 231
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r10/run-qmailsmtpdlog 97
+MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r10/smtp-auth-close3.patch 535
+MD5 b1a3fcd28ed415f92d775ac6fbe54dda files/1.03-r10/tls-patch.txt 5803
+MD5 dd5158b78a3878d78a68878f1910e0e4 files/1.03-r10/tls.patch.bz2 10458
 MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r8/defaultdelivery 34
-MD5 f42d6f2e58b7031ceb491820e85ddd16 files/1.03-r8/qmail-1.03-starttls-smtp-auth.patch 41786
 MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r8/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r8/run-qmailsmtpdlog 97
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r8/run-qmailsendlog 96
-MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r8/qmail-linksync.patch 1363
+MD5 f42d6f2e58b7031ceb491820e85ddd16 files/1.03-r8/qmail-1.03-starttls-smtp-auth.patch 41786
 MD5 8ca0f00a5f3404506b70f8f4420cafc9 files/1.03-r8/qmail-control 809
+MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r8/qmail-linksync.patch 1363
+MD5 71aa0894c118dda3405f1f847944158c files/1.03-r8/qmail-queue.patch 1512
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
 MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r8/run-qmailsend 29
-MD5 71aa0894c118dda3405f1f847944158c files/1.03-r9/qmail-queue.patch 1512
-MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r9/run-qmailsmtpd 231
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r8/run-qmailsendlog 96
+MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r8/run-qmailsmtpd 231
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r8/run-qmailsmtpdlog 97
 MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r9/defaultdelivery 34
-MD5 f42d6f2e58b7031ceb491820e85ddd16 files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch 41786
 MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r9/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r9/run-qmailsmtpdlog 97
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r9/run-qmailsendlog 96
-MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r9/qmail-linksync.patch 1363
+MD5 f42d6f2e58b7031ceb491820e85ddd16 files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch 41786
 MD5 0b5b699aaf38366692d70ac3aa3a51e9 files/1.03-r9/qmail-control 809
+MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r9/qmail-linksync.patch 1363
+MD5 71aa0894c118dda3405f1f847944158c files/1.03-r9/qmail-queue.patch 1512
 MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r9/run-qmailsend 29
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r10/rc 108
-MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r10/run-qmailsmtpd 231
-MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44
-MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r10/errno.patch 850
-MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r10/smtp-auth-close3.patch 535
-MD5 b1a3fcd28ed415f92d775ac6fbe54dda files/1.03-r10/tls-patch.txt 5803
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r10/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r10/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r10/run-qmailsmtpdlog 97
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r10/run-qmailsendlog 96
-MD5 dd5158b78a3878d78a68878f1910e0e4 files/1.03-r10/tls.patch.bz2 10458
-MD5 a33acd5b72a4390c9b0d599a7b170ee7 files/1.03-r10/qmail-control 810
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r10/run-qmailsend 29
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r9/run-qmailsendlog 96
+MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r9/run-qmailsmtpd 231
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r9/run-qmailsmtpdlog 97
diff --git a/net-mail/qmail/files/1.03-r6/dot_qmail b/net-mail/qmail/files/1.03-r6/dot_qmail
deleted file mode 100644
index 7c9e5d08f067..000000000000
--- a/net-mail/qmail/files/1.03-r6/dot_qmail
+++ /dev/null
@@ -1 +0,0 @@
-./.maildir/
diff --git a/net-mail/qmail/files/1.03-r6/qmail-control b/net-mail/qmail/files/1.03-r6/qmail-control
deleted file mode 100644
index ef562e2ff6a3..000000000000
--- a/net-mail/qmail/files/1.03-r6/qmail-control
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/1.03-r6/qmail-control,v 1.2 2003/02/14 23:03:47 vapier Exp $
-
-opts="start stop restart reload"
-
-start() {
-    ebegin "Starting qmail mta ..."
-    svc -u /var/qmail/supervise/*
-    eend $?
-    ebegin "Starting qmail mta logging ..."
-    svc -u /var/qmail/supervise/*/log
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping qmail mta ..."
-    svc -d /var/qmail/supervise/*
-    eend $?
-    ebegin "Stopping qmail mta logging ..."
-    svc -d /var/qmail/supervise/*/log
-    eend $?
-}
-
-reload() {
-    ebegin "Reloading 'locals' and 'virtualdomains' control files."
-    svc -h /var/qmail/supervise/qmail-send
-    eend $?
-}
diff --git a/net-mail/qmail/files/1.03-r6/qmail-linksync.patch b/net-mail/qmail/files/1.03-r6/qmail-linksync.patch
deleted file mode 100644
index 1b35f12aaa1f..000000000000
--- a/net-mail/qmail/files/1.03-r6/qmail-linksync.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../qmail-1.03.orig/qmail-local.c	Mon Jun 15 12:53:16 1998
-+++ qmail-local.c	Sun Jul 16 16:19:04 2000
-@@ -1,5 +1,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
- #include "readwrite.h"
- #include "sig.h"
- #include "env.h"
-@@ -128,6 +129,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 it was error_exist, almost certainly successful; i hate NFS */
-  tryunlinktmp(); _exit(0);
- 
---- ../qmail-1.03.orig/qmail-queue.c	Mon Jun 15 12:53:16 1998
-+++ qmail-queue.c	Sun Jul 16 16:19:33 2000
-@@ -1,5 +1,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
- #include "readwrite.h"
- #include "sig.h"
- #include "exit.h"
-@@ -155,6 +156,7 @@
- {
-  unsigned int len;
-  char ch;
-+ int fd;
- 
-  sig_blocknone();
-  umask(033);
-@@ -183,7 +185,7 @@
-  todofn = fnnum("todo/",0);
-  intdfn = fnnum("intd/",0);
- 
-- if (link(pidfn,messfn) == -1) die(64);
-+ if (link(pidfn,messfn) == -1) die(64); 
-  if (unlink(pidfn) == -1) die(63);
-  flagmademess = 1;
- 
-@@ -248,6 +250,8 @@
-  if (fsync(intdfd) == -1) die_write();
- 
-  if (link(intdfn,todofn) == -1) die(66);
-+ if ((fd = open(todofn, O_RDONLY)) < 0 ||
-+     fsync(fd) < 0 || close(fd) < 0) die(66); 
- 
-  triggerpull();
-  die(0);
diff --git a/net-mail/qmail/files/1.03-r6/rc b/net-mail/qmail/files/1.03-r6/rc
deleted file mode 100644
index 57fdec522803..000000000000
--- a/net-mail/qmail/files/1.03-r6/rc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec env - PATH="/var/qmail/bin:$PATH" \
-	qmail-start '|dot-forward .forward ./.maildir/'
diff --git a/net-mail/qmail/files/1.03-r6/run-qmailsend b/net-mail/qmail/files/1.03-r6/run-qmailsend
deleted file mode 100644
index 8dbd3adf524f..000000000000
--- a/net-mail/qmail/files/1.03-r6/run-qmailsend
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /var/qmail/rc
diff --git a/net-mail/qmail/files/1.03-r6/run-qmailsendlog b/net-mail/qmail/files/1.03-r6/run-qmailsendlog
deleted file mode 100644
index 5ff50d1e7711..000000000000
--- a/net-mail/qmail/files/1.03-r6/run-qmailsendlog
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-send
diff --git a/net-mail/qmail/files/1.03-r6/run-qmailsmtpd b/net-mail/qmail/files/1.03-r6/run-qmailsmtpd
deleted file mode 100644
index 0d61202a7cf3..000000000000
--- a/net-mail/qmail/files/1.03-r6/run-qmailsmtpd
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-QMAILDUID=`id -u qmaild`
-NOFILESGID=`id -g qmaild`
-exec /usr/bin/softlimit -m 2000000 \
-	/usr/bin/tcpserver -H -R -v -p -x /etc/tcp.smtp.cdb \
-	-u $QMAILDUID -g $NOFILESGID 0 smtp rblsmtpd /var/qmail/bin/qmail-smtpd 2>&1
diff --git a/net-mail/qmail/files/1.03-r6/run-qmailsmtpdlog b/net-mail/qmail/files/1.03-r6/run-qmailsmtpdlog
deleted file mode 100644
index 2d9546146583..000000000000
--- a/net-mail/qmail/files/1.03-r6/run-qmailsmtpdlog
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-smtpd
diff --git a/net-mail/qmail/files/1.03-r7/defaultdelivery b/net-mail/qmail/files/1.03-r7/defaultdelivery
deleted file mode 100644
index d0ef7de8b590..000000000000
--- a/net-mail/qmail/files/1.03-r7/defaultdelivery
+++ /dev/null
@@ -1,2 +0,0 @@
-|dot-forward .forward
-./.maildir/
diff --git a/net-mail/qmail/files/1.03-r7/dot_qmail b/net-mail/qmail/files/1.03-r7/dot_qmail
deleted file mode 100644
index 7c9e5d08f067..000000000000
--- a/net-mail/qmail/files/1.03-r7/dot_qmail
+++ /dev/null
@@ -1 +0,0 @@
-./.maildir/
diff --git a/net-mail/qmail/files/1.03-r7/qmail-control b/net-mail/qmail/files/1.03-r7/qmail-control
deleted file mode 100644
index bf43dcc9f271..000000000000
--- a/net-mail/qmail/files/1.03-r7/qmail-control
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/1.03-r7/qmail-control,v 1.2 2003/02/14 23:03:53 vapier Exp $
-
-opts="start stop restart reload"
-
-start() {
-    ebegin "Starting qmail mta ..."
-    svc -u /var/qmail/supervise/*
-    eend $?
-    ebegin "Starting qmail mta logging ..."
-    svc -u /var/qmail/supervise/*/log
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping qmail mta ..."
-    svc -d /var/qmail/supervise/*
-    eend $?
-    ebegin "Stopping qmail mta logging ..."
-    svc -d /var/qmail/supervise/*/log
-    eend $?
-}
-
-reload() {
-    ebegin "Reloading 'locals' and 'virtualdomains' control files."
-    svc -h /var/qmail/supervise/qmail-send
-    eend $?
-}
diff --git a/net-mail/qmail/files/1.03-r7/qmail-linksync.patch b/net-mail/qmail/files/1.03-r7/qmail-linksync.patch
deleted file mode 100644
index 1b35f12aaa1f..000000000000
--- a/net-mail/qmail/files/1.03-r7/qmail-linksync.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../qmail-1.03.orig/qmail-local.c	Mon Jun 15 12:53:16 1998
-+++ qmail-local.c	Sun Jul 16 16:19:04 2000
-@@ -1,5 +1,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
- #include "readwrite.h"
- #include "sig.h"
- #include "env.h"
-@@ -128,6 +129,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 it was error_exist, almost certainly successful; i hate NFS */
-  tryunlinktmp(); _exit(0);
- 
---- ../qmail-1.03.orig/qmail-queue.c	Mon Jun 15 12:53:16 1998
-+++ qmail-queue.c	Sun Jul 16 16:19:33 2000
-@@ -1,5 +1,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
- #include "readwrite.h"
- #include "sig.h"
- #include "exit.h"
-@@ -155,6 +156,7 @@
- {
-  unsigned int len;
-  char ch;
-+ int fd;
- 
-  sig_blocknone();
-  umask(033);
-@@ -183,7 +185,7 @@
-  todofn = fnnum("todo/",0);
-  intdfn = fnnum("intd/",0);
- 
-- if (link(pidfn,messfn) == -1) die(64);
-+ if (link(pidfn,messfn) == -1) die(64); 
-  if (unlink(pidfn) == -1) die(63);
-  flagmademess = 1;
- 
-@@ -248,6 +250,8 @@
-  if (fsync(intdfd) == -1) die_write();
- 
-  if (link(intdfn,todofn) == -1) die(66);
-+ if ((fd = open(todofn, O_RDONLY)) < 0 ||
-+     fsync(fd) < 0 || close(fd) < 0) die(66); 
- 
-  triggerpull();
-  die(0);
diff --git a/net-mail/qmail/files/1.03-r7/rc b/net-mail/qmail/files/1.03-r7/rc
deleted file mode 100644
index a7bbdc986766..000000000000
--- a/net-mail/qmail/files/1.03-r7/rc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec env - PATH="/var/qmail/bin:$PATH" \
-	qmail-start "`cat /var/qmail/control/defaultdelivery`"
diff --git a/net-mail/qmail/files/1.03-r7/run-qmailsend b/net-mail/qmail/files/1.03-r7/run-qmailsend
deleted file mode 100644
index 8dbd3adf524f..000000000000
--- a/net-mail/qmail/files/1.03-r7/run-qmailsend
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /var/qmail/rc
diff --git a/net-mail/qmail/files/1.03-r7/run-qmailsendlog b/net-mail/qmail/files/1.03-r7/run-qmailsendlog
deleted file mode 100644
index 5ff50d1e7711..000000000000
--- a/net-mail/qmail/files/1.03-r7/run-qmailsendlog
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-send
diff --git a/net-mail/qmail/files/1.03-r7/run-qmailsmtpd b/net-mail/qmail/files/1.03-r7/run-qmailsmtpd
deleted file mode 100644
index 0d61202a7cf3..000000000000
--- a/net-mail/qmail/files/1.03-r7/run-qmailsmtpd
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-QMAILDUID=`id -u qmaild`
-NOFILESGID=`id -g qmaild`
-exec /usr/bin/softlimit -m 2000000 \
-	/usr/bin/tcpserver -H -R -v -p -x /etc/tcp.smtp.cdb \
-	-u $QMAILDUID -g $NOFILESGID 0 smtp rblsmtpd /var/qmail/bin/qmail-smtpd 2>&1
diff --git a/net-mail/qmail/files/1.03-r7/run-qmailsmtpdlog b/net-mail/qmail/files/1.03-r7/run-qmailsmtpdlog
deleted file mode 100644
index 2d9546146583..000000000000
--- a/net-mail/qmail/files/1.03-r7/run-qmailsmtpdlog
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-smtpd