Updated claws-mail and its plugins to version 3.13.2.

Pkgsrc changes:
patch-ae, patch-cb and parts of patch-ca has been filed upstream by
people from the OpenBSD project.

Changelog (from NEWS):

* 3.13.2
--------

* Bug fixes:
	o bug 2358, '"Disposition-Notification-To:" should default
		     to same value as "From:'
	o bug 3557, 'Remotely exploitable bug.'
	o bug 3584, 'After 3.13.1, characters in some Japanese codec
		     are never correctly converted to internal ones'

* 3.13.1
--------

* When attaching files with no suffix, e.g. Makefile, the correct
  mime type is now found.

* Added support for a whole range of extra TLDs.

* '➜' is used instead of '-->' in the Message List when sender is
  yourself. (Only visible if the hidden pref 'enable_swap_from' is
  set to 0.)

* An external editor can now be embedded in the Compose window.
  This depends upon the 'Text editor' option (/Configuration/
  Preferences/Message View/External Programs) having a suitable
  value, such as 'gvim -f --socketid %w %s'.

* Address Book: address books can now be searched.

* A hidden pref has been added, 'next_on_delete'. This controls the
  message selection when a message is deleted. A setting of '0'
  which cause the previous, older message to be selected, a setting
  of '1' will cause the next, newer message to be selected.

* PDF Viewer plugin: Support for encrypted (password protected) PDFs.

* RSSyl plugin: The feed preferences window appearance has been
  improved.

* The --enable-new-addrbook configure option has been renamed to
  --enable-alternate-addressbook.

* Windows: Re-enabled regexps.

* updated man page.

* Updated translations: British English, Czech, Dutch, Finnish,
  French, German, Hebrew, Hungarian, Italian, Lithuanian,
  Norwegian Bokmål, Slovak, Swedish, Traditional Chinese.

* New translations: Russian.

* Removed translations: Bulgarian, Esperanto.

* Bug fixes:
	o bug 1959, 'Selection selects too many under expanded view'
	o bug 2490, 'Selecting mails through Shift-Home/End doesn't
		     work properly'
	o bug 3151, 'loaded vCalendar plugin "disables" gnome-shells
		     calendar view entries'
	o bug 3375, 'Crash (SEGV) at gtkcmctree.c:4514 after deleting
		     an unread message'
	o bug 3557, 'Remotely exploitable bug.'
	o bug 3454, (windows) 'Attachments containing certain special
		     characters in filename are not opened'
	o bug 3480, 'No valid feed found when channel title is
		     missing'
	o bug 3513, 'Can't delete multiple selected e-mails'
	o bug 3541, 'Selecting a leaf folder with keyboard no longer
		     opens it'
	o bug 3559, 'Opening preferences window causes out of bounds
		     read'
	o bug 3561, 'HTML <a> tag with no href makes message display
		     incorrectly.'
	o bug 3562, 'Hyperlink Errors URI XMPP, SIP, SIPS and Skype'
	o bug 3563, 'URL parser will read out of bounds when closing
		     bracket is missing in get_url_part'
	o bug 3566, 'Missing locales in Eastern name order'
	o Debian bug 801375, 'Segfault when activating ... the plugin
			      with the Code from Google'
	o better fix for crash after broken pgp keyring update, and
	  bogus EOF message on verifying sigs of missing keys
	o building on OpenBSD
	o libetpan version test
	o folder renaming for IMAP on Windows.

6 files changed, 12 insertions, 68 deletions

diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers
index efe37244bc7..428a5420ff8 100644
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.19 2015/10/31 18:54:46 nros Exp $
+# $NetBSD: Makefile.vers,v 1.20 2016/01/31 13:37:08 nros Exp $
 #
-CLAWS_VERSION=	3.13.0
+CLAWS_VERSION=	3.13.2
diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST
index 85eb2f9e998..8076a98ab1b 100644
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2015/10/31 18:54:46 nros Exp $
+@comment $NetBSD: PLIST,v 1.23 2016/01/31 13:37:08 nros Exp $
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
@@ -50,6 +50,7 @@ include/claws-mail/common/stringtable.h
 include/claws-mail/common/tags.h
 include/claws-mail/common/template.h
 include/claws-mail/common/timing.h
+include/claws-mail/common/tlds.h
 include/claws-mail/common/utils.h
 include/claws-mail/common/uuencode.h
 include/claws-mail/common/version.h
@@ -228,12 +229,10 @@ 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/cs/LC_MESSAGES/claws-mail.mo
 share/locale/de/LC_MESSAGES/claws-mail.mo
 share/locale/en_GB/LC_MESSAGES/claws-mail.mo
-share/locale/eo/LC_MESSAGES/claws-mail.mo
 share/locale/es/LC_MESSAGES/claws-mail.mo
 share/locale/fi/LC_MESSAGES/claws-mail.mo
 share/locale/fr/LC_MESSAGES/claws-mail.mo
@@ -244,6 +243,7 @@ share/locale/lt/LC_MESSAGES/claws-mail.mo
 share/locale/nb/LC_MESSAGES/claws-mail.mo
 share/locale/nl/LC_MESSAGES/claws-mail.mo
 share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
+share/locale/ru/LC_MESSAGES/claws-mail.mo
 share/locale/sk/LC_MESSAGES/claws-mail.mo
 share/locale/sv/LC_MESSAGES/claws-mail.mo
 share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 720b7fd7554..df9276eee7c 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.28 2015/11/03 23:27:02 agc Exp $
+$NetBSD: distinfo,v 1.29 2016/01/31 13:37:08 nros Exp $
 
