Rewritten the virtual-domain-outgoing-IP-address patch, enhanced the ebuilds a small bit.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 133 insertions, 137 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index c870b3cf212c..58cba84e864a 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,12 @@
 # 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.53 2005/07/19 15:41:24 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.54 2005/07/20 14:11:05 hansmi Exp $
+
+  20 Jul 2005; Michael Hanselmann <hansmi@gentoo.org>
+  files/1.03-r16/virtual-domain-outgoing-IP-address.patch,
+  qmail-1.03-r15.ebuild, qmail-1.03-r16.ebuild:
+  Rewritten the virtual-domain-outgoing-IP-address patch, enhanced the ebuilds
+  a small bit.
 
   19 Jul 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r16.ebuild:
   Took out broken virtual-ip-patch, bug #99497
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 2ad3284ca38e..ddd37aec97f1 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,79 +1,69 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 29fd64e7535994c2d07840b4f3dee521 ChangeLog 30700
+MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
+MD5 cd27fb007c1ab505fb041467b31cfd26 ChangeLog 30956
+MD5 c87f9758ff296040b074f69d91728310 qmail-1.03-r16.ebuild 20936
+MD5 404097d69469ba7ef38d85956ac3409a qmail-1.03-r15.ebuild 18459
+MD5 7db09ceb9337348431fb9f8418e5892e files/dot_qmail-log 276
+MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
+MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
+MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719
+MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850
+MD5 1a4fbc35caee388c5ee4f7413ce63148 files/run-qmailsmtpdlog 321
+MD5 836c401d53b4f1d40872dcb3c3ccbd46 files/conf-send 235
+MD5 70f7b1f551a6dce51f65e2e8b7d7d37a files/run-qmailsend 165
+MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073
+MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
+MD5 4ee8193d6da00d6930ecadb1e91fd964 files/run-qmailqmqpdlog 321
+MD5 05c7891e3fde628aa9aada21a4d6eebe files/run-qmailqmtpd 839
+MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557
+MD5 37c08c1ad7423b6625a4dca603fe1df0 files/conf-smtpd-r16 1931
+MD5 9cc72fa27c9643d8b7d8388d6e045d6f files/config-sanity-check 1296
+MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
+MD5 6e7b856c1034c00ee4ff63209c354c25 files/run-qmailsmtpd 839
+MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224
+MD5 84f1655093d0de27bebc48111dddba5f files/conf-smtpd 1935
+MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
+MD5 f278840a9cd62309d70cb339fbf1f6a6 files/run-qmailqmtpdlog 321
+MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
+MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
+MD5 fd098ab9ede9c74f209bf16e168ab185 files/conf-common 2328
+MD5 9867559d416bd731eed63709f5eef841 files/run-qmailpop3dlog 321
+MD5 73db31418bb525a8a5653b435ea07315 files/qmail-genrsacert.sh 1464
+MD5 5d982dc0db68c72cde9ce03f0da37ce4 files/run-qmailpop3d 909
+MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
+MD5 60de9dacc5289d44d64603d76e5ebc99 files/run-qmailsendlog 320
+MD5 24d7af84c757b2892e51d1f88a264983 files/mkservercert 1425
+MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207
+MD5 15cef40ec6b06900d3a2cbff9a2c0968 files/run-qmailqmqpd 839
+MD5 f681f647ece2b703dc75a2a8e6899432 files/digest-qmail-1.03-r16 1948
+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
 MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r14/maildir-quota-fix.patch 547
-MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616
-MD5 518aef241cd482233a3c07608e12276c files/1.03-r14/qmail-1.03-accept-5xx.tls.patch 882
+MD5 2a725c31201c59077cd389486407624f files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch 2131
 MD5 a8bfc3cf2c69e8e46b07a357a8572e5e files/1.03-r14/qmail-1.03-qregex-memleak-fix.patch 498
-MD5 34a2e22386f4d11874e33b38576a7958 files/1.03-r14/qmail-gentoo-branding.patch 375
 MD5 d046c053c7dd353891dd6778000890bf files/1.03-r14/qmail-pop3d-capa-outputfix.patch 424
-MD5 9fa1fc2153d5a4659ddf02d9e3a1f9ba files/1.03-r14/qmail-pop3d-stat.tls.patch 750
+MD5 518aef241cd482233a3c07608e12276c files/1.03-r14/qmail-1.03-accept-5xx.tls.patch 882
+MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616
+MD5 34a2e22386f4d11874e33b38576a7958 files/1.03-r14/qmail-gentoo-branding.patch 375
 MD5 a91645f4af61ce981e01ef84bc2ae7b6 files/1.03-r14/qmail-qmailqueue-docs.patch 1085
