diff options
Diffstat (limited to 'net/glib-networking')
| -rw-r--r-- | net/glib-networking/Makefile | 6 | ||||
| -rw-r--r-- | net/glib-networking/distinfo | 4 | ||||
| -rw-r--r-- | net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c | 24 | ||||
| -rw-r--r-- | net/glib-networking/pkg-plist | 1 |
4 files changed, 18 insertions, 17 deletions
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile index 38d1f0fee563..5aef870e5e01 100644 --- a/net/glib-networking/Makefile +++ b/net/glib-networking/Makefile @@ -1,10 +1,8 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/net/glib-networking/Makefile 19944 2014-10-15 05:33:09Z gusi $ PORTNAME= glib-networking -PORTVERSION= 2.42.1 -PORTREVISION= 1 +PORTVERSION= 2.44.0 CATEGORIES= net MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,6 +20,8 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ RUN_DEPENDS= ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas +PORTSCOUT= limitw:1,even + USES= gettext gmake libtool pathfix pkgconfig tar:xz USE_GNOME= glib20 intltool GNU_CONFIGURE= yes diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo index 911ad3fcd429..af11b91d74db 100644 --- a/net/glib-networking/distinfo +++ b/net/glib-networking/distinfo @@ -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 diff --git a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c index 1e8f45fb017f..58b3a1168620 100644 --- a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c +++ b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c @@ -1,8 +1,8 @@ ---- 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 && @@ -10,12 +10,12 @@ gnutls->priv->cert_requested) { g_clear_error (inout_error); -@@ -361,7 +362,7 @@ g_tls_client_connection_gnutls_finish_ha - { - gnutls_datum session_data; +@@ -327,7 +328,7 @@ g_tls_client_connection_gnutls_finish_ha -- if (!*inout_error && -+ if (inout_error && !*inout_error && - gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn), - &session_data) == 0) + if (gnutls->priv->session_id) + { +- if (!*inout_error) ++ if (inout_error && !*inout_error) { + if (!gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (conn))) + { diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist index 3aa4c948ae58..3f8a1a58d741 100644 --- a/net/glib-networking/pkg-plist +++ b/net/glib-networking/pkg-plist @@ -12,6 +12,7 @@ share/locale/as/LC_MESSAGES/glib-networking.mo 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@valencia/LC_MESSAGES/glib-networking.mo share/locale/cs/LC_MESSAGES/glib-networking.mo |