diff options
| author | drochner <drochner> | 2008-03-06 14:20:30 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2008-03-06 14:20:30 +0000 |
| commit | 04dc78555de8f5ecf8dc318c3f7460b4390f0224 (patch) | |
| tree | 5667579976dbb1d569a4115e02a43b2b415f5f31 | |
| parent | c2c9ea2849256d93873ba53c190df71b52db7f3a (diff) | |
| download | pkgsrc-04dc78555de8f5ecf8dc318c3f7460b4390f0224.tar.gz | |
add a case, making the patch identical to Gentoo's,
ride on yesterday's PKGREV bump
| -rw-r--r-- | mail/evolution/distinfo | 4 | ||||
| -rw-r--r-- | mail/evolution/patches/patch-ac | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index b68ba391188..ceddd924c5f 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.53 2008/03/05 19:08:05 drochner Exp $ +$NetBSD: distinfo,v 1.54 2008/03/06 14:20:30 drochner Exp $ SHA1 (evolution-2.12.3.tar.bz2) = 14861dd497e935074424269f2d1e6c11be56abfe RMD160 (evolution-2.12.3.tar.bz2) = afe803833e213387fde3c180afc91bfc1e792262 Size (evolution-2.12.3.tar.bz2) = 25938535 bytes SHA1 (patch-aa) = 6b7a9364a71ee8b9c8bd9084ceded06c7e384a7f SHA1 (patch-ab) = 871a322eefd1a42e7197da764d49cd1d24f6535d -SHA1 (patch-ac) = 6ec88b37a0817fbe409c04e25b9b9cda5872ca9e +SHA1 (patch-ac) = 000f7074415772aebc9137277ba45aef6b75ae25 diff --git a/mail/evolution/patches/patch-ac b/mail/evolution/patches/patch-ac index 48cb3e73940..05e0c9313c0 100644 --- a/mail/evolution/patches/patch-ac +++ b/mail/evolution/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.15 2008/03/05 19:08:05 drochner Exp $ +$NetBSD: patch-ac,v 1.16 2008/03/06 14:20:30 drochner Exp $ --- mail/em-format.c.orig 2007-10-12 08:56:01.000000000 +0200 +++ mail/em-format.c +@@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf + opart = camel_mime_part_new(); + valid = camel_cipher_decrypt(context, part, opart, ex); + if (valid == NULL) { +- em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); ++ em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); + em_format_part_as(emf, stream, part, NULL); + } else { + if (emfc == NULL) @@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C if (valid == NULL) { em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error")); |