Fixed four bugs, see ChangeLog.

21 files changed, 97 insertions, 53 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index d21bd9f156de..804d5138cbda 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/qmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.17 2005/01/03 19:44:44 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.18 2005/01/03 20:55:10 hansmi Exp $
+
+  03 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r12.ebuild,
+  qmail-1.03-r13.ebuild, qmail-1.03-r14.ebuild, qmail-1.03-r15.ebuild,
+  qmail-1.03-r16.ebuild, +files/1.03-r16/starttls-recordio.patch:
+  Added bounce-encap-patch from bug 38849. Fixed a problem with recordio and
+  tls, bug 40521. Integrated mailwrapper, bug 48885. Fixed bug 51967 and
+  changed all needed #!/bin/sh to #!/bin/bash in the scripts.
 
   03 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r15.ebuild,
   qmail-1.03-r16.ebuild:
@@ -62,7 +69,7 @@
   qmail-1.03-r11.ebuild, qmail-1.03-r9.ebuild:
   Fix use invocation
 
-  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> qmail-1.03-r15.ebuild:
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> qmail-1.03-r15.ebuild:
   Stable on alpha.
 
   28 May 2004; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index c9e6e7cbace6..655daa5223ef 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -2,51 +2,51 @@ MD5 326c3d12fa42f7d77ec25d0034c6386c qmail-1.03-r11.ebuild 11387
 MD5 b29fd46e11237b9ee8c69b705a91b1bf qmail-1.03-r8.ebuild 8060
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 MD5 d18a1222087e80a39b2588e0f12e6e13 qmail-1.03-r10.ebuild 11111
-MD5 4d6d87b6cb0188f08fc749fcdd3fbe94 ChangeLog 19838
-MD5 e3ac39823c205fc835e4cfa8eb719e32 qmail-1.03-r16.ebuild 18675
+MD5 c40ef2120074e7931a689ba568d107d4 ChangeLog 20391
+MD5 5eacc23899acc4cd889111456359ae64 qmail-1.03-r16.ebuild 19348
 MD5 48561c5b6846d4b381dfdd498b1955f4 qmail-1.03-r9.ebuild 9887
-MD5 c53a30f429eecc567a0079b699150187 qmail-1.03-r12.ebuild 13686
-MD5 09b1f3a68c4b311e015e5659e0fe9949 qmail-1.03-r14.ebuild 15792
-MD5 0b0e3be753693204fd9545e39756e22f qmail-1.03-r15.ebuild 17583
-MD5 e98868f5438e0bad8815e8c2e629d611 qmail-1.03-r13.ebuild 14073
+MD5 680b7751a954606dfe22cc1b413011df qmail-1.03-r12.ebuild 13703
+MD5 232f8df68dccefe171d5831c12b645af qmail-1.03-r14.ebuild 15809
+MD5 32a41c8bc348659fdc0453ea9ec9d934 qmail-1.03-r15.ebuild 17600
+MD5 78fa69d8366643f3c8f2d66ee2d37252 qmail-1.03-r13.ebuild 14090
 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
 MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
 MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719
 MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
 MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850
-MD5 041e9e9ee360bc691a642048b54c1d5b files/run-qmailsmtpdlog 319
+MD5 967b7fc8c81ad203e8f376c60a140159 files/run-qmailsmtpdlog 316
 MD5 cb4bafe4fe0260c575331b93a17e831b files/digest-qmail-1.03-r14 1564
 MD5 836c401d53b4f1d40872dcb3c3ccbd46 files/conf-send 235
-MD5 d2aab8d06da2697ea72ef2c06e752414 files/run-qmailsend 168
-MD5 317fd1bccf34f09f57639e6ffbb1d8e5 files/qmail-config-system 1076
+MD5 70f7b1f551a6dce51f65e2e8b7d7d37a files/run-qmailsend 165
+MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073
 MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
-MD5 a57fd00fc0d3ab86cad0974853c9fa33 files/run-qmailqmqpdlog 319
-MD5 ba8f93b127ae78f3e2fd045d03c63396 files/run-qmailqmtpd 842
+MD5 fa4b2bbbfa9915866ae3f04063dd04bd files/run-qmailqmqpdlog 316
+MD5 05c7891e3fde628aa9aada21a4d6eebe files/run-qmailqmtpd 839
 MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557
 MD5 d6b150617bc5d76374fe010fc2902923 files/digest-qmail-1.03-r11 764
 MD5 7f17bb21b4ada140e73809d6478a5544 files/config-sanity-check 1223
 MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
