diff options
| author | Marius Bakke <marius@gnu.org> | 2022-07-22 01:09:14 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-07-22 01:09:14 +0200 |
| commit | 9044b086ddca64a62966a83cbf1b82d32dece89e (patch) | |
| tree | 2c7f910c9100b2f2a752d07fe0ec44be83fb7600 /gnu/packages/tls.scm | |
| parent | 5dfc6ab1ab292b87ceea144aa661d0e64c834031 (diff) | |
| parent | abea091dbef2d44e6eb46bd2413bdf917e14d095 (diff) | |
| download | guix-9044b086ddca64a62966a83cbf1b82d32dece89e.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/tls.scm')
| -rw-r--r-- | gnu/packages/tls.scm | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 0772eaeb76..61a768f2e1 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -351,6 +351,7 @@ OpenSSL for TARGET." (package (name "openssl") (version "1.1.1p") + (replacement openssl/fixed) (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -473,10 +474,29 @@ OpenSSL for TARGET." (license license:openssl) (home-page "https://www.openssl.org/"))) +(define openssl/fixed + (package + (inherit openssl) + (name "openssl") + (version "1.1.1q") + (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 + "1jhhzp4gh6ymidxm1ckjk948l583awp0w3y2nvqdz7022kk9r4yp")))))) + (define-public openssl-3.0 (package (inherit openssl) - (version "3.0.4") + (version "3.0.5") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -489,7 +509,7 @@ OpenSSL for TARGET." (patches (search-patches "openssl-3.0-c-rehash-in.patch")) (sha256 (base32 - "03y0q2pzpkpgfgf74x4pf8gyar9d7pb0l0p7g2s0m2k6k8z88c98")))) + "0yja085lygkdxbf4k4rckkj9r24p8dgix8avqljnbbbixydqszda")))) (arguments (substitute-keyword-arguments (package-arguments openssl) ((#:phases phases '%standard-phases) |