diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2018-09-30 11:58:29 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2018-09-30 11:58:29 +0000 |
| commit | 951c1f5d1c7354f058f5919d858dbb0c174dc73e (patch) | |
| tree | 6146e775343aaf339921799078894a48fef9aa15 /net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c | |
| parent | Remove expired ports: (diff) | |
The FreeBSD GNOME team proudly presents GNOME 3.28 for FreeBSD.
The offical GNOME 3.28 release notes can be found at
https://help.gnome.org/misc/release-notes/3.28/
Thanks to Antoine Brodin for running the exp-runs.
PR: 229761
Diffstat (limited to 'net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c')
| -rw-r--r-- | net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c deleted file mode 100644 index 0e8e34509232..000000000000 --- a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c +++ /dev/null @@ -1,30 +0,0 @@ ---- 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); - -- 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) && - gnutls->priv->cert_requested) - { - g_clear_error (inout_error); -@@ -339,7 +340,7 @@ - } - - resumed = gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (conn)); -- if (*inout_error || !resumed) -+ if (inout_error && *inout_error || !resumed) - { - /* 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; - |