diff options
| author | drochner <drochner@pkgsrc.org> | 2010-12-02 11:14:22 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2010-12-02 11:14:22 +0000 |
| commit | f327b9b74d2549dfb5ee7b7157533554e4d9eb1b (patch) | |
| tree | 4618e387eec12044480f8ca0c8bf4ec75f5ebb8d /mail | |
| parent | c71354b0ef8572f8db1621d4cf68ff1af7257191 (diff) | |
| download | pkgsrc-f327b9b74d2549dfb5ee7b7157533554e4d9eb1b.tar.gz | |
remove obsolete patches noticed by wiz
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/claws-mail/patches/patch-bc | 38 | ||||
| -rw-r--r-- | mail/claws-mail/patches/patch-bd | 23 |
2 files changed, 0 insertions, 61 deletions
diff --git a/mail/claws-mail/patches/patch-bc b/mail/claws-mail/patches/patch-bc deleted file mode 100644 index 16ee7b1d681..00000000000 --- a/mail/claws-mail/patches/patch-bc +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2010/05/17 17:58:13 drochner Exp $ - ---- src/plugins/pgpinline/pgpinline.c.orig 2009-02-23 16:55:51.000000000 +0000 -+++ src/plugins/pgpinline/pgpinline.c -@@ -583,9 +583,14 @@ static gboolean pgpinline_sign(MimeInfo - - /* get content node from message */ - msgcontent = (MimeInfo *) mimeinfo->node->children->data; -- if (msgcontent->type == MIMETYPE_MULTIPART) -+ if (msgcontent->type == MIMETYPE_MULTIPART) { -+ if (!msgcontent->node->children) { -+ debug_print("msgcontent->node->children NULL, bailing\n"); -+ privacy_set_error(_("Malformed message")); -+ return FALSE; -+ } - msgcontent = (MimeInfo *) msgcontent->node->children->data; -- -+ } - /* get rid of quoted-printable or anything */ - procmime_decode_content(msgcontent); - -@@ -768,9 +773,14 @@ static gboolean pgpinline_encrypt(MimeIn - - /* get content node from message */ - msgcontent = (MimeInfo *) mimeinfo->node->children->data; -- if (msgcontent->type == MIMETYPE_MULTIPART) -+ if (msgcontent->type == MIMETYPE_MULTIPART) { -+ if (!msgcontent->node->children) { -+ debug_print("msgcontent->node->children NULL, bailing\n"); -+ privacy_set_error(_("Malformed message")); -+ return FALSE; -+ } - msgcontent = (MimeInfo *) msgcontent->node->children->data; -- -+ } - /* get rid of quoted-printable or anything */ - procmime_decode_content(msgcontent); - diff --git a/mail/claws-mail/patches/patch-bd b/mail/claws-mail/patches/patch-bd deleted file mode 100644 index 17465209bf2..00000000000 --- a/mail/claws-mail/patches/patch-bd +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2010/05/17 17:58:13 drochner Exp $ - ---- src/gtk/sslcertwindow.c.orig 2009-09-28 07:04:13.000000000 +0000 -+++ src/gtk/sslcertwindow.c -@@ -267,12 +267,15 @@ static gboolean sslcert_ask_hook(gpointe - { - SSLCertHookData *hookdata = (SSLCertHookData *)source; - -- if (prefs_common.skip_ssl_cert_check) -- return TRUE; -- - if (hookdata == NULL) { - return FALSE; - } -+ -+ if (prefs_common.skip_ssl_cert_check) { -+ hookdata->accept = TRUE; -+ return TRUE; -+ } -+ - if (hookdata->old_cert == NULL) { - if (hookdata->expired) - hookdata->accept = sslcertwindow_ask_expired_cert(hookdata->cert); |