quick fix

3 files changed, 45 insertions, 37 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index d440d96dadc7..c3699573a597 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,6 +1,9 @@
 # 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.26 2003/07/27 09:22:27 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.27 2003/07/31 11:21:08 seemant Exp $
+
+  31 Jul 2003; Seemant Kulleen <seemant@gentoo.org> qmail-1.03-r10.ebuild:
+  changed epatch to patch, because the dry-run on tls.patch.bz2 seems to fail.
 
   27 Jul 2003; Nick Hadaway <raker@gentoo.org> qmail-1.03-r10.ebuild:
   Integrated the qmail-pop3d build into this.  It was just the creation 
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index db448a7af4e8..a2215ae556ff 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -1,44 +1,44 @@
-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 b1a3fcd28ed415f92d775ac6fbe54dda files/1.03-r10/tls-patch.txt 5803
-MD5 dd5158b78a3878d78a68878f1910e0e4 files/1.03-r10/tls.patch.bz2 10458
-MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r10/smtp-auth-close3.patch 535
-MD5 88f15101dd4bc36b52d13f336713e716 files/1.03-r10/run-qmailpop3d 221
-MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r10/run-qmailpop3dlog 97
-MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
+MD5 30ae1187a48ebe4c70c38c08c5706d76 qmail-1.03-r9.ebuild 9991
+MD5 2d5e1e44905fc1776d083088d6bef177 qmail-1.03-r10.ebuild 11181
+MD5 19dd9b9232eb66c5adb8263df11c2873 qmail-1.03-r8.ebuild 8143
+MD5 18ba2458ab1f62d326c07e52d8ed9d15 ChangeLog 4962
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 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 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 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r8/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r8/dot_qmail 12
 MD5 f42d6f2e58b7031ceb491820e85ddd16 files/1.03-r8/qmail-1.03-starttls-smtp-auth.patch 41786
-MD5 8ca0f00a5f3404506b70f8f4420cafc9 files/1.03-r8/qmail-control 809
+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 71aa0894c118dda3405f1f847944158c files/1.03-r8/qmail-queue.patch 1512
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
+MD5 8ca0f00a5f3404506b70f8f4420cafc9 files/1.03-r8/qmail-control 809
 MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r8/run-qmailsend 29
-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 71aa0894c118dda3405f1f847944158c files/1.03-r9/qmail-queue.patch 1512
+MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r9/run-qmailsmtpd 231
 MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r9/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r9/dot_qmail 12
 MD5 f42d6f2e58b7031ceb491820e85ddd16 files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch 41786
-MD5 0b5b699aaf38366692d70ac3aa3a51e9 files/1.03-r9/qmail-control 809
+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 71aa0894c118dda3405f1f847944158c files/1.03-r9/qmail-queue.patch 1512
+MD5 0b5b699aaf38366692d70ac3aa3a51e9 files/1.03-r9/qmail-control 809
 MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r9/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
-MD5 53573c699bc7a642b1ba3bf4b8b67876 qmail-1.03-r10.ebuild 11090
-MD5 19dd9b9232eb66c5adb8263df11c2873 qmail-1.03-r8.ebuild 8143
-MD5 30ae1187a48ebe4c70c38c08c5706d76 qmail-1.03-r9.ebuild 9991
-MD5 37762ce50723e83f9378988c41695f43 ChangeLog 4805
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r10/rc 108
+MD5 88f15101dd4bc36b52d13f336713e716 files/1.03-r10/run-qmailpop3d 221
+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 0e97c0b031776f40cacdfbf3114af574 files/1.03-r10/run-qmailpop3dlog 97
diff --git a/net-mail/qmail/qmail-1.03-r10.ebuild b/net-mail/qmail/qmail-1.03-r10.ebuild
index eb8a5c3db6b6..23b85e1bf50b 100644
--- a/net-mail/qmail/qmail-1.03-r10.ebuild
+++ b/net-mail/qmail/qmail-1.03-r10.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-r10.ebuild,v 1.21 2003/07/31 00:51:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r10.ebuild,v 1.22 2003/07/31 11:21:08 seemant Exp $
 
 inherit eutils
 
@@ -52,7 +52,12 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-${PR}/smtp-auth-close3.patch
 
 	# TLS support and an EHLO patch
-	use ssl && epatch ${FILESDIR}/${PV}-${PR}/tls.patch.bz2
+	if use ssl 
+	then
+		ebegin "Applying tls.patch.bz2..."
+		bzcat ${FILESDIR}/${PV}-${PR}/tls.patch.bz2 | patch -p1 &>/dev/null || die
+		eend $?
+	fi
 
 	# patch so an alternate queue processor can be used
 	# i.e. - qmail-scanner