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

[Florian Pritz]

    Date: Tuesday, May 19, 2015 @ 11:06:28
  Author: bluewind
Revision: 133784

upgpkg: lib32-gnutls 3.4.1-1

upstream update

Added:
  lib32-gnutls/trunk/test_do_not_perform_internationalized_name_checks_without_libidn.diff
Modified:
  lib32-gnutls/trunk/PKGBUILD
Deleted:
  lib32-gnutls/trunk/buildfix.diff

-----------------------------------------------------------------------+
 PKGBUILD                                                              |   25 +++++----
 buildfix.diff                                                         |   27 ----------
 test_do_not_perform_internationalized_name_checks_without_libidn.diff |   21 +++++++
 3 files changed, 35 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-19 09:02:39 UTC (rev 133783)
+++ PKGBUILD	2015-05-19 09:06:28 UTC (rev 133784)
@@ -7,29 +7,28 @@
 
 _pkgbasename=gnutls
 pkgname=lib32-$_pkgbasename
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.4.1
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)"
 arch=('x86_64')
 license=('GPL3' 'LGPL2.1')
 url="http://gnutls.org/"
-depends=('lib32-zlib' 'lib32-nettle' 'lib32-libidn' 'lib32-p11-kit' 'lib32-libtasn1' $_pkgbasename)
+depends=('lib32-zlib' 'lib32-nettle' 'lib32-p11-kit' 'lib32-libtasn1' $_pkgbasename)
 makedepends=('gcc-multilib')
 source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
-        buildfix.diff)
-md5sums=('aa015c2666b031044edfb01b01980d84'
+        test_do_not_perform_internationalized_name_checks_without_libidn.diff)
+md5sums=('2d04f34fa25b45f9dcb9104c0394e12e'
          'SKIP'
-         'ffce1bd795445aaecf54100f44299fa7')
+        'cc584698a4558642129b6398d1e666d6')
 validpgpkeys=(1F42418905D8206AA754CCDC29EE58B996865171)
 
-prepare(){
+prepare() {
   cd ${_pkgbasename}-${pkgver}
-  # buildfix https://gitlab.com/gnutls/gnutls/commit/7e63027a5caafa55dcca65c5b9bff3bf76c5a41c?view=inline
-  patch -Np1 -i ${srcdir}/buildfix.diff
-  autoreconf -vfi
+  # 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() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
@@ -37,10 +36,14 @@
 
   cd ${srcdir}/${_pkgbasename}-${pkgver}
 
+  # disable libidn for security reasons:
+  # http://lists.gnupg.org/pipermail/gnutls-devel/2015-May/007582.html
+
   # build fails without --disable-hardware-acceleration because of assembler errors
   ./configure --prefix=/usr --libdir=/usr/lib32 \
     --with-zlib \
     --disable-static \
+	--without-idn \
     --disable-guile \
     --disable-valgrind-tests --disable-hardware-acceleration
   make

Deleted: buildfix.diff
===================================================================
--- buildfix.diff	2015-05-19 09:02:39 UTC (rev 133783)
+++ buildfix.diff	2015-05-19 09:06:28 UTC (rev 133784)
@@ -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

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-19 09:06:28 UTC (rev 133784)
@@ -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)
+