From 2cd7cc2321be1e4121eaae2aa778ef328389a10ade55bc5ee07191b9fcbc5dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 19 Jun 2015 13:41:49 +0000 Subject: [PATCH] Accepting request 312733 from home:pluskalm:branches:devel:libraries:c_c++ - Update to 7.43.0 * Added CURLOPT_PROXY_SERVICE_NAME * Added CURLOPT_SERVICE_NAME * New curl option: --proxy-service-name * Mew curl option: --service-name * New curl option: --data-raw * Added CURLOPT_PIPEWAIT * Added support for multiplexing transfers using HTTP/2, enable this with the new CURLPIPE_MULTIPLEX bit for CURLMOPT_PIPELINING * HTTP/2: requires nghttp2 1.0.0 or later * scripts: add zsh.pl for generating zsh completion * curl.h: add CURL_HTTP_VERSION_2 * CVE-2015-3236: lingering HTTP credentials in connection re-use * CVE-2015-3237: SMB send off unrelated memory contents - Disable HTTP/2 as it would create build cycle OBS-URL: https://build.opensuse.org/request/show/312733 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=135 --- curl-7.42.1.tar.lzma | 3 -- curl-7.42.1.tar.lzma.asc | 7 ----- curl-7.43.0.tar.lzma | 3 ++ curl-7.43.0.tar.lzma.asc | 7 +++++ curl.changes | 20 +++++++++++++ curl.spec | 7 ++--- libcurl-ocloexec.patch | 63 +++++++++------------------------------- 7 files changed, 46 insertions(+), 64 deletions(-) delete mode 100644 curl-7.42.1.tar.lzma delete mode 100644 curl-7.42.1.tar.lzma.asc create mode 100644 curl-7.43.0.tar.lzma create mode 100644 curl-7.43.0.tar.lzma.asc diff --git a/curl-7.42.1.tar.lzma b/curl-7.42.1.tar.lzma deleted file mode 100644 index 56e427c..0000000 --- a/curl-7.42.1.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d6c196ab5083ab2ea3691819602e7b9698404ce8480d4008e3ba64822cc2c47 -size 2732330 diff --git a/curl-7.42.1.tar.lzma.asc b/curl-7.42.1.tar.lzma.asc deleted file mode 100644 index ac52ca3..0000000 --- a/curl-7.42.1.tar.lzma.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlVAdY8ACgkQeOEcayedXJEnugCeKbbLQ/LtJLXKFY4RI1pxERMo -9dIAnRheh6V5PzOCo1CuzaAfyVM+5Xfj -=kzMD ------END PGP SIGNATURE----- diff --git a/curl-7.43.0.tar.lzma b/curl-7.43.0.tar.lzma new file mode 100644 index 0000000..4a7b50b --- /dev/null +++ b/curl-7.43.0.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2b8d84d9c7d85f81cc8477ea3ec757e4c9908eca116be8764b7d158aa7677fa +size 2765536 diff --git a/curl-7.43.0.tar.lzma.asc b/curl-7.43.0.tar.lzma.asc new file mode 100644 index 0000000..5f13f83 --- /dev/null +++ b/curl-7.43.0.tar.lzma.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlWBDEMACgkQeOEcayedXJEmEACfRhRhpQINTGbbdK2u/p97qMzq +EBsAn1SxVVYoOudPZ0SOZ+10cau0b0sC +=Zuc9 +-----END PGP SIGNATURE----- diff --git a/curl.changes b/curl.changes index afa5896..6d86f3e 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Jun 19 13:07:44 UTC 2015 - mpluskal@suse.com + +- Update to 7.43.0 + * Added CURLOPT_PROXY_SERVICE_NAME + * Added CURLOPT_SERVICE_NAME + * New curl option: --proxy-service-name + * Mew curl option: --service-name + * New curl option: --data-raw + * Added CURLOPT_PIPEWAIT + * Added support for multiplexing transfers using HTTP/2, enable + this with the new CURLPIPE_MULTIPLEX bit for + CURLMOPT_PIPELINING + * HTTP/2: requires nghttp2 1.0.0 or later + * scripts: add zsh.pl for generating zsh completion + * curl.h: add CURL_HTTP_VERSION_2 + * CVE-2015-3236: lingering HTTP credentials in connection re-use + * CVE-2015-3237: SMB send off unrelated memory contents +- Disable HTTP/2 as it would create build cycle + ------------------------------------------------------------------- Wed May 20 15:18:12 UTC 2015 - vcizek@suse.com diff --git a/curl.spec b/curl.spec index e789304..cb5f8fb 100644 --- a/curl.spec +++ b/curl.spec @@ -20,7 +20,7 @@ %bcond_with mozilla_nss %bcond_without testsuite Name: curl -Version: 7.42.1 +Version: 7.43.0 Release: 0 Summary: A Tool for Transferring Data from URLs License: BSD-3-Clause and MIT @@ -40,7 +40,6 @@ BuildRequires: groff BuildRequires: krb5-mini-devel BuildRequires: libtool BuildRequires: lzma -BuildRequires: nghttp2-devel BuildRequires: openldap2-devel BuildRequires: pkg-config BuildRequires: pkgconfig(libidn) @@ -132,8 +131,7 @@ sed -i 's/\(link_all_deplibs=\)unknown/\1no/' configure --enable-hidden-symbols \ --disable-static \ --enable-threaded-resolver \ - --with-libmetalink \ - --with-nghttp2=%{_libdir} + --with-libmetalink # if this fails, the above sed hack did not work ./libtool --config | grep -q link_all_deplibs=no @@ -169,7 +167,6 @@ install -Dm 0644 docs/libcurl/libcurl.m4 %{buildroot}%{_datadir}/aclocal/libcurl %defattr(-,root,root) %doc README RELEASE-NOTES %doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting} -%doc lib/README.curl_off_t %{_bindir}/curl %{_mandir}/man1/curl.1%{ext_man} diff --git a/libcurl-ocloexec.patch b/libcurl-ocloexec.patch index 15e9cd5..6f07a1b 100644 --- a/libcurl-ocloexec.patch +++ b/libcurl-ocloexec.patch @@ -7,32 +7,10 @@ To make it portable you have to test O_CLOEXEC support at *runtime* compile time is not enough. -Index: lib/cookie.c -=================================================================== ---- lib/cookie.c.orig 2015-04-22 10:05:04.652863265 +0200 -+++ lib/cookie.c 2015-04-22 10:05:08.225915413 +0200 -@@ -914,7 +914,7 @@ struct CookieInfo *Curl_cookie_init(stru - fp = NULL; - } - else -- fp = file?fopen(file, "r"):NULL; -+ fp = file?fopen(file, "re"):NULL; - - c->newsession = newsession; /* new session? */ - -@@ -1262,7 +1262,7 @@ static int cookie_output(struct CookieIn - use_stdout=TRUE; - } - else { -- out = fopen(dumphere, "w"); -+ out = fopen(dumphere, "we"); - if(!out) - return 1; /* failure */ - } Index: lib/file.c =================================================================== ---- lib/file.c.orig 2015-04-22 10:05:04.652863265 +0200 -+++ lib/file.c 2015-04-22 10:05:08.226915427 +0200 +--- lib/file.c.orig ++++ lib/file.c @@ -238,7 +238,7 @@ static CURLcode file_connect(struct conn /* binary zeroes indicate foul play */ return CURLE_URL_MALFORMAT; @@ -42,7 +20,7 @@ Index: lib/file.c file->path = real_path; #endif file->freepath = real_path; /* free this when done */ -@@ -336,7 +336,7 @@ static CURLcode file_upload(struct conne +@@ -334,7 +334,7 @@ static CURLcode file_upload(struct conne else mode = MODE_DEFAULT|O_TRUNC; @@ -53,8 +31,8 @@ Index: lib/file.c return CURLE_WRITE_ERROR; Index: lib/formdata.c =================================================================== ---- lib/formdata.c.orig 2015-04-22 10:05:04.652863265 +0200 -+++ lib/formdata.c 2015-04-22 10:05:08.226915427 +0200 +--- lib/formdata.c.orig ++++ lib/formdata.c @@ -1256,7 +1256,7 @@ CURLcode Curl_getformdata(struct Session FILE *fileread; @@ -75,8 +53,8 @@ Index: lib/formdata.c } Index: lib/hostip6.c =================================================================== ---- lib/hostip6.c.orig 2015-04-22 10:05:04.652863265 +0200 -+++ lib/hostip6.c 2015-04-22 10:05:08.226915427 +0200 +--- lib/hostip6.c.orig ++++ lib/hostip6.c @@ -39,7 +39,7 @@ #ifdef HAVE_PROCESS_H #include @@ -97,8 +75,8 @@ Index: lib/hostip6.c ipv6_works = 0; Index: lib/if2ip.c =================================================================== ---- lib/if2ip.c.orig 2015-04-22 10:05:04.652863265 +0200 -+++ lib/if2ip.c 2015-04-22 10:05:08.227915442 +0200 +--- lib/if2ip.c.orig ++++ lib/if2ip.c @@ -222,7 +222,7 @@ if2ip_result_t Curl_if2ip(int af, unsign if(len >= sizeof(req.ifr_name)) return IF2IP_NOT_FOUND; @@ -108,24 +86,11 @@ Index: lib/if2ip.c if(CURL_SOCKET_BAD == dummy) return IF2IP_NOT_FOUND; -Index: lib/netrc.c -=================================================================== ---- lib/netrc.c.orig 2015-04-22 10:05:04.652863265 +0200 -+++ lib/netrc.c 2015-04-22 10:05:08.227915442 +0200 -@@ -109,7 +109,7 @@ int Curl_parsenetrc(const char *host, - netrc_alloc = TRUE; - } - -- file = fopen(netrcfile, "r"); -+ file = fopen(netrcfile, "re"); - if(netrc_alloc) - free(netrcfile); - if(file) { Index: lib/connect.c =================================================================== ---- lib/connect.c.orig 2015-04-22 10:05:04.652863265 +0200 -+++ lib/connect.c 2015-04-22 10:05:08.227915442 +0200 -@@ -1334,7 +1334,7 @@ CURLcode Curl_socket(struct connectdata +--- lib/connect.c.orig ++++ lib/connect.c +@@ -1337,7 +1337,7 @@ CURLcode Curl_socket(struct connectdata (struct curl_sockaddr *)addr); else /* opensocket callback not set, so simply create the socket now */ @@ -136,8 +101,8 @@ Index: lib/connect.c /* no socket, no connection */ Index: configure.ac =================================================================== ---- configure.ac.orig 2015-04-22 10:05:04.652863265 +0200 -+++ configure.ac 2015-04-22 10:05:08.228915457 +0200 +--- configure.ac.orig ++++ configure.ac @@ -182,6 +182,7 @@ AC_CANONICAL_HOST dnl Get system canonical name AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS])