[Midnightbsd-cvs] mports [21695] trunk/net/glib-networking: glib networking 2.46.1

[laffer1 at midnightbsd.org]

Revision: 21695
          http://svnweb.midnightbsd.org/mports/?rev=21695
Author:   laffer1
Date:     2016-08-16 22:28:41 -0400 (Tue, 16 Aug 2016)
Log Message:
-----------
glib networking 2.46.1

Modified Paths:
--------------
    trunk/net/glib-networking/Makefile
    trunk/net/glib-networking/distinfo
    trunk/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
    trunk/net/glib-networking/pkg-plist

Modified: trunk/net/glib-networking/Makefile
===================================================================
--- trunk/net/glib-networking/Makefile	2016-08-17 02:27:52 UTC (rev 21694)
+++ trunk/net/glib-networking/Makefile	2016-08-17 02:28:41 UTC (rev 21695)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	glib-networking
-PORTVERSION=	2.44.0
+PORTVERSION=	2.46.1
 PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	GNOME

Modified: trunk/net/glib-networking/distinfo
===================================================================
--- trunk/net/glib-networking/distinfo	2016-08-17 02:27:52 UTC (rev 21694)
+++ trunk/net/glib-networking/distinfo	2016-08-17 02:28:41 UTC (rev 21695)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-networking-2.44.0.tar.xz) = 8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346
-SIZE (gnome2/glib-networking-2.44.0.tar.xz) = 375456
+SHA256 (gnome2/glib-networking-2.46.1.tar.xz) = d5034214217f705891b6c9e719cc2c583c870bfcfdc454ebbb5e5e8940ac90b1
+SIZE (gnome2/glib-networking-2.46.1.tar.xz) = 378352

Modified: trunk/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
===================================================================
--- trunk/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c	2016-08-17 02:27:52 UTC (rev 21694)
+++ trunk/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c	2016-08-17 02:28:41 UTC (rev 21695)
@@ -1,6 +1,6 @@
---- tls/gnutls/gtlsclientconnection-gnutls.c.orig	2015-03-17 14:53:17.000000000 +0100
-+++ tls/gnutls/gtlsclientconnection-gnutls.c	2015-03-17 16:02:39.897699000 +0100
-@@ -309,7 +309,8 @@ g_tls_client_connection_gnutls_finish_ha
+--- tls/gnutls/gtlsclientconnection-gnutls.c.orig	2015-04-30 17:57:54.000000000 +0200
++++ tls/gnutls/gtlsclientconnection-gnutls.c	2015-08-06 17:06:17.000000000 +0200
+@@ -322,7 +322,8 @@
  
    g_assert (inout_error != NULL);
  
@@ -10,12 +10,21 @@
        gnutls->priv->cert_requested)
      {
        g_clear_error (inout_error);
-@@ -327,7 +328,7 @@ g_tls_client_connection_gnutls_finish_ha
+@@ -339,7 +340,7 @@
+     }
  
-   if (gnutls->priv->session_id)
+   resumed = gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (conn));
+-  if (*inout_error || !resumed)
++  if (inout_error && *inout_error || !resumed)
      {
--      if (!*inout_error)
-+      if (inout_error && !*inout_error)
- 	{
-           if (!gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (conn)))
-             {
+       /* Clear session data since the server did not accept what we provided. */
+       gnutls->priv->session_data_override = FALSE;
+@@ -348,7 +349,7 @@
+         g_tls_backend_gnutls_remove_session (GNUTLS_CLIENT, gnutls->priv->session_id);
+     }
+ 
+-  if (!*inout_error && !resumed)
++  if (inout_error && !*inout_error && !resumed)
+     {
+       gnutls_datum_t session_datum;
+ 

Modified: trunk/net/glib-networking/pkg-plist
===================================================================
--- trunk/net/glib-networking/pkg-plist	2016-08-17 02:27:52 UTC (rev 21694)
+++ trunk/net/glib-networking/pkg-plist	2016-08-17 02:28:41 UTC (rev 21695)
@@ -47,6 +47,7 @@
 share/locale/mr/LC_MESSAGES/glib-networking.mo
 share/locale/nb/LC_MESSAGES/glib-networking.mo
 share/locale/nl/LC_MESSAGES/glib-networking.mo
+share/locale/oc/LC_MESSAGES/glib-networking.mo
 share/locale/or/LC_MESSAGES/glib-networking.mo
 share/locale/pa/LC_MESSAGES/glib-networking.mo
 share/locale/pl/LC_MESSAGES/glib-networking.mo
@@ -70,5 +71,5 @@
 share/locale/zh_CN/LC_MESSAGES/glib-networking.mo
 share/locale/zh_HK/LC_MESSAGES/glib-networking.mo
 share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
- at exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
- at unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+ at postexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+ at postunexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true