diff options
| author | Tomáš Čech <sleep_walker@gnu.org> | 2015-03-27 23:33:47 +0100 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-04-10 01:04:22 -0400 |
| commit | a55e2b221c121503045fd8e8fcecc4a8c1f47a29 (patch) | |
| tree | 96bbdbe2fc4221460712ae64ae3ebd9f732d4015 /gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch | |
| parent | 7dae5ac4b128fe3a3d69e9dc6b544a5d044d9b1d (diff) | |
| download | guix-a55e2b221c121503045fd8e8fcecc4a8c1f47a29.tar.gz guix-a55e2b221c121503045fd8e8fcecc4a8c1f47a29.zip | |
gnu: curl: Update to 7.41.0. Support CURLOPT_CAPATH on GnuTLS.
Fixes <http://bugs.gnu.org/20121>.
* gnu/packages/patches/curl-gss-api-fix.patch: Delete file.
* gnu/packages/patches/curl-support-capath-on-gnutls.patch,
gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch: New files.
* gnu-system.am (dist_patch_DATA): Add new patches and remove old one.
* gnu/packages/curl.scm (curl): Update to 7.41.0. Add new patches and remove
old one. Disable one unit test.
Modified-By: Mark H Weaver <mhw@netris.org>
Diffstat (limited to 'gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch')
| -rw-r--r-- | gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch b/gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch new file mode 100644 index 0000000000..d2391d461d --- /dev/null +++ b/gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch @@ -0,0 +1,16 @@ +This patch updates 'configure' as autoreconf would have done after +applying curl-support-capath-on-gnutls.patch. + +--- a/configure 2015-03-22 01:11:23.178743705 +0100 ++++ b/configure 2015-02-25 00:05:37.000000000 +0100 +@@ -23952,8 +24432,8 @@ + ca="$want_ca" + capath="no" + elif test "x$want_capath" != "xno" -a "x$want_capath" != "xunset"; then +- if test "x$OPENSSL_ENABLED" != "x1" -a "x$POLARSSL_ENABLED" != "x1"; then +- as_fn_error $? "--with-ca-path only works with openSSL or PolarSSL" "$LINENO" 5 ++ if test "x$OPENSSL_ENABLED" != "x1" -a "x$GNUTLS_ENABLED" != "x1" -a "x$POLARSSL_ENABLED" != "x1"; then ++ as_fn_error $? "--with-ca-path only works with OpenSSL, GnuTLS or PolarSSL" "$LINENO" 5 + fi + capath="$want_capath" + ca="no" |