-MD5 2a725c31201c59077cd389486407624f files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch 2131
-MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch 1433
 MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728
-MD5 3a5f3dbe17b1f4f4318b8941bb55743e files/1.03-r15/Makefile-relaymxlookup.patch 1947
-MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336
-MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
-MD5 118a42c2a167a1081ccd820f5b7f76db files/1.03-r15/spawn-alloc-h.patch 256
-MD5 47aab2c1e0357f8cf6f173caeca60419 files/1.03-r15/tlsbeforeauth-fix.patch 969
-MD5 c0d3c5bd70a49284eb8cc8a5f952202e files/1.03-r16/Makefile-relaymxlookup.patch 1988
+MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch 1433
 MD5 a963429b55bc3713ff3a22674101dfdb files/1.03-r16/auth-after-tls-only.patch 2241
-MD5 72c4027c99c19158d4bbe3ed77efcae6 files/1.03-r16/double-bounce-trim.patch 1662
-MD5 8f196c7649132af2c0c3745c1a5f1e9c files/1.03-r16/famd-dnotify.patch 555
-MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571
+MD5 c0d3c5bd70a49284eb8cc8a5f952202e files/1.03-r16/Makefile-relaymxlookup.patch 1988
+MD5 0600d03067d6a112ff8fef64f8952f5c files/1.03-r16/qmail-1.03-env-servercert.patch 1306
 MD5 a8f7776c6f7e51e1d23c5d086714b329 files/1.03-r16/invalid-envelope-sender-log.patch 418
-MD5 d48eeee899c7999925dd64afd4109269 files/1.03-r16/nullenvsender-recipcount.tls.patch 1479
+MD5 0494b42b8f85e67f82f892024b18e6af files/1.03-r16/virtual-domain-outgoing-IP-address.patch 4040
+MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571
 MD5 a1e8f454e96a2b23e9daae34fa6b6b5e files/1.03-r16/qmail-1.03-accept-5xx.tls.patch 930
-MD5 0600d03067d6a112ff8fef64f8952f5c files/1.03-r16/qmail-1.03-env-servercert.patch 1306
+MD5 8f196c7649132af2c0c3745c1a5f1e9c files/1.03-r16/famd-dnotify.patch 555
+MD5 d48eeee899c7999925dd64afd4109269 files/1.03-r16/nullenvsender-recipcount.tls.patch 1479
+MD5 72c4027c99c19158d4bbe3ed77efcae6 files/1.03-r16/double-bounce-trim.patch 1662
 MD5 8d015331a1c3f0ad22f40bb6837569ca files/1.03-r16/qmail-logmail.patch 269
-MD5 b968f9de39ff3cac7e6abbd8705af5f2 files/1.03-r16/qmail-smtpd-relay-reject.gentoo.patch 1206
 MD5 a8af4cf9b59e294737987624bc917e80 files/1.03-r16/smtpplugins 614
 MD5 81330827d80408f9bb6eab01857849dc files/1.03-r16/starttls-recordio.patch 390
