Fixed bug 68173

5 files changed, 29 insertions, 6 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 251e0ee39634..d21bd9f156de 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2005/01/02 22:16:06 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.17 2005/01/03 19:44:44 hansmi Exp $
+
+  03 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r15.ebuild,
+  qmail-1.03-r16.ebuild:
+  Fixed bug 68173.
 
 *qmail-1.03-r16 (02 Jan 2005)
 
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index ff2724af27be..c9e6e7cbace6 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -2,12 +2,12 @@ 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 9af01892acf1d6dfeac50c674e8886b4 ChangeLog 19716
-MD5 bf936c8d04f78d9af3d923fd853b039f qmail-1.03-r16.ebuild 18554
+MD5 4d6d87b6cb0188f08fc749fcdd3fbe94 ChangeLog 19838
+MD5 e3ac39823c205fc835e4cfa8eb719e32 qmail-1.03-r16.ebuild 18675
 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 0c91415205fdad5a78c7203cded883eb qmail-1.03-r15.ebuild 17465
+MD5 0b0e3be753693204fd9545e39756e22f qmail-1.03-r15.ebuild 17583
 MD5 e98868f5438e0bad8815e8c2e629d611 qmail-1.03-r13.ebuild 14073
 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
 MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
@@ -162,6 +162,7 @@ MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r12/smtp-auth-close3.patch 728
 MD5 b643468b77484854e9f293f9b1c2f111 files/1.03-r12/run-qmailqmqpd 1169
 MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r12/dot_qmail 82
 MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch 1433
+MD5 118a42c2a167a1081ccd820f5b7f76db files/1.03-r15/spawn-alloc-h.patch 256
 MD5 d0aef5e4c492dbdc768bc1e0f7558870 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
diff --git a/mail-mta/qmail/files/1.03-r15/spawn-alloc-h.patch b/mail-mta/qmail/files/1.03-r15/spawn-alloc-h.patch
new file mode 100644
index 000000000000..fbf79aa867e9
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r15/spawn-alloc-h.patch
@@ -0,0 +1,10 @@
+--- spawn.c.orig        2004-10-19 12:09:28.071384468 -0400
++++ spawn.c     2004-10-19 12:10:18.340941456 -0400
+@@ -1,5 +1,6 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include "alloc.h"
+ #include "sig.h"
+ #include "wait.h"
+ #include "substdio.h"
+
diff --git a/mail-mta/qmail/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild
index 0b8e0201e22c..011d49a952f3 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.13 2005/01/02 22:16:06 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.14 2005/01/03 19:44:44 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -213,6 +213,10 @@ src_unpack() {
 	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 ${FILESDIR}/${PVR}/spawn-alloc-h.patch
+
 	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index 02d47550b534..c502b8a3d68d 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.1 2005/01/02 22:16:06 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.2 2005/01/03 19:44:44 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -229,6 +229,10 @@ src_unpack() {
 	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 ${FILESDIR}/${PV}-r15/spawn-alloc-h.patch
+
 	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"