[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
119/169: gnu: openssl: Absorb 1.1.1l graft.
From: |
guix-commits |
Subject: |
119/169: gnu: openssl: Absorb 1.1.1l graft. |
Date: |
Thu, 28 Oct 2021 02:08:52 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit ed3ba7537eeb8a0f685721937041ff9c625b0088
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 b7f3ddd..2ce719e 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!
;;
- 100/169: gnu: python-pytest-6: Fix version via setuptools-scm., (continued)
- 100/169: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/28
- 104/169: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/28
- 106/169: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/28
- 93/169: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/28
- 101/169: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/28
- 109/169: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/28
- 118/169: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/28
- 120/169: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/28
- 133/169: gnu: python-flit: Update to 3.3.0., guix-commits, 2021/10/28
- 116/169: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/28
- 119/169: gnu: openssl: Absorb 1.1.1l graft.,
guix-commits <=
- 128/169: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/28
- 140/169: gnu: gtk: Replace gdk-pixbuf+svg by librsvg., guix-commits, 2021/10/28
- 141/169: gnu: librsvg: Preserve the loaders.cache file., guix-commits, 2021/10/28
- 66/169: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/28
- 71/169: gnu: dbus-c++: Fix build., guix-commits, 2021/10/28
- 38/169: gnu: python-sphinx: Update to 4.2.0., guix-commits, 2021/10/28
- 36/169: gnu: python-sphinxcontrib-htmlhelp: Update to 2.0.0., guix-commits, 2021/10/28
- 39/169: gnu: gstreamer-docs: Update to 1.19.2., guix-commits, 2021/10/28
- 55/169: gnu: abseil-cpp: Update to 20210324.2., guix-commits, 2021/10/28
- 54/169: gnu: abseil-cpp: Remove googletest patch., guix-commits, 2021/10/28