summaryrefslogtreecommitdiff
path: root/gnu/packages/tls.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/tls.scm')
-rw-r--r--gnu/packages/tls.scm37
1 files changed, 4 insertions, 33 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 26a2eaa2a7..f736447523 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -164,7 +164,7 @@ living in the same process.")
(define-public gnutls
(package
(name "gnutls")
- (version "3.6.5")
+ (version "3.6.6")
(source (origin
(method url-fetch)
(uri
@@ -176,16 +176,7 @@ living in the same process.")
(patches (search-patches "gnutls-skip-trust-store-test.patch"))
(sha256
(base32
- "0ddvg97dyrh8dkffv1mdc0knxx5my3qdbzv97s4a6jggmk9wwgh7"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; XXX: The generated configure script in GnuTLS 3.6.5
- ;; apparently does not know about Guile 2.2.
- (substitute* "configure"
- (("guile_versions_to_search=\"2\\.0 1\\.8\"")
- "guile_versions_to_search=\"2.2 2.0 1.8\""))
- #t))))
+ "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv"))))
(build-system gnu-build-system)
(arguments
`(; Ensure we don't keep a reference to this buggy software.
@@ -271,8 +262,7 @@ required structures.")
(define-public openssl
(package
(name "openssl")
- (replacement openssl/fixed)
- (version "1.0.2p")
+ (version "1.0.2r")
(source (origin
(method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -284,7 +274,7 @@ required structures.")
"/openssl-" version ".tar.gz")))
(sha256
(base32
- "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah"))
+ "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf"))
(patches (search-patches "openssl-runpath.patch"
"openssl-c-rehash-in.patch"))))
(build-system gnu-build-system)
@@ -328,16 +318,6 @@ required structures.")
"/share/openssl-" ,version)
(string-append "--prefix=" out)))))
- (add-after
- 'install 'make-libraries-writable
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Make libraries writable so that 'strip' does its job.
- (let ((out (assoc-ref outputs "out")))
- (for-each (lambda (file)
- (chmod file #o644))
- (find-files (string-append out "/lib")
- "\\.so"))
- #t)))
(add-after 'install 'move-static-libraries
(lambda* (#:key outputs #:allow-other-keys)
;; Move static libraries to the "static" output.
@@ -400,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)