From 8337ebe6d69855bbb4453a9cdf780e04880ac322 Mon Sep 17 00:00:00 2001 From: Wolfgang Stöggl Date: Feb 24 2020 17:22:26 +0000 Subject: New upstream version 2.10.15 Update patch: cpprest-2.10.15-disable-outside-and-failing-tests.patch --- diff --git a/.gitignore b/.gitignore index 535495a..224810e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /cpprest-2.10.12.tar.gz /cpprest-2.10.13.tar.gz /cpprest-2.10.14.tar.gz +/cpprest-2.10.15.tar.gz diff --git a/cpprest-2.10.15-disable-outside-and-failing-tests.patch b/cpprest-2.10.15-disable-outside-and-failing-tests.patch new file mode 100644 index 0000000..3b9e03f --- /dev/null +++ b/cpprest-2.10.15-disable-outside-and-failing-tests.patch @@ -0,0 +1,104 @@ +diff --git a/Release/tests/functional/http/client/CMakeLists.txt b/Release/tests/functional/http/client/CMakeLists.txt +index 635e7da8..bdc37062 100644 +--- a/Release/tests/functional/http/client/CMakeLists.txt ++++ b/Release/tests/functional/http/client/CMakeLists.txt +@@ -12,7 +12,6 @@ set(SOURCES + multiple_requests.cpp + oauth1_tests.cpp + oauth2_tests.cpp +- outside_tests.cpp + pipeline_stage_tests.cpp + progress_handler_tests.cpp + proxy_tests.cpp +diff --git a/Release/tests/functional/http/client/authentication_tests.cpp b/Release/tests/functional/http/client/authentication_tests.cpp +index c0440fed..afa4a666 100644 +--- a/Release/tests/functional/http/client/authentication_tests.cpp ++++ b/Release/tests/functional/http/client/authentication_tests.cpp +@@ -675,9 +675,13 @@ SUITE(authentication_tests) + VERIFY_ARE_EQUAL(return_code, response.status_code()); + } + ++/* + TEST(auth_no_data) { auth_test_impl(false); } ++*/ + ++/* + TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } ++*/ + + TEST_FIXTURE(uri_address, set_user_options_asio_http) + { +@@ -695,6 +699,7 @@ SUITE(authentication_tests) + VERIFY_ARE_EQUAL(200, response.status_code()); + } + ++/* + TEST_FIXTURE(uri_address, set_user_options_asio_https) + { + handle_timeout([] { +@@ -714,6 +719,7 @@ SUITE(authentication_tests) + VERIFY_IS_FALSE(v.empty()); + }); + } ++*/ + + #endif + +diff --git a/Release/tests/functional/http/client/connections_and_errors.cpp b/Release/tests/functional/http/client/connections_and_errors.cpp +index 847755d8..59b36b0a 100644 +--- a/Release/tests/functional/http/client/connections_and_errors.cpp ++++ b/Release/tests/functional/http/client/connections_and_errors.cpp +@@ -408,6 +408,7 @@ SUITE(connections_and_errors) + } + #endif + ++/* + // Try to connect to a server on a closed port and cancel the operation. + TEST_FIXTURE(uri_address, cancel_bad_port) + { +@@ -439,6 +440,7 @@ SUITE(connections_and_errors) + + VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); + } ++*/ + + } // SUITE(connections_and_errors) + +diff --git a/Release/tests/functional/websockets/client/authentication_tests.cpp b/Release/tests/functional/websockets/client/authentication_tests.cpp +index a35949c9..7a3fd753 100644 +--- a/Release/tests/functional/websockets/client/authentication_tests.cpp ++++ b/Release/tests/functional/websockets/client/authentication_tests.cpp +@@ -93,6 +93,7 @@ SUITE(authentication_tests) + return false; + } + ++/* + TEST(ssl_test) + { + websocket_client client; +@@ -127,6 +128,7 @@ SUITE(authentication_tests) + throw; + } + } ++*/ + + void handshake_error_test_impl(const ::utility::string_t& host) + { +@@ -148,11 +150,17 @@ SUITE(authentication_tests) + } + } + ++/* + TEST(self_signed_cert) { handshake_error_test_impl(U("wss://self-signed.badssl.com/")); } ++*/ + ++/* + TEST(hostname_mismatch) { handshake_error_test_impl(U("wss://wrong.host.badssl.com/")); } ++*/ + ++/* + TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } ++*/ + + } // SUITE(authentication_tests) + diff --git a/cpprest-2.10.9-disable-outside-and-failing-tests.patch b/cpprest-2.10.9-disable-outside-and-failing-tests.patch deleted file mode 100644 index e37595f..0000000 --- a/cpprest-2.10.9-disable-outside-and-failing-tests.patch +++ /dev/null @@ -1,211 +0,0 @@ -diff --git a/Release/tests/functional/http/client/CMakeLists.txt b/Release/tests/functional/http/client/CMakeLists.txt -index 45f0d9af..0a379c2b 100644 ---- a/Release/tests/functional/http/client/CMakeLists.txt -+++ b/Release/tests/functional/http/client/CMakeLists.txt -@@ -12,7 +12,6 @@ set(SOURCES - multiple_requests.cpp - oauth1_tests.cpp - oauth2_tests.cpp -- outside_tests.cpp - pipeline_stage_tests.cpp - progress_handler_tests.cpp - proxy_tests.cpp -diff --git a/Release/tests/functional/http/client/authentication_tests.cpp b/Release/tests/functional/http/client/authentication_tests.cpp -index c0440fed..afa4a666 100644 ---- a/Release/tests/functional/http/client/authentication_tests.cpp -+++ b/Release/tests/functional/http/client/authentication_tests.cpp -@@ -675,9 +675,13 @@ SUITE(authentication_tests) - VERIFY_ARE_EQUAL(return_code, response.status_code()); - } - -+/* - TEST(auth_no_data) { auth_test_impl(false); } -+*/ - -+/* - TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } -+*/ - - TEST_FIXTURE(uri_address, set_user_options_asio_http) - { -@@ -695,6 +699,7 @@ SUITE(authentication_tests) - VERIFY_ARE_EQUAL(200, response.status_code()); - } - -+/* - TEST_FIXTURE(uri_address, set_user_options_asio_https) - { - handle_timeout([] { -@@ -714,6 +719,7 @@ SUITE(authentication_tests) - VERIFY_IS_FALSE(v.empty()); - }); - } -+*/ - - #endif - -diff --git a/Release/tests/functional/http/client/client_construction.cpp b/Release/tests/functional/http/client/client_construction.cpp -index 1229b2cf..84d1b636 100644 ---- a/Release/tests/functional/http/client/client_construction.cpp -+++ b/Release/tests/functional/http/client/client_construction.cpp -@@ -40,6 +40,7 @@ SUITE(client_construction) - http_client c3(utility::string_t(U("http://localhost:4567/"))); - } - -+/* - // Tests different variations on specifying the URI in http_client constructor. - TEST_FIXTURE(uri_address, different_uris) - { -@@ -54,6 +55,7 @@ SUITE(client_construction) - test_connection(scoped.server(), &client, expected_paths[i]); - } - } -+*/ - - // Helper function verifies that when constructing an http_client with given - // URI std::invalid_argument is thrown. -diff --git a/Release/tests/functional/http/client/connections_and_errors.cpp b/Release/tests/functional/http/client/connections_and_errors.cpp -index 22e0fc82..f2a848e5 100644 ---- a/Release/tests/functional/http/client/connections_and_errors.cpp -+++ b/Release/tests/functional/http/client/connections_and_errors.cpp -@@ -343,6 +343,7 @@ SUITE(connections_and_errors) - response.content_ready().wait(); - } - -+/* - TEST_FIXTURE(uri_address, cancel_with_error) - { - http_client c(m_uri); -@@ -358,6 +359,7 @@ SUITE(connections_and_errors) - // All errors after cancellation are ignored. - VERIFY_THROWS_HTTP_ERROR_CODE(responseTask.get(), std::errc::operation_canceled); - } -+*/ - - TEST_FIXTURE(uri_address, cancel_while_uploading_data) - { -@@ -416,6 +418,7 @@ SUITE(connections_and_errors) - } - #endif - -+/* - // Try to connect to a server on a closed port and cancel the operation. - TEST_FIXTURE(uri_address, cancel_bad_port) - { -@@ -447,6 +450,7 @@ SUITE(connections_and_errors) - - VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); - } -+*/ - - } // SUITE(connections_and_errors) - -diff --git a/Release/tests/functional/http/client/progress_handler_tests.cpp b/Release/tests/functional/http/client/progress_handler_tests.cpp -index 320bcc5c..f52931e0 100644 ---- a/Release/tests/functional/http/client/progress_handler_tests.cpp -+++ b/Release/tests/functional/http/client/progress_handler_tests.cpp -@@ -338,6 +338,7 @@ SUITE(progress_handler_tests) - VERIFY_THROWS(client.request(msg).get().content_ready().get(), std::invalid_argument); - } - -+#if 0 - TEST_FIXTURE(uri_address, data_upload_exception) - { - http_client client(m_uri); -@@ -361,6 +362,7 @@ SUITE(progress_handler_tests) - { /* It is ok if the request does not complete before the server is shutdown */ - } - } -+#endif - - TEST_FIXTURE(uri_address, data_download_exception, "Ignore:Windows", "395") - { -diff --git a/Release/tests/functional/http/client/to_string_tests.cpp b/Release/tests/functional/http/client/to_string_tests.cpp -index 8ae964f7..9d2466b5 100644 ---- a/Release/tests/functional/http/client/to_string_tests.cpp -+++ b/Release/tests/functional/http/client/to_string_tests.cpp -@@ -68,6 +68,7 @@ SUITE(to_string_tests) - msg.to_string(), mtd, U("/path%20baby/"), U("HTTP/1.1"), expected_headers, body); - } - -+/* - TEST_FIXTURE(uri_address, response_to_string_without_body) - { - test_http_server::scoped_server scoped(m_uri); -@@ -98,6 +99,7 @@ SUITE(to_string_tests) - } - #endif - } -+*/ - - TEST_FIXTURE(uri_address, response_to_string_with_body) - { -diff --git a/Release/tests/functional/websockets/client/authentication_tests.cpp b/Release/tests/functional/websockets/client/authentication_tests.cpp -index 29536860..5ed0725a 100644 ---- a/Release/tests/functional/websockets/client/authentication_tests.cpp -+++ b/Release/tests/functional/websockets/client/authentication_tests.cpp -@@ -93,6 +93,7 @@ SUITE(authentication_tests) - return false; - } - -+/* - TEST(ssl_test) - { - websocket_client client; -@@ -127,6 +128,7 @@ SUITE(authentication_tests) - throw; - } - } -+*/ - - // These tests are specific to our websocketpp based implementation. - #if !defined(__cplusplus_winrt) -@@ -159,12 +161,14 @@ SUITE(authentication_tests) - } - } - -+/* - // Test specifically for server SignalR team hit interesting cases with. - TEST(sni_with_older_server_test) - { - websocket_client client; - sni_test_impl(client); - } -+*/ - - // WinRT doesn't expose option for disabling. - // No stable server is available to reliably test this. -@@ -194,6 +198,7 @@ SUITE(authentication_tests) - } - } - -+/* - // Winrt doesn't allow explicitly setting server host for SNI. - TEST(sni_explicit_hostname) - { -@@ -204,6 +209,7 @@ SUITE(authentication_tests) - websocket_client client(config); - sni_test_impl(client); - } -+*/ - - void handshake_error_test_impl(const ::utility::string_t& host) - { -@@ -225,11 +231,17 @@ SUITE(authentication_tests) - } - } - -+/* - TEST(self_signed_cert) { handshake_error_test_impl(U("wss://self-signed.badssl.com/")); } -+*/ - -+/* - TEST(hostname_mismatch) { handshake_error_test_impl(U("wss://wrong.host.badssl.com/")); } -+*/ - -+/* - TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } -+*/ - - #endif - diff --git a/cpprest.spec b/cpprest.spec index b832593..cfd1c39 100644 --- a/cpprest.spec +++ b/cpprest.spec @@ -1,14 +1,14 @@ %define major 2 %define minor 10 Name: cpprest -Version: 2.10.14 -Release: 3%{?dist} +Version: 2.10.15 +Release: 1%{?dist} Summary: C++ REST library License: MIT Url: https://github.com/Microsoft/cpprestsdk Source0: https://github.com/Microsoft/cpprestsdk/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # Disable outside, failing and sometimes failing tests -Patch1: cpprest-2.10.9-disable-outside-and-failing-tests.patch +Patch1: cpprest-2.10.15-disable-outside-and-failing-tests.patch # Disable tests with long timeouts Patch2: cpprest-2.10.9-disable-tests-long-timeouts.patch # Disable test extract_floating_point, which fails on ppc64le and aarch64 @@ -58,7 +58,8 @@ cd Release mkdir build.release cd build.release export CXXFLAGS="%{optflags} -Wl,--as-needed" -%cmake .. -DCMAKE_BUILD_TYPE=Release -DWERROR=OFF -DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF +# Not needed anymore since v2.10.15 (new default): -DCPPREST_EXPORT_DIR=cmake/cpprestsdk +%cmake .. -DCMAKE_BUILD_TYPE=Release -DWERROR=OFF -DCPPREST_EXCLUDE_BROTLI=OFF make %{?_smp_mflags} %install @@ -91,6 +92,10 @@ cd Release/build.release/Binaries %changelog +* Mon Feb 24 2020 Wolfgang Stöggl - 2.10.15-1 +- New upstream version 2.10.15 +- Update patch: cpprest-2.10.15-disable-outside-and-failing-tests.patch + * Tue Jan 28 2020 Fedora Release Engineering - 2.10.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 457c6de..a7af3c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cpprest-2.10.14.tar.gz) = 7208b8c31e42a9bda2bf1d5c65527e54e3f946ec57743aaf7058c12a311de78de354d5ff859f35b3a8936c8964ac5695a692e234f3365edc426cf9580f76cd4f +SHA512 (cpprest-2.10.15.tar.gz) = ef8884c9f7fde2b6a25357ef0e7ee87b473a2e3140af2c5af0e3be7776ac2e8c0da431a356892020a3c37c84e30396350e2083cd4e1192a41fd3e099e74179f7