Date: Tuesday, May 5, 2015 @ 19:40:41 Author: andyrtr Revision: 238511
prepare next release Modified: gnutls/trunk/PKGBUILD Deleted: gnutls/trunk/buildfix.diff ---------------+ PKGBUILD | 26 +++++++++++--------------- buildfix.diff | 27 --------------------------- 2 files changed, 11 insertions(+), 42 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-05-05 15:56:09 UTC (rev 238510) +++ PKGBUILD 2015-05-05 17:40:41 UTC (rev 238511) @@ -3,7 +3,7 @@ # Maintainer: Andreas Radke <[email protected]> pkgname=gnutls -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -11,30 +11,26 @@ url="http://www.gnutls.org/"; install=gnutls.install options=('!zipman') -depends=('gcc-libs' 'libidn' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') +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} - buildfix.diff) -md5sums=('aa015c2666b031044edfb01b01980d84' - 'SKIP' - 'ffce1bd795445aaecf54100f44299fa7') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('2d04f34fa25b45f9dcb9104c0394e12e' + 'SKIP') validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F' '1F42418905D8206AA754CCDC29EE58B996865171') # "Simon Josefsson <[email protected]>" # "Nikos Mavrogiannopoulos <[email protected]> -prepare(){ +build() { cd ${pkgname}-${pkgver} - # buildfix https://gitlab.com/gnutls/gnutls/commit/7e63027a5caafa55dcca65c5b9bff3bf76c5a41c?view=inline - patch -Np1 -i ${srcdir}/buildfix.diff - autoreconf -vfi -} -build() { - 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 \ + --without-idn \ --enable-guile --with-guile-site-dir=no \ --with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit" make @@ -42,7 +38,7 @@ check() { cd ${pkgname}-${pkgver} - make check + make -j1 check } package() { Deleted: buildfix.diff =================================================================== --- buildfix.diff 2015-05-05 15:56:09 UTC (rev 238510) +++ buildfix.diff 2015-05-05 17:40:41 UTC (rev 238511) @@ -1,27 +0,0 @@ -diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am -index 8e793d3..68de757 100644 ---- a/doc/manpages/Makefile.am -+++ b/doc/manpages/Makefile.am -@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3 - APIMANS += gnutls_certificate_get_peers_subkey_id.3 - APIMANS += gnutls_certificate_get_trust_list.3 - APIMANS += gnutls_certificate_get_verify_flags.3 --APIMANS += gnutls_certificate_get_verify_flags.3 --APIMANS += gnutls_certificate_get_x509_crt.3 - APIMANS += gnutls_certificate_get_x509_crt.3 - APIMANS += gnutls_certificate_get_x509_key.3 --APIMANS += gnutls_certificate_get_x509_key.3 - APIMANS += gnutls_certificate_send_x509_rdn_sequence.3 - APIMANS += gnutls_certificate_server_set_request.3 - APIMANS += gnutls_certificate_set_dh_params.3 -@@ -1101,7 +1098,7 @@ compare-makefile: - @echo "******************************************************************************" - @echo "If the following step fails copy $(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am" - @echo "******************************************************************************" -- FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \ -+ FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \ - MANS=""; \ - for i in $$FUNCS; do \ - MANS="$$MANS\nAPIMANS += $$i.3"; \ --- -libgit2 0.21.4
