GNU bug report logs - #32707
[PATCH] gnu: OpenSSL 1.1: Update to 1.1.1.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 32707 in the body.
You can then email your comments to 32707 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: OpenSSL 1.1: Update to 1.1.1.
Date: Tue, 11 Sep 2018 17:11:49 -0400

* 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

Message #8 received at 32707 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Leo Famulari <leo <at> famulari.name>
Cc: 32707 <at> debbugs.gnu.org
Subject: Re: [bug#32707] [PATCH] gnu: OpenSSL 1.1: Update to 1.1.1.
Date: Thu, 13 Sep 2018 10:51:23 +0200

Hello,

Leo Famulari <leo <at> famulari.name> 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/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

Perhaps we should rename the patch to “openssl-1.1-c-rehash-in.patch”
and adjust the file name above as a hint.

Otherwise LGTM, thanks!

Ludo’.

Message #13 received at 32707-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 32707-done <at> debbugs.gnu.org
Subject: Re: [bug#32707] [PATCH] gnu: OpenSSL 1.1: Update to 1.1.1.
Date: Fri, 14 Sep 2018 16:53:10 -0400

[Message part 1 (text/plain, inline)]

On Thu, Sep 13, 2018 at 10:51:23AM +0200, Ludovic Courtès wrote:
> Perhaps we should rename the patch to “openssl-1.1-c-rehash-in.patch”
> 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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.