new revision that adds patch that fixes kmail bug where messages with assignments get broken gpg signatures

4 files changed, 67 insertions, 3 deletions

diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 9b09e3985542..43d62422d2ab 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -4,14 +4,14 @@ MD5 3eae1afd41911bfee40a760b1bf8568a kdenetwork-3.0.5a.ebuild 967
 MD5 ce60f0025c07b1748b3b6254be3858c2 kdenetwork-3.1.ebuild 920
 MD5 960d3fd45443a3d76d0e244c9b3833b3 kdenetwork-3.1.1.ebuild 880
 MD5 7ee307959ba5ec560a0ad4044842f832 kdenetwork-3.0.4-r1.ebuild 1058
-MD5 d076d96395aa0b0006214d7d79017453 kdenetwork-3.1.1-r1.ebuild 997
-MD5 0574cd343f13f18977de6c6e816c857d ChangeLog 4967
+MD5 564a8dc3457bef3cd777102cc10934d7 kdenetwork-3.1.1-r1.ebuild 1001
+MD5 ad757abcaae03a2838cfc3017c79a3f0 ChangeLog 5257
 MD5 8cfc35635879b3b4fc158d2efa9ec0bb files/lisa 559
 MD5 86ce22554d0bf8df52bc6fe7425184a3 files/reslisa 570
 MD5 5eff7873bc0ddc7248a5c0a3d44ba2db files/digest-kdenetwork-2.2.2-r2 139
 MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
 MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
-MD5 ea32ef78624e86438c87a6cd5654183b files/kdenetwork-3.1.1-kmail-sig.diff 1464
+MD5 1b93352391186816969c66a339688062 files/kdenetwork-3.1.1-kmail-sig.diff 1442
 MD5 450c5fbda500f395c2514d2fb8f6a5b4 files/kdenetwork-3.1-libxml2-2.5.2.diff 559
 MD5 c97042204651bd92a0d0ccff4d6d0467 files/digest-kdenetwork-3.0.5a 71
 MD5 f67a62b0d07393c5fe1e38380eee7225 files/digest-kdenetwork-3.0.5b 71
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.1.1-r1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.1.1-r1
new file mode 100644
index 000000000000..c9621f46a951
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.1.1-r1
@@ -0,0 +1 @@
+MD5 d981fa1114d06256230bed4a4b948766 kdenetwork-3.1.1.tar.bz2 4962697
diff --git a/kde-base/kdenetwork/files/kdenetwork-3.1.1-kmail-sig.diff b/kde-base/kdenetwork/files/kdenetwork-3.1.1-kmail-sig.diff
new file mode 100644
index 000000000000..95a46980627c
--- /dev/null
+++ b/kde-base/kdenetwork/files/kdenetwork-3.1.1-kmail-sig.diff
@@ -0,0 +1,32 @@
+===================================================================
+RCS file: /home2/webcvs/mirror/kdenetwork/kmail/Attic/kmcomposewin.cpp,v
+retrieving revision 1.627.2.11
+retrieving revision 1.627.2.12
+diff -u -p -r1.627.2.11 -r1.627.2.12
+--- kmail/kmcomposewin.cpp	2003/03/08 16:49:14	1.627.2.11
++++ kmail/kmcomposewin.cpp	2003/03/24 20:23:01	1.627.2.12
+@@ -1857,10 +1857,7 @@ Kpgp::Result KMComposeWin::composeMessag
+     innerBodyPart.setBodyEncoded( body );
+     DwBodyPart* innerDwPart = theMessage.createDWBodyPart( &innerBodyPart );
+     innerDwPart->Assemble();
+-    // insert an empty line before the first body part because some broken MTAs
+-    // seem to add an empty line if it's not present and this would break the
+-    // signature (cf. bug 55629)
+-    body  = "\n--";
++    body  = "--";
+     body +=     boundaryCStr;
+     body +=                 "\n";
+     body += innerDwPart->AsString().c_str();
+@@ -2631,11 +2628,7 @@ kdDebug() << "**************************
+ 
+       QCString mainStr;
+ 
+-      // insert an empty line before the first body part because some broken
+-      // MTAs seem to add an empty line if it's not present and this would
+-      // break the signature of a message which contains this message as
+-      // attachment (cf. bug 55629)
+-      mainStr  = "\n--";
++      mainStr  = "--";
+       mainStr +=       boundaryCStr;
+ 
+       if( structuring.data.includeCleartext && (0 < clearCStr.length()) ) {
diff --git a/kde-base/kdenetwork/kdenetwork-3.1.1-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..35884f4164ec
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.1.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.1.1-r1.ebuild,v 1.1 2003/04/19 17:24:56 danarmak Exp $
+inherit kde-dist 
+
+IUSE=""
+DESCRIPTION="KDE network apps: kmail, kppp, knode..."
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+newdepend "=kde-base/kdebase-${PV}*"
+
+# fix bug where pgp sigs are broken when signining messages with attachements
+PATCHES="$FILESDIR/$P-kmail-sig.diff"
+
+src_install() {
+	kde_src_install
+
+	chmod +s ${D}/${KDEDIR}/bin/reslisa
+
+	# empty config file needed for lisa to work with default settings
+	touch ${D}/etc/lisarc
+
+	# lisa, reslisa initscripts
+	dodir /etc/init.d
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
+	chmod +x ${D}/etc/init.d/*
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/lisa.conf lisa
+	newins ${FILESDIR}/reslisa.conf reslisa
+}