diff options
| author | Cyril Roelandt <tipecaml@gmail.com> | 2013-06-27 23:57:45 +0200 |
|---|---|---|
| committer | Cyril Roelandt <tipecaml@gmail.com> | 2013-06-28 17:26:49 +0200 |
| commit | 013ce67b193326f4dfbdddb3c6445d542476bd93 (patch) | |
| tree | 119e910de17340d748f84f5e997abf675df51ffd | |
| parent | 88a0b7b05127b1e1ca6672ead75925249f9fa114 (diff) | |
| download | gnu-guix-013ce67b193326f4dfbdddb3c6445d542476bd93.tar gnu-guix-013ce67b193326f4dfbdddb3c6445d542476bd93.tar.gz | |
gnutls: fix the test-suite for 32 bits systems.
* gnu/packages/patches/gnutls-fix-tests-on-32-bits-system.patch: New file.
* gnu-system.am: Add it here...
* gnu/packages/gnutls.scm (gnutls): ... and use it here.
Thanks to Nikos Mavrogiannopoulos for providing this patch:
http://permalink.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/6778
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/gnutls.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/patches/gnutls-fix-tests-on-32-bits-system.patch | 36 |
3 files changed, 45 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index 128fff3a42..f5c2c60012 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -188,6 +188,7 @@ dist_patch_DATA = \ gnu/packages/patches/glib-tests-prlimit.patch \ gnu/packages/patches/glibc-bootstrap-system.patch \ gnu/packages/patches/glibc-no-ld-so-cache.patch \ + gnu/packages/patches/gnutls-fix-tests-on-32-bits-system.patch \ gnu/packages/patches/grub-gets-undeclared.patch \ gnu/packages/patches/guile-1.8-cpp-4.5.patch \ gnu/packages/patches/guile-default-utf8.patch \ diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm index 32726f6258..d636a9c927 100644 --- a/gnu/packages/gnutls.scm +++ b/gnu/packages/gnutls.scm @@ -23,6 +23,7 @@ #:use-module (guix build-system gnu) #:use-module ((gnu packages compression) #:renamer (symbol-prefix-proc 'guix:)) + #:use-module (gnu packages) #:use-module (gnu packages nettle) #:use-module (gnu packages guile) #:use-module (gnu packages perl) @@ -65,12 +66,18 @@ portable, and only require an ANSI C89 platform.") (base32 "1zi2kq3vcbqdy9khl7r6pgk4hgwibniasm9k6siasdvqjijq3ymb")))) (build-system gnu-build-system) + (arguments + `(#:patches (list (assoc-ref %build-inputs + "patch/fix-tests")) + #:patch-flags '("-p0"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.0) ("zlib" ,guix:zlib) - ("perl" ,perl))) + ("perl" ,perl) + ("patch/fix-tests" + ,(search-patch "gnutls-fix-tests-on-32-bits-system.patch")))) (propagated-inputs `(("libtasn1" ,libtasn1) ("nettle" ,nettle) diff --git a/gnu/packages/patches/gnutls-fix-tests-on-32-bits-system.patch b/gnu/packages/patches/gnutls-fix-tests-on-32-bits-system.patch new file mode 100644 index 0000000000..07d633149e --- /dev/null +++ b/gnu/packages/patches/gnutls-fix-tests-on-32-bits-system.patch @@ -0,0 +1,36 @@ +From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos <nmav@gnutls.org> +Date: Sun, 2 Jun 2013 12:10:06 +0200 +Subject: [PATCH] Avoid comparing the expiration date to prevent false positive +error in 32-bit systems. + +--- + tests/cert-tests/pem-decoding | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding +index fe769ec..f8c6372 100755 +--- tests/cert-tests/pem-decoding ++++ tests/cert-tests/pem-decoding +@@ -61,7 +61,9 @@ if test "$rc" != "0"; then + exit $rc + fi + +-diff $srcdir/complex-cert.pem tmp-pem.pem ++cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1 ++cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2 ++diff tmp1 tmp2 + rc=$? + + if test "$rc" != "0"; then +@@ -69,6 +71,6 @@ if test "$rc" != "0"; then + exit $rc + fi + +-rm -f tmp-pem.pem ++rm -f tmp-pem.pem tmp1 tmp2 + + exit 0 +-- +1.7.1 + |