Date: Monday, September 19, 2011 @ 18:25:54 Author: ibiru Revision: 138311
update to 2.29.92 Modified: glib-networking/trunk/PKGBUILD Deleted: glib-networking/trunk/fix_G_TLS_ERROR_EOF_handling.patch glib-networking/trunk/glib-networking-2.29.9-port-gnutls3-API.patch -----------------------------------------------+ PKGBUILD | 11 +-- fix_G_TLS_ERROR_EOF_handling.patch | 73 ------------------------ glib-networking-2.29.9-port-gnutls3-API.patch | 17 ----- 3 files changed, 4 insertions(+), 97 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-09-19 22:23:50 UTC (rev 138310) +++ PKGBUILD 2011-09-19 22:25:54 UTC (rev 138311) @@ -2,8 +2,8 @@ # Maintainer: Jan "heftig" Steffens <[email protected]> pkgname=glib-networking -pkgver=2.29.18 -pkgrel=2 +pkgver=2.29.92 +pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64') url="http://www.gtk.org/"; @@ -12,14 +12,11 @@ makedepends=('intltool') options=('!libtool') install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz - fix_G_TLS_ERROR_EOF_handling.patch) -sha256sums=('87d77d9bf184398cd8b7f709e6de42f11b2badf9df1bd96a9ab69c0c8a0766f0' - '286d64a121cb987866b51af70f55d47bafc5bf60e813aa1412dce51e426cc553') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('65b3785e02ffae1cf5e3f25985ac428d6d17e69355947ed831e1a6d1e852948a') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix_G_TLS_ERROR_EOF_handling.patch" ./configure \ --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/glib-networking --disable-static Deleted: fix_G_TLS_ERROR_EOF_handling.patch =================================================================== --- fix_G_TLS_ERROR_EOF_handling.patch 2011-09-19 22:23:50 UTC (rev 138310) +++ fix_G_TLS_ERROR_EOF_handling.patch 2011-09-19 22:25:54 UTC (rev 138311) @@ -1,73 +0,0 @@ -From 9e2aaacafb45d51cff57dc033f4b5ad5bc1a1762 Mon Sep 17 00:00:00 2001 -From: Dan Winship <[email protected]> -Date: Fri, 16 Sep 2011 15:29:29 +0000 -Subject: gnutls: fix G_TLS_ERROR_EOF handling with gnutls 3.0 - -gnutls 3.0 has a new error code for "peer closed connection without -sending a Close packet", so add some #ifdefs to do the right thing -with either 2.x or 3.x. - -https://bugzilla.gnome.org/show_bug.cgi?id=659233 ---- -diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c -index c1ede79..0f792bb 100644 ---- a/tls/gnutls/gtlsconnection-gnutls.c -+++ b/tls/gnutls/gtlsconnection-gnutls.c -@@ -132,7 +132,10 @@ struct _GTlsConnectionGnutlsPrivate - - GError *error; - GCancellable *cancellable; -- gboolean blocking, eof; -+ gboolean blocking; -+#ifndef GNUTLS_E_PREMATURE_TERMINATION -+ gboolean eof; -+#endif - GIOCondition internal_direction; - }; - -@@ -548,19 +551,22 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, - gnutls->priv->need_handshake = TRUE; - return status; - } -- else if (status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH) -+ else if ( -+#ifdef GNUTLS_E_PREMATURE_TERMINATION -+ status == GNUTLS_E_PREMATURE_TERMINATION -+#else -+ status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && gnutls->priv->eof -+#endif -+ ) - { -- if (gnutls->priv->eof) -+ if (gnutls->priv->require_close_notify) - { -- if (gnutls->priv->require_close_notify) -- { -- g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, -- _("TLS connection closed unexpectedly")); -- return status; -- } -- else -- return 0; -+ g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, -+ _("TLS connection closed unexpectedly")); -+ return status; - } -+ else -+ return 0; - } - - return status; -@@ -795,8 +801,10 @@ g_tls_connection_gnutls_pull_func (gnutls_transport_ptr_t transport_data, - - if (ret < 0) - set_gnutls_error (gnutls, G_IO_IN); -+#ifndef GNUTLS_E_PREMATURE_TERMINATION - else if (ret == 0) - gnutls->priv->eof = TRUE; -+#endif - - return ret; - } --- -cgit v0.9.0.2 Deleted: glib-networking-2.29.9-port-gnutls3-API.patch =================================================================== --- glib-networking-2.29.9-port-gnutls3-API.patch 2011-09-19 22:23:50 UTC (rev 138310) +++ glib-networking-2.29.9-port-gnutls3-API.patch 2011-09-19 22:25:54 UTC (rev 138311) @@ -1,17 +0,0 @@ -Index: tls/gnutls/gtlsconnection-gnutls.c -=================================================================== ---- tls/gnutls/gtlsconnection-gnutls.c -+++ tls/gnutls/gtlsconnection-gnutls.c 2011-08-04 00:40:33.194189789 +0200 -@@ -860,9 +860,10 @@ - - if (peer_certificate) - { -- int status; -+ int verify_ret; -+ unsigned int status; - -- status = gnutls_certificate_verify_peers (gnutls->priv->session); -+ verify_ret = gnutls_certificate_verify_peers2 (gnutls->priv->session, &status); - peer_certificate_errors = g_tls_certificate_gnutls_convert_flags (status); - if (peer_certificate_errors) - {
