bug#27113: [PATCH: core-updates] gnu: packages: openssl: delete test ELF files from tarball

bug#27113: [PATCH: core-updates] gnu: packages: openssl: delete test ELF files from tarball

[Sergei Trofimovich]

Otherwise building openssl fails: substitute can't decode binary ELF file:

  ice-9/boot-9.scm:760:25: In procedure dispatch-exception:
  ice-9/boot-9.scm:760:25: Throw to key `decoding-error' with args
  `("peek-char" "input decoding error" 84 #<input: test/ssltest_old 15>)'.

* gnu/packages/tls.scm (openssl)[arguments]: delete test ELF files from tarball
---
 gnu/packages/tls.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 1cd6a99dc..406672202 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -329,6 +329,10 @@ required structures.")
          'patch-source-shebangs 'patch-tests
          (lambda* (#:key inputs native-inputs #:allow-other-keys)
            (let ((bash (assoc-ref (or native-inputs inputs) "bash")))
+             ;; remove ELF files. substitute can't read it as test file
+             (delete-file "test/ssltest_old")
+             (delete-file "test/v3ext")
+             (delete-file "test/x509aux")
              (substitute* (find-files "test" ".*")
                (("/bin/sh")
                 (string-append bash "/bin/sh"))
-- 
2.13.0

bug#27113: [PATCH: core-updates] gnu: packages: openssl: delete test ELF files from tarball

[Ludovic Courtès]

Hi Sergei,

Sergei Trofimovich <slyfox@inbox.ru> skribis:

> Otherwise building openssl fails: substitute can't decode binary ELF file:
>
>   ice-9/boot-9.scm:760:25: In procedure dispatch-exception:
>   ice-9/boot-9.scm:760:25: Throw to key `decoding-error' with args
>   `("peek-char" "input decoding error" 84 #<input: test/ssltest_old 15>)'.
>
> * gnu/packages/tls.scm (openssl)[arguments]: delete test ELF files from tarball

Good catch!  I think we should even remove them in a snippet, WDYT?

Thank you,
Ludo’.

bug#27113: [PATCH: core-updates] gnu: packages: openssl: delete test ELF files from tarball

[Sergei Trofimovich]

[-- Attachment #1.1: Type: text/plain, Size: 730 bytes --]

On Sun, 28 May 2017 22:11:12 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Hi Sergei,
> 
> Sergei Trofimovich <slyfox@inbox.ru> skribis:
> 
> > Otherwise building openssl fails: substitute can't decode binary ELF file:
> >
> >   ice-9/boot-9.scm:760:25: In procedure dispatch-exception:
> >   ice-9/boot-9.scm:760:25: Throw to key `decoding-error' with args
> >   `("peek-char" "input decoding error" 84 #<input: test/ssltest_old 15>)'.
> >
> > * gnu/packages/tls.scm (openssl)[arguments]: delete test ELF files from tarball  
> 
> Good catch!  I think we should even remove them in a snippet, WDYT?

Moved file removals to (snippet) section. Attached updated patch.
Openssl still works :)

-- 

  Sergei

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-packages-openssl-delete-test-ELF-files-from-tarb.patch --]
[-- Type: text/x-patch, Size: 1494 bytes --]

From 867b88b54c13d0ef9a3546255e5f9fc168d1a7ac Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@inbox.ru>
Date: Sun, 28 May 2017 09:39:05 +0100
Subject: [PATCH: core-updates] gnu: packages: openssl: delete test ELF files
 from tarball

Otherwise building openssl fails: substitute can't decode binary ELF file:

  ice-9/boot-9.scm:760:25: In procedure dispatch-exception:
  ice-9/boot-9.scm:760:25: Throw to key `decoding-error' with args
  `("peek-char" "input decoding error" 84 #<input: test/ssltest_old 15>)'.

* gnu/packages/tls.scm (openssl)[snippet]: delete test ELF files from tarball
---
 gnu/packages/tls.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 6a0b0637a..10dbee3eb 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -235,6 +235,13 @@ required structures.")
              (sha256
               (base32
                "037kvpisc6qh5dkppcwbm5bg2q800xh2hma3vghz8xcycmdij1yf"))
+             (snippet
+               '(begin
+                  ;; remove ELF file. substitute can't read it as test file
+                  (delete-file "test/ssltest_old")
+                  (delete-file "test/v3ext")
+                  (delete-file "test/x509aux")
+                  #t))
              (patches (search-patches "openssl-runpath.patch"
                                       "openssl-c-rehash-in.patch"))))
    (build-system gnu-build-system)
-- 
2.13.0


[-- Attachment #2: Цифровая подпись OpenPGP --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

bug#27113: [PATCH: core-updates] gnu: packages: openssl: delete test ELF files from tarball

[Ludovic Courtès]

Hello!

Sergei Trofimovich <slyfox@inbox.ru> skribis:

> From 867b88b54c13d0ef9a3546255e5f9fc168d1a7ac Mon Sep 17 00:00:00 2001
> From: Sergei Trofimovich <slyfox@inbox.ru>
> Date: Sun, 28 May 2017 09:39:05 +0100
> Subject: [PATCH: core-updates] gnu: packages: openssl: delete test ELF files
>  from tarball
>
> Otherwise building openssl fails: substitute can't decode binary ELF file:
>
>   ice-9/boot-9.scm:760:25: In procedure dispatch-exception:
>   ice-9/boot-9.scm:760:25: Throw to key `decoding-error' with args
>   `("peek-char" "input decoding error" 84 #<input: test/ssltest_old 15>)'.
>
> * gnu/packages/tls.scm (openssl)[snippet]: delete test ELF files from tarball

I adjusted the commit log and comment and pushed:

  https://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates

Thanks!

Ludo’.