[arch-commits] Commit in glib-networking/trunk (2 files)

[Ionut Biru]

    Date: Saturday, August 13, 2011 @ 09:27:37
  Author: ibiru
Revision: 135436

fix undefined symbol when using gnutls 3.0. FS#25550

Added:
  glib-networking/trunk/glib-networking-2.29.9-port-gnutls3-API.patch
Modified:
  glib-networking/trunk/PKGBUILD

-----------------------------------------------+
 PKGBUILD                                      |    9 ++++++---
 glib-networking-2.29.9-port-gnutls3-API.patch |   17 +++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-13 11:30:59 UTC (rev 135435)
+++ PKGBUILD	2011-08-13 13:27:37 UTC (rev 135436)
@@ -2,7 +2,7 @@
 # Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
 pkgname=glib-networking
 pkgver=2.28.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -11,11 +11,14 @@
 makedepends=('intltool')
 options=('!libtool')
 install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2
+        glib-networking-2.29.9-port-gnutls3-API.patch)
+sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c'
+            '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np0 -i "$srcdir/glib-networking-2.29.9-port-gnutls3-API.patch"
   ./configure \
     --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/glib-networking --disable-static

Added: glib-networking-2.29.9-port-gnutls3-API.patch
===================================================================
--- glib-networking-2.29.9-port-gnutls3-API.patch	                        (rev 0)
+++ glib-networking-2.29.9-port-gnutls3-API.patch	2011-08-13 13:27:37 UTC (rev 135436)
@@ -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)
+ 	{