summaryrefslogtreecommitdiff
path: root/gnu/packages/tls.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-03-01 17:41:21 +0100
committerMarius Bakke <mbakke@fastmail.com>2019-03-01 17:41:21 +0100
commit0e5f3282601f84b7dfba65cbc617c31629040223 (patch)
tree82f3d3c57f688c9276b08e285dc0a6dc0388b4ef /gnu/packages/tls.scm
parentf5e563e50a232492e57d609a95d96081a060ea17 (diff)
downloadguix-patches-0e5f3282601f84b7dfba65cbc617c31629040223.tar
guix-patches-0e5f3282601f84b7dfba65cbc617c31629040223.tar.gz
gnu: OpenSSL@1.0: Update to 1.0.2r.
* gnu/packages/tls.scm (openssl): Update to 1.0.2r. [replacement]: Remove. (openssl/fixed): Remove variable.
Diffstat (limited to 'gnu/packages/tls.scm')
-rw-r--r--gnu/packages/tls.scm14
1 files changed, 2 insertions, 12 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 9cb2f7e7b0..7cc70fe0d6 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -262,8 +262,7 @@ required structures.")
(define-public openssl
(package
(name "openssl")
- (replacement openssl/fixed)
- (version "1.0.2q")
+ (version "1.0.2r")
(source (origin
(method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -275,7 +274,7 @@ required structures.")
"/openssl-" version ".tar.gz")))
(sha256
(base32
- "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p"))
+ "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf"))
(patches (search-patches "openssl-runpath.patch"
"openssl-c-rehash-in.patch"))))
(build-system gnu-build-system)
@@ -381,15 +380,6 @@ required structures.")
(license license:openssl)
(home-page "https://www.openssl.org/")))
-(define-public openssl/fixed
- (hidden-package
- (package
- (inherit openssl)
- (source (origin
- (inherit (package-source openssl))
- (patches (append (origin-patches (package-source openssl))
- (search-patches "openssl-CVE-2019-1559.patch"))))))))
-
(define-public openssl-next
(package
(inherit openssl)