[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
119/140: gnu: openssl: Absorb 1.1.1l graft.
From: |
guix-commits |
Subject: |
119/140: gnu: openssl: Absorb 1.1.1l graft. |
Date: |
Sun, 17 Oct 2021 23:11:12 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 87893f5923cf00678fb6b24495540e10e31e23b3
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 15 00:38:40 2021 -0400
gnu: openssl: Absorb 1.1.1l graft.
* gnu/packages/tls.scm (openssl)[replacement]: Remove.
[source]: Update to 1.1.1l. Fix indentation.
* gnu/packages/tls.scm (openssl-1.1.1l): Delete variable.
---
gnu/packages/tls.scm | 44 ++++++++++++--------------------------------
1 file changed, 12 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index fd60ef0..aab5ddb 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -366,8 +366,7 @@ OpenSSL for TARGET."
(define-public openssl
(package
(name "openssl")
- (version "1.1.1k")
- (replacement openssl-1.1.1l)
+ (version "1.1.1l")
(source (origin
(method url-fetch)
(uri (list (string-append
"https://www.openssl.org/source/openssl-"
@@ -380,11 +379,11 @@ OpenSSL for TARGET."
(patches (search-patches "openssl-1.1-c-rehash-in.patch"))
(sha256
(base32
- "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"))))
+ "1lbblxps2fhmz7bqh058iywh5wxfignbfx1s1kz2fj63b5g3wyhb"))))
(build-system gnu-build-system)
(outputs '("out"
- "doc" ;6.8 MiB of man3 pages and full HTML documentation
- "static")) ;6.4 MiB of .a files
+ "doc" ;6.8 MiB of man3 pages and full HTML documentation
+ "static")) ;6.4 MiB of .a files
(native-inputs `(("perl" ,perl)))
(arguments
`(#:parallel-tests? #f
@@ -409,11 +408,11 @@ OpenSSL for TARGET."
;; https://github.com/openssl/openssl/issues/12242
#$@(if (or (target-arm?)
(target-riscv64?))
- #~((replace 'check
- (lambda* (#:key tests? test-target #:allow-other-keys)
- (when tests?
- (invoke "make" "TESTS=-test_afalg" test-target)))))
- #~())
+ #~((replace 'check
+ (lambda* (#:key tests? test-target #:allow-other-keys)
+ (when tests?
+ (invoke "make" "TESTS=-test_afalg" test-target)))))
+ #~())
(replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys)
(let* ((out #$output)
@@ -427,7 +426,7 @@ OpenSSL for TARGET."
invoke #$@(if (%current-target-system)
#~("./Configure")
#~("./config"))
- "shared" ;build shared libraries
+ "shared" ;build shared libraries
"--libdir=lib"
;; The default for this catch-all directory is
@@ -480,12 +479,12 @@ OpenSSL for TARGET."
(native-search-paths
(list (search-path-specification
(variable "SSL_CERT_DIR")
- (separator #f) ;single entry
+ (separator #f) ;single entry
(files '("etc/ssl/certs")))
(search-path-specification
(variable "SSL_CERT_FILE")
(file-type 'regular)
- (separator #f) ;single entry
+ (separator #f) ;single entry
(files '("etc/ssl/certs/ca-certificates.crt")))))
(synopsis "SSL/TLS implementation")
(description
@@ -493,25 +492,6 @@ OpenSSL for TARGET."
(license license:openssl)
(home-page "https://www.openssl.org/")))
-;; Replacement package to fix multiple CVEs.
-(define openssl-1.1.1l
- (package
- (inherit openssl)
- (version "1.1.1l")
- (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
- "1lbblxps2fhmz7bqh058iywh5wxfignbfx1s1kz2fj63b5g3wyhb"))))))
-
;; We will not add any new uses of this package. If you add new code that uses
;; this package, your change will be reverted!
;;
- 05/140: gnu: pulseaudio: Use meson build system., (continued)
- 05/140: gnu: pulseaudio: Use meson build system., guix-commits, 2021/10/17
- 16/140: gnu: cogl: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., guix-commits, 2021/10/17
- 12/140: gnu: appstream-glib: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., guix-commits, 2021/10/17
- 22/140: gnu: gst-plugins-good: Update to 1.18.4., guix-commits, 2021/10/17
- 25/140: gnu: gst-plugins-bad: Update to 1.18.4., guix-commits, 2021/10/17
- 31/140: gnu: libevdev: Update to 1.11.0., guix-commits, 2021/10/17
- 27/140: gnu: gst-editing-services: Update to 1.18.4., guix-commits, 2021/10/17
- 26/140: gnu: gst-plugins-bad: Add missing inputs to enable more features., guix-commits, 2021/10/17
- 33/140: gnu: bluez: Update to 5.59., guix-commits, 2021/10/17
- 118/140: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/17
- 119/140: gnu: openssl: Absorb 1.1.1l graft.,
guix-commits <=
- 135/140: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/17
- 113/140: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 121/140: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/17
- 52/140: Revert commits made to resolve a gdk-pixbuf+svg propagation issue., guix-commits, 2021/10/17
- 34/140: gnu: gnupg: Don't explicitly return #t from phases., guix-commits, 2021/10/17
- 66/140: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/17
- 39/140: gnu: gstreamer-docs: Update to 1.19.2., guix-commits, 2021/10/17
- 57/140: gnu: Add a missing copyright., guix-commits, 2021/10/17
- 49/140: gnu: e2fsprogs: Update to 1.46.4., guix-commits, 2021/10/17
- 61/140: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/10/17