me/guix
Archived
1
0
Fork 0
Code Activity

gnu: OpenSSL@1.0: Incorporate grafted changes.

Browse source 
* gnu/packages/tls.scm (openssl-1.0): Update to 1.0.2t.
[replacement]: Remove.
[arguments]: Add #:parallel-build?.
(openssl-1.0.2t): Remove variable.
This commit is contained in:
Marius Bakke 2019-10-13 23:00:15 +02:00
parent 378ebc048c
commit 8fc24f300b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/tls.scm
View file

@ -391,8 +391,7 @@ required structures.")
(package (package
(inherit openssl) (inherit openssl)
(name "openssl") (name "openssl")
(version "1.0.2s") (version "1.0.2t")
(replacement openssl-1.0.2t)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-" (uri (list (string-append "https://www.openssl.org/source/openssl-"
@ -404,7 +403,7 @@ required structures.")
"/openssl-" version ".tar.gz"))) "/openssl-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa")) "1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql"))
(patches (search-patches "openssl-runpath.patch" (patches (search-patches "openssl-runpath.patch"
"openssl-c-rehash-in.patch")))) "openssl-c-rehash-in.patch"))))
(outputs '("out" (outputs '("out"
@ -412,6 +411,8 @@ required structures.")
"static")) ;6MiB of .a files "static")) ;6MiB of .a files
(arguments (arguments
(substitute-keyword-arguments (package-arguments openssl) (substitute-keyword-arguments (package-arguments openssl)
;; Parallel build is not supported in 1.0.x.
((#:parallel-build? _ #f) #f)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-before 'patch-source-shebangs 'patch-tests (add-before 'patch-source-shebangs 'patch-tests
@ -474,27 +475,6 @@ required structures.")
,version "/misc")) ,version "/misc"))
#t))))))))) #t)))))))))
(define openssl-1.0.2t
(package
(inherit openssl)
(version "1.0.2t")
(source (origin
(inherit (package-source openssl-1.0))
(uri (list (string-append "https://www.openssl.org/source/openssl-"
version ".tar.gz")
(string-append "ftp://ftp.openssl.org/source/"
"openssl-" version ".tar.gz")
(string-append "ftp://ftp.openssl.org/source/old/"
(string-trim-right version char-set:letter)
"/openssl-" version ".tar.gz")))
(sha256
(base32
"1g67ra0ph7gpz6fgvv1i96d792jmd6ymci5kk53vbikszr74djql"))))
(arguments
(substitute-keyword-arguments (package-arguments openssl-1.0)
;; Parallel build is not supported in 1.0.x.
((#:parallel-build? _ #f) #f)))))
(define-public libressl (define-public libressl
(package (package
(name "libressl") (name "libressl")