diff options
Diffstat (limited to 'mail/claws-mail')
| -rw-r--r-- | mail/claws-mail/Makefile | 3 | ||||
| -rw-r--r-- | mail/claws-mail/Makefile.vers | 4 | ||||
| -rw-r--r-- | mail/claws-mail/PLIST | 4 | ||||
| -rw-r--r-- | mail/claws-mail/distinfo | 9 | ||||
| -rw-r--r-- | mail/claws-mail/patches/patch-ba | 34 |
5 files changed, 45 insertions, 9 deletions
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 21b1b82c33a..afdcfc11acf 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2010/01/17 12:02:22 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2010/02/03 19:45:04 drochner Exp $ PKG_DESTDIR_SUPPORT= user-destdir INSTALLATION_DIRS+= ${EGDIR} @@ -7,7 +7,6 @@ INSTALLATION_DIRS+= share/claws-mail .include "Makefile.common" PKGNAME= claws-mail-${CLAWS_VERSION} -PKGREVISION= 1 MAINTAINER= smb@NetBSD.org COMMENT= X based e-mail and netnews client diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers index a5e2fbb43a2..b72272b8154 100644 --- a/mail/claws-mail/Makefile.vers +++ b/mail/claws-mail/Makefile.vers @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.vers,v 1.9 2009/09/15 10:27:02 drochner Exp $ +# $NetBSD: Makefile.vers,v 1.10 2010/02/03 19:45:04 drochner Exp $ # -CLAWS_VERSION= 3.7.2 +CLAWS_VERSION= 3.7.5 diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST index 4e6fb703d7a..ec56718fe1b 100644 --- a/mail/claws-mail/PLIST +++ b/mail/claws-mail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2009/09/15 10:27:02 drochner Exp $ +@comment $NetBSD: PLIST,v 1.14 2010/02/03 19:45:04 drochner Exp $ bin/claws-mail bin/sylpheed-claws include/claws-mail/account.h @@ -235,7 +235,9 @@ share/doc/claws-mail/manual/pl/claws-mail-manual.pdf share/doc/claws-mail/manual/pl/claws-mail-manual.ps share/doc/claws-mail/manual/pl/claws-mail-manual.txt share/examples/claws-mail/mime.types +share/icons/hicolor/128x128/apps/claws-mail.png share/icons/hicolor/48x48/apps/claws-mail.png +share/icons/hicolor/64x64/apps/claws-mail.png share/locale/bg/LC_MESSAGES/claws-mail.mo share/locale/ca/LC_MESSAGES/claws-mail.mo share/locale/de/LC_MESSAGES/claws-mail.mo diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo index 8badba4083e..56dca099f00 100644 --- a/mail/claws-mail/distinfo +++ b/mail/claws-mail/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.13 2009/09/15 10:27:02 drochner Exp $ +$NetBSD: distinfo,v 1.14 2010/02/03 19:45:04 drochner Exp $ -SHA1 (claws-mail-3.7.2.tar.bz2) = 4e988793ac6258c26d61c06af5b7ecf1e965389f -RMD160 (claws-mail-3.7.2.tar.bz2) = f37e7466f06fdf5dd878d45f1acdb04667c5d1b0 -Size (claws-mail-3.7.2.tar.bz2) = 5907134 bytes +SHA1 (claws-mail-3.7.5.tar.bz2) = 627c6b297dde7f1d4f2798d3bdbda2d0436421b7 +RMD160 (claws-mail-3.7.5.tar.bz2) = 06ac2bd594d184ed6b5141f4f00e3508b93657b2 +Size (claws-mail-3.7.5.tar.bz2) = 6060781 bytes SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0 SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691 +SHA1 (patch-ba) = 5e01c6aa7612a9890d6968c05a41f351d9992ca5 diff --git a/mail/claws-mail/patches/patch-ba b/mail/claws-mail/patches/patch-ba new file mode 100644 index 00000000000..a62ecbb6ec4 --- /dev/null +++ b/mail/claws-mail/patches/patch-ba @@ -0,0 +1,34 @@ +$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); |