diff options
| author | wiz <wiz@pkgsrc.org> | 2016-09-19 15:32:47 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-09-19 15:32:47 +0000 |
| commit | ac83b7e7d174d8ae363aa01fa981885b8096d0d4 (patch) | |
| tree | c2abaca2caa17be0fe216da43f5d1d09120b0cc9 /security | |
| parent | 6b961175cc17c4c0908bf502398869590cdb5e20 (diff) | |
| download | pkgsrc-ac83b7e7d174d8ae363aa01fa981885b8096d0d4.tar.gz | |
Add upstream patch so one test passes.
Replace bash binary path in more shell scripts so more tests work.
Result: no failing tests. Yay!
Diffstat (limited to 'security')
| -rw-r--r-- | security/gnutls/Makefile | 14 | ||||
| -rw-r--r-- | security/gnutls/distinfo | 3 | ||||
| -rw-r--r-- | security/gnutls/patches/patch-tests_mini-server-name.c | 18 |
3 files changed, 30 insertions, 5 deletions
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index fcf1e3c3d12..04e35ffcd6b 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -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 diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo index 47379e7aee9..37707a6f520 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -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) = 240fbfc0ba20af35e0634ba873fe9e34bfbcc 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 diff --git a/security/gnutls/patches/patch-tests_mini-server-name.c b/security/gnutls/patches/patch-tests_mini-server-name.c new file mode 100644 index 00000000000..a22073f3b23 --- /dev/null +++ b/security/gnutls/patches/patch-tests_mini-server-name.c @@ -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); + } |