From c6a4d3790fc33558d9af322dac15d2bd6d34ac0b Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 19 Aug 2011 23:14:47 +0000
Subject: Fri Aug 19 23:14:46 UTC 2011

---
 extra/glib-networking/PKGBUILD                          | 15 +++++++++------
 .../glib-networking-2.29.9-port-gnutls3-API.patch       | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch

(limited to 'extra/glib-networking')

diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index ca799b5ba..d6f4c744e 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $
+# $Id: PKGBUILD 135780 2011-08-18 15:04:08Z andyrtr $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=glib-networking
 pkgver=2.28.7
-pkgrel=1
+pkgrel=4
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
+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.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 \
+    --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/glib-networking --disable-static
   make
 }
diff --git a/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch b/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch
new file mode 100644
index 000000000..19a168638
--- /dev/null
+++ b/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch
@@ -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)
+ 	{
-- 
cgit v1.2.3-54-g00ecf