Updated mail/gmime 2.6.20 to 2.6.23

----------------------------
2017-01-21  Jeffrey Stedfast  <fejj@gnome.org>
	* README: Bumped version
	* configure.ac: Bumped version to 2.6.23

2017-01-17  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-crypto-context.c (g_mime_decryption_*): Fixed naming.

2016-12-17  Jeffrey Stedfast  <fejj@gnome.org>
	* README: Bumped version
	* configure.ac: Bumped version to 2.6.22

2016-12-12  Jeffrey Stedfast  <fejj@gnome.org>
	* mono/gmime-api.raw: Updated Mono bindings.

2016-12-11  Jeffrey Stedfast  <fejj@gnome.org>
	* README: Bumped version
	* configure.ac: Bumped version to 2.6.21

2016-12-10  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-gpg-context.c (gpg_ctx_get_argv): Don't pass --yes, ever.

2016-12-10  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-gpg-context.c (gpg_ctx_get_argv): Add back --batch
	and --yes to fix the unit tests for GnuPG 1.4.x.
	(gpg_ctx_get_argv): Now also takes a path argument to gpg to use
	as the first argument instead of hard-coding "gpg".
	(g_mime_gpg_context_new): Updated to query the GnuPG version in
	case we need that information (turns out we don't at the moment).

2016-12-09  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-crypto-context.c (g_mime_crypto_context_set_retrieve_session_key):
	Moved here from GMimeGpgContext.
	(g_mime_crypto_context_get_retrieve_session_key): Same.

	Thanks to Daniel Kahn Gillmor for this patch.

2016-12-05  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-multipart-encrypted.c
	(g_mime_multipart_encrypted_decrypt_session): New function to
	decrypt a multipart/encrypted using a session_key.

	* gmime/gmime-crypto-context.c (g_mime_crypto_context_decrypt_session): New
	function to decrypt a MIME part using a session_key.

	* gmime/gmime-gpg-context.c (gpg_ctx_get_argv): Added support for
	--override-session-key-id for the new decrypt_session() method.
	(gpg_ctx_op_start): Updated to create the secret_fd when passing a session_key
	as well.
	(gpg_ctx_write_session_key): New function to write the session_key to gpg.
	(gpg_decrypt_session): New function to decrypt a MIME part using a session_key.

	Thanks to Daniel Kahn Gillmor for this patch.

2016-12-05  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-gpg-context.c (gpg_ctx_parse_status): Advance over the SESSION_KEY
	identifier before calling next_token() so that next_token() actually gets the
	sesstion key token that we want. Also fixed to free any existing session_key
	if gpg somehow sends us multiple SESSION_KEY responses.

	Thanks to Daniel Kahn Gillmor for this patch.

2016-12-03  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-gpg-context.c (next_token): Now takes a 'secret' argument to
	determine if it will overwrite the token within the buffer with '*' to
	prevent leaking of the secret token.
	(gpg_ctx_parse_status): Pass TRUE to next_token() when reading the
	SESSION_KEY token.

2016-12-02  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-gpg-context.c (gpg_ctx_free): Free the session_key.
	(gpg_ctx_get_argv): Pass --show-session-key to gpg if requested.
	(gpg_ctx_parse_status): Decode the session-key sent by gpg.
	(gpg_decrypt): Set the session_key on the decrypt result.
	(g_mime_gpg_context_get_retrieve_session_key): Added.
	(g_mime_gpg_context_set_retrieve_session_key): Added.

	* gmime/gmime-crypto-context.c (g_mime_decrypt_result_set_session_key): Added.
	(g_mime_decryption_result_get_session_key): Added.

	Thanks to Daniel Kahn Gillmor for this patch.

2016-12-02  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-gpg-context.c (g_mime_gpg_context_new): Allow NULL for the gpg path
	in order to use the default gpg path (i.e. "gpg").

	* tests/test-pgp*.c: Updated unit tests to pass NULL for the gpg path so that
	running the unit tests don't depend on a specific location of gpg.

	Thanks to Daniel Kahn Gillmor for this patch.

2016-08-30  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-multipart.c (read_random_pool): Only initialized srand() once.

2016-07-19  Jeffrey Stedfast  <jeff@xamarin.com>
	* gmime/gmime-gpg-context.c (gpg_ctx_get_argv): Always use --batch mode and
	don't pass --yes.

2016-07-14  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-parser.c (parser_construct_part): When parsing individual
	mime parts, do not treat them as top-level mime parts of a message.

	When decrypting mime parts, for example, we need all headers of the
	decrypted mime part to be included in the GMimeObject returned,
	otherwise we end up losing data.

2016-03-03  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-utils.c (header_fold_tokens): Fixed folding logic to add a
	space between two consecutive encoded-word tokens when they will fit on
	a single line. Thanks to Jaroslav Gratz for discovering this bug.

	Fixes bug #761263

2016-03-03  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-multipart-signed.c (g_mime_multipart_signed_verify): Fixed
	a memory leak when verifying S/MIME signatures. Thanks to Minaev Mike for
	discovering this bug.

	Fixes bug #760681

2016-01-13  Jeffrey STedfast  <fejj@gnome.org>
	* gmime/gmime-pkcs7-context.c (key_list_free): Fixed the logic for freeing
	a list of keys. Thanks to foudfou for this patch.

	Fixes bug #760573

2015-10-08  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/internet-address.c (decode_route): Make sure to free the route
	in error cases to avoid a memory leak.

	Fixes bug #756270

2015-04-11  Jeffrey Stedfast  <fejj@gnome.org>
	* util/url-scanner.c (url_scanner_table_init): Treat all character
	values >= 128 as url-safe. Fixes bug #738583.

2014-07-18  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-header.c (g_mime_header_list_register_writer):
	g_hash_table_remove() will g_free() the key for us, so don't do it
	ourselves (will result in a double-free).

2014-07-17  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-table-private.h: Increased GMIME_FOLD_LEN to 78.

2014-05-24  Jeffrey Stedfast  <fejj@gnome.org>
	* gmime/gmime-part.c (g_mime_part_is_attachment): New function to
	determine if a MIME part is an attachment or not.

	* gmime/gmime-disposition.c (g_mime_content_disposition_is_attachment):
	New function to determine if the Content-Disposition value matches
	"attachment".

3 files changed, 11 insertions, 9 deletions

diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index bb6d9d9d755..6ee5cb97f1d 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2014/11/22 03:47:33 mef Exp $
+# $NetBSD: Makefile,v 1.36 2017/02/25 00:05:06 mef Exp $
 #
 
-DISTNAME=	gmime-2.6.20
+DISTNAME=	gmime-2.6.23
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gmime/2.6/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/mail/gmime/PLIST b/mail/gmime/PLIST
index 1b30dc72a3a..f2c654f2478 100644
--- a/mail/gmime/PLIST
+++ b/mail/gmime/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2013/07/13 19:23:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/02/25 00:05:06 mef Exp $
 include/gmime-2.6/gmime/gmime-certificate.h
 include/gmime-2.6/gmime/gmime-charset.h
 include/gmime-2.6/gmime/gmime-content-type.h
@@ -134,8 +134,10 @@ share/gtk-doc/html/gmime-2.6/gmime-streams.html
 share/gtk-doc/html/gmime-2.6/gmime.html
 share/gtk-doc/html/gmime-2.6/home.png
 share/gtk-doc/html/gmime-2.6/index.html
-share/gtk-doc/html/gmime-2.6/index.sgml
+share/gtk-doc/html/gmime-2.6/left-insensitive.png
 share/gtk-doc/html/gmime-2.6/left.png
+share/gtk-doc/html/gmime-2.6/right-insensitive.png
 share/gtk-doc/html/gmime-2.6/right.png
 share/gtk-doc/html/gmime-2.6/style.css
+share/gtk-doc/html/gmime-2.6/up-insensitive.png
 share/gtk-doc/html/gmime-2.6/up.png
diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo
index 0e4563e47ea..395e8934fdc 100644
--- a/mail/gmime/distinfo
+++ b/mail/gmime/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.26 2015/11/03 23:27:06 agc Exp $
+$NetBSD: distinfo,v 1.27 2017/02/25 00:05:06 mef Exp $
 
-SHA1 (gmime-2.6.20.tar.xz) = d290d628f26ef0a233781bf0793f12b1795d8536
-RMD160 (gmime-2.6.20.tar.xz) = c0f41c81a9c7d7ecd968efc3ee68e584ebe0ee0a
-SHA512 (gmime-2.6.20.tar.xz) = 8a43cc57fb2884a0d0979dd42775aa0946d11f460beb33fc7f7a166bcabb81b9590426072eeb606e2d5423ac4d68ff73d619fee96f33669f62069fcccfaf0a10
-Size (gmime-2.6.20.tar.xz) = 740696 bytes
+SHA1 (gmime-2.6.23.tar.xz) = 12e2d6aa0206ce99093ad3f0619b8870df156cb2
+RMD160 (gmime-2.6.23.tar.xz) = 2a7e594814a6b9e95d55b6a370086606081e97a8
+SHA512 (gmime-2.6.23.tar.xz) = 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
+Size (gmime-2.6.23.tar.xz) = 5216588 bytes