-MD5 8b50041a2bb1f630b728dd07b6940506 files/run-qmailsmtpd 842
+MD5 6e7b856c1034c00ee4ff63209c354c25 files/run-qmailsmtpd 839
 MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224
 MD5 5c22397958f313d4cc62239e3e90c188 files/conf-smtpd 1702
 MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
 MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
-MD5 78e194c9fe61cab604d3d5a464965f72 files/run-qmailqmtpdlog 319
+MD5 8a0617c35da5f6703ad17a74ca617a7e files/run-qmailqmtpdlog 316
 MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
 MD5 0d96233f19a26e578c44e9d87f9e80eb files/digest-qmail-1.03-r13 1359
 MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
 MD5 490c49c812e7a04baadbbda6f4fc05b0 files/conf-common 2331
-MD5 0486e6491047bf8354f591ed0f536dd4 files/run-qmailpop3dlog 319
+MD5 8b155bdcd8ed957168b5180a915ee440 files/run-qmailpop3dlog 316
 MD5 6833866c14d955fee43d202f2c62151a files/qmail-genrsacert.sh 1165
-MD5 c5fe4a6ceb6786211e5953ede7437209 files/run-qmailpop3d 908
+MD5 5d982dc0db68c72cde9ce03f0da37ce4 files/run-qmailpop3d 909
 MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
 MD5 48a1e168db29ab4e6c57f1ac135ee2bf files/digest-qmail-1.03-r9 323
-MD5 5ddcb673977385f4bfdc93a2d4e65162 files/run-qmailsendlog 143
+MD5 c9017098b4721c4f68418d33236986c2 files/run-qmailsendlog 145
 MD5 0d96233f19a26e578c44e9d87f9e80eb files/digest-qmail-1.03-r12 1359
-MD5 91b1a3e8204f46c743031bad44bb88bd files/mkservercert 1429
+MD5 24d7af84c757b2892e51d1f88a264983 files/mkservercert 1425
 MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207
-MD5 0396cd9a5fc41ef7583548fa4a87fd86 files/run-qmailqmqpd 842
-MD5 721fae7da8d79f3dc8b0c28bd91251d5 files/digest-qmail-1.03-r16 1878
+MD5 15cef40ec6b06900d3a2cbff9a2c0968 files/run-qmailqmqpd 839
+MD5 25c7f01a56d3c9de72ab55cd3697b2e5 files/digest-qmail-1.03-r16 1954
 MD5 c369664bce0646b3d323d08f9ba5b8ce files/dot_qmail 82
 MD5 cc5c84d3a0837007b8af4a1f2e657872 files/1.03-r14/auth-after-tls-only.patch 2151
 MD5 9fa1fc2153d5a4659ddf02d9e3a1f9ba files/1.03-r14/qmail-pop3d-stat.tls.patch 750
@@ -75,6 +75,7 @@ MD5 aa1f60fd8b7d154da1e7d7a6fab422ce files/1.03-r16/Makefile-relaymxlookup.patch
 MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571
 MD5 fe189f1c8c28ae8b15bde3f8bb169997 files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch 454
 MD5 a8af4cf9b59e294737987624bc917e80 files/1.03-r16/smtpplugins 614
+MD5 81330827d80408f9bb6eab01857849dc files/1.03-r16/starttls-recordio.patch 390
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r9/run-qmailsmtpdlog 97
 MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r9/run-qmailsend 29
 MD5 71aa0894c118dda3405f1f847944158c files/1.03-r9/qmail-queue.patch 1512
