ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-20 17:53:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openssl: Absorb 1.1.1l graft.

Browse source 
* 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.
This commit is contained in:
Maxim Cournoyer 2021-10-15 00:38:40 -04:00
parent 6933a32b8b
commit a095d983ea
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 12 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/tls.scm
View file

@ -385,8 +385,7 @@ (define (target->openssl-target target)
(define-public openssl (define-public openssl
(package (package
(name "openssl") (name "openssl")
(version "1.1.1k") (version "1.1.1l")
(replacement openssl-1.1.1l)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-" (uri (list (string-append "https://www.openssl.org/source/openssl-"
@ -399,7 +398,7 @@ (define-public openssl
(patches (search-patches "openssl-1.1-c-rehash-in.patch")) (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
(sha256 (sha256
(base32 (base32
"1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9")))) "1lbblxps2fhmz7bqh058iywh5wxfignbfx1s1kz2fj63b5g3wyhb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc" ;6.8 MiB of man3 pages and full HTML documentation "doc" ;6.8 MiB of man3 pages and full HTML documentation
@ -512,25 +511,6 @@ (define-public openssl
(license license:openssl) (license license:openssl)
(home-page "https://www.openssl.org/"))) (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 ;; We will not add any new uses of this package. If you add new code that uses
;; this package, your change will be reverted! ;; this package, your change will be reverted!
;; ;;