Fix for bug #119890 thanks to Arthur Britto <ahbritto@iat.com>

(Portage version: 2203-svn)

5 files changed, 97 insertions, 1 deletions

diff --git a/mail-filter/procmail/ChangeLog b/mail-filter/procmail/ChangeLog
index 15c51b3eed6a..19093386e606 100644
--- a/mail-filter/procmail/ChangeLog
+++ b/mail-filter/procmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/procmail
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.25 2006/02/20 01:40:14 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.26 2006/05/12 07:04:36 ferdy Exp $
+
+*procmail-3.22-r8 (12 May 2006)
+
+  12 May 2006; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/procmail-maxprocs-fix.diff, +procmail-3.22-r8.ebuild:
+  Fix for bug #119890 thanks to Arthur Britto <ahbritto@iat.com>
 
   20 Feb 2006; Joshua Kinard <kumba@gentoo.org> procmail-3.22-r7.ebuild:
   Marked stable on mips.
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index 9e8634d4db8a..b5d5d4908a3d 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -1,9 +1,12 @@
 MD5 307a641d3c63ae5e15248b72c6eab177 ChangeLog 7208
 MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r6 65
 MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r7 65
+MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r8 65
 MD5 280e86cd3850b13629b0beee3c2c5522 files/gentoo-maildir2.diff 797
 MD5 6c44beee1c99e38bfd3b3bda6979db00 files/procmail-comsat-segfault.diff 822
 MD5 e0c638b848ae112a847d5ef48cb9f209 files/procmail-lazy-bindings.diff 622
+MD5 38be5f7bba5a1ae6e6cf8b68539dbf90 files/procmail-maxprocs-fix.diff 465
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 66b5fb24b12d077d4437c865b1c1d449 procmail-3.22-r6.ebuild 1788
 MD5 57631ecb365ddeb7fd4c4f6c532ddc29 procmail-3.22-r7.ebuild 1865
+MD5 d87c4e35edf8c540dc8c436d77f99411 procmail-3.22-r8.ebuild 1946
diff --git a/mail-filter/procmail/files/digest-procmail-3.22-r8 b/mail-filter/procmail/files/digest-procmail-3.22-r8
new file mode 100644
index 000000000000..d14b9662a1d7
--- /dev/null
+++ b/mail-filter/procmail/files/digest-procmail-3.22-r8
@@ -0,0 +1 @@
+MD5 1678ea99b973eb77eda4ecf6acae53f1 procmail-3.22.tar.gz 226817
diff --git a/mail-filter/procmail/files/procmail-maxprocs-fix.diff b/mail-filter/procmail/files/procmail-maxprocs-fix.diff
new file mode 100644
index 000000000000..c78b000a8b92
--- /dev/null
+++ b/mail-filter/procmail/files/procmail-maxprocs-fix.diff
@@ -0,0 +1,11 @@
+--- src/formisc.c.orig	2006-01-22 00:35:30.000000000 -0800
++++ src/formisc.c	2006-01-22 00:35:55.000000000 -0800
+@@ -183,7 +183,7 @@
+ 		 retval=excode;
+ 	    }					       /* reap some children */
+ 	while(childlimit&&children>=childlimit||(child=fork())==-1&&children)
+-	   for(--children;(excode=waitfor((pid_t)0))!=NO_PROCESS;)
++	   for(;(excode=waitfor((pid_t)0))!=NO_PROCESS;)
+ 	    { if(excode!=EXIT_SUCCESS)
+ 		 retval=excode;
+ 	      if(--children<=maxchild)
diff --git a/mail-filter/procmail/procmail-3.22-r8.ebuild b/mail-filter/procmail/procmail-3.22-r8.ebuild
new file mode 100644
index 000000000000..68b8cda2fff5
--- /dev/null
+++ b/mail-filter/procmail/procmail-3.22-r8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r8.ebuild,v 1.1 2006/05/12 07:04:36 ferdy Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="http://www.procmail.org/"
+SRC_URI="http://www.procmail.org/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="mbox selinux"
+PROVIDE="virtual/mda"
+
+DEPEND="virtual/libc virtual/mta"
+RDEPEND="virtual/libc
+	selinux? ( sec-policy/selinux-procmail )"
+
+src_compile() {
+	# -finline-functions (implied by -O3) leaves strstr() in an infinite loop.
+	# To work around this, we append -fno-inline-functions to CFLAGS
+	append-flags -fno-inline-functions
+
+	sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
+		-e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
+		-e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
+		-i Makefile
+
+	if ! use mbox ; then
+		echo "# Use maildir-style mailbox in user's home directory" > ${S}/procmailrc
+		echo 'DEFAULT=$HOME/.maildir/' >> ${S}/procmailrc
+		cd ${S}
+		epatch ${FILESDIR}/gentoo-maildir2.diff
+	else
+		echo '# Use mbox-style mailbox in /var/spool/mail' > ${S}/procmailrc
+		echo 'DEFAULT=/var/spool/mail/$LOGNAME' >> ${S}/procmailrc
+	fi
+
+	# Do not use lazy bindings on lockfile and procmail
+	epatch "${FILESDIR}/${PN}-lazy-bindings.diff"
+
+	# Fix for bug #102340
+	epatch "${FILESDIR}/${PN}-comsat-segfault.diff"
+
+	# Fix for bug #119890
+	epatch "${FILESDIR}/${PN}-maxprocs-fix.diff"
+
+	emake || die
+}
+
+src_install () {
+	cd ${S}/new
+	insinto /usr/bin
+	insopts -m 6755
+	doins procmail
+
+	insopts -m 2755
+	doins lockfile
+
+	dobin formail mailstat
+	insopts -m 0644
+
+	doman *.1 *.5
+
+	cd ${S}
+	dodoc Artistic COPYING FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README
+
+	insinto /etc
+	doins procmailrc
+
+	docinto examples
+	dodoc examples/*
+}