diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-03-14 17:37:20 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-03-14 17:37:20 +0100 |
| commit | 8c72ed923d77ee55989965bb02628043799b9548 (patch) | |
| tree | 802e6eb910719a98fa09bf7c2bd884097f649adc /gnu/packages/tls.scm | |
| parent | 189be331acfda1c242a9c85fca8d2a0356742f48 (diff) | |
| parent | aac6cbbfede0bbfafdbbeeb460f00a244333895d (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/tls.scm')
| -rw-r--r-- | gnu/packages/tls.scm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e79065ae78..a7944c2ce7 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -115,7 +115,7 @@ in intelligent transportation networks.") (define-public p11-kit (package (name "p11-kit") - (version "0.23.9") + (version "0.23.10") (source (origin (method url-fetch) @@ -123,7 +123,7 @@ in intelligent transportation networks.") "download/" version "/p11-kit-" version ".tar.gz")) (sha256 (base32 - "0qyvnkb5hfi94wv3bn67y20hcbbvynvjwxpk7k9sh1si6ff69hg1")))) + "0hxfwnyb5yllvlsh0cj6favcph36gm94b6df7zhl7xay48zjl8gr")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -787,7 +787,15 @@ then ported to the GNU / Linux environment.") version "-apache.tgz")) (sha256 (base32 - "1vsmgxnw7dpvma51896n63yaf9sncmf885ax2jfcg89ssin6vdmf")))) + "1vsmgxnw7dpvma51896n63yaf9sncmf885ax2jfcg89ssin6vdmf")) + ;; An RFC 5114 constant was accidentally renamed in version 2.7.0. + ;; See https://github.com/ARMmbed/mbedtls/pull/1362. + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "include/mbedtls/dhm.h" + (("#define MBEDTLS_DHM_RFC5114_MODP_P") + "#define MBEDTLS_DHM_RFC5114_MODP_2048_P")))))) (build-system cmake-build-system) (arguments `(#:configure-flags |