head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2010Q1:1.1.0.2
	pkgsrc-2010Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2010.05.17.17.58.13;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2010.02.03.19.45.04;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update claws-mail to 3.7.6
changes:
-Encrypt saved LDAP passwords
-UI improvements
-bugfixes
-translation updates
-builds with libetpan-1.0, needs gtk2-2.10
@
text
@$NetBSD: patch-ba,v 1.1 2010/02/03 19:45:04 drochner Exp $

--- src/plugins/smime/smime.c.orig	2010-01-31 10:07:40.000000000 +0000
+++ src/plugins/smime/smime.c
@@@@ -420,7 +420,9 @@@@ static MimeInfo *smime_decrypt(MimeInfo 
 	encinfo = mimeinfo;
 
 	cipher = sgpgme_data_from_mimeinfo(encinfo);
+#if 0
 	gpgme_data_set_encoding(cipher, GPGME_DATA_ENCODING_BASE64);
+#endif
 	plain = sgpgme_decrypt_verify(cipher, &sigstat, ctx);
 
 	gpgme_data_release(cipher);
@@@@ -791,6 +793,9 @@@@ gboolean smime_encrypt(MimeInfo *mimeinf
 	encmultipart->subtype = g_strdup("x-pkcs7-mime");
 	g_hash_table_insert(encmultipart->typeparameters, g_strdup("name"),
                             g_strdup("smime.p7m"));
+	g_hash_table_insert(encmultipart->typeparameters,
+			    g_strdup("smime-type"),
+			    g_strdup("enveloped-data"));
 	
 	encmultipart->disposition = DISPOSITIONTYPE_ATTACHMENT;
 	g_hash_table_insert(encmultipart->dispositionparameters, g_strdup("filename"),
@@@@ -827,7 +832,9 @@@@ gboolean smime_encrypt(MimeInfo *mimeinf
 	gpgme_data_new(&gpgenc);
 	cm_gpgme_data_rewind(gpgtext);
 	
+#if 0
 	gpgme_data_set_encoding(gpgenc, GPGME_DATA_ENCODING_BASE64);
+#endif
 	gpgme_op_encrypt(ctx, kset, GPGME_ENCRYPT_ALWAYS_TRUST, gpgtext, gpgenc);
 
 	gpgme_release(ctx);
@


1.1
log
@update claws-mail to 3.7.5 and adjust plugins as necessary
changes:
-many bugfixes
-spellchecker, printing and other UI improvements
-documentation and translation updates
approved by smb
@
text
@d1 1
a1 1
$NetBSD$
@