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

[andyrtr at archlinux.org]

    Date: Monday, February 20, 2012 @ 01:10:18
  Author: andyrtr
Revision: 150680

upgpkg: gnutls 3.0.13-1

upstream update 3.0.13

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

---------------+
 PKGBUILD      |   19 ++++++++++++-------
 buildfix.diff |   13 +++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-20 03:46:01 UTC (rev 150679)
+++ PKGBUILD	2012-02-20 06:10:18 UTC (rev 150680)
@@ -2,26 +2,31 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.12
+pkgver=3.0.13
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
 install=gnutls.install
-options=('!libtool' '!zipman' '!makeflags')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
-makedepends=('valgrind')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('685fe5c00786c04b39e9aac362fa0cac')
+options=('!libtool' '!zipman')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11')
+makedepends=('valgrind' 'strace')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}
+        buildfix.diff)
+md5sums=('ec549be557f31ea8c1738cb441ef23ec'
+         'a6a9a1d148abd6377e7634eb03bdaf7c'
+         'b6284815621293cb4a2f0ad25bcc985d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix hanging make check - http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commit;h=642e6b5ca996325dc0ca6401a3b87039408b2585
+  patch -Np1 -i ${srcdir}/buildfix.diff
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
 	--disable-guile \
-	--enable-valgrind-tests # x86_64 test are all passed. some fail in i686 chroot
+	--enable-valgrind-tests
   make
 }
 

Added: buildfix.diff
===================================================================
--- buildfix.diff	                        (rev 0)
+++ buildfix.diff	2012-02-20 06:10:18 UTC (rev 150680)
@@ -0,0 +1,13 @@
+index 17f6d3f..cc01dcd 100644 (file)
+
+
+--- a/tests/mini-loss-time.c
++++ b/tests/mini-loss-time.c
+@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
+     {
+       /* parent */
+       server (fd[0], server_packet);
++      kill(child, SIGTERM);
+     }
+   else 
+     {