diff --git a/mail-mta/qmail/files/1.03-r16/starttls-recordio.patch b/mail-mta/qmail/files/1.03-r16/starttls-recordio.patch
new file mode 100644
index 000000000000..6fcc228f87cd
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r16/starttls-recordio.patch
@@ -0,0 +1,12 @@
+--- 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/digest-qmail-1.03-r16 b/mail-mta/qmail/files/digest-qmail-1.03-r16
index b93bb6e46960..14019df2b6cc 100644
--- a/mail-mta/qmail/files/digest-qmail-1.03-r16
+++ b/mail-mta/qmail/files/digest-qmail-1.03-r16
@@ -25,3 +25,4 @@ MD5 2bd191cca4e640e87cca79bc0405f97a qmail-1.03-moreipme-0.6pre1-gentoo.patch 13
 MD5 d96455aaed208e9cd450d8874564781b qmail-relaymxlookup-0.3.diff 3856
 MD5 d898fbb2b4cb259b208dbb8c9d8c47a9 gentoo-qmail-1.03-r16-mfcheck.3.patch 4223
 MD5 95692f3a7574f258489943ca9d09981a gentoo-qmail-1.03-r16-spp.034.patch 34568
+MD5 a6d05602399a51f6133c7ff19142b7c8 qmail-bounce-encap-20040210.patch 4238
diff --git a/mail-mta/qmail/files/mkservercert b/mail-mta/qmail/files/mkservercert
index 82313cd5ebfa..42990f826549 100644
--- a/mail-mta/qmail/files/mkservercert
+++ b/mail-mta/qmail/files/mkservercert
@@ -1,5 +1,5 @@
-#! /bin/sh
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/mkservercert,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+#!/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.
diff --git a/mail-mta/qmail/files/qmail-config-system b/mail-mta/qmail/files/qmail-config-system
index 77148d0380aa..55237beee7ef 100644
--- a/mail-mta/qmail/files/qmail-config-system
+++ b/mail-mta/qmail/files/qmail-config-system
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # Configuration System for Qmail
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/qmail-config-system,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+# $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
 
diff --git a/mail-mta/qmail/files/run-qmailpop3d b/mail-mta/qmail/files/run-qmailpop3d
index fa3b23e8ceda..e6cf60a03e40 100644
--- a/mail-mta/qmail/files/run-qmailpop3d
+++ b/mail-mta/qmail/files/run-qmailpop3d
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # Gentoo Startup script for qmail's POP3 daemon
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailpop3d,v 1.2 2004/07/05 00:14:00 robbat2 Exp $
+# $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
diff --git a/mail-mta/qmail/files/run-qmailpop3dlog b/mail-mta/qmail/files/run-qmailpop3dlog
index b254146ee184..9e25905177eb 100644
--- a/mail-mta/qmail/files/run-qmailpop3dlog
+++ b/mail-mta/qmail/files/run-qmailpop3dlog
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # Gentoo Startup script for qmail's POP3 daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailpop3dlog,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailpop3dlog,v 1.3 2005/01/03 20:55:10 hansmi Exp $
 SERVICE=pop3
 source /var/qmail/bin/qmail-config-system && \
 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
index a82f3db7e9ef..85ffee18112f 100644
--- a/mail-mta/qmail/files/run-qmailqmqpd
+++ b/mail-mta/qmail/files/run-qmailqmqpd
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # Gentoo Startup script for qmail's QMQP daemon
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmqpd,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+# $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
diff --git a/mail-mta/qmail/files/run-qmailqmqpdlog b/mail-mta/qmail/files/run-qmailqmqpdlog
index ad18d7725c7e..2bcef3188e2a 100644
--- a/mail-mta/qmail/files/run-qmailqmqpdlog
+++ b/mail-mta/qmail/files/run-qmailqmqpdlog
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # Gentoo Startup script for qmail's QMQP daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmqpdlog,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmqpdlog,v 1.3 2005/01/03 20:55:10 hansmi Exp $
 SERVICE=qmqp
 source /var/qmail/bin/qmail-config-system && \
 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
index 3daf53d9df0c..b93094414a48 100644
--- a/mail-mta/qmail/files/run-qmailqmtpd
+++ b/mail-mta/qmail/files/run-qmailqmtpd
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # Gentoo Startup script for qmail's QMTP daemon
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmtpd,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+# $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
diff --git a/mail-mta/qmail/files/run-qmailqmtpdlog b/mail-mta/qmail/files/run-qmailqmtpdlog
index 919d4f95f08b..a27490ac960f 100644
--- a/mail-mta/qmail/files/run-qmailqmtpdlog
+++ b/mail-mta/qmail/files/run-qmailqmtpdlog
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # Gentoo Startup script for qmail's QMTP daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmtpdlog,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmtpdlog,v 1.3 2005/01/03 20:55:10 hansmi Exp $
 SERVICE=qmtp
 source /var/qmail/bin/qmail-config-system && \
 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
