mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-11 14:26:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: OpenSSL: Absorb graft.

Browse source 
* gnu/packages/tls.scm (openssl): Update to 1.1.1p.
[replacement]: Remove.
(openssl/fixed): Remove variable.
This commit is contained in:
Marius Bakke 2022-06-27 19:29:49 +02:00
parent 2a7648774f
commit 1e39cc6481
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/tls.scm
View file

@ -350,8 +350,7 @@ OpenSSL for TARGET."
(define-public openssl (define-public openssl
(package (package
(name "openssl") (name "openssl")
(version "1.1.1n") (version "1.1.1p")
(replacement openssl/fixed)
(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-"
@ -364,7 +363,7 @@ OpenSSL for TARGET."
(patches (search-patches "openssl-1.1-c-rehash-in.patch")) (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
(sha256 (sha256
(base32 (base32
"0ymif8rlc5cf5qp5bh2pxlrgq6xryh7g4sqfvrdjg9gnli8ypp20")))) "0vyfibydji26wk1fmm0piz0810mfr7j4vaa2k5iwgiv6m8mbcqdz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc" ;6.8 MiB of man3 pages and full HTML documentation "doc" ;6.8 MiB of man3 pages and full HTML documentation
@ -474,25 +473,6 @@ OpenSSL for TARGET."
(license license:openssl) (license license:openssl)
(home-page "https://www.openssl.org/"))) (home-page "https://www.openssl.org/")))
(define openssl/fixed
(package
(inherit openssl)
(name "openssl")
(version "1.1.1p")
(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
"0vyfibydji26wk1fmm0piz0810mfr7j4vaa2k5iwgiv6m8mbcqdz"))))))
(define-public openssl-3.0 (define-public openssl-3.0
(package (package
(inherit openssl) (inherit openssl)