mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 13:28:12 -05:00
gnu: OpenSSL 1.1: Update to 1.1.1.
* gnu/packages/tls.scm (openssl-next): Update to 1.1.1. [arguments]: Patch a `/usr/bin/env` invocation in the 'config' script. Adjust the documentation output. * gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch: Rename and ... * gnu/packages/patches/openssl-1.1-c-rehash-in.patch: ... adjust patch. * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
This commit is contained in:
parent
e830c9d0b0
commit
9e9e5d5a26
3 changed files with 29 additions and 9 deletions
|
@ -1011,7 +1011,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/openssl-runpath.patch \
|
||||
%D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch \
|
||||
%D%/packages/patches/openssl-1.0.2-CVE-2018-0732.patch \
|
||||
%D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \
|
||||
%D%/packages/patches/openssl-1.1-c-rehash-in.patch \
|
||||
%D%/packages/patches/openssl-c-rehash-in.patch \
|
||||
%D%/packages/patches/orpheus-cast-errors-and-includes.patch \
|
||||
%D%/packages/patches/osip-CVE-2017-7853.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.
|
|
@ -410,7 +410,7 @@ (define-public openssl-next
|
|||
(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-"
|
||||
|
@ -420,13 +420,13 @@ (define-public openssl-next
|
|||
(string-append "ftp://ftp.openssl.org/source/old/"
|
||||
(string-trim-right version char-set:letter)
|
||||
"/" name "-" version ".tar.gz")))
|
||||
(patches (search-patches "openssl-1.1.0-c-rehash-in.patch"))
|
||||
(patches (search-patches "openssl-1.1-c-rehash-in.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb"))))
|
||||
"0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8"))))
|
||||
(outputs '("out"
|
||||
"doc" ; 1.3MiB of man3 pages
|
||||
"static")) ; 5.5MiB of .a files
|
||||
"doc" ; 6.7 MiB of man3 pages and full HTML documentation
|
||||
"static")) ; 6.4 MiB of .a files
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openssl)
|
||||
((#:phases phases)
|
||||
|
@ -439,6 +439,11 @@ (define-public openssl-next
|
|||
(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"
|
||||
|
@ -460,6 +465,21 @@ (define-public openssl-next
|
|||
'("-mfpu=vfpv3")
|
||||
'())))))
|
||||
|
||||
(delete 'move-man3-pages)
|
||||
(add-after 'install 'move-extra-documentation
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Move man3 pages and full HTML documentation to "doc".
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(man3 (string-append out "/share/man/man3"))
|
||||
(html (string-append out "/share/doc/openssl"))
|
||||
(doc (assoc-ref outputs "doc"))
|
||||
(man-target (string-append doc "/share/man/man3"))
|
||||
(html-target (string-append doc "/share/doc/openssl")))
|
||||
(copy-recursively man3 man-target)
|
||||
(delete-file-recursively man3)
|
||||
(copy-recursively html html-target)
|
||||
(delete-file-recursively html)
|
||||
#t)))
|
||||
;; XXX: Duplicate this phase to make sure 'version' evaluates
|
||||
;; in the current scope and not the inherited one.
|
||||
(replace 'remove-miscellany
|
||||
|
|
Loading…
Reference in a new issue