more work in progres on -r12, nearly completed, ready for limited testing now

5 files changed, 83 insertions, 39 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index e8533228f3ea..ef7517ec9ef2 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/qmail
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.39 2003/09/01 19:38:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.40 2003/09/02 09:02:01 robbat2 Exp $
+
+  02 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild,
+  files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch,
+  files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch:
+  more work in progres on -r12, nearly completed, ready for limited testing now
 
   01 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild:
   more tweaks to r12
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index a1ee37c6fcf3..6cc5842fbf6a 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -2,8 +2,8 @@ MD5 4bf70f21528928c670477f76bd375237 qmail-1.03-r11.ebuild 11431
 MD5 3bdf6864e9399d20c8d786be23d7d34f qmail-1.03-r9.ebuild 9990
 MD5 d1d239c08fb007430de3a84e0a5de524 qmail-1.03-r10.ebuild 11180
 MD5 173fcf74cb0fb3fd6df5a3c842cd6d41 qmail-1.03-r8.ebuild 8142
-MD5 3b4b49aa100bc952404f479fbb3e58ba qmail-1.03-r12.ebuild 12673
-MD5 4410eabfaab1eb8e4c458e61ef5276bf ChangeLog 9640
+MD5 dd72cf9cc2abdd4e31c26f8b1622a818 qmail-1.03-r12.ebuild 12568
+MD5 50e22f313e002791523bcd0b771c3f5e ChangeLog 9907
 MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
 MD5 e0686e52df7f0c840a7ac2bfe1fd291a files/tcp.qmqp.sample 337
 MD5 946a715ffdd5e6d2d29c6fdfb29376dd files/tcp.smtp.sample 3726
@@ -92,10 +92,11 @@ MD5 53f8a798a9a11ef0352581244a7c1ad4 files/1.03-r12/conf-qmqpd 470
 MD5 7e3617ddb00abaa780f29cfdb838fd16 files/1.03-r12/conf-qmtpd 562
 MD5 1d7e48b17ef49117c4f975adf4757bf1 files/1.03-r12/conf-smtpd 1709
 MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r12/run-qmailsendlog 96
-MD5 2989c6fc4e70a9cc18580b3d83ce33fc files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch 2043
+MD5 2a725c31201c59077cd389486407624f files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch 2131
 MD5 fc7391f02934a9c75a92dce36229d590 files/1.03-r12/qmail-control 858
 MD5 dda736a7fb5a56209abead6e840252e8 files/1.03-r12/badrcptto-morebadrcptto-accdias-gentoo 19322
 MD5 2eb76f26c4ae70595f013d34519a41b8 files/1.03-r12/conf-common 1094
 MD5 aac562ac21608c8110340b31eec932e2 files/1.03-r12/config-sanity-check 814
+MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch 1433
 MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r12/run-qmailsend 29
 MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r12/run-qmailpop3dlog 97
diff --git a/net-mail/qmail/files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch b/net-mail/qmail/files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch
index a960ab503e37..3409116d57ab 100644
--- a/net-mail/qmail/files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch
+++ b/net-mail/qmail/files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch
@@ -1,15 +1,15 @@
 diff -ur qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
---- qmail-1.03.orig/qmail-smtpd.c	2003-08-12 19:54:02.000000000 -0700
-+++ qmail-1.03/qmail-smtpd.c	2003-08-12 20:00:30.000000000 -0700
-@@ -81,6 +81,7 @@
- }
+--- 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_relay() { out("553 we don't relay (#5.7.1)\r\n"); }
  void err_wantmail() { out("503 MAIL first (#5.5.1)\r\n"); }
-@@ -241,6 +242,40 @@
+ void err_wantrcpt() { out("503 RCPT first (#5.5.1)\r\n"); }
+@@ -296,6 +297,40 @@
    return 1;
  }
  
@@ -47,10 +47,10 @@ diff -ur qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
 +  return 1;
 +}
 +
- int bmfcheck()
+ int bmcheck(which) int which;
  {
-   int j;
-@@ -289,6 +324,12 @@
+   int i = 0;
+@@ -351,6 +386,12 @@
    smtp_greet("250 "); out("\r\n");
    seenmail = 0; dohelo(arg);
  }
@@ -58,24 +58,24 @@ diff -ur qmail-1.03.orig/qmail-smtpd.c qmail-1.03/qmail-smtpd.c
 +void smtp_size()
 +{
 +  size_buf[fmt_ulong(size_buf,(unsigned long) databytes)] = 0;
-+  out("250 SIZE "); out(size_buf); out("\r\n");
++  out("\r\n250-SIZE "); out(size_buf); 
 +}
- /* ESMTP extensions are published here */
  void smtp_ehlo(arg) char *arg;
  {
-@@ -304,6 +345,7 @@
-   out("\r\n250-AUTH=LOGIN PLAIN");
+   smtp_greet("250-");
+@@ -364,6 +405,7 @@
+ #ifdef TLS
+   if (!ssl) out("\r\n250-STARTTLS");
  #endif
-   out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
 +  smtp_size();
+   out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
    seenmail = 0; dohelo(arg);
  }
