diff options
| author | Leo Famulari <leo@famulari.name> | 2016-07-18 12:47:13 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-07-18 12:47:18 -0400 |
| commit | 2d656a93db5e5c67c47fe8a9cca44ca5fb2a4edf (patch) | |
| tree | 56baf3c540b075f39ec8af87419dfc433fc50f56 /gnu/packages | |
| parent | 273260646d90bbe78aaf2f07bc22723818201fe9 (diff) | |
| download | guix-2d656a93db5e5c67c47fe8a9cca44ca5fb2a4edf.tar.gz guix-2d656a93db5e5c67c47fe8a9cca44ca5fb2a4edf.zip | |
Revert "gnu: gnutls: Fix test failure."
This reverts commit 1d14bf9f5ff43ff9097f1c5e1e2d37528eb74971.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/patches/gnutls-fix-stale-test.patch | 50 | ||||
| -rw-r--r-- | gnu/packages/tls.scm | 8 |
2 files changed, 0 insertions, 58 deletions
diff --git a/gnu/packages/patches/gnutls-fix-stale-test.patch b/gnu/packages/patches/gnutls-fix-stale-test.patch deleted file mode 100644 index abb547a4d9..0000000000 --- a/gnu/packages/patches/gnutls-fix-stale-test.patch +++ /dev/null @@ -1,50 +0,0 @@ -A certificate used in the GnuTLS test suite has expired, causing the -test suite to fail. - -The effect of this patch depends on whether or not the datefudge program -is available. If it is, then it is used to change the date in the test -environment. If it is not, then the test is skipped. - -At the time this patch was added to Guix, datefudge was not available, -so the test is skipped. - -Taken from upstream commit: -https://gitlab.com/gnutls/gnutls/commit/47f25d9e08d4e102572804a2aed186b01db23c65 - -From 47f25d9e08d4e102572804a2aed186b01db23c65 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@redhat.com> -Date: Wed, 29 Jun 2016 17:31:13 +0200 -Subject: [PATCH] tests: use datefudge in name-constraints test - -This avoids the expiration of the used certificate to affect the test. ---- - tests/cert-tests/name-constraints | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/tests/cert-tests/name-constraints b/tests/cert-tests/name-constraints -index 05d6e9b..59af00f 100755 ---- a/tests/cert-tests/name-constraints -+++ b/tests/cert-tests/name-constraints -@@ -28,7 +28,18 @@ if ! test -z "${VALGRIND}"; then - fi - TMPFILE=tmp.$$.pem - --${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/name-constraints-ip.pem" -+export TZ="UTC" -+ -+# Check for datefudge -+TSTAMP=`datefudge -s "2006-09-23" date -u +%s || true` -+if test "$TSTAMP" != "1158969600"; then -+ echo $TSTAMP -+ echo "You need datefudge to run this test" -+ exit 77 -+fi -+ -+datefudge -s "2016-04-22" \ -+ ${VALGRIND} "${CERTTOOL}" -e --infile "${srcdir}/name-constraints-ip.pem" - rc=$? - - if test "${rc}" != "0"; then --- -2.9.1 - diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6ba1776636..bdc1d7c997 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -122,7 +122,6 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (replacement gnutls/fixed) (version "3.4.7") (source (origin (method url-fetch) @@ -195,13 +194,6 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) -(define-public gnutls/fixed - (package - (inherit gnutls) - (source (origin - (inherit (package-source gnutls)) - (patches (search-patches "gnutls-fix-stale-test.patch")))))) - (define-public openssl (package (name "openssl") |