add a patch to fix the infinite loop bug. Patch by: John Hampton <pacopablo@pacopablo.com> in bug #57313

5 files changed, 113 insertions, 2 deletions

diff --git a/app-text/crm114/ChangeLog b/app-text/crm114/ChangeLog
index 3997eba1f20a..61bd0bb2f6ce 100644
--- a/app-text/crm114/ChangeLog
+++ b/app-text/crm114/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/crm114
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.9 2004/07/13 05:04:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/ChangeLog,v 1.10 2004/07/17 17:34:26 seemant Exp $
+
+*crm114-20040627-r1 (17 Jul 2004)
+
+  17 Jul 2004; Seemant Kulleen <seemant@gentoo.org>
+  +files/crm114-20040627-loopfix.patch, +crm114-20040627-r1.ebuild:
+  add a patch to fix the infinite loop bug. Patch by: John Hampton
+  <pacopablo@pacopablo.com> in bug #57313
 
 *crm114-20040627 (12 Jul 2004)
 
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index ea285da7feff..805be40e5424 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,7 +1,10 @@
 MD5 db1b1c8dce8a7f77b610a50c83787f3f crm114-20040627.ebuild 1835
 MD5 cf9a417463f367569ac737e9e9d39cb4 crm114-20040601.ebuild 1823
-MD5 05bc222584cfc43b80f07187373ec62e ChangeLog 1585
+MD5 be282568f89f37a41f9359cfe953dcc9 crm114-20040627-r1.ebuild 1884
+MD5 352ebb7fa08db9f31bb9cb64ba5650cd ChangeLog 1850
 MD5 7ac2597dc19a6e74bca4bef3951e3ac0 metadata.xml 542
 MD5 4abb78bb7c3987fa2a351ee89da2e1a6 files/crm114-20040601-mailfilter.patch 455
+MD5 1a7caa636b940f27ee5cb832bcfdbdf8 files/crm114-20040627-loopfix.patch 604
+MD5 f99ce07e865639c39ccc81d817470035 files/digest-crm114-20040627-r1 84
 MD5 0fc29953d2967ddbdf87912a44176a3f files/digest-crm114-20040601 82
 MD5 f99ce07e865639c39ccc81d817470035 files/digest-crm114-20040627 84
diff --git a/app-text/crm114/crm114-20040627-r1.ebuild b/app-text/crm114/crm114-20040627-r1.ebuild
new file mode 100644
index 000000000000..4270c25daa0b
--- /dev/null
+++ b/app-text/crm114/crm114-20040627-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/crm114/crm114-20040627-r1.ebuild,v 1.1 2004/07/17 17:34:26 seemant Exp $
+
+inherit eutils
+
+IUSE="emacs nls static"
+
+MY_P=${P}-BlameSeifkes.src
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A powerful text processing tools, mainly used for spam filtering"
+HOMEPAGE="http://crm114.sourceforge.net/"
+SRC_URI="http://crm114.sourceforge.net/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+TREVERS="0.6.8"
+
+DEPEND=">=sys-apps/sed-4
+	virtual/libc
+	mail-filter/procmail
+	emacs? ( app-emacs/mew )
+	!emacs? ( net-mail/metamail )
+	!static? ( >=dev-libs/tre-${TREVERS} )"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i "s#^CFLAGS.*#CFLAGS+=${CFLAGS} -I.#" Makefile
+
+	if use static ; then
+		sed -i "s#-ltre#-L${S}/${TREVERS}/lib/.libs/ -ltre#g" Makefile
+	else
+		sed -i "s#-static##g"  Makefile
+	fi
+
+	epatch ${FILESDIR}/${PN}-20040601-mailfilter.patch
+	epatch ${FILESDIR}/${PN}-20040627-loopfix.patch
+
+	cd ${S}/tre-${TREVERS}
+	chmod +x configure
+}
+
+src_compile() {
+	# Build TRE library.
+	if use static ; then
+		cd ${S}/tre-${TREVERS}
+	    econf \
+			`use_enable nls` \
+			`use_enable static` \
+			--enable-system-abi \
+			--disable-profile \
+			--disable-agrep \
+			--disable-debug || die
+		emake || die
+	fi
+
+	# Build crm114
+	cd ${S}
+	emake || die
+}
+
+src_install() {
+	cd ${S}
+	dobin crm114 cssutil cssdiff cssmerge
+	dosym crm114 /usr/bin/crm
+
+	dodoc COLOPHON.txt CRM114_Mailfilter_HOWTO.txt FAQ.txt INTRO.txt
+	dodoc QUICKREF.txt classify_details.txt inoc_passwd.txt
+	dodoc knownbugs.txt things_to_do.txt README
+
+	mkdir ${D}/usr/share/${PN}
+	cp -a *.crm ${D}/usr/share/${PN}
+	cp -a *.cf ${D}/usr/share/${PN}
+	cp -a *.mfp ${D}/usr/share/${PN}
+}
+
+pkg_postinst() {
+	echo
+	einfo "The spam-filter CRM files are installed in /usr/share/${PN}."
+	echo
+}
diff --git a/app-text/crm114/files/crm114-20040627-loopfix.patch b/app-text/crm114/files/crm114-20040627-loopfix.patch
new file mode 100644
index 000000000000..0b4fbe16a6a0
--- /dev/null
+++ b/app-text/crm114/files/crm114-20040627-loopfix.patch
@@ -0,0 +1,14 @@
+diff -urN crm114-old/mailfilter.crm crm114-new/mailfilter.crm
+--- crm114-old/mailfilter.crm	2004-06-27 03:45:19.000000000 -0700
++++ crm114-new/mailfilter.crm	2004-07-16 11:00:01.970824969 -0700
+@@ -807,8 +807,8 @@
+ 		#   get rid of any first-column 'From's as they are message breaks!
+ 		#   this isn't necessary if we're mailing to someplace else...
+ 		{
+-			match (:f:) <nomultiline> [:m_text:] /\n\nFrom/
+-			alter (:f:) />:*:f:/
++			match (:f:) <nomultiline> [:m_text:] /^From/
++			alter (:f:) / :*:f:/
+ 			liaf
+ 		}
+ 	       	alter (:_dw:) /:*:_dw:-=-Extra Stuff-=-\n\n:*:m_text: -0-0-0- :*:_nl:/		
diff --git a/app-text/crm114/files/digest-crm114-20040627-r1 b/app-text/crm114/files/digest-crm114-20040627-r1
new file mode 100644
index 000000000000..eb286bd81086
--- /dev/null
+++ b/app-text/crm114/files/digest-crm114-20040627-r1
@@ -0,0 +1 @@
+MD5 637471a68c29bab77373f9a24c310984 crm114-20040627-BlameSeifkes.src.tar.gz 777271