diff options
Diffstat (limited to 'extra/gnutls')
-rw-r--r-- | extra/gnutls/PKGBUILD | 20 | ||||
-rw-r--r-- | extra/gnutls/check_fix.diff | 34 |
2 files changed, 7 insertions, 47 deletions
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index ed78c95e7..a06f9d2dc 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187148 2013-06-04 15:50:10Z andyrtr $ +# $Id: PKGBUILD 191197 2013-07-19 17:34:12Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -13,18 +13,12 @@ install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('valgrind' 'strace' 'datefudge') -source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig} - check_fix.diff) -md5sums=('c220b50736f61292ed8722d5132b6a3e' - 'SKIP' - '53ae2a58a401d9e6d052910670da8b07') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('9dd691ad1ccdb7386029809afef6b5ea' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" - - # fix i686 test suite failure - patch -Np1 -i ${srcdir}/check_fix.diff - ./configure --prefix=/usr \ --with-zlib \ --disable-static \ @@ -35,8 +29,8 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" - make -k check - #make -j1 check + #make -k check + make -j1 check } package() { diff --git a/extra/gnutls/check_fix.diff b/extra/gnutls/check_fix.diff deleted file mode 100644 index f7c7e32c3..000000000 --- a/extra/gnutls/check_fix.diff +++ /dev/null @@ -1,34 +0,0 @@ -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 |