From unknown Tue Jun 17 01:32:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32707] [PATCH] gnu: OpenSSL 1.1: Update to 1.1.1. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Sep 2018 21:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 32707 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 32707@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.153670108428891 (code B ref -1); Tue, 11 Sep 2018 21:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Sep 2018 21:24:44 +0000 Received: from localhost ([127.0.0.1]:37396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fzq9M-0007Vv-Jj for submit@debbugs.gnu.org; Tue, 11 Sep 2018 17:24:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fzq9K-0007Vh-GY for submit@debbugs.gnu.org; Tue, 11 Sep 2018 17:24:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzq96-0006b3-AC for submit@debbugs.gnu.org; Tue, 11 Sep 2018 17:24:31 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:54177) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fzq95-0006Zs-As for submit@debbugs.gnu.org; Tue, 11 Sep 2018 17:24:27 -0400 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 compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 7EBAB21FDA; Tue, 11 Sep 2018 17:11:54 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 11 Sep 2018 17:11:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=content-transfer-encoding:date:from:message-id:mime-version :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=zPY 91XVhLRcay0FOm8kY6uM89lXP4xH6qK12RssQ8hE=; b=maGXgt7rAjm82L2CEil qySKg8fwFhJhaH5ud1N2E3Bq9JTDe2+8C98qFukEkBi2RXarhgmNYbGmTdfSZm2Q Gjb68k0cqs3TqT9SdBr8OXEt4Ai9GgNO3BaAKeUZ2VcFNDbh4QISLzw9DXFVu1Kw AwPFMQWP+OG4yRVeG/+zw1ag= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=zPY91XVhLRcay0FOm8kY6uM89lXP4xH6qK12RssQ8 hE=; b=mPBfvSguqigHRaIOWutSqikz8KsJQatllnmJKTUEZsM14Saa2+JlEme+j Hmd635uzX+Fy5r+4+D//9vBhcqas7F3xNsJ3fIuwV218WLFW4/zEGhD3h+Mi6xpE GJ9PIc2ldsa4l2FPM821ak/bZqSCK/meq1n9kkMXS6CvB6o8qwIgU4m365qUnycY 14E3xPnBkIm27wAemsgjcHBp92g/yO3FO1Sp0FU0gJrO0fyCnFdU+D1RfDj+ztAq vbsU15AA3z8O4fYQQP0Run4M/wbcHnpkcb0Qigo7NZ/YSEDlrn/ifP0Ms5nfLnLQ 9iDRi34McbdLNz/RSIlgxUv6q4hSw== X-ME-Proxy: X-ME-Sender: 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> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) * 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 From unknown Tue Jun 17 01:32:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32707] [PATCH] gnu: OpenSSL 1.1: Update to 1.1.1. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Sep 2018 08:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32707 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 32707@debbugs.gnu.org Received: via spool by 32707-submit@debbugs.gnu.org id=B32707.153682869610341 (code B ref 32707); Thu, 13 Sep 2018 08:52:02 +0000 Received: (at 32707) by debbugs.gnu.org; 13 Sep 2018 08:51:36 +0000 Received: from localhost ([127.0.0.1]:38737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g0NLc-0002gj-10 for submit@debbugs.gnu.org; Thu, 13 Sep 2018 04:51:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g0NLa-0002gU-OX for 32707@debbugs.gnu.org; Thu, 13 Sep 2018 04:51:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g0NLR-00013F-Jz for 32707@debbugs.gnu.org; Thu, 13 Sep 2018 04:51:29 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g0NLR-00012L-F4; Thu, 13 Sep 2018 04:51:25 -0400 Received: from [193.50.110.53] (port=33984 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1g0NLQ-00029c-Oy; Thu, 13 Sep 2018 04:51:25 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <9d01011d886e15d25ac0e36e656412aab13001fe.1536700308.git.leo@famulari.name> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 27 Fructidor an 226 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 13 Sep 2018 10:51:23 +0200 In-Reply-To: <9d01011d886e15d25ac0e36e656412aab13001fe.1536700308.git.leo@famulari.name> (Leo Famulari's message of "Tue, 11 Sep 2018 17:11:49 -0400") Message-ID: <87pnxhpypg.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hello, Leo Famulari skribis: > * 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/p= ackages/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 Perhaps we should rename the patch to =E2=80=9Copenssl-1.1-c-rehash-in.patc= h=E2=80=9D and adjust the file name above as a hint. Otherwise LGTM, thanks! Ludo=E2=80=99. From unknown Tue Jun 17 01:32:59 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Leo Famulari Subject: bug#32707: closed (Re: [bug#32707] [PATCH] gnu: OpenSSL 1.1: Update to 1.1.1.) Message-ID: References: <20180914205310.GA7874@jasmine.lan> <9d01011d886e15d25ac0e36e656412aab13001fe.1536700308.git.leo@famulari.name> X-Gnu-PR-Message: they-closed 32707 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 32707@debbugs.gnu.org Date: Fri, 14 Sep 2018 20:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1536958442-26046-1" This is a multi-part message in MIME format... ------------=_1536958442-26046-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #32707: [PATCH] gnu: OpenSSL 1.1: Update to 1.1.1. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 32707@debbugs.gnu.org. --=20 32707: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32707 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1536958442-26046-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 32707-done) by debbugs.gnu.org; 14 Sep 2018 20:53:16 +0000 Received: from localhost ([127.0.0.1]:40963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g0v5Y-0006kS-Eo for submit@debbugs.gnu.org; Fri, 14 Sep 2018 16:53:16 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:54659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g0v5W-0006kH-8t for 32707-done@debbugs.gnu.org; Fri, 14 Sep 2018 16:53:14 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D62162C3CA; Fri, 14 Sep 2018 16:53:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 14 Sep 2018 16:53:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= mesmtp; bh=d/25rnQDowE2ZA94gHk+ImDCLk8zhUkTpVCTp+O+ZK0=; b=a6StL k4+dXLaFwVQ363bK+XLnY824blWEOVIi3nw/eL0huxHC2g+DMqIanUPZqGvAXix6 wrtFtZIDu+04U59VwNwnJry9PpKsM58rUcWJ5RAEzhSQJ9N1AUlUhov5zAUsvSem 3xsOSDgwi3DsDID9XvBz9jXmxa6MrNegOpRtUM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=d/25rnQDowE2ZA94gHk+ImDCLk8zh UkTpVCTp+O+ZK0=; b=OGBYNUkz1TpFSjr+wulC0vFwJtShGPbDPpbSLsR0MYJOx jP6YCdzacRUBvbHg0N6muMaUaTPKLdez3kwILnpm2MZvkBqnPCBgOxA3w6zuQGKP 9nQx3a8khD9jxsy0Ye7s3bjCpXsLLwcEDqCf0jXBKRQ4sMFJpE7GeJE9DoR3Rj4p wtzNAkK49+2XIfMz/3w4M52QuDjYZlb9dXqcbRZ7EICt2SOh1PtN5PATCz20r022 L8L7f9bQ1R09pgQQyJRkxLXuFGc2p15jbqImrIaI9E3rgCbL03hXkpseFr5vq3Tk mB56Hzozggrl+6FUp0KgUBRpG771Lu/TGKagNoLxg== X-ME-Proxy: X-ME-Sender: Received: from localhost (c-76-124-202-137.hsd1.pa.comcast.net [76.124.202.137]) by mail.messagingengine.com (Postfix) with ESMTPA id F15C9E47C0; Fri, 14 Sep 2018 16:53:11 -0400 (EDT) Date: Fri, 14 Sep 2018 16:53:10 -0400 From: Leo Famulari To: Ludovic =?iso-8859-1?Q?Court=E8s?= Subject: Re: [bug#32707] [PATCH] gnu: OpenSSL 1.1: Update to 1.1.1. Message-ID: <20180914205310.GA7874@jasmine.lan> References: <9d01011d886e15d25ac0e36e656412aab13001fe.1536700308.git.leo@famulari.name> <87pnxhpypg.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="3MwIy2ne0vdjdPXF" Content-Disposition: inline In-Reply-To: <87pnxhpypg.fsf@gnu.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 32707-done Cc: 32707-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --3MwIy2ne0vdjdPXF Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 13, 2018 at 10:51:23AM +0200, Ludovic Court=C3=A8s wrote: > Perhaps we should rename the patch to =E2=80=9Copenssl-1.1-c-rehash-in.pa= tch=E2=80=9D > and adjust the file name above as a hint. Right! > Otherwise LGTM, thanks! Later I noticed that this new version of OpenSSL includes several more megabytes of superfluous documentation, so I adjusted the documentation output and pushed as 9e9e5d5a269f32fab596c83451824a50dbc2b62d --3MwIy2ne0vdjdPXF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlucH7YACgkQJkb6MLrK fwjkQQ//dPHy6wSQEe8W6bbm8ITzCrERABrMg2K+PRklICRkEyjn/vTNCV0VOlh+ jWRp/nyx3KoVHeWNaDE5zA0CZ3WWZQ8LABmlMJRftc7eaYTIj6uU6avmpUjoqEPH K5IaNIk6dep8HZCwm0oa0HAn6n1L1OYA/mdZS3nrpYdNYal5pP0lRVZQkzGk2FVy NTfoQcuChT/sGF+jbdlQT1g2dDO4M/25Lit2o/2JgNoys2GRmtfM4S5XduD8oq2Q J6NuR4HyDk1w7VqVG2GCBvOgcQ1Tj1f0v/luymi55T2jtlqhJMTXnPNP0WGyrpee 1c61skx3NGQnmDTb1i0o1hhI7nrG8Ub8Pxx9FJpY+eiYpKZHQ5fP4wBxjQ/lUOM/ hxWW5FxoCfKZ53VsvtwzonS6Hcn3eV/7RtDjVTNj0ml7khHUo51rxTLEVqpk11cy kd7vmcxAhx7lmsaIGrAo5wUjsEyeJ/9vakamSTx8rMQPnB1knAkeczBDJvHF4sBw ztn0Kq5XnSNJBtV8qrGF3oSLphkA1xYCA91WmljpFlJtRjk7p8BV/7XTSHQxPmiq NDdGi5ZjQVPu9N1V+XS5GfslzhbbZ9xXKO7oIWrrdKJqzRnXS5mnKfyE0x9blDkw 6IZId43j2JTRKy9TbY35dsjFgwguXQT2uPx2JYUGNU3u8hheVFQ= =rWBi -----END PGP SIGNATURE----- --3MwIy2ne0vdjdPXF-- ------------=_1536958442-26046-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 Sep 2018 21:24:44 +0000 Received: from localhost ([127.0.0.1]:37396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fzq9M-0007Vv-Jj for submit@debbugs.gnu.org; Tue, 11 Sep 2018 17:24:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fzq9K-0007Vh-GY for submit@debbugs.gnu.org; Tue, 11 Sep 2018 17:24:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzq96-0006b3-AC for submit@debbugs.gnu.org; Tue, 11 Sep 2018 17:24:31 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:54177) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fzq95-0006Zs-As for submit@debbugs.gnu.org; Tue, 11 Sep 2018 17:24:27 -0400 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 compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 7EBAB21FDA; Tue, 11 Sep 2018 17:11:54 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 11 Sep 2018 17:11:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=content-transfer-encoding:date:from:message-id:mime-version :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=zPY 91XVhLRcay0FOm8kY6uM89lXP4xH6qK12RssQ8hE=; b=maGXgt7rAjm82L2CEil qySKg8fwFhJhaH5ud1N2E3Bq9JTDe2+8C98qFukEkBi2RXarhgmNYbGmTdfSZm2Q Gjb68k0cqs3TqT9SdBr8OXEt4Ai9GgNO3BaAKeUZ2VcFNDbh4QISLzw9DXFVu1Kw AwPFMQWP+OG4yRVeG/+zw1ag= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=zPY91XVhLRcay0FOm8kY6uM89lXP4xH6qK12RssQ8 hE=; b=mPBfvSguqigHRaIOWutSqikz8KsJQatllnmJKTUEZsM14Saa2+JlEme+j Hmd635uzX+Fy5r+4+D//9vBhcqas7F3xNsJ3fIuwV218WLFW4/zEGhD3h+Mi6xpE GJ9PIc2ldsa4l2FPM821ak/bZqSCK/meq1n9kkMXS6CvB6o8qwIgU4m365qUnycY 14E3xPnBkIm27wAemsgjcHBp92g/yO3FO1Sp0FU0gJrO0fyCnFdU+D1RfDj+ztAq vbsU15AA3z8O4fYQQP0Run4M/wbcHnpkcb0Qigo7NZ/YSEDlrn/ifP0Ms5nfLnLQ 9iDRi34McbdLNz/RSIlgxUv6q4hSw== X-ME-Proxy: X-ME-Sender: 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: OpenSSL 1.1: Update to 1.1.1. Date: Tue, 11 Sep 2018 17:11:49 -0400 Message-Id: <9d01011d886e15d25ac0e36e656412aab13001fe.1536700308.git.leo@famulari.name> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) * 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 ------------=_1536958442-26046-1--