From 06143f1791b81c0a75001b3d7839cd383371ae1b Mon Sep 17 00:00:00 2001
From: Nagy Karoly Gabriel <nagy.karoly@opensde.org>
Date: Sat, 23 Feb 2013 12:41:43 +0100
Subject: [PATCH] crm114: Updated (20080326-BlameSentansoken ->
 20100106-BlameMichelson)

---
 mail/crm114/crm114.desc           |  6 ++---
 mail/crm114/dont_profile.patch    | 29 ----------------------
 mail/crm114/message-munging.patch | 41 +++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 32 deletions(-)
 delete mode 100644 mail/crm114/dont_profile.patch
 create mode 100644 mail/crm114/message-munging.patch

diff --git a/mail/crm114/crm114.desc b/mail/crm114/crm114.desc
index b25b7fc40..07109904c 100644
--- a/mail/crm114/crm114.desc
+++ b/mail/crm114/crm114.desc
@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../crm114/crm114.desc
-[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2013 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY]
@@ -36,7 +36,7 @@
 
 [L] GPL
 [S] Stable
-[V] 20080326-BlameSentansoken
+[V] 20100106-BlameMichelson
 [P] X -----5---9 196.700
 
-[D] 3156189334 crm114-20080326-BlameSentansoken.src.tar.gz http://crm114.sourceforge.net/tarballs/
+[D] 675507020 crm114-20100106-BlameMichelson.src.tar.gz http://crm114.sourceforge.net/tarballs/
diff --git a/mail/crm114/dont_profile.patch b/mail/crm114/dont_profile.patch
deleted file mode 100644
index 36330d52d..000000000
--- a/mail/crm114/dont_profile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../crm114/dont_profile.patch
-# Copyright (C) 2008 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-the -pg option makes `crm` whine when it can't write a gmon.out file
-
---- ./Makefile.orig	2008-08-14 06:13:22.000000000 -0400
-+++ ./Makefile	2008-08-14 06:13:48.000000000 -0400
-@@ -81,7 +81,7 @@
- #    BSD users - do NOT use -static-libgcc!!!
- #LDFLAGS += -static -static-libgcc 
- #    use this one if you want program profiling.
--LDFLAGS += -static -static-libgcc -pg
-+#LDFLAGS += -static -static-libgcc -pg
- #
- #   Any standard install flags?  We nominally use protection 755
- INSTALLFLAGS += -m 755
diff --git a/mail/crm114/message-munging.patch b/mail/crm114/message-munging.patch
new file mode 100644
index 000000000..f2df7cd4c
--- /dev/null
+++ b/mail/crm114/message-munging.patch
@@ -0,0 +1,41 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../crm114/message-munging.patch
+# Copyright (C) 2013 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+Message munging work around (see bug #406207).
+
+Index: crm114/maillib.crm
+===================================================================
+--- ./maillib.crm	2009-10-20 11:12:34.000000000 +0200
++++ ./maillib.crm	2010-01-23 15:03:22.000000000 +0100
+@@ -371,11 +371,13 @@
+ 	match (:found: :hd: :tail:) <nomultiline nocase> /^(:*:header:) (.*)/
+ 	alter (:tail:) /:*:tail: (:*:comment:)/
+     }
+-    alius
+-    {
+-	#    no such header.  make one.
+-	call /:mungmail_add:/ [:*:header: (:*:comment:)]
+-    }
++# Commented out by Milan Zamazal <pdm@debian.org> on 2007-01-28 as suggested on
++# the crm114 mailing list.  If this is wrong please let me know.
++#   alius
++#   {
++#       #    no such header.  make one.
++#       call /:mungmail_add:/ [:*:header: (:*:comment:)]
++#   }
+ }
+ return
+