ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-30 16:12:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: OpenSSL: Incorporate grafted changes.

Browse source 
* gnu/packages/tls.scm (openssl): Update to 1.1.1d.
[replacement]: Remove field.
(openssl-1.1.1d): Remove variable.
This commit is contained in:
Marius Bakke 2019-12-03 00:04:11 +01:00
parent f3e00778d8
commit e554eba02c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/tls.scm
View file

@ -300,8 +300,7 @@ (define-public guile3.0-gnutls
(define-public openssl (define-public openssl
(package (package
(name "openssl") (name "openssl")
(version "1.1.1c") (version "1.1.1d")
(replacement openssl-1.1.1d)
(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-"
@ -313,7 +312,7 @@ (define-public openssl
"/openssl-" version ".tar.gz"))) "/openssl-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn")) "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy"))
(patches (search-patches "openssl-1.1-c-rehash-in.patch")))) (patches (search-patches "openssl-1.1-c-rehash-in.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
@ -425,24 +424,6 @@ (define-public openssl
(license license:openssl) (license license:openssl)
(home-page "https://www.openssl.org/"))) (home-page "https://www.openssl.org/")))
(define openssl-1.1.1d
(package/inherit
openssl
(version "1.1.1d")
(source (origin
(method url-fetch)
(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")))
(patches (search-patches "openssl-1.1-c-rehash-in.patch"))
(sha256
(base32
"1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy"))))))
(define-public openssl-1.0 (define-public openssl-1.0
(package (package
(inherit openssl) (inherit openssl)