Date: Saturday, September 17, 2011 @ 04:01:40 Author: heftig Revision: 138135
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64 Added: glib-networking/repos/gnome-unstable-i686/PKGBUILD (from rev 138134, glib-networking/trunk/PKGBUILD) glib-networking/repos/gnome-unstable-i686/fix_G_TLS_ERROR_EOF_handling.patch (from rev 138134, glib-networking/trunk/fix_G_TLS_ERROR_EOF_handling.patch) glib-networking/repos/gnome-unstable-i686/glib-networking-2.29.9-port-gnutls3-API.patch (from rev 138134, glib-networking/trunk/glib-networking-2.29.9-port-gnutls3-API.patch) glib-networking/repos/gnome-unstable-i686/glib-networking.install (from rev 138134, glib-networking/trunk/glib-networking.install) glib-networking/repos/gnome-unstable-x86_64/PKGBUILD (from rev 138134, glib-networking/trunk/PKGBUILD) glib-networking/repos/gnome-unstable-x86_64/fix_G_TLS_ERROR_EOF_handling.patch (from rev 138134, glib-networking/trunk/fix_G_TLS_ERROR_EOF_handling.patch) glib-networking/repos/gnome-unstable-x86_64/glib-networking-2.29.9-port-gnutls3-API.patch (from rev 138134, glib-networking/trunk/glib-networking-2.29.9-port-gnutls3-API.patch) glib-networking/repos/gnome-unstable-x86_64/glib-networking.install (from rev 138134, glib-networking/trunk/glib-networking.install) Deleted: glib-networking/repos/gnome-unstable-i686/PKGBUILD glib-networking/repos/gnome-unstable-i686/glib-networking-2.29.9-port-gnutls3-API.patch glib-networking/repos/gnome-unstable-i686/glib-networking.install glib-networking/repos/gnome-unstable-x86_64/PKGBUILD glib-networking/repos/gnome-unstable-x86_64/glib-networking-2.29.9-port-gnutls3-API.patch glib-networking/repos/gnome-unstable-x86_64/glib-networking.install ---------------------------------------------------------------------+ gnome-unstable-i686/PKGBUILD | 64 ++++---- gnome-unstable-i686/fix_G_TLS_ERROR_EOF_handling.patch | 73 ++++++++++ gnome-unstable-i686/glib-networking-2.29.9-port-gnutls3-API.patch | 34 ++-- gnome-unstable-i686/glib-networking.install | 22 +-- gnome-unstable-x86_64/PKGBUILD | 64 ++++---- gnome-unstable-x86_64/fix_G_TLS_ERROR_EOF_handling.patch | 73 ++++++++++ gnome-unstable-x86_64/glib-networking-2.29.9-port-gnutls3-API.patch | 34 ++-- gnome-unstable-x86_64/glib-networking.install | 22 +-- 8 files changed, 270 insertions(+), 116 deletions(-) Deleted: gnome-unstable-i686/PKGBUILD =================================================================== --- gnome-unstable-i686/PKGBUILD 2011-09-17 07:58:51 UTC (rev 138134) +++ gnome-unstable-i686/PKGBUILD 2011-09-17 08:01:40 UTC (rev 138135) @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> -pkgname=glib-networking -pkgver=2.29.18 -pkgrel=1 -pkgdesc="Network-related giomodules for glib" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') -makedepends=('intltool' 'namcap') -options=('!libtool') -install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('87d77d9bf184398cd8b7f709e6de42f11b2badf9df1bd96a9ab69c0c8a0766f0') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/glib-networking --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: Copied: glib-networking/repos/gnome-unstable-i686/PKGBUILD (from rev 138134, glib-networking/trunk/PKGBUILD) =================================================================== --- gnome-unstable-i686/PKGBUILD (rev 0) +++ gnome-unstable-i686/PKGBUILD 2011-09-17 08:01:40 UTC (rev 138135) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> + +pkgname=glib-networking +pkgver=2.29.18 +pkgrel=2 +pkgdesc="Network-related giomodules for glib" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') +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') + +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 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: Copied: glib-networking/repos/gnome-unstable-i686/fix_G_TLS_ERROR_EOF_handling.patch (from rev 138134, glib-networking/trunk/fix_G_TLS_ERROR_EOF_handling.patch) =================================================================== --- gnome-unstable-i686/fix_G_TLS_ERROR_EOF_handling.patch (rev 0) +++ gnome-unstable-i686/fix_G_TLS_ERROR_EOF_handling.patch 2011-09-17 08:01:40 UTC (rev 138135) @@ -0,0 +1,73 @@ +From 9e2aaacafb45d51cff57dc033f4b5ad5bc1a1762 Mon Sep 17 00:00:00 2001 +From: Dan Winship <d...@gnome.org> +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: gnome-unstable-i686/glib-networking-2.29.9-port-gnutls3-API.patch =================================================================== --- gnome-unstable-i686/glib-networking-2.29.9-port-gnutls3-API.patch 2011-09-17 07:58:51 UTC (rev 138134) +++ gnome-unstable-i686/glib-networking-2.29.9-port-gnutls3-API.patch 2011-09-17 08:01:40 UTC (rev 138135) @@ -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) - { Copied: glib-networking/repos/gnome-unstable-i686/glib-networking-2.29.9-port-gnutls3-API.patch (from rev 138134, glib-networking/trunk/glib-networking-2.29.9-port-gnutls3-API.patch) =================================================================== --- gnome-unstable-i686/glib-networking-2.29.9-port-gnutls3-API.patch (rev 0) +++ gnome-unstable-i686/glib-networking-2.29.9-port-gnutls3-API.patch 2011-09-17 08:01:40 UTC (rev 138135) @@ -0,0 +1,17 @@ +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) + { Deleted: gnome-unstable-i686/glib-networking.install =================================================================== --- gnome-unstable-i686/glib-networking.install 2011-09-17 07:58:51 UTC (rev 138134) +++ gnome-unstable-i686/glib-networking.install 2011-09-17 08:01:40 UTC (rev 138135) @@ -1,11 +0,0 @@ -post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: glib-networking/repos/gnome-unstable-i686/glib-networking.install (from rev 138134, glib-networking/trunk/glib-networking.install) =================================================================== --- gnome-unstable-i686/glib-networking.install (rev 0) +++ gnome-unstable-i686/glib-networking.install 2011-09-17 08:01:40 UTC (rev 138135) @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gio-querymodules usr/lib/gio/modules +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: gnome-unstable-x86_64/PKGBUILD =================================================================== --- gnome-unstable-x86_64/PKGBUILD 2011-09-17 07:58:51 UTC (rev 138134) +++ gnome-unstable-x86_64/PKGBUILD 2011-09-17 08:01:40 UTC (rev 138135) @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> -pkgname=glib-networking -pkgver=2.29.18 -pkgrel=1 -pkgdesc="Network-related giomodules for glib" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') -makedepends=('intltool' 'namcap') -options=('!libtool') -install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('87d77d9bf184398cd8b7f709e6de42f11b2badf9df1bd96a9ab69c0c8a0766f0') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/glib-networking --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: Copied: glib-networking/repos/gnome-unstable-x86_64/PKGBUILD (from rev 138134, glib-networking/trunk/PKGBUILD) =================================================================== --- gnome-unstable-x86_64/PKGBUILD (rev 0) +++ gnome-unstable-x86_64/PKGBUILD 2011-09-17 08:01:40 UTC (rev 138135) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Jan "heftig" Steffens <jan.steff...@gmail.com> + +pkgname=glib-networking +pkgver=2.29.18 +pkgrel=2 +pkgdesc="Network-related giomodules for glib" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') +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') + +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 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: Copied: glib-networking/repos/gnome-unstable-x86_64/fix_G_TLS_ERROR_EOF_handling.patch (from rev 138134, glib-networking/trunk/fix_G_TLS_ERROR_EOF_handling.patch) =================================================================== --- gnome-unstable-x86_64/fix_G_TLS_ERROR_EOF_handling.patch (rev 0) +++ gnome-unstable-x86_64/fix_G_TLS_ERROR_EOF_handling.patch 2011-09-17 08:01:40 UTC (rev 138135) @@ -0,0 +1,73 @@ +From 9e2aaacafb45d51cff57dc033f4b5ad5bc1a1762 Mon Sep 17 00:00:00 2001 +From: Dan Winship <d...@gnome.org> +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: gnome-unstable-x86_64/glib-networking-2.29.9-port-gnutls3-API.patch =================================================================== --- gnome-unstable-x86_64/glib-networking-2.29.9-port-gnutls3-API.patch 2011-09-17 07:58:51 UTC (rev 138134) +++ gnome-unstable-x86_64/glib-networking-2.29.9-port-gnutls3-API.patch 2011-09-17 08:01:40 UTC (rev 138135) @@ -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) - { Copied: glib-networking/repos/gnome-unstable-x86_64/glib-networking-2.29.9-port-gnutls3-API.patch (from rev 138134, glib-networking/trunk/glib-networking-2.29.9-port-gnutls3-API.patch) =================================================================== --- gnome-unstable-x86_64/glib-networking-2.29.9-port-gnutls3-API.patch (rev 0) +++ gnome-unstable-x86_64/glib-networking-2.29.9-port-gnutls3-API.patch 2011-09-17 08:01:40 UTC (rev 138135) @@ -0,0 +1,17 @@ +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) + { Deleted: gnome-unstable-x86_64/glib-networking.install =================================================================== --- gnome-unstable-x86_64/glib-networking.install 2011-09-17 07:58:51 UTC (rev 138134) +++ gnome-unstable-x86_64/glib-networking.install 2011-09-17 08:01:40 UTC (rev 138135) @@ -1,11 +0,0 @@ -post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: glib-networking/repos/gnome-unstable-x86_64/glib-networking.install (from rev 138134, glib-networking/trunk/glib-networking.install) =================================================================== --- gnome-unstable-x86_64/glib-networking.install (rev 0) +++ gnome-unstable-x86_64/glib-networking.install 2011-09-17 08:01:40 UTC (rev 138135) @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gio-querymodules usr/lib/gio/modules +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}