add gentoo branding patch and patch to add docs for QMAILQUEUE

5 files changed, 59 insertions, 4 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index 0b95f66fccaf..bb0cf07d71b9 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.52 2003/11/30 11:33:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.53 2003/11/30 21:24:54 robbat2 Exp $
+
+  30 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r14.ebuild,
+  files/1.03-r14/qmail-gentoo-branding.patch,
+  files/1.03-r14/qmail-qmailqueue-docs.patch:
+  add gentoo branding patch and patch to add docs for QMAILQUEUE
 
   30 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r14.ebuild:
   forgot to put in unstable
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index 6012789cab36..7e40cbca0fe4 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -1,11 +1,11 @@
-MD5 39c695fea89306c99a4ef07cad7370d4 qmail-1.03-r14.ebuild 15450
+MD5 ba102f6a4922d4d9a108f542a24c82e0 qmail-1.03-r14.ebuild 15754
 MD5 ded2ff2bdb5763a3cca002f79425be66 qmail-1.03-r11.ebuild 11395
 MD5 bc20b8ab3977f5ae84b74e3c6eec2f3b qmail-1.03-r9.ebuild 9963
 MD5 4c1f85da35d1c41f674d9cbaed5b1bad qmail-1.03-r13.ebuild 14026
 MD5 4ec9b420e902b04f70b810720a5d5bd7 qmail-1.03-r10.ebuild 11151
 MD5 42789d45c1d7895767ef8d7007ac5caf qmail-1.03-r8.ebuild 8114
 MD5 4ce79aa111f45b13f820f0906f22f9ee qmail-1.03-r12.ebuild 13624
-MD5 42a5323911090c954eb9729eb981220d ChangeLog 14461
+MD5 549c5f11cbc9c7ce536775b9b7cd9bf8 ChangeLog 14695
 MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
 MD5 f376490154b9fce6c3d79640a7aed64e files/rc 280
 MD5 e0686e52df7f0c840a7ac2bfe1fd291a files/tcp.qmqp.sample 337
@@ -165,5 +165,7 @@ MD5 9fa1fc2153d5a4659ddf02d9e3a1f9ba files/1.03-r14/qmail-pop3d-stat.tls.patch 7
 MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616
 MD5 d046c053c7dd353891dd6778000890bf files/1.03-r14/qmail-pop3d-capa-outputfix.patch 424
 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 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
diff --git a/net-mail/qmail/files/1.03-r14/qmail-gentoo-branding.patch b/net-mail/qmail/files/1.03-r14/qmail-gentoo-branding.patch
new file mode 100644
index 000000000000..4f353b9e0c40
--- /dev/null
+++ b/net-mail/qmail/files/1.03-r14/qmail-gentoo-branding.patch
@@ -0,0 +1,11 @@
+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/net-mail/qmail/files/1.03-r14/qmail-qmailqueue-docs.patch b/net-mail/qmail/files/1.03-r14/qmail-qmailqueue-docs.patch
new file mode 100644
index 000000000000..d4827a78ebcf
--- /dev/null
+++ b/net-mail/qmail/files/1.03-r14/qmail-qmailqueue-docs.patch
@@ -0,0 +1,31 @@
+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/net-mail/qmail/qmail-1.03-r14.ebuild b/net-mail/qmail/qmail-1.03-r14.ebuild
index 0d3485e4df4d..815f4408af9e 100644
--- a/net-mail/qmail/qmail-1.03-r14.ebuild
+++ b/net-mail/qmail/qmail-1.03-r14.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-r14.ebuild,v 1.2 2003/11/30 11:33:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r14.ebuild,v 1.3 2003/11/30 21:24:54 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -80,6 +80,8 @@ src_unpack() {
 	# i.e. - qmail-scanner
 	EPATCH_SINGLE_MSG="Adding QMAILQUEUE support" \
 	epatch ${DISTDIR}/qmailqueue-patch
+	EPATCH_SINGLE_MSG="Adding QMAILQUEUE info to documentation" \
+	epatch ${FILESDIR}/${PVR}/qmail-qmailqueue-docs.patch
 
 	# a patch for faster queue processing
 	EPATCH_SINGLE_MSG="Patching for large queues" \
@@ -182,6 +184,10 @@ src_unpack() {
 	EPATCH_SINGLE_MSG="qmail-pop3d reports erroneous figures on STAT after a DELE" \
 	epatch ${FILESDIR}/${PVR}/qmail-pop3d-stat.tls.patch
 
+	EPATCH_SINGLE_MSG="Branding qmail with Gentoo identifier 'Gentoo Linux ${PF}'" \
+	epatch ${FILESDIR}/${PVR}/qmail-gentoo-branding.patch
+	sed -e "s/__PF__/${PF}/" -i ${S}/qmail-smtpd.c
+
 	echo -n "${CC} ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"