From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzq9j-0007Er-Ks for guix-patches@gnu.org; Tue, 11 Sep 2018 17:25:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzq9f-00074q-EU for guix-patches@gnu.org; Tue, 11 Sep 2018 17:25:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33138) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fzq9e-00074D-3w for guix-patches@gnu.org; Tue, 11 Sep 2018 17:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fzq9d-0007WX-Tx for guix-patches@gnu.org; Tue, 11 Sep 2018 17:25:01 -0400 Subject: [bug#32707] [PATCH] gnu: OpenSSL 1.1: Update to 1.1.1. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzq94-0006hJ-0y for guix-patches@gnu.org; Tue, 11 Sep 2018 17:24:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzpwy-000700-5g for guix-patches@gnu.org; Tue, 11 Sep 2018 17:12:01 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:53197) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fzpwx-0006zD-Uc for guix-patches@gnu.org; Tue, 11 Sep 2018 17:11:56 -0400 Received: from jasmine.lan (c-76-124-202-137.hsd1.pa.comcast.net [76.124.202.137]) by mail.messagingengine.com (Postfix) with ESMTPA id CFABE1029E for ; Tue, 11 Sep 2018 17:11:53 -0400 (EDT) From: Leo Famulari Date: Tue, 11 Sep 2018 17:11:49 -0400 Message-Id: <9d01011d886e15d25ac0e36e656412aab13001fe.1536700308.git.leo@famulari.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 32707@debbugs.gnu.org * gnu/packages/tls.scm (openssl-next): Update to 1.1.1. [arguments]: Patch a `/usr/bin/env` invocation in the 'config' script. * gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch: Adjust patch. --- gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch | 6 +++--- gnu/packages/tls.scm | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch b/gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch index e3a982b7a..c96493b58 100644 --- a/gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch +++ b/gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch @@ -6,14 +6,14 @@ to create symbolic links to certificates, for instance in the 'nss-certs' package. diff --git a/tools/c_rehash.in b/tools/c_rehash.in -index 2fef627..9d40eae 100644 +index 421fd89208..93aca4e168 100644 --- a/tools/c_rehash.in +++ b/tools/c_rehash.in @@ -1,4 +1,6 @@ --#!{- $config{hashbangperl} -} +-#!{- $config{HASHBANGPERL} -} +eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' + & eval 'exec perl -wS "$0" $argv:q' + if 0; # {- join("\n# ", @autowarntext) -} - # Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. + # Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5e49509dd..56ba37bc6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -410,7 +410,7 @@ required structures.") (package (inherit openssl) (name "openssl") - (version "1.1.0i") + (version "1.1.1") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -423,7 +423,7 @@ required structures.") (patches (search-patches "openssl-1.1.0-c-rehash-in.patch")) (sha256 (base32 - "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb")))) + "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8")))) (outputs '("out" "doc" ; 1.3MiB of man3 pages "static")) ; 5.5MiB of .a files @@ -439,6 +439,11 @@ required structures.") (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib"))) + ;; It's not a shebang so patch-source-shebangs misses it... + (substitute* "config" + (("/usr/bin/env") + (string-append (assoc-ref %build-inputs "coreutils") + "/bin/env"))) (invoke "./config" "shared" ;build shared libraries "--libdir=lib" -- 2.19.0