aboutsummaryrefslogtreecommitdiff
path: root/net/glib-networking
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2016-02-14 18:57:53 +0000
committerKoop Mast <kwm@FreeBSD.org>2016-02-14 18:57:53 +0000
commitb93a80c99281466281db26011356c75bd54ea36c (patch)
treecb5a8a1108829deee66dbb334ff2a733162448c6 /net/glib-networking
parentb78527376a1d11bef820d5e9fe86d3c524ea6acf (diff)
downloadports-b93a80c99281466281db26011356c75bd54ea36c.tar.gz
ports-b93a80c99281466281db26011356c75bd54ea36c.zip
Notes
Diffstat (limited to 'net/glib-networking')
-rw-r--r--net/glib-networking/Makefile4
-rw-r--r--net/glib-networking/distinfo4
-rw-r--r--net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c29
-rw-r--r--net/glib-networking/pkg-plist1
4 files changed, 24 insertions, 14 deletions
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 5aef870e5e01..0e2213ec9030 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= glib-networking
-PORTVERSION= 2.44.0
+PORTVERSION= 2.46.1
CATEGORIES= net
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,7 +22,7 @@ RUN_DEPENDS= ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
PORTSCOUT= limitw:1,even
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
+USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
USE_GNOME= glib20 intltool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo
index af11b91d74db..2b8fa89aa425 100644
--- a/net/glib-networking/distinfo
+++ b/net/glib-networking/distinfo
@@ -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
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 58b3a1168620..0e8e34509232 100644
--- a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
+++ b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
@@ -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;
+
diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist
index 62960f021d11..4e42cdb88c42 100644
--- a/net/glib-networking/pkg-plist
+++ b/net/glib-networking/pkg-plist
@@ -47,6 +47,7 @@ share/locale/ml/LC_MESSAGES/glib-networking.mo
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