[arch-commits] Commit in gnutls/trunk (2 files)

[Andreas Radke]

    Date: Thursday, May 7, 2015 @ 21:00:38
  Author: andyrtr
Revision: 238603

upgpkg: gnutls 3.4.1-1

upstream update 3.4.1

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

-----------------------------------------------------------------------+
 PKGBUILD                                                              |   15 
+++++--
 test_do_not_perform_internationalized_name_checks_without_libidn.diff |   21 
++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2015-05-07 18:54:24 UTC (rev 238602)
+++ PKGBUILD    2015-05-07 19:00:38 UTC (rev 238603)
@@ -13,14 +13,23 @@
 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})
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/${pkgname}-${pkgver}.tar.xz{,.sig}
+        test_do_not_perform_internationalized_name_checks_without_libidn.diff)
 md5sums=('2d04f34fa25b45f9dcb9104c0394e12e'
-         'SKIP')
+         'SKIP'
+         'cc584698a4558642129b6398d1e666d6')
 validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F'
               '1F42418905D8206AA754CCDC29EE58B996865171')
                # "Simon Josefsson <si...@josefsson.org>"
                # "Nikos Mavrogiannopoulos <n...@gnutls.org>
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix build in testsuite without libidn
+  # 
https://gitlab.com/gnutls/gnutls/commit/78fcb17c74e1e625f89e71e0641083c85a268414
+  patch -Np1 -i 
$srcdir/test_do_not_perform_internationalized_name_checks_without_libidn.diff
+}
+
 build() {
   cd ${pkgname}-${pkgver}
 
@@ -38,7 +47,7 @@
 
 check() {
   cd ${pkgname}-${pkgver}
-  make -j1 check
+  make check
 }
 
 package() {

Added: test_do_not_perform_internationalized_name_checks_without_libidn.diff
===================================================================
--- test_do_not_perform_internationalized_name_checks_without_libidn.diff       
                        (rev 0)
+++ test_do_not_perform_internationalized_name_checks_without_libidn.diff       
2015-05-07 19:00:38 UTC (rev 238603)
@@ -0,0 +1,21 @@
+diff --git a/tests/hostname-check.c b/tests/hostname-check.c
+index 120f3b9..670248a 100644
+--- a/tests/hostname-check.c
++++ b/tests/hostname-check.c
+@@ -1147,6 +1147,7 @@ void doit(void)
+       if (ret)
+               fail("%d: Hostname incorrectly matches (%d)\n", __LINE__, ret);
+ 
++#ifdef HAVE_LIBIDN
+       ret = gnutls_x509_crt_check_hostname(x509, "www.teχ.gr");
+       if (!ret)
+               fail("%d: Hostname incorrectly does not match (%d)\n", 
__LINE__, ret);
+@@ -1166,6 +1167,7 @@ void doit(void)
+       ret = gnutls_x509_crt_check_hostname(x509, "ΤΈΣΤ.gr");
+       if (!ret)
+               fail("%d: Hostname incorrectly does not match (%d)\n", 
__LINE__, ret);
++#endif
+ 
+ #ifdef ENABLE_OPENPGP
+       if (debug)
+