unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sergei Trofimovich <slyfox@inbox.ru>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 27113@debbugs.gnu.org
Subject: bug#27113: [PATCH: core-updates] gnu: packages: openssl: delete test ELF files from tarball
Date: Sun, 28 May 2017 23:20:55 +0100	[thread overview]
Message-ID: <20170528232055.33609e1d@sf> (raw)
In-Reply-To: <87lgpgpwrj.fsf@gnu.org>


[-- 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 --]

  reply	other threads:[~2017-05-28 22:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-28  8:44 bug#27113: [PATCH: core-updates] gnu: packages: openssl: delete test ELF files from tarball Sergei Trofimovich
2017-05-28 20:11 ` Ludovic Courtès
2017-05-28 22:20   ` Sergei Trofimovich [this message]
2017-05-30  8:10     ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170528232055.33609e1d@sf \
    --to=slyfox@inbox.ru \
    --cc=27113@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).