Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 9CA857A2B6 for ; Mon, 19 Sep 2016 15:32:48 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 490D185E54; Mon, 19 Sep 2016 15:32:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CD6D785E13 for ; Mon, 19 Sep 2016 15:32:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id PfUCF5_3bV2t for ; Mon, 19 Sep 2016 15:32:47 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 471D484CFD for ; Mon, 19 Sep 2016 15:32:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 41E42FBD1; Mon, 19 Sep 2016 15:32:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_147429916729510" MIME-Version: 1.0 Date: Mon, 19 Sep 2016 15:32:47 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/security/gnutls To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20160919153247.41E42FBD1@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_147429916729510 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Mon Sep 19 15:32:47 UTC 2016 Modified Files: pkgsrc/security/gnutls: Makefile distinfo Added Files: pkgsrc/security/gnutls/patches: patch-tests_mini-server-name.c Log Message: Add upstream patch so one test passes. Replace bash binary path in more shell scripts so more tests work. Result: no failing tests. Yay! To generate a diff of this commit: cvs rdiff -u -r1.165 -r1.166 pkgsrc/security/gnutls/Makefile cvs rdiff -u -r1.120 -r1.121 pkgsrc/security/gnutls/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/security/gnutls/patches/patch-tests_mini-server-name.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_147429916729510 Content-Disposition: inline Content-Length: 3526 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/gnutls/Makefile diff -u pkgsrc/security/gnutls/Makefile:1.165 pkgsrc/security/gnutls/Makefile:1.166 --- pkgsrc/security/gnutls/Makefile:1.165 Mon Sep 19 13:01:23 2016 +++ pkgsrc/security/gnutls/Makefile Mon Sep 19 15:32:47 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.165 2016/09/19 13:01:23 wiz Exp $ +# $NetBSD: Makefile,v 1.166 2016/09/19 15:32:47 wiz Exp $ DISTNAME= gnutls-3.5.4 CATEGORIES= security devel @@ -23,17 +23,23 @@ CONFIGURE_ARGS+= --disable-libdane CONFIGURE_ARGS+= --without-tpm CONFIGURE_ARGS+= AUTOGEN=/bin/true -# as of 3.5.4, 1 test failure -# FAIL: mini-server-name -# server:262: server: did not received expected name +# as of 3.5.4, 0 test failures TEST_TARGET= check # without the USE_TOOLS line below, two more shell script based tests fail # but when this line is added, the tool path for bash is embedded # in to the binaries, so only enable this for testing and # disable before commit #USE_TOOLS+= bash + INFO_FILES= yes +REPLACE_BASH+= tests/cert-tests/openpgp-certs +REPLACE_BASH+= tests/danetool.sh +REPLACE_BASH+= tests/ocsp-tests/ocsp-must-staple-connection +REPLACE_BASH+= tests/ocsp-tests/ocsp-tls-connection +REPLACE_BASH+= tests/key-tests/dsa +REPLACE_BASH+= tests/suite/testcompat-main-polarssl +REPLACE_BASH+= tests/suite/testcompat-main-openssl REPLACE_BASH+= tests/fastopen.sh REPLACE_BASH+= tests/starttls.sh Index: pkgsrc/security/gnutls/distinfo diff -u pkgsrc/security/gnutls/distinfo:1.120 pkgsrc/security/gnutls/distinfo:1.121 --- pkgsrc/security/gnutls/distinfo:1.120 Mon Sep 19 13:01:09 2016 +++ pkgsrc/security/gnutls/distinfo Mon Sep 19 15:32:47 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.120 2016/09/19 13:01:09 wiz Exp $ +$NetBSD: distinfo,v 1.121 2016/09/19 15:32:47 wiz Exp $ SHA1 (gnutls-3.5.4.tar.xz) = d2b9d5f7ad158c5b2a636660fc445765ffd92c75 RMD160 (gnutls-3.5.4.tar.xz) = d4bb8babd43455bcec24f1298710b576ae996f44 @@ -11,3 +11,4 @@ SHA1 (patch-src_libopts_compat_compat.h) SHA1 (patch-src_libopts_libopts.c) = ce5e7681def882e95ed5ab770564d1f999b97039 SHA1 (patch-src_libopts_makeshell.c) = e5b7d66caaec45e12ae5490d515fc9fc75de3d92 SHA1 (patch-src_libopts_proto.h) = 78f845bdcbac8de74953a3cee0b77fa9c5b05386 +SHA1 (patch-tests_mini-server-name.c) = 5cf02775d81d01f133475e86940a222d18da5848 Added files: Index: pkgsrc/security/gnutls/patches/patch-tests_mini-server-name.c diff -u /dev/null pkgsrc/security/gnutls/patches/patch-tests_mini-server-name.c:1.1 --- /dev/null Mon Sep 19 15:32:47 2016 +++ pkgsrc/security/gnutls/patches/patch-tests_mini-server-name.c Mon Sep 19 15:32:47 2016 @@ -0,0 +1,18 @@ +$NetBSD: patch-tests_mini-server-name.c,v 1.1 2016/09/19 15:32:47 wiz Exp $ + +Only test DNS UTF-8 support when building with libidn. +https://gitlab.com/gnutls/gnutls/commit/480c9f572c511230699a1d35d3053515058584c2 + +--- tests/mini-server-name.c.orig 2016-09-03 08:29:22.000000000 +0000 ++++ tests/mini-server-name.c +@@ -341,8 +341,10 @@ void doit(void) + start(0, "", 0, "", 0); + start(0, "test.example.com", strlen("test.example.com"), "test.example.com", strlen("test.example.com")); + start(0, "longtest.example.com.", strlen("longtest.example.com"), "longtest.example.com.", strlen("longtest.example.com")); ++#ifdef HAVE_LIBIDN + /* test invalid UTF8 */ + start(1, "invalid\xff.example.com.", sizeof("invalid\xff.example.com")-1, NULL, 0); ++#endif + /* test embedded NULL */ + start(1, "invalid\x00.example.com.", sizeof("invalid\x00.example.com")-1, NULL, 0); + } --_----------=_147429916729510--