diff --git a/curl-7.41.0-use-openssl-s-built-in-verify-path-as-fallback.diff b/curl-7.41.0-use-openssl-s-built-in-verify-path-as-fallback.diff deleted file mode 100644 index e3b6a4a..0000000 --- a/curl-7.41.0-use-openssl-s-built-in-verify-path-as-fallback.diff +++ /dev/null @@ -1,29 +0,0 @@ -From 9af60d2d52d9635ba4498d3a42abd85c7c2140db Mon Sep 17 00:00:00 2001 -From: Ludwig Nussel -Date: Tue, 24 Mar 2015 13:25:17 +0100 -Subject: [PATCH] use openssl's built in verify path as fallback - -Trying to verify a peer without any having any root CA certificates -registered won't work. So use openssl's built in default as -fallback. - -https://github.com/bagder/curl/pull/175 ---- - lib/vtls/openssl.c | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: curl-7.45.0/lib/vtls/openssl.c -=================================================================== ---- curl-7.45.0.orig/lib/vtls/openssl.c -+++ curl-7.45.0/lib/vtls/openssl.c -@@ -1952,6 +1952,10 @@ static CURLcode ossl_connect_step1(struc - "none", - data->set.str[STRING_SSL_CAPATH] ? data->set.str[STRING_SSL_CAPATH]: - "none"); -+ } else if (data->set.ssl.verifypeer) { -+ /* verfying the peer without any CA certificates won't -+ work so use openssl's built in default as fallback */ -+ SSL_CTX_set_default_verify_paths(connssl->ctx); - } - - if(data->set.str[STRING_SSL_CRLFILE]) { diff --git a/curl-7.47.1.tar.lzma b/curl-7.47.1.tar.lzma deleted file mode 100644 index 856f0d8..0000000 --- a/curl-7.47.1.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c9b2fd75417ff0a1d0cd1bb284d1d8d7a08963f945860c987d59ae0eb412aa01 -size 2875509 diff --git a/curl-7.47.1.tar.lzma.asc b/curl-7.47.1.tar.lzma.asc deleted file mode 100644 index 8d191e7..0000000 --- a/curl-7.47.1.tar.lzma.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAla4X80ACgkQeOEcayedXJFLWACglcsd1JCV1a5mQlzMVI166llH -66oAn3wjtUvix9Gn59EGwBz1k5Kby2gH -=Zg6S ------END PGP SIGNATURE----- diff --git a/curl-7.48.0.tar.lzma b/curl-7.48.0.tar.lzma new file mode 100644 index 0000000..2a04633 --- /dev/null +++ b/curl-7.48.0.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df764ca663a6589280fd6ac0adb24051ef26cfefef24451f28f99eb7338894d6 +size 5924818 diff --git a/curl-7.48.0.tar.lzma.asc b/curl-7.48.0.tar.lzma.asc new file mode 100644 index 0000000..ab9f061 --- /dev/null +++ b/curl-7.48.0.tar.lzma.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlbyPqAACgkQeOEcayedXJHnxQCgiQ5JvClsu1EWLgDFM4aqAsZf +mmYAnizZMyraOk0q42/1A/0GnkavRUx1 +=rVbn +-----END PGP SIGNATURE----- diff --git a/curl.changes b/curl.changes index 2cf7f77..1dff955 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Mar 31 17:25:29 UTC 2016 - idonmez@suse.com + +- Update to 7.48.0 + * configure: --with-ca-fallback: use built-in TLS CA fallback + * TFTP: add --tftp-no-options to expose CURLOPT_TFTP_NO_OPTIONS + * getinfo: CURLINFO_TLS_SSL_PTR supersedes CURLINFO_TLS_SESSION + * Lots of bugfixes, see https://curl.haxx.se/changes.html#7_48_0 +- Drop curl-7.41.0-use-openssl-s-built-in-verify-path-as-fallback.diff, + superseded by --with-ca-fallback configure option. + ------------------------------------------------------------------- Thu Mar 17 10:58:24 UTC 2016 - astieger@suse.com diff --git a/curl.spec b/curl.spec index a3ca07f..32f06ae 100644 --- a/curl.spec +++ b/curl.spec @@ -20,7 +20,7 @@ %bcond_with mozilla_nss %bcond_without testsuite Name: curl -Version: 7.47.1 +Version: 7.48.0 Release: 0 Summary: A Tool for Transferring Data from URLs License: BSD-3-Clause and MIT @@ -33,8 +33,6 @@ Source4: %{name}.keyring Patch0: libcurl-ocloexec.patch Patch1: dont-mess-with-rpmoptflags.diff Patch3: curl-secure-getenv.patch -# PATCH-FIX-OPENSUSE lnussel@suse.de -- use openssl's built in verify path as fallback -Patch4: curl-7.41.0-use-openssl-s-built-in-verify-path-as-fallback.diff BuildRequires: groff BuildRequires: krb5-mini-devel BuildRequires: libtool @@ -99,7 +97,6 @@ user interaction or any kind of interactivity. %patch0 %patch1 %patch3 -%patch4 -p1 %build # curl complains if macro definition is contained in CFLAGS @@ -118,6 +115,7 @@ sed -i 's/\(link_all_deplibs=\)unknown/\1no/' configure --enable-ipv6 \ %if %{with openssl} --with-ssl \ + --with-ca-fallback \ --without-ca-path \ --without-ca-bundle \ %else