-MD5 d59cac4ed0aeb4d5a5988634aaf34ab0 files/1.03-r16/virtual-domain-outgoing-IP-address.patch 4057
-MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
-MD5 fd098ab9ede9c74f209bf16e168ab185 files/conf-common 2328
-MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207
-MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
-MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557
-MD5 836c401d53b4f1d40872dcb3c3ccbd46 files/conf-send 235
-MD5 84f1655093d0de27bebc48111dddba5f files/conf-smtpd 1935
-MD5 37c08c1ad7423b6625a4dca603fe1df0 files/conf-smtpd-r16 1931
-MD5 9cc72fa27c9643d8b7d8388d6e045d6f files/config-sanity-check 1296
-MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719
-MD5 f681f647ece2b703dc75a2a8e6899432 files/digest-qmail-1.03-r16 1948
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/dot_qmail 82
-MD5 7db09ceb9337348431fb9f8418e5892e files/dot_qmail-log 276
-MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850
-MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224
-MD5 24d7af84c757b2892e51d1f88a264983 files/mkservercert 1425
-MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073
-MD5 73db31418bb525a8a5653b435ea07315 files/qmail-genrsacert.sh 1464
-MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
-MD5 5d982dc0db68c72cde9ce03f0da37ce4 files/run-qmailpop3d 909
-MD5 9867559d416bd731eed63709f5eef841 files/run-qmailpop3dlog 321
-MD5 15cef40ec6b06900d3a2cbff9a2c0968 files/run-qmailqmqpd 839
-MD5 4ee8193d6da00d6930ecadb1e91fd964 files/run-qmailqmqpdlog 321
-MD5 05c7891e3fde628aa9aada21a4d6eebe files/run-qmailqmtpd 839
-MD5 f278840a9cd62309d70cb339fbf1f6a6 files/run-qmailqmtpdlog 321
-MD5 70f7b1f551a6dce51f65e2e8b7d7d37a files/run-qmailsend 165
-MD5 60de9dacc5289d44d64603d76e5ebc99 files/run-qmailsendlog 320
-MD5 6e7b856c1034c00ee4ff63209c354c25 files/run-qmailsmtpd 839
-MD5 1a4fbc35caee388c5ee4f7413ce63148 files/run-qmailsmtpdlog 321
-MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
-MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
-MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
-MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
-MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
-MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
-MD5 0b013aa4c8ebe908f006ce650c686a75 qmail-1.03-r15.ebuild 18206
-MD5 ba4f248ff9cad7b2a5bcf59da1ff949e qmail-1.03-r16.ebuild 20868
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3TDnI1lqEGTUzyQRAo1lAJ9yKffuTNca/iO8f0x37YisvQDfNACfcXy9
-oexzgvOrX92rmKnZFQGaKgw=
-=nsHI
------END PGP SIGNATURE-----
+MD5 b968f9de39ff3cac7e6abbd8705af5f2 files/1.03-r16/qmail-smtpd-relay-reject.gentoo.patch 1206
+MD5 118a42c2a167a1081ccd820f5b7f76db files/1.03-r15/spawn-alloc-h.patch 256
+MD5 3a5f3dbe17b1f4f4318b8941bb55743e files/1.03-r15/Makefile-relaymxlookup.patch 1947
+MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336
+MD5 47aab2c1e0357f8cf6f173caeca60419 files/1.03-r15/tlsbeforeauth-fix.patch 969
+MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
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
index e122b26a46d3..f1c3d13f8adc 100644
--- 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
@@ -1,115 +1,109 @@
-diff -NuarbBw qmail-1.03.orig/qmail-qmqpc.c qmail-1.03/qmail-qmqpc.c
---- qmail-1.03.orig/qmail-qmqpc.c	1998-06-15 03:53:16.000000000 -0700
-+++ qmail-1.03/qmail-qmqpc.c	2005-07-14 01:00:24.000000000 -0700
+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) { // JAK
++  if (timeoutconn(qmqpfd,&ip,(struct ip_address*)0,PORT_QMQP,10) != 0) {
      lasterror = 73;
      if (errno == error_timeout) lasterror = 72;
      close(qmqpfd);
-diff -NuarbBw qmail-1.03.orig/qmail-remote.c qmail-1.03/qmail-remote.c
---- qmail-1.03.orig/qmail-remote.c	2005-07-14 00:50:58.000000000 -0700
-+++ qmail-1.03/qmail-remote.c	2005-07-14 01:01:22.000000000 -0700
+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 }; // JAK
-+ipalloc                 smtpip   = { 0 }; // JAK
++stralloc smtphost = {0};
++ipalloc smtpip = {0};
 +
  saa reciplist = {0};
  
  struct ip_address partner;
-@@ -902,9 +905,27 @@
- 
-   addrmangle(&sender,argv[2],&flagalias,0);
+@@ -904,6 +907,20 @@
   
-+   // '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.
-+
-+   stralloc_copy ( &smtphost, &canonhost ); // JAK
-+   dns_ip ( &smtpip, &smtphost );           // JAK
-+
    if (!saa_readyplus(&reciplist,0)) temp_nomem();
    if (ipme_init() != 1) temp_oserr();
-  
-+   // JAK =>
-+   // Check if the obtained SMTP IP address is one of the addresses
-+   // on this machine. If it is, set 'helohost' to 'smtphost'.
-+
-+   if ( ipme_is ( &smtpip.ix -> ip ) )
-+      stralloc_copy ( &helohost, &smtphost );
-+   else                                        
-+      smtpip.ix -> ip.d [ 0 ] = smtpip.ix -> ip.d [ 1 ] = smtpip.ix -> ip.d [ 2 ] = smtpip.ix -> ip.d [ 3 ] = 0;
-+
-+   // JAK <=
++  
++  // '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;
-   while (*recips) {
-@@ -951,7 +972,7 @@
+@@ -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) port,timeoutconnect) == 0) { // JAK
++      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 */
-diff -NuarbBw qmail-1.03.orig/remoteinfo.c qmail-1.03/remoteinfo.c
---- qmail-1.03.orig/remoteinfo.c	1998-06-15 03:53:16.000000000 -0700
-+++ qmail-1.03/remoteinfo.c	2005-07-14 01:00:24.000000000 -0700
+@@ -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; } // JAK
++  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 -NuarbBw qmail-1.03.orig/timeoutconn.c qmail-1.03/timeoutconn.c
---- qmail-1.03.orig/timeoutconn.c	1998-06-15 03:53:16.000000000 -0700
-+++ qmail-1.03/timeoutconn.c	2005-07-14 01:00:24.000000000 -0700
+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,smtpip,port,timeout) // JAK
++int timeoutconn(s,ip,localip,port,timeout)
  int s;
  struct ip_address *ip;
