diff --git a/0001-tests-distribute-the-http2-server.pl-script-too.patch b/0001-tests-distribute-the-http2-server.pl-script-too.patch new file mode 100644 index 0000000..bdae33f --- /dev/null +++ b/0001-tests-distribute-the-http2-server.pl-script-too.patch @@ -0,0 +1,23 @@ +From 5e26d9ceeaca8a6730bf405e6512bfe542698c26 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Thu, 21 Jul 2016 13:03:16 +0200 +Subject: [PATCH] tests: distribute the http2-server.pl script, too + +--- + RELEASE-NOTES | 1 + + tests/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +Index: curl-7.50.0/tests/Makefile.am +=================================================================== +--- curl-7.50.0.orig/tests/Makefile.am 2016-07-21 15:26:23.281377532 +0200 ++++ curl-7.50.0/tests/Makefile.am 2016-07-21 15:26:24.613399438 +0200 +@@ -29,7 +29,7 @@ EXTRA_DIST = ftpserver.pl httpserver.pl + $(HTMLPAGES) $(PDFPAGES) \ + serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl \ + CMakeLists.txt mem-include-scan.pl valgrind.supp http_pipe.py extern-scan.pl \ +- manpage-scan.pl nroff-scan.pl ++ manpage-scan.pl nroff-scan.pl http2-server.pl + + DISTCLEANFILES = configurehelp.pm + diff --git a/curl-7.49.1.tar.lzma b/curl-7.49.1.tar.lzma deleted file mode 100644 index 8920576..0000000 --- a/curl-7.49.1.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:540dd7e2017293ac13c925951a8e3187382b6fe7be045d5806912aae3c1f7c0c -size 5989789 diff --git a/curl-7.49.1.tar.lzma.asc b/curl-7.49.1.tar.lzma.asc deleted file mode 100644 index 2fdbc9b..0000000 --- a/curl-7.49.1.tar.lzma.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCgAGBQJXS9rrAAoJEFzJCP23HhLCQ4MIAIKNa1jj9CcGbnuFDi/buyAW -k0YEQZOOohvX0Kx/oYbga8gSKiy0NBYqS6u+MK3b8k5yDdRS6yD2eHZRdcFF/w4N -kKRS77fkYm+OdZ9KrTcK4X9VJs0T9YYBkAEJFSTmvDmM6mtoage/Kf44q+jbyB4O -QqtoZhRui2cZ+w4Eaj4R40sWpFSWKYwpzMqfrsfWlcoIUk9TZRePT60FfDXYXvVV -GeybgTlYHlFJ+imQd0jwL8+YmO4/Q48FrRoVYMX/oqiC/f4tRVeIJML2BS+W2J65 -iCPw3CPb6INCrSd4/yRAajXUxco66EQX/FO5aeCvdDDvoWdp5UD6zDTemC1gUyw= -=4/tM ------END PGP SIGNATURE----- diff --git a/curl-7.50.0.tar.lzma b/curl-7.50.0.tar.lzma new file mode 100644 index 0000000..c0e3966 --- /dev/null +++ b/curl-7.50.0.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a3376ffa365c9cf61eb8a0804dbf91883290c28bdaf4b76047addf75c7b1c80 +size 5992396 diff --git a/curl-7.50.0.tar.lzma.asc b/curl-7.50.0.tar.lzma.asc new file mode 100644 index 0000000..ba6e2d1 --- /dev/null +++ b/curl-7.50.0.tar.lzma.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCgAGBQJXkI6pAAoJEFzJCP23HhLC6F4H/2M0xB4iDTUy14+6ilY6hhvF +jZw6VPkN5upjN660koECvycRtTDry94ZoGcTcifHba3NjixkpfpY1Xa3qixoyqos +IlyyqG77NcrMGs3us6dEpqxUlQ+I2F+LXGLm9Uz/A7c6NN1dh2esXeJD911Dhmbs +Ko4qbB1+m1FYxTjv9X2m99+93QtfKVnFGfjfF7mR6ZUKLsq+Ix8djzlmQ3p/d0XK +LhmkO3kfvHiE83ENRVTj/oplqLFTd7MOAkzc22OQ267GwqntlM0K2YsdGR2DEEiZ +ReI4KGzNwkG/VIeEBRHV38NpcGjNzm3lUcJPXSQ5xON5rGvsjsLvyWN4yS+MbT8= +=NWkR +-----END PGP SIGNATURE----- diff --git a/curl-disable_failing_tests.patch b/curl-disable_failing_tests.patch new file mode 100644 index 0000000..50abba3 --- /dev/null +++ b/curl-disable_failing_tests.patch @@ -0,0 +1,14 @@ +Index: curl-7.50.0/tests/data/DISABLED +=================================================================== +--- curl-7.50.0.orig/tests/data/DISABLED 2016-06-27 16:11:14.000000000 +0200 ++++ curl-7.50.0/tests/data/DISABLED 2016-07-21 15:15:31.134631724 +0200 +@@ -2,6 +2,9 @@ + # test cases are run by runtests.pl. Just add the plain test case numbers, one + # per line. + # Lines starting with '#' letters are treated as comments. ++# man pages problems ++1139 ++1140 + 594 + 1209 + 1211 diff --git a/curl.changes b/curl.changes index acc19b5..0bebaed 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Thu Jul 21 09:30:30 UTC 2016 - vcizek@suse.com + +- update to 7.50.0 + Changes: + * http: add CURLINFO_HTTP_VERSION and %{http_version} + Bugfixes: + * openssl: fix build with OPENSSL_NO_COMP + * cmake: Added missing mbedTLS support + * URL parser: allow URLs to use one, two or three slashes + * curl: fix -q [regression] + * openssl: Use correct buffer sizes for error messages + * curl: fix SIGSEGV while parsing URL with too many globs + * vtls: fix ssl session cache race condition + * http: Fix HTTP/2 connection reuse [regression] + * checksrc: Add LoadLibrary to the banned functions list + * configure: occasional ignorance of --enable-symbol-hiding with GCC + * http2: test17xx are the first real HTTP/2 tests + * resolve: add support for IPv6 DNS64/NAT64 Networks on OS X + iOS + * curl_multi_socket_action.3: rewording + * CURLOPT_POSTFIELDS.3: Clarify what happens when set empty + * cmake: Fix build with winldap + * openssl: fix cert check with non-DNS name fields present + * curl.1: mention the units for the progress meter + * openssl: use more 'const' to fix build warnings with 1.1.0 branch + * cmake: now using BUILD_TESTING=ON/OFF + * vtls: Only call add/getsession if session id is enabled + * headers: forward declare CURL, CURLM and CURLSH as structs + * configure: improve detection of CA bundle path on FreeBSD + * SFTP: set a generic error when no SFTP one exists + * curl_global_init.3: expand on the SSL and WIN32 bits purpose + * conn: don't free easy handle data in handler->disconnect + * cookie.c: Fix misleading indentation + * library: Fix memory leaks found during static analysis + * CURLMOPT_SOCKETFUNCTION.3: fix typo + * curl_global_init: moved the "IPv6 works" check here + * connect: disable TFO on Linux when using SSL + * vauth: Fixed memory leak due to function returning without free +- refresh libcurl-ocloexec.patch +- disable tests 1139 and 1140 which fail due to missing manpage + * add curl-disable_failing_tests.patch +- ship http2_server.pl for testing + * add 0001-tests-distribute-the-http2-server.pl-script-too.patch + ------------------------------------------------------------------- Tue Jun 14 11:47:27 UTC 2016 - astieger@suse.com diff --git a/curl.spec b/curl.spec index a82b955..141c54e 100644 --- a/curl.spec +++ b/curl.spec @@ -20,7 +20,7 @@ %bcond_with mozilla_nss %bcond_without testsuite Name: curl -Version: 7.49.1 +Version: 7.50.0 Release: 0 Summary: A Tool for Transferring Data from URLs License: BSD-3-Clause and MIT @@ -33,6 +33,8 @@ Source4: https://daniel.haxx.se/mykey.asc#/%{name}.keyring Patch0: libcurl-ocloexec.patch Patch1: dont-mess-with-rpmoptflags.diff Patch3: curl-secure-getenv.patch +Patch4: curl-disable_failing_tests.patch +Patch5: 0001-tests-distribute-the-http2-server.pl-script-too.patch BuildRequires: groff BuildRequires: krb5-mini-devel BuildRequires: libtool @@ -97,6 +99,8 @@ user interaction or any kind of interactivity. %patch0 %patch1 %patch3 +%patch4 -p1 +%patch5 -p1 %build # curl complains if macro definition is contained in CFLAGS diff --git a/libcurl-ocloexec.patch b/libcurl-ocloexec.patch index 6f07a1b..75d2d5e 100644 --- a/libcurl-ocloexec.patch +++ b/libcurl-ocloexec.patch @@ -9,18 +9,18 @@ compile time is not enough. Index: lib/file.c =================================================================== ---- lib/file.c.orig -+++ lib/file.c -@@ -238,7 +238,7 @@ static CURLcode file_connect(struct conn - /* binary zeroes indicate foul play */ +--- lib/file.c.orig 2016-07-21 00:31:36.000000000 +0200 ++++ lib/file.c 2016-07-21 11:39:54.121170539 +0200 +@@ -241,7 +241,7 @@ static CURLcode file_connect(struct conn return CURLE_URL_MALFORMAT; + } - fd = open_readonly(real_path, O_RDONLY); + fd = open_readonly(real_path, O_RDONLY|O_CLOEXEC); file->path = real_path; #endif file->freepath = real_path; /* free this when done */ -@@ -334,7 +334,7 @@ static CURLcode file_upload(struct conne +@@ -337,7 +337,7 @@ static CURLcode file_upload(struct conne else mode = MODE_DEFAULT|O_TRUNC; @@ -31,9 +31,9 @@ Index: lib/file.c return CURLE_WRITE_ERROR; Index: lib/formdata.c =================================================================== ---- lib/formdata.c.orig -+++ lib/formdata.c -@@ -1256,7 +1256,7 @@ CURLcode Curl_getformdata(struct Session +--- lib/formdata.c.orig 2016-07-21 00:31:36.000000000 +0200 ++++ lib/formdata.c 2016-07-21 11:39:54.121170539 +0200 +@@ -1290,7 +1290,7 @@ CURLcode Curl_getformdata(struct Curl_ea FILE *fileread; fileread = strequal("-", file->contents)? @@ -42,7 +42,7 @@ Index: lib/formdata.c /* * VMS: This only allows for stream files on VMS. Stream files are -@@ -1415,7 +1415,7 @@ static size_t readfromfile(struct Form * +@@ -1450,7 +1450,7 @@ static size_t readfromfile(struct Form * else { if(!form->fp) { /* this file hasn't yet been opened */ @@ -53,8 +53,8 @@ Index: lib/formdata.c } Index: lib/hostip6.c =================================================================== ---- lib/hostip6.c.orig -+++ lib/hostip6.c +--- lib/hostip6.c.orig 2016-07-21 00:31:36.000000000 +0200 ++++ lib/hostip6.c 2016-07-21 11:39:54.121170539 +0200 @@ -39,7 +39,7 @@ #ifdef HAVE_PROCESS_H #include @@ -64,7 +64,7 @@ Index: lib/hostip6.c #include "urldata.h" #include "sendf.h" #include "hostip.h" -@@ -104,7 +104,7 @@ bool Curl_ipv6works(void) +@@ -103,7 +103,7 @@ bool Curl_ipv6works(void) static int ipv6_works = -1; if(-1 == ipv6_works) { /* probe to see if we have a working IPv6 stack */ @@ -75,9 +75,9 @@ Index: lib/hostip6.c ipv6_works = 0; Index: lib/if2ip.c =================================================================== ---- lib/if2ip.c.orig -+++ lib/if2ip.c -@@ -222,7 +222,7 @@ if2ip_result_t Curl_if2ip(int af, unsign +--- lib/if2ip.c.orig 2016-06-27 16:11:14.000000000 +0200 ++++ lib/if2ip.c 2016-07-21 11:39:54.121170539 +0200 +@@ -223,7 +223,7 @@ if2ip_result_t Curl_if2ip(int af, unsign if(len >= sizeof(req.ifr_name)) return IF2IP_NOT_FOUND; @@ -88,9 +88,9 @@ Index: lib/if2ip.c Index: lib/connect.c =================================================================== ---- lib/connect.c.orig -+++ lib/connect.c -@@ -1337,7 +1337,7 @@ CURLcode Curl_socket(struct connectdata +--- lib/connect.c.orig 2016-07-21 00:31:36.000000000 +0200 ++++ lib/connect.c 2016-07-21 11:39:54.121170539 +0200 +@@ -1351,7 +1351,7 @@ CURLcode Curl_socket(struct connectdata (struct curl_sockaddr *)addr); else /* opensocket callback not set, so simply create the socket now */ @@ -101,9 +101,9 @@ Index: lib/connect.c /* no socket, no connection */ Index: configure.ac =================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -182,6 +182,7 @@ AC_CANONICAL_HOST +--- configure.ac.orig 2016-07-21 00:31:36.000000000 +0200 ++++ configure.ac 2016-07-21 11:39:54.125170603 +0200 +@@ -185,6 +185,7 @@ AC_CANONICAL_HOST dnl Get system canonical name AC_DEFINE_UNQUOTED(OS, "${host}", [cpu-machine-OS]) @@ -111,7 +111,7 @@ Index: configure.ac dnl Checks for programs. dnl Our curl_off_t internal and external configure settings -@@ -194,6 +195,7 @@ dnl Our configure and build reentrant se +@@ -197,6 +198,7 @@ dnl Our configure and build reentrant se CURL_CONFIGURE_THREAD_SAFE CURL_CONFIGURE_REENTRANT