From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dF6ZZ-0000tq-US for guix-patches@gnu.org; Sun, 28 May 2017 18:22:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dF6ZW-0003yt-Pe for guix-patches@gnu.org; Sun, 28 May 2017 18:22:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:39561) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dF6ZW-0003yn-N4 for guix-patches@gnu.org; Sun, 28 May 2017 18:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dF6ZW-0005Vl-Ga for guix-patches@gnu.org; Sun, 28 May 2017 18:22:02 -0400 Subject: bug#27113: [PATCH: core-updates] gnu: packages: openssl: delete test ELF files from tarball Resent-Message-ID: Date: Sun, 28 May 2017 23:20:55 +0100 From: Sergei Trofimovich Message-ID: <20170528232055.33609e1d@sf> In-Reply-To: <87lgpgpwrj.fsf@gnu.org> References: <20170528084407.15909-1-slyfox@inbox.ru> <87lgpgpwrj.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/y+PlVcDJxyuquV3ScOi+q9x"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 27113@debbugs.gnu.org --Sig_/y+PlVcDJxyuquV3ScOi+q9x Content-Type: multipart/mixed; boundary="MP_/+Ggtj6OJgnTUKjkVUncd9+z" --MP_/+Ggtj6OJgnTUKjkVUncd9+z Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sun, 28 May 2017 22:11:12 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Hi Sergei, >=20 > Sergei Trofimovich skribis: >=20 > > Otherwise building openssl fails: substitute can't decode binary ELF fi= le: > > > > 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 #= )'. > > > > * gnu/packages/tls.scm (openssl)[arguments]: delete test ELF files from= tarball =20 >=20 > 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 :) --=20 Sergei --MP_/+Ggtj6OJgnTUKjkVUncd9+z Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-packages-openssl-delete-test-ELF-files-from-tarb.patch =46rom 867b88b54c13d0ef9a3546255e5f9fc168d1a7ac Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich 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 #)'. * gnu/packages/tls.scm (openssl)[snippet]: delete test ELF files from tarba= ll --- 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) --=20 2.13.0 --MP_/+Ggtj6OJgnTUKjkVUncd9+z-- --Sig_/y+PlVcDJxyuquV3ScOi+q9x Content-Type: application/pgp-signature Content-Description: Цифровая подпись OpenPGP -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQSZKa0VG5avZRlY01hxoe52YR/zqgUCWStNRwAKCRBxoe52YR/z qgipAJsGPJM2AU8IyQ6BuSUPCXa+bAHzygCdGB1niftQsGhmkB5WtVZV3lfOpPA= =FHrX -----END PGP SIGNATURE----- --Sig_/y+PlVcDJxyuquV3ScOi+q9x--