[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
118/130: gnu: openssl: Absorb 1.1.1l graft.
From: |
guix-commits |
Subject: |
118/130: gnu: openssl: Absorb 1.1.1l graft. |
Date: |
Sat, 16 Oct 2021 02:36:47 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit a0f29ddddfa594e4a5f2c8856e0cac60a1d904e1
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!
;;
- 128/130: gnu: libthai: Make datrie a normal native-input., (continued)
- 128/130: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/10/16
- 130/130: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/10/16
- 70/130: gnu: python-keras: Enable parallel tests., guix-commits, 2021/10/16
- 129/130: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/10/16
- 86/130: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/10/16
- 104/130: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/16
- 99/130: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/16
- 120/130: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/16
- 121/130: gnu: heimdal: Fix build., guix-commits, 2021/10/16
- 125/130: gnu: gtk: Deprecate gdk-pixbuf+svg in favor of librsvg., guix-commits, 2021/10/16
- 118/130: gnu: openssl: Absorb 1.1.1l graft.,
guix-commits <=
- 57/130: gnu: Add a missing copyright., guix-commits, 2021/10/16
- 63/130: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/16
- 66/130: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/16
- 65/130: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/16
- 77/130: gnu: tzdata: Update to 2021c., guix-commits, 2021/10/16
- 78/130: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/16
- 74/130: gnu: python-keras: Skip a flaky test., guix-commits, 2021/10/16
- 75/130: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/10/16
- 82/130: gnu: curl: Honor #:tests?., guix-commits, 2021/10/16
- 84/130: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/10/16