index 0d77770c7a36..d24ad8c1dcb7 100644
--- a/mail-mta/qmail/files/run-qmailsend
+++ b/mail-mta/qmail/files/run-qmailsend
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Gentoo qmail rc booter
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsend,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+# $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
index 1578e3875c14..f1604c936a5c 100644
--- a/mail-mta/qmail/files/run-qmailsendlog
+++ b/mail-mta/qmail/files/run-qmailsendlog
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 SERVICE=send
 source /var/qmail/bin/qmail-config-system && \
 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
index 4af9f3c0539c..5075cca4a265 100644
--- a/mail-mta/qmail/files/run-qmailsmtpd
+++ b/mail-mta/qmail/files/run-qmailsmtpd
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # Gentoo Startup script for qmail's SMTP daemon
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsmtpd,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+# $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
diff --git a/mail-mta/qmail/files/run-qmailsmtpdlog b/mail-mta/qmail/files/run-qmailsmtpdlog
index 068c59ab3535..2af080fabe31 100644
--- a/mail-mta/qmail/files/run-qmailsmtpdlog
+++ b/mail-mta/qmail/files/run-qmailsmtpdlog
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # Gentoo Startup script for qmail's SMTP daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsmtpdlog,v 1.2 2004/07/18 03:29:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsmtpdlog,v 1.3 2005/01/03 20:55:10 hansmi Exp $
 SERVICE=smtp
 source /var/qmail/bin/qmail-config-system && \
 exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/qmail-1.03-r12.ebuild b/mail-mta/qmail/qmail-1.03-r12.ebuild
index 092453fa8615..daf4e269dd3c 100644
--- a/mail-mta/qmail/qmail-1.03-r12.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r12.ebuild,v 1.7 2005/01/02 22:16:06 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r12.ebuild,v 1.8 2005/01/03 20:55:10 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -39,6 +39,7 @@ LICENSE="as-is"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND="virtual/libc
 	sys-apps/groff
+	app-shells/bash
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	>=net-mail/queue-fix-1.4-r1"
 
diff --git a/mail-mta/qmail/qmail-1.03-r13.ebuild b/mail-mta/qmail/qmail-1.03-r13.ebuild
index 9db9e8ae33e4..cf6835997a2f 100644
--- a/mail-mta/qmail/qmail-1.03-r13.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r13.ebuild,v 1.8 2005/01/02 22:16:06 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r13.ebuild,v 1.9 2005/01/03 20:55:10 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -39,6 +39,7 @@ LICENSE="as-is"
 KEYWORDS="x86 ppc sparc ~hppa alpha"
 DEPEND="virtual/libc
 	sys-apps/groff
+	app-shells/bash
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	>=net-mail/queue-fix-1.4-r1"
 
diff --git a/mail-mta/qmail/qmail-1.03-r14.ebuild b/mail-mta/qmail/qmail-1.03-r14.ebuild
index 90aedd197f36..dd40040ac220 100644
--- a/mail-mta/qmail/qmail-1.03-r14.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r14.ebuild,v 1.8 2005/01/02 22:16:06 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r14.ebuild,v 1.9 2005/01/03 20:55:10 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -47,6 +47,7 @@ DEPEND="virtual/libc
 
 RDEPEND="!virtual/mta
 	virtual/libc
+	app-shells/bash
 	>=sys-apps/ucspi-tcp-0.88
 	>=sys-apps/daemontools-0.76-r1
 	>=net-mail/checkpassword-0.90
diff --git a/mail-mta/qmail/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild
index 011d49a952f3..992ff01d0f66 100644
--- a/mail-mta/qmail/qmail-1.03-r15.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.14 2005/01/03 19:44:44 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.15 2005/01/03 20:55:10 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -48,6 +48,7 @@ DEPEND="virtual/libc
 	>=net-mail/queue-fix-1.4-r1"
 RDEPEND="!virtual/mta
 	virtual/libc
