diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-17 15:48:27 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-17 15:48:27 +0200 |
| commit | c0eeccbc2486572de1ef88249c63bc71c28dfef6 (patch) | |
| tree | a265eb0b77b3b876844662da5bc9b32c549209e0 /gnu/packages/tls.scm | |
| parent | 56501d3b1727cbafed25be4268c4e6c9387088d9 (diff) | |
| parent | a1b484654af07303813a215d4e04c0e4e7b199e5 (diff) | |
| download | patches-c0eeccbc2486572de1ef88249c63bc71c28dfef6.tar patches-c0eeccbc2486572de1ef88249c63bc71c28dfef6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/tls.scm')
| -rw-r--r-- | gnu/packages/tls.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d3ab981056..74cbb16ebb 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -195,7 +195,9 @@ required structures.") (base32 "06996ds1rk8xhnyb5y273a7xkcxhggp4bq1g02rab55d7bjhfh0x")) (patches (search-patches "openssl-runpath.patch" - "openssl-c-rehash-in.patch")))) + "openssl-c-rehash-in.patch" + "openssl-CVE-2016-2177.patch" + "openssl-CVE-2016-2178.patch")))) (build-system gnu-build-system) (outputs '("out" "doc" ;1.5MiB of man3 pages @@ -322,7 +324,7 @@ required structures.") (define-public libressl (package (name "libressl") - (version "2.3.5") + (version "2.3.6") (source (origin (method url-fetch) @@ -331,7 +333,7 @@ required structures.") version ".tar.gz")) (sha256 (base32 - "0fvmifz61zfq6byy4dh1qqdg9fpbdsyldjwx5hlcgg6ywxf2f9gl")))) + "1yipsp1ici207nbminbf1knh252kzvqg036v0xpx0fw1wrwlg2im")))) (build-system gnu-build-system) (native-search-paths ;; FIXME: These two variables must designate a single file or directory |