-SHA1 (claws-mail-3.13.0.tar.xz) = 87d329ad507e88ebe60730c3f099fda0ba7886bc
-RMD160 (claws-mail-3.13.0.tar.xz) = 697605f4db28684e4feb84cc1d1981e1bb0c4762
-SHA512 (claws-mail-3.13.0.tar.xz) = 5682a5e4642870a69374dc304d446db9dfd427bf8bd6f924a1193366098e07ca63623caefa454d62b413b8bb614fc7f1c0853852a1c44908c8541e554f3439e2
-Size (claws-mail-3.13.0.tar.xz) = 6582288 bytes
+SHA1 (claws-mail-3.13.2.tar.xz) = 8d670c30b07ac47ee1772e47f6721f49df77a4a7
+RMD160 (claws-mail-3.13.2.tar.xz) = 14a80c6743efd564b5273cc4670a4f2a928c464e
+SHA512 (claws-mail-3.13.2.tar.xz) = 7356a4286fc76e215746de846f412e80b4d21c3be90ac8edd7719be2874569f953ce5c094e4a20b0c467db994d710135fc14bcb01f8fb4e947bf7d1666261ea3
+Size (claws-mail-3.13.2.tar.xz) = 5582600 bytes
 SHA1 (patch-ab) = d1c89842cedad037c9ac3836da630244fe8ff9c9
-SHA1 (patch-ae) = 06810bde96aa6d0d015bfc879c2f5f344863fb5b
 SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
 SHA1 (patch-ah) = cdfd816669c0c1ae6dba0d97a6d1fe5a8c2e4626
 SHA1 (patch-ai) = e2da8ef08afc0543cbbd00b71720d0002f8b9faf
 SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
-SHA1 (patch-ca) = 6243d9a22cf7e9b355e53ce301069f84278c6274
-SHA1 (patch-cb) = 41c8d3f48a22885854c5bef71558e38b60084e22
+SHA1 (patch-ca) = eea9ff85a304f0f66bf6c6cc9b1161f0c36d04f6
diff --git a/mail/claws-mail/patches/patch-ae b/mail/claws-mail/patches/patch-ae
deleted file mode 100644
index 85c5d874a38..00000000000
--- a/mail/claws-mail/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2015/10/31 18:54:46 nros Exp $
-
-* <sys/socket.h> is needed for AF_UNSPEC
---- src/common/utils.c.orig	2015-10-11 08:19:33.000000000 +0000
-+++ src/common/utils.c
-@@ -49,6 +49,7 @@
- #include <ctype.h>
- #include <errno.h>
- #include <sys/param.h>
-+#include <sys/socket.h>
- 
- #if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
- #  include <wchar.h>
-@@ -5106,7 +5107,7 @@ size_t fast_strftime(gchar *buf, gint bu
- 				*curpos++ = '0'+(lt->tm_min % 10);
- 				break;
- 			case 's':
--				snprintf(subbuf, 64, "%ld", mktime(lt));
-+				snprintf(subbuf, 64, "%lld", (long long)mktime(lt));
- 				len = strlen(subbuf); CHECK_SIZE();
- 				strncpy2(curpos, subbuf, buflen - total_done);
- 				break;
-@@ -5216,7 +5217,7 @@ int claws_unlink(const gchar *filename) 
- 	if (prefs_common_get_use_shred()) {
- 		if (found_shred == -1) {
- 			/* init */
--			args[0] = g_find_program_in_path("shred");
-+			args[0] = g_find_program_in_path("claws-mail-shred");
- 			debug_print("found shred: %s\n", args[0]);
- 			found_shred = (args[0] != NULL) ? 1:0;
- 			args[1] = "-f";
diff --git a/mail/claws-mail/patches/patch-ca b/mail/claws-mail/patches/patch-ca
index 152e0db194c..74890410fe4 100644
--- a/mail/claws-mail/patches/patch-ca
+++ b/mail/claws-mail/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.3 2014/01/15 17:19:30 drochner Exp $
+$NetBSD: patch-ca,v 1.4 2016/01/31 13:37:08 nros Exp $
 
 --- src/plugins/vcalendar/vcal_folder.c.orig	2014-01-14 12:32:26.000000000 +0000
 +++ src/plugins/vcalendar/vcal_folder.c
@@ -10,13 +10,3 @@ $NetBSD: patch-ca,v 1.3 2014/01/15 17:19:30 drochner Exp $
 +				time_t duration = (time_t) 0;
  				struct icaldurationtype ical_dur;
  				int i = 0;
- 
-@@ -1158,7 +1158,7 @@ static void vcal_set_mtime(Folder *folde
- 	}
- 
- 	item->mtime = s.st_mtime;
--	debug_print("VCAL: forced mtime of %s to %ld\n", item->name?item->name:"(null)", item->mtime);
-+	debug_print("VCAL: forced mtime of %s to %lld\n", item->name?item->name:"(null)", (long long)item->mtime);
- 	g_free(path);
- }
- 
diff --git a/mail/claws-mail/patches/patch-cb b/mail/claws-mail/patches/patch-cb
deleted file mode 100644
index 44eb8c6d5c6..00000000000
--- a/mail/claws-mail/patches/patch-cb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2014/01/15 17:19:30 drochner Exp $
-
---- src/plugins/vcalendar/vcal_meeting_gtk.c.orig	2014-01-14 12:35:57.000000000 +0000
-+++ src/plugins/vcalendar/vcal_meeting_gtk.c
-@@ -1982,7 +1982,7 @@ void multisync_export(void)
- 	list = vcal_folder_get_waiting_events();
- 	for (cur = list; cur; cur = cur->next) {
- 		VCalEvent *event = (VCalEvent *)cur->data;
--		file = g_strdup_printf("multisync%lu-%d", time(NULL), i);
-+		file = g_strdup_printf("multisync%llu-%d", (long long)time(NULL), i);
- 
- 		i++;
-