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

[Andreas Radke]

    Date: Thursday, April 9, 2015 @ 22:02:21
  Author: andyrtr
Revision: 235989

upgpkg: gnutls 3.4.0-1

upstream update 3.4.0

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

----------------+
 PKGBUILD       |   28 +++++++++++++++-------------
 buildfix.diff  |   27 +++++++++++++++++++++++++++
 gnutls.install |    2 +-
 3 files changed, 43 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-09 20:02:20 UTC (rev 235988)
+++ PKGBUILD	2015-04-09 20:02:21 UTC (rev 235989)
@@ -3,8 +3,8 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=gnutls
-pkgver=3.3.14
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL2.1')
@@ -13,14 +13,23 @@
 options=('!zipman')
 depends=('gcc-libs' 'libidn' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
 optdepends=('guile: for use with Guile bindings')
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('7f4465f8c564cf9cb8f5cb38b909f7ca'
-         'SKIP')
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/${pkgname}-${pkgver}.tar.xz{,.sig}
+        buildfix.diff)
+md5sums=('aa015c2666b031044edfb01b01980d84'
+         'SKIP'
+         'ffce1bd795445aaecf54100f44299fa7')
 validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F'
               '1F42418905D8206AA754CCDC29EE58B996865171')
                # "Simon Josefsson <simon at josefsson.org>"
                # "Nikos Mavrogiannopoulos <nmav at gnutls.org>
 
+prepare(){
+  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}
   ./configure --prefix=/usr \
@@ -33,14 +42,7 @@
 
 check() {
   cd ${pkgname}-${pkgver}
-  make -j1 check  || /bin/true
-  
-  # one test segfaults (guile bindings - this is known since the last release.
-#  PASS: x509-certificates.scm
-#  ../../build-aux/test-driver: line 107:  5507 Segmentation fault      (core dumped) "$@" > $log_file 2>&1
-#  FAIL: x509-auth.scm
-
-  #|| make -j1 check # || /bin/true
+  make check
 }
 
 package() {

Added: buildfix.diff
===================================================================
--- buildfix.diff	                        (rev 0)
+++ buildfix.diff	2015-04-09 20:02:21 UTC (rev 235989)
@@ -0,0 +1,27 @@
+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

Modified: gnutls.install
===================================================================
--- gnutls.install	2015-04-09 20:02:20 UTC (rev 235988)
+++ gnutls.install	2015-04-09 20:02:21 UTC (rev 235989)
@@ -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-5.gz gnutls.info.gz gnutls-guile.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