fix copyright headers, fix bug #35949 properly as opposed to the old broken -O2 fix.

4 files changed, 22 insertions, 23 deletions

diff --git a/net-mail/procmail/ChangeLog b/net-mail/procmail/ChangeLog
index 516cc1156dc6..689784605941 100644
--- a/net-mail/procmail/ChangeLog
+++ b/net-mail/procmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/procmail
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/ChangeLog,v 1.20 2003/06/21 18:57:10 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/ChangeLog,v 1.21 2004/01/06 00:38:16 robbat2 Exp $
+
+  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> procmail-3.22-r5.ebuild,
+  procmail-3.22-r6.ebuild:
+  fix copyright headers, fix bug #35949 properly as opposed to the old broken
+  -O2 fix.
 
 *procmail-3.22-r6 (21 Jun 2003)
 
diff --git a/net-mail/procmail/Manifest b/net-mail/procmail/Manifest
index b69b82561d10..49db20dd9a94 100644
--- a/net-mail/procmail/Manifest
+++ b/net-mail/procmail/Manifest
@@ -1,8 +1,8 @@
-MD5 6dad1cc3ee902796e4210225eb6dea58 ChangeLog 4004
+MD5 0de85b0f2c72c4eb8834323eeb99e620 procmail-3.22-r5.ebuild 1782
+MD5 8874110abbd112110887ba045862741d procmail-3.22-r6.ebuild 1748
+MD5 1f933f3894884a7d8110eb03ab82da10 ChangeLog 4196
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 5a0035844b0e167c848164db2c2c7489 procmail-3.22-r5.ebuild 1784
-MD5 dbeed38ef8a594bdab3e88da5c70c692 procmail-3.22-r6.ebuild 1792
+MD5 280e86cd3850b13629b0beee3c2c5522 files/gentoo-maildir2.diff 797
 MD5 150bfe71f6ba342ce7866fa808dab958 files/digest-procmail-3.22-r5 200
 MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r6 65
 MD5 cf77e1216e268b2b86ae18e4d2e35d30 files/gentoo-maildir.diff 796
-MD5 280e86cd3850b13629b0beee3c2c5522 files/gentoo-maildir2.diff 797
diff --git a/net-mail/procmail/procmail-3.22-r5.ebuild b/net-mail/procmail/procmail-3.22-r5.ebuild
index e7a2cbc9086c..71241544b9ea 100644
--- a/net-mail/procmail/procmail-3.22-r5.ebuild
+++ b/net-mail/procmail/procmail-3.22-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r5.ebuild,v 1.13 2003/09/05 09:05:26 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r5.ebuild,v 1.14 2004/01/06 00:38:16 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
diff --git a/net-mail/procmail/procmail-3.22-r6.ebuild b/net-mail/procmail/procmail-3.22-r6.ebuild
index 155e8acee5f1..a260abb0024f 100644
--- a/net-mail/procmail/procmail-3.22-r6.ebuild
+++ b/net-mail/procmail/procmail-3.22-r6.ebuild
@@ -1,36 +1,31 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r6.ebuild,v 1.4 2003/09/18 18:31:14 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/procmail/procmail-3.22-r6.ebuild,v 1.5 2004/01/06 00:38:16 robbat2 Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
 SRC_URI="http://www.procmail.org/${P}.tar.gz"
 HOMEPAGE="http://www.procmail.org/"
-
 IUSE=""
-
 DEPEND="virtual/glibc
 	virtual/mta"
-
 RDEPEND="virtual/glibc"
-
 PROVIDE="virtual/mda"
-
 SLOT="0"
 LICENSE="Artistic | GPL-2"
 KEYWORDS="x86 ppc sparc alpha arm hppa amd64 ia64"
 
 src_compile() {
 
-	cp Makefile Makefile.orig
-# Added a -O2 at the end of CFLAGS to overcome what seems to be a
-# gcc-3.1 strstr() bug with more aggressive optimization flags
-# The order of the flags matters as the last flag passed clobbers
-# the first flag.  i.e. if -O2 was placed before ${CFLAGS},
-# whatever optimization that is in ${CFLAGS} would clobber -O2
-	sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS} -O2:" \
+# With gcc-3.1 and newer, there is a bug with aggressive optimization caused by
+# -finline-functions (implied by -O3) that leaves strstr() is an infinite loop.
+# To work around this, we append -fno-inline-functions to CFLAGS disable just
+# that optimization and avoid the bug.
+	CFLAGS="${CFLAGS} -fno-inline-functions"
+	sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
 		-e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
-		-e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" Makefile.orig > Makefile
+		-e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
+		-i Makefile
 
 	if [ -z "`use mbox`" ];
 	then
@@ -38,7 +33,6 @@ src_compile() {
 		echo 'DEFAULT=$HOME/.maildir/' >> ${S}/procmailrc
 		cd ${S}
 		patch -p1 <${FILESDIR}/gentoo-maildir2.diff
-
 	else
 		echo '# Use mbox-style mailbox in /var/spool/mail' > ${S}/procmail
 		echo 'DEFAULT=/var/spool/mail/$LOGNAME' >> ${S}/procmailrc