From df4680dd1b0f6080991747ea583ab61b272835bf Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 21 Jan 2016 17:48:59 +0000
Subject: gnutils: update to 3.4.8

---
 abs/core/gnutls/PKGBUILD       | 46 +++++++++++++++++++++++++-----------------
 abs/core/gnutls/gnutls.install |  2 +-
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/abs/core/gnutls/PKGBUILD b/abs/core/gnutls/PKGBUILD
index e6d5075..f030c5a 100644
--- a/abs/core/gnutls/PKGBUILD
+++ b/abs/core/gnutls/PKGBUILD
@@ -1,41 +1,51 @@
-# $Id: PKGBUILD 162907 2012-07-03 15:25:08Z andyrtr $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.21
+pkgver=3.4.8
 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/"
+license=('GPL3' 'LGPL2.1')
+url="http://www.gnutls.org/"
 install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
-makedepends=('valgrind' 'strace')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('7480dff7115e5af85215893c06b3ac5c'
-         'c84eb5e67f1498c60ea6fd6ba9045def')
+options=('!zipman')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
+optdepends=('guile: for use with Guile bindings')
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('a26e6dd8d5ad92016e3f068795b89624'
+         'SKIP')
+validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F'
+              '1F42418905D8206AA754CCDC29EE58B996865171')
+               # "Simon Josefsson <simon@josefsson.org>"
+               # "Nikos Mavrogiannopoulos <nmav@gnutls.org>
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
+
+  # disable libidn for security reasons:
+  # http://lists.gnupg.org/pipermail/gnutls-devel/2015-May/007582.html
+
   ./configure --prefix=/usr \
 	--with-zlib \
 	--disable-static \
-	--disable-guile \
-	--disable-valgrind-tests
+	--without-idn \
+	--enable-guile --with-guile-site-dir=no \
+	--with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit"
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -k check # passes all  || /bin/true
+  cd ${pkgname}-${pkgver}
+  make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-  
-  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
+
+  # lots of .png files are put into infodir and are gzipped by makepkg! this needs to be fixed by using !zipman
   # gzip -9 all files in infodir and manpages manually
   find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
   find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
diff --git a/abs/core/gnutls/gnutls.install b/abs/core/gnutls/gnutls.install
index e8c8e17..196a913 100644
--- a/abs/core/gnutls/gnutls.install
+++ b/abs/core/gnutls/gnutls.install
@@ -1,5 +1,5 @@
 infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz)
+filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info-5.gz gnutls.info-6.gz gnutls.info.gz gnutls-guile.info.gz)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
-- 
cgit v0.12

