Add .signature support re: Bug 51842

6 files changed, 137 insertions, 2 deletions

diff --git a/mail-client/cone/ChangeLog b/mail-client/cone/ChangeLog
index 3de398668dc2..b65a6ae822b5 100644
--- a/mail-client/cone/ChangeLog
+++ b/mail-client/cone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/cone
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/ChangeLog,v 1.4 2004/07/01 19:47:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/ChangeLog,v 1.5 2004/07/07 05:40:45 merlin Exp $
+
+*cone-0.57-r1 (07 Jul 2004)
+
+  07 Jul 2004; Cory Visi <merlin@gentoo.org> cone-0.57-r1.ebuild,
+  files/cone-dotsignature.patch:
+  Add .signature support re: Bug 51842, thanks to Andrey Ulanov
+  <drey@rt.mipt.ru> for the patch
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cone-0.56.ebuild,
   cone-0.57.ebuild:
diff --git a/mail-client/cone/Manifest b/mail-client/cone/Manifest
index 6d7d385e0465..44ad880ca4b2 100644
--- a/mail-client/cone/Manifest
+++ b/mail-client/cone/Manifest
@@ -1,5 +1,8 @@
-MD5 96ac83639e0509ca7cfe3a303642a216 ChangeLog 1196
+MD5 8c780727aa9157c681b800ecc824fe93 ChangeLog 1423
 MD5 58432623c8abcfb259a3147db822c599 cone-0.56.ebuild 832
 MD5 1d0e68e4d9b8252f2a9c83b067e75327 cone-0.57.ebuild 844
+MD5 a8d63653bca46c24de587bf46f6c8828 cone-0.57-r1.ebuild 779
 MD5 cd49a94f0d2396f3880a8b0bca431073 files/digest-cone-0.56 63
 MD5 6a82a031a17392d5565b4ceaafc87604 files/digest-cone-0.57 63
+MD5 28b43eab37446bf115b3a7c894f99040 files/cone-dotsignature.patch 2127
+MD5 6a82a031a17392d5565b4ceaafc87604 files/digest-cone-0.57-r1 63
diff --git a/mail-client/cone/cone-0.57-r1.ebuild b/mail-client/cone/cone-0.57-r1.ebuild
new file mode 100644
index 000000000000..2a4afda1cbfe
--- /dev/null
+++ b/mail-client/cone/cone-0.57-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.57-r1.ebuild,v 1.1 2004/07/07 05:40:45 merlin Exp $
+
+DESCRIPTION="Cone: COnsole News reader and Emailer"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/cone/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc"
+IUSE="spell crypt"
+
+RDEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.6
+	dev-libs/libxml2
+	fam? ( app-admin/fam )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )
+	spell? ( virtual/aspell-dict )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+EXTRA_ECONF="--with-devel"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/cone-dotsignature.patch
+}
+
+src_install() {
+	make check DESTDIR=${D} || die
+	make install DESTDIR=${D} || die
+	DESTDIR=${D} make install-configure || die
+}
diff --git a/mail-client/cone/files/cone-dotsignature.patch b/mail-client/cone/files/cone-dotsignature.patch
new file mode 100644
index 000000000000..62458b70504f
--- /dev/null
+++ b/mail-client/cone/files/cone-dotsignature.patch
@@ -0,0 +1,83 @@
+diff -ur cone-0.57/cone/cursesmessage.C cone-0.57.my/cone/cursesmessage.C
+--- cone-0.57/cone/cursesmessage.C	2003-09-30 07:31:49.000000000 +0400
++++ cone-0.57.my/cone/cursesmessage.C	2004-05-20 23:53:22.000000000 +0400
+@@ -2044,6 +2044,7 @@
+ 			if (ifs.eof())
+ 				break;
+ 		}
++		ifs.close();
+ 
+ 		if (reformatterPtr)
+ 		{
+@@ -2059,6 +2060,8 @@
+ 		LIBMAIL_THROW();
+ 	}
+ 
++	writeSignature(otmpfile);
++
+ 	otmpfile << flush;
+ 
+ 	if (otmpfile.fail() ||
+@@ -2323,6 +2326,9 @@
+ 				if (reformatterPtr)
+ 					delete reformatterPtr;
+ 			}
++
++			writeSignature(otmpfile);
++
+ 			otmpfile << flush;
+ 		}
+ 	}
+diff -ur cone-0.57/cone/mymessage.C cone-0.57.my/cone/mymessage.C
+--- cone-0.57/cone/mymessage.C	2003-06-12 02:36:30.000000000 +0400
++++ cone-0.57.my/cone/mymessage.C	2004-05-21 00:00:04.000000000 +0400
+@@ -566,9 +566,15 @@
+ 		if (customheaders.size() > 0)
+ 			o << customheaders << "\n";
+ 
++		o << "Mime-Version: 1.0\n"                                                                     
++                  << "Content-Type: text/plain; charset="
++                  << Gettext::defaultCharset()->chset
++                  << "\nContent-Transfer-Encoding: 8bit\n";
++		  
+ 		o << "From: " << from << "\n"
+ 		  << "Reply-To: " << replyto << "\n\n";
+ 
++		writeSignature(o);
+ 		o.flush();
+ 
+ 		if (o.bad() || o.fail() ||
+@@ -848,3 +854,20 @@
+ 			return true;
+ 	return false;
+ }
++
++void myMessage::writeSignature(std::ofstream &o)
++{
++	string homedir = myServer::getHomeDir();
++        string signpath = homedir + "/.signature";
++	string line;
++	ifstream signfile(signpath.c_str());
++	if(signfile.is_open())
++	{
++    	    o << "\n\n--\n";
++	    while (!getline(signfile, line).fail())
++	    {
++    		    o << line << endl;
++	    }
++    	    signfile.close();
++	}
++}
+diff -ur cone-0.57/cone/mymessage.H cone-0.57.my/cone/mymessage.H
+--- cone-0.57/cone/mymessage.H	2003-06-12 02:36:30.000000000 +0400
++++ cone-0.57.my/cone/mymessage.H	2004-05-20 23:51:22.000000000 +0400
+@@ -149,6 +149,9 @@
+ private:
+ 	static bool isSignedEncrypted(mail::mimestruct &, bool);
+ 
++protected:
++	static void writeSignature(std::ofstream &);
++
+ };
+ 
+ #endif
diff --git a/mail-client/cone/files/digest-cone-0.57-r1 b/mail-client/cone/files/digest-cone-0.57-r1
new file mode 100644
index 000000000000..4ee167fce192
--- /dev/null
+++ b/mail-client/cone/files/digest-cone-0.57-r1
@@ -0,0 +1 @@
+MD5 967397b0c05917d36682336041d724b6 cone-0.57.tar.bz2 1835675
diff --git a/mail-client/cone/metadata.xml b/mail-client/cone/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/mail-client/cone/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>