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

[andyrtr at archlinux.org]

    Date: Friday, February 24, 2012 @ 15:54:44
  Author: andyrtr
Revision: 151093

upgpkg: gnutls 3.0.14-1

upstream update 3.0.14

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

---------------+
 PKGBUILD      |   14 +++++---------
 buildfix.diff |   28 ----------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-24 20:41:57 UTC (rev 151092)
+++ PKGBUILD	2012-02-24 20:54:44 UTC (rev 151093)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.13
-pkgrel=2
+pkgver=3.0.14
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
@@ -12,16 +12,12 @@
 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'
-         '9b2a32b41391d95aeb8ddae3756fa191')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('0d613985c867846ccb5cbaba8fa576ef'
+         '847af57e7d4702b176d1cbf157962f6e')
 
 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 \

Deleted: buildfix.diff
===================================================================
--- buildfix.diff	2012-02-24 20:41:57 UTC (rev 151092)
+++ buildfix.diff	2012-02-24 20:54:44 UTC (rev 151093)
@@ -1,28 +0,0 @@
-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 
-     {
---- a/src/libopts/m4/libopts.m4
-+++ b/src/libopts/m4/libopts.m4
-@@ -487,9 +487,9 @@ AC_DEFUN([LIBOPTS_CHECK_COMMON],[
-     fi])
- 
-   AC_ARG_ENABLE([libopts-install],
--    AC_HELP_STRING([--disable-libopts-install],
--       [Do not install libopts with client installation]))
--  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" != Xno])
-+    AC_HELP_STRING([--enable-libopts-install],
-+       [Install libopts with client installation]))
-+  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" = Xyes])
- 
-   [if test -z "${NEED_LIBOPTS_DIR}" ; then]
-      AC_MSG_CHECKING([whether autoopts-config can be found])