[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
119/136: gnu: openssl: Absorb 1.1.1l graft.
From: |
guix-commits |
Subject: |
119/136: gnu: openssl: Absorb 1.1.1l graft. |
Date: |
Sun, 17 Oct 2021 05:16:22 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 521121f9ac1f97b8d7db86c9e66aaa3a5dde9e22
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!
;;
- 81/136: build: qt-utils: Don't wrap .X-real files., (continued)
- 81/136: build: qt-utils: Don't wrap .X-real files., guix-commits, 2021/10/17
- 84/136: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/17
- 85/136: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/17
- 88/136: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/17
- 108/136: gnu: lsof: Fix indentation., guix-commits, 2021/10/17
- 103/136: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/17
- 117/136: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/17
- 106/136: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/17
- 102/136: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/17
- 128/136: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/17
- 119/136: gnu: openssl: Absorb 1.1.1l graft.,
guix-commits <=
- 124/136: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/10/17
- 68/136: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/17
- 75/136: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/10/17
- 91/136: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/10/17
- 120/136: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/17
- 131/136: gnu: pulseaudio: Add doxygen to fix build., guix-commits, 2021/10/17
- 129/136: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/17
- 135/136: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/17