[arch-commits] Commit in gnutls/trunk (PKGBUILD check_fix.diff)

[Andreas Radke]

    Date: Sunday, June 2, 2013 @ 16:00:37
  Author: andyrtr
Revision: 186981

upgpkg: gnutls 3.2.1-1

upstream update 3.2.1

Added:
  gnutls/trunk/check_fix.diff
Modified:
  gnutls/trunk/PKGBUILD

----------------+
 PKGBUILD       |   17 ++++++++++++-----
 check_fix.diff |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-02 10:21:27 UTC (rev 186980)
+++ PKGBUILD	2013-06-02 14:00:37 UTC (rev 186981)
@@ -3,7 +3,7 @@
 # Maintainer: Andreas Radke <andyrtr at 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 @@
 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 @@
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make -k check
+  #make -j1 check
 }
 
 package() {

Added: check_fix.diff
===================================================================
--- check_fix.diff	                        (rev 0)
+++ check_fix.diff	2013-06-02 14:00:37 UTC (rev 186981)
@@ -0,0 +1,34 @@
+From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at 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