[Midnightbsd-cvs] mports [20433] trunk/net/glib-networking: glib networking 2.44

[laffer1 at midnightbsd.org]

Revision: 20433
          http://svnweb.midnightbsd.org/mports/?rev=20433
Author:   laffer1
Date:     2015-10-03 16:22:48 -0400 (Sat, 03 Oct 2015)
Log Message:
-----------
glib networking 2.44

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	2015-10-03 20:21:35 UTC (rev 20432)
+++ trunk/net/glib-networking/Makefile	2015-10-03 20:22:48 UTC (rev 20433)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	glib-networking
-PORTVERSION=	2.42.1
+PORTVERSION=	2.44.0
 PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	GNOME

Modified: trunk/net/glib-networking/distinfo
===================================================================
--- trunk/net/glib-networking/distinfo	2015-10-03 20:21:35 UTC (rev 20432)
+++ trunk/net/glib-networking/distinfo	2015-10-03 20:22:48 UTC (rev 20433)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-networking-2.42.1.tar.xz) = c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0
-SIZE (gnome2/glib-networking-2.42.1.tar.xz) = 374540
+SHA256 (gnome2/glib-networking-2.44.0.tar.xz) = 8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346
+SIZE (gnome2/glib-networking-2.44.0.tar.xz) = 375456

Modified: trunk/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
===================================================================
--- trunk/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c	2015-10-03 20:21:35 UTC (rev 20432)
+++ trunk/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c	2015-10-03 20:22:48 UTC (rev 20433)
@@ -1,9 +1,9 @@
---- tls/gnutls/gtlsclientconnection-gnutls.c.orig	2012-03-04 18:47:23.000000000 -0500
-+++ tls/gnutls/gtlsclientconnection-gnutls.c	2012-03-04 18:50:26.000000000 -0500
-@@ -349,7 +349,8 @@ g_tls_client_connection_gnutls_finish_ha
- {
-   GTlsClientConnectionGnutls *gnutls = G_TLS_CLIENT_CONNECTION_GNUTLS (conn);
+--- 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
  
+   g_assert (inout_error != NULL);
+ 
 -  if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
 +  if (inout_error &&
 +      g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
@@ -10,12 +10,12 @@
        gnutls->priv->cert_requested)
      {
        g_clear_error (inout_error);
-@@ -361,7 +362,7 @@ g_tls_client_connection_gnutls_finish_ha
+@@ -327,7 +328,7 @@ g_tls_client_connection_gnutls_finish_ha
+ 
+   if (gnutls->priv->session_id)
      {
-       gnutls_datum session_data;
- 
--      if (!*inout_error &&
-+      if (inout_error && !*inout_error &&
- 	  gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn),
- 				    &session_data) == 0)
+-      if (!*inout_error)
++      if (inout_error && !*inout_error)
  	{
+           if (!gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (conn)))
+             {

Modified: trunk/net/glib-networking/pkg-plist
===================================================================
--- trunk/net/glib-networking/pkg-plist	2015-10-03 20:21:35 UTC (rev 20432)
+++ trunk/net/glib-networking/pkg-plist	2015-10-03 20:22:48 UTC (rev 20433)
@@ -12,6 +12,7 @@
 share/locale/be/LC_MESSAGES/glib-networking.mo
 share/locale/bg/LC_MESSAGES/glib-networking.mo
 share/locale/bn_IN/LC_MESSAGES/glib-networking.mo
+share/locale/bs/LC_MESSAGES/glib-networking.mo
 share/locale/ca/LC_MESSAGES/glib-networking.mo
 share/locale/ca at valencia/LC_MESSAGES/glib-networking.mo
 share/locale/cs/LC_MESSAGES/glib-networking.mo