From 91d3f2ebc9b69c3e24bd507890afbb4bd3f4eea3 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 5 Jun 2013 00:33:46 -0700
Subject: Wed Jun  5 00:33:46 PDT 2013

---
 extra/gnutls/PKGBUILD       | 19 +++++++++++++------
 extra/gnutls/check_fix.diff | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 extra/gnutls/check_fix.diff

(limited to 'extra/gnutls')

diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 8edc2dff2..ed78c95e7 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185059 2013-05-10 18:32:00Z andyrtr $
+# $Id: PKGBUILD 187148 2013-06-04 15:50:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.1.11
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -11,14 +11,20 @@ license=('GPL3' 'LGPL2.1')
 url="http://www.gnutls.org/"
 install=gnutls.install
 options=('!libtool' '!zipman')
-depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
 makedepends=('valgrind' 'strace' 'datefudge')
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('b1c8f431f7c258a1e76cdba05cc1dd88'
-         'SKIP')
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}
+        check_fix.diff)
+md5sums=('c220b50736f61292ed8722d5132b6a3e'
+         'SKIP'
+         '53ae2a58a401d9e6d052910670da8b07')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  # fix i686 test suite failure
+  patch -Np1 -i ${srcdir}/check_fix.diff
+  
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
@@ -30,6 +36,7 @@ build() {
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make -k check
+  #make -j1 check
 }
 
 package() {
diff --git a/extra/gnutls/check_fix.diff b/extra/gnutls/check_fix.diff
new file mode 100644
index 000000000..f7c7e32c3
--- /dev/null
+++ b/extra/gnutls/check_fix.diff
@@ -0,0 +1,34 @@
+From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sun, 2 Jun 2013 12:10:06 +0200
+Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems.
+
+---
+ tests/cert-tests/pem-decoding |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
+index fe769ec..f8c6372 100755
+--- a/tests/cert-tests/pem-decoding
++++ b/tests/cert-tests/pem-decoding
+@@ -61,7 +61,9 @@ if test "$rc" != "0"; then
+   exit $rc
+ fi
+ 
+-diff $srcdir/complex-cert.pem tmp-pem.pem
++cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1
++cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2
++diff tmp1 tmp2
+ rc=$?
+ 
+ if test "$rc" != "0"; then
+@@ -69,6 +71,6 @@ if test "$rc" != "0"; then
+   exit $rc
+ fi
+ 
+-rm -f tmp-pem.pem
++rm -f tmp-pem.pem tmp1 tmp2
+ 
+ exit 0
+-- 
+1.7.1
-- 
cgit v1.2.3-54-g00ecf