- void smtp_rset()
-@@ -314,6 +356,7 @@
+@@ -375,6 +417,7 @@
  void smtp_mail(arg) char *arg;
  {
    if (!addrparse(arg)) { err_syntax(); return; }
 +  if (databytes && !sizelimit(arg)) { err_size(); return; }
-   flagbarf = bmfcheck();
+   if (bmfok) flagbarfbmf = bmcheck(BMCHECK_BMF);
    seenmail = 1;
    if (!stralloc_copys(&rcptto,"")) die_nomem();
diff --git a/net-mail/qmail/files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch b/net-mail/qmail/files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch
new file mode 100644
index 000000000000..e6aab720418c
--- /dev/null
+++ b/net-mail/qmail/files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch
@@ -0,0 +1,41 @@
+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/net-mail/qmail/qmail-1.03-r12.ebuild b/net-mail/qmail/qmail-1.03-r12.ebuild
index 585aacef5cdb..bda29177b90a 100644
--- a/net-mail/qmail/qmail-1.03-r12.ebuild
+++ b/net-mail/qmail/qmail-1.03-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r12.ebuild,v 1.7 2003/09/01 19:38:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r12.ebuild,v 1.8 2003/09/02 09:02:01 robbat2 Exp $
 
 inherit eutils
 
@@ -24,8 +24,7 @@ SRC_URI="mirror://qmail/qmail-1.03.tar.gz
   	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-limit-bounce-size.patch.txt
 	http://www.ckdhr.com/ckd/qmail-103.patch
 	http://www.arda.homeunix.net/store/qmail/qregex-starttls-2way-auth.patch
-	http://www.soffian.org/downloads/qmail/qmail-remote-auth-patch-doc.txt
-	"
+	http://www.soffian.org/downloads/qmail/qmail-remote-auth-patch-doc.txt"
 
 SLOT="0"
 LICENSE="as-is"
@@ -79,7 +78,7 @@ src_unpack() {
 	epatch ${DISTDIR}/qmail-1.03-qmtpc.patch
 
 	# Large TCP DNS replies confuse it sometimes
-	#EPATCH_SINGLE_MSG="Adding support for oversize DNS" \
+	EPATCH_SINGLE_MSG="Adding support for oversize DNS" \
 	epatch ${DISTDIR}/qmail-103.patch
 
 	# Fix for tabs in .qmail bug noted at
@@ -102,11 +101,6 @@ src_unpack() {
 	# make the qmail 'sendmail' binary behave like sendmail's for -f
 	epatch ${DISTDIR}/sendmail-flagf.patch
 
-	#TODO REDIFF
-	# Reject some bad relaying attempts
-	# gentoo bug #18064 
-	#epatch ${DISTDIR}/qmail-smtpd-relay-reject
-	
 	# Apply patch to make qmail-local and qmail-pop3d compatible with the
 	# maildir++ quota system that is used by vpopmail and courier-imap
 	epatch ${DISTDIR}/qmail-maildir++.patch
@@ -117,19 +111,23 @@ src_unpack() {
 	# This will make the emails headers be written in localtime rather than GMT
 	# If you really want, uncomment it yourself, as mail really should be in GMT
 	epatch ${DISTDIR}/qmail-date-localtime.patch.txt
-
-	#TODO REDIFF
-	# Apply patch to add ESMTP SIZE support to qmail-smtpd
-	# This helps your server to be able to reject excessively large messages
-	# "up front", rather than waiting the whole message to arrive and then
-	# bouncing it because it exceeded your databytes setting
-	#epatch ${DISTDIR}/qmail-smtpd-esmtp-size.diff.txt
-	#epatch ${FILESDIR}/${PV}-${PR}/qmail-smtpd-esmtp-size-gentoo.patch
 	
 	# Apply patch to trim large bouncing messages down greatly reduces traffic
 	# when multiple bounces occur (As in with spam)
 	epatch ${DISTDIR}/qmail-limit-bounce-size.patch.txt
 	
+	#TODO TEST
+	# Apply patch to add ESMTP SIZE support to qmail-smtpd
+	# This helps your server to be able to reject excessively large messages
+	# "up front", rather than waiting the whole message to arrive and then
+	# bouncing it because it exceeded your databytes setting
+	epatch ${FILESDIR}/${PV}-${PR}/qmail-smtpd-esmtp-size-gentoo.patch
+	
+	#TODO TEST
+	# Reject some bad relaying attempts
+	# gentoo bug #18064 
+	epatch ${FILESDIR}/${PV}-${PR}/qmail-smtpd-relay-reject.gentoo.patch
+
 	#TODO REDIFF
 	# provide badrcptto support
 	# as per bug #17283
@@ -138,7 +136,6 @@ src_unpack() {
 	#epatch ${FILESDIR}/${PV}-${PR}/badrcptto-morebadrcptto-accdias-gentoo
 
 	echo -n "${CC} ${CFLAGS}" >${S}/conf-cc	
-	#ewarn "TLS support is disabled due to a bug in the patch presently"
 	use ssl && echo -n ' -DTLS' >>${S}/conf-cc
 	echo -n "${CC} ${LDFLAGS}" > ${S}/conf-ld
 	echo -n "500" > ${S}/conf-spawn