-+struct ip_address *smtpip;             // JAK
++struct ip_address *localip;
  unsigned int port;
  int timeout;
  {
-@@ -22,6 +23,25 @@
+@@ -22,6 +23,17 @@
    fd_set wfds;
    struct timeval tv;
   
-+   // JAK =>
-+   // If 'smtpip' != 0.0.0.0 bind () it as outgoing SMTP IP address.
-+
-+   if ( ( smtpip            != 0 ) &&
-+        ( smtpip -> d [ 0 ] != 0 ) && 
-+        ( smtpip -> d [ 1 ] != 0 ) && 
-+        ( smtpip -> d [ 2 ] != 0 ) && 
-+        ( smtpip -> d [ 3 ] != 0 )    )
-+   {
-+      byte_zero ( &sin, sizeof ( sin ) );
-+      byte_copy ( &sin.sin_addr.s_addr, 4, smtpip );
-+      sin.sin_family = AF_INET;
-+
-+      if ( bind ( s, ( struct sockaddr * ) &sin, sizeof ( sin ) ) )
-+         return ( -1 );
-+   }
-+
-+   // JAK <=
++  // 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/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild
index b389f44aeeb6..f33a18c16664 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.29 2005/07/18 05:13:41 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.30 2005/07/20 14:11:05 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails flag-o-matic
 
@@ -434,6 +434,11 @@ buildtcprules() {
 }
 
 pkg_postinst() {
+	if [[ ! -x /var/qmail/bin/queue-fix ]]; then
+		eerror "Can't find /var/qmail/bin/queue-fix -- have you rm -rf'd /var/qmail?"
+		einfo "Please remerge net-mail/queue-fix and don't do that again!"
+		die "Can't find /var/qmail/bin/queue-fix"
+	fi
 
 	einfo "Setting up the message queue hierarchy ..."
 	# queue-fix makes life easy!
@@ -485,7 +490,7 @@ pkg_preinst() {
 			else
 				fail=1
 			fi
-			if [ "${fail}" = "1" ]; then
+			if [ "${fail}" = 1 -a -f ${old} ]; then
 				eerror "Error moving $old to $new, be sure to check the"
 				eerror "configuration! You may have already moved the files,"
 				eerror "in which case you can delete $old"
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index 3a09028f7af0..8888ab202023 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.29 2005/07/19 15:41:24 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.30 2005/07/20 14:11:05 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails flag-o-matic
 
@@ -251,8 +251,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${PVR}/invalid-envelope-sender-log.patch
 
 	# See bug 98961
-	# hansmi, 2005-07-19: This patch is broken, needs fixing, #99497
-	# epatch ${FILESDIR}/${PVR}/virtual-domain-outgoing-IP-address.patch
+	# Sort-of rewritten by hansmi@g.o, because the old patch was heavily broken
+	# (caused qmail-remote to segfault)
+	epatch ${FILESDIR}/${PVR}/virtual-domain-outgoing-IP-address.patch
 
 	# See bug #90631
 	if use logmail; then
@@ -380,7 +381,7 @@ src_install() {
 
 	for i in mailer-daemon postmaster root
 	do
-		if [ ! -f ${ROOT}/var/qmail/alias/.qmail-${i} ]; then
+		if [[ ! -f ${ROOT}/var/qmail/alias/.qmail-${i} ]]; then
 			touch ${D}/var/qmail/alias/.qmail-${i}
 			fowners alias:qmail /var/qmail/alias/.qmail-${i}
 		fi
@@ -477,7 +478,7 @@ buildtcprules() {
 		src=${ROOT}${TCPRULES_DIR}/${f}
 		cdb=${ROOT}${TCPRULES_DIR}/${f}.cdb
 		tmp=${ROOT}${TCPRULES_DIR}/.${f}.tmp
-		cat ${src} 2>/dev/null | tcprules ${cdb} ${tmp}
+		cat ${src} 2>/dev/null | tcprules ${cdb} ${tmp} < ${src}
 	done
 }
 
@@ -546,7 +547,7 @@ pkg_preinst() {
 			else
 				fail=1
 			fi
-			if [ "${fail}" = "1" ]; then
+			if [ "${fail}" = 1 -a -f ${old} ]; then
 				eerror "Error moving $old to $new, be sure to check the"
 				eerror "configuration! You may have already moved the files,"
 				eerror "in which case you can delete $old"