fix for bug #102340

(Portage version: 2.0.51.22-r2)

5 files changed, 103 insertions, 11 deletions

diff --git a/mail-filter/procmail/ChangeLog b/mail-filter/procmail/ChangeLog
index df9da38e6048..8a977cb62050 100644
--- a/mail-filter/procmail/ChangeLog
+++ b/mail-filter/procmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/procmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.14 2005/08/13 11:01:01 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.15 2005/08/17 17:34:48 ferdy Exp $
+
+*procmail-3.22-r7 (17 Aug 2005)
+
+  17 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/procmail-comsat-segfault.diff, +procmail-3.22-r7.ebuild:
+  fix for bug #102340
 
   13 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
   procmail-3.22-r6.ebuild:
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index d18439ffa151..66bd96d61981 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 876137fdd072fd6e51d8365e8da50031 procmail-3.22-r7.ebuild 1861
 MD5 66b5fb24b12d077d4437c865b1c1d449 procmail-3.22-r6.ebuild 1788
 MD5 b3e0ed505f4a298f68857d6fcc2fb249 ChangeLog 6070
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 280e86cd3850b13629b0beee3c2c5522 files/gentoo-maildir2.diff 797
 MD5 e0c638b848ae112a847d5ef48cb9f209 files/procmail-lazy-bindings.diff 622
 MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r6 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC/dN4ViELBEf1JB0RAj8ZAJ9WSLOhdIwrR4dmCTazt9rAaY6aHACfTt34
-7EaKyNFpp0YjdBp5yQJXqHw=
-=AMkI
------END PGP SIGNATURE-----
+MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r7 65
+MD5 6c44beee1c99e38bfd3b3bda6979db00 files/procmail-comsat-segfault.diff 822
diff --git a/mail-filter/procmail/files/digest-procmail-3.22-r7 b/mail-filter/procmail/files/digest-procmail-3.22-r7
new file mode 100644
index 000000000000..d14b9662a1d7
--- /dev/null
+++ b/mail-filter/procmail/files/digest-procmail-3.22-r7
@@ -0,0 +1 @@
+MD5 1678ea99b973eb77eda4ecf6acae53f1 procmail-3.22.tar.gz 226817
diff --git a/mail-filter/procmail/files/procmail-comsat-segfault.diff b/mail-filter/procmail/files/procmail-comsat-segfault.diff
new file mode 100644
index 000000000000..e96bb5d94a38
--- /dev/null
+++ b/mail-filter/procmail/files/procmail-comsat-segfault.diff
@@ -0,0 +1,20 @@
+--- src/comsat.c.old	2005-08-17 19:17:20.000000000 +0200
++++ src/comsat.c	2005-08-17 19:18:19.000000000 +0200
+@@ -92,7 +92,7 @@
+    }
+   if(newvalid)						  /* so far, so good */
+    { int s;
+-     if(!*chp)						       /* no service */
++     if(!chad||!*chp)						       /* no service */
+ 	chp=BIFF_serviceport;				/* new balls please! */
+      s=strtol(chp,&chad,10);
+      if(chp!=chad)			       /* the service is not numeric */
+@@ -120,7 +120,7 @@
+ { int s;const char*p;
+   if(!csvalid||!buf)		  /* is comat on and set to a valid address? */
+      return;
+-  if(!*cslgname||strlen(cslgname)+2>linebuf)	       /* is $LOGNAME bogus? */
++  if(!cslgname||!*cslgname||strlen(cslgname)+2>linebuf)	       /* is $LOGNAME bogus? */
+      return;
+   if(!(p=folder?folder:cslastf))		     /* do we have a folder? */
+      return;
diff --git a/mail-filter/procmail/procmail-3.22-r7.ebuild b/mail-filter/procmail/procmail-3.22-r7.ebuild
new file mode 100644
index 000000000000..e025c946e5fa
--- /dev/null
+++ b/mail-filter/procmail/procmail-3.22-r7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r7.ebuild,v 1.1 2005/08/17 17:34:48 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 ~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"
+
+	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/*
+}