+	app-shells/bash
 	>=sys-apps/ucspi-tcp-0.88
 	>=sys-apps/daemontools-0.76-r1
 	>=net-mail/checkpassword-0.90
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index c502b8a3d68d..bd6dc69771fe 100644
--- a/mail-mta/qmail/qmail-1.03-r16.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.2 2005/01/03 19:44:44 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.3 2005/01/03 20:55:10 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -36,13 +36,13 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 	http://hansmi.ch/download/qmail/qmail-relaymxlookup-0.3.diff
 	mirror://gentoo/gentoo-qmail-1.03-r16-mfcheck.3.patch
 	mirror://gentoo/gentoo-qmail-1.03-r16-spp.034.patch
+	http://www.finnie.org/software/qmail-bounce-encap/qmail-bounce-encap-20040210.patch
 	"
 # broken stuffs
 #http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch
 
 LICENSE="as-is"
 SLOT="0"
-#KEYWORDS="~x86 ~ppc ~sparc mips alpha arm hppa amd64 ia64"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64"
 
 DEPEND="virtual/libc
@@ -51,13 +51,15 @@ DEPEND="virtual/libc
 	>=net-mail/queue-fix-1.4-r1"
 RDEPEND="!virtual/mta
 	virtual/libc
+	app-shells/bash
 	>=sys-apps/ucspi-tcp-0.88
 	>=sys-apps/daemontools-0.76-r1
 	>=net-mail/checkpassword-0.90
 	>=net-mail/cmd5checkpw-0.22
 	>=net-mail/dot-forward-0.71
 	>=net-mail/queue-fix-1.4-r1
-	selinux? ( sec-policy/selinux-qmail )"
+	selinux? ( sec-policy/selinux-qmail )
+	mailwrapper? ( net-mail/mailwrapper )"
 
 PROVIDE="virtual/mta
 	 virtual/mda"
@@ -222,17 +224,27 @@ src_unpack() {
 	# Rediffed patch to prevent from a problem which can
 	# happen when using NAT. Rediffed by hansmi@gentoo.org.
 	# See http://www.suspectclass.com/~sgifford/qmail/qmail-moreipme-0.6.README
+	EPATCH_SINGLE_MSG="Adding moreipme-patch" \
 	epatch ${DISTDIR}/qmail-1.03-moreipme-0.6pre1-gentoo.patch
 
 	# Patch to look up the mx before relaying
 	# Look at http://hansmi.ch/software/qmail
+	EPATCH_SINGLE_MSG="Adding relaymxlookup-patch" \
 	epatch ${DISTDIR}/qmail-relaymxlookup-0.3.diff
 	epatch ${FILESDIR}/${PVR}/Makefile-relaymxlookup.patch
 
 	# Fix a bug on ia64, see bug 68173
 	# Doesn't affect other platforms
+	EPATCH_SINGLE_MSG="Patch for spawn.c to fix a bug on ia64" \
 	epatch ${FILESDIR}/${PV}-r15/spawn-alloc-h.patch
 
+	# Added due to bug 38849
+	EPATCH_SINGLE_MSG="Adding qmail-bounce-encap to encapsulate bounces in rfc822 messages" \
+	epatch ${DISTDIR}/qmail-bounce-encap-20040210.patch
+
+	# Fixes bug 40521
+	epatch ${FILESDIR}/${PVR}/starttls-recordio.patch
+
 	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"
@@ -336,8 +348,15 @@ src_install() {
 	einfo "Creating sendmail replacement ..."
 	diropts -m 755
 	dodir /usr/sbin /usr/lib
-	dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-	dosym /var/qmail/bin/sendmail /usr/lib/sendmail
+
+	if useq mailwrapper; then
+		# make it compatible with mailwrapper, bug 48885
+		dosym /var/qmail/bin/sendmail /usr/sbin/sendmail.qmail
+		dosym /usr/sbin/sendmail /usr/lib/sendmail
+	else
+		dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
+		dosym /var/qmail/bin/sendmail /usr/lib/sendmail
+	fi
 
 	einfo "Setting up the default aliases ..."
 	diropts -m 700 -o alias -g qmail