diff --git a/cpprest-2.10.1-srand-boost-1.66.patch b/cpprest-2.10.1-srand-boost-1.66.patch deleted file mode 100644 index d80affa..0000000 --- a/cpprest-2.10.1-srand-boost-1.66.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6b2e0480018530b616f61d5cdc786c92ba148bb7 Mon Sep 17 00:00:00 2001 -From: John Hruby -Date: Tue, 26 Dec 2017 16:52:13 +0100 -Subject: [PATCH] fixed strand - ---- - Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp -index 0be40f6b..395632c3 100644 ---- a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp -+++ b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp -@@ -422,7 +422,7 @@ class connection : public config::socket_type::socket_con_type { - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared( -+ m_strand = lib::make_shared( - lib::ref(*io_service)); - - m_async_read_handler = m_strand->wrap(lib::bind( diff --git a/cpprest-2.10.1-threadpool-boost-1.66.patch b/cpprest-2.10.1-threadpool-boost-1.66.patch deleted file mode 100644 index ac22844..0000000 --- a/cpprest-2.10.1-threadpool-boost-1.66.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up ./Release/include/pplx/threadpool.h.orig ./Release/include/pplx/threadpool.h ---- ./Release/include/pplx/threadpool.h.orig 2018-01-02 00:00:45.072599770 +0100 -+++ ./Release/include/pplx/threadpool.h 2018-01-02 00:01:04.504600576 +0100 -@@ -53,7 +53,7 @@ class threadpool - { - public: - static threadpool& shared_instance(); -- _ASYNCRTIMP static std::unique_ptr __cdecl construct(size_t num_threads); -+ _ASYNCRTIMP static std::unique_ptr __cdecl construct(int num_threads); - - virtual ~threadpool() = default; - -@@ -67,7 +67,7 @@ public: - boost::asio::io_service& service() { return m_service; } - - protected: -- threadpool(size_t num_threads) : m_service(num_threads) {} -+ threadpool(int num_threads) : m_service(num_threads) {} - - boost::asio::io_service m_service; - }; -diff -up ./Release/src/pplx/threadpool.cpp.orig ./Release/src/pplx/threadpool.cpp ---- ./Release/src/pplx/threadpool.cpp.orig 2018-01-01 23:45:35.424562058 +0100 -+++ ./Release/src/pplx/threadpool.cpp 2018-01-01 23:51:05.732575752 +0100 -@@ -31,11 +31,11 @@ namespace - - struct threadpool_impl final : crossplat::threadpool - { -- threadpool_impl(size_t n) -+ threadpool_impl(int n) - : crossplat::threadpool(n) - , m_work(m_service) - { -- for (size_t i = 0; i < n; i++) -+ for (int i = 0; i < n; i++) - add_thread(); - } - -@@ -152,7 +152,7 @@ void cpprest_init(JavaVM* vm) { - } - #endif - --std::unique_ptr crossplat::threadpool::construct(size_t num_threads) -+std::unique_ptr crossplat::threadpool::construct(int num_threads) - { - return std::unique_ptr(new threadpool_impl(num_threads)); - } diff --git a/cpprest.changes b/cpprest.changes index 1aab507..1a13f1c 100644 --- a/cpprest.changes +++ b/cpprest.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Mar 22 13:48:16 UTC 2018 - astieger@suse.com + +- update to 2.10.2: + * Fix an issue where requests sent via authenticated proxies + could not be successfully redirected from one domain to another + * Add http_listener configuration for the backlog, the maximum + length of the queue of pending connections on the port + * Make it possible to set the user agent for websockets + * Add support for retrieving HTTP version of a request in HTTP + listener + * various language/compiler fixes + * drop upstreamed/unneeded patches: + cpprest-2.10.1-srand-boost-1.66.patch + cpprest-2.10.1-threadpool-boost-1.66.patch + ------------------------------------------------------------------- Thu Mar 22 13:11:01 UTC 2018 - guillaume.gardet@opensuse.org diff --git a/cpprest.spec b/cpprest.spec index 561d073..afd8a73 100644 --- a/cpprest.spec +++ b/cpprest.spec @@ -19,7 +19,7 @@ %define major 2 %define minor 10 Name: cpprest -Version: 2.10.1 +Version: 2.10.2 Release: 0 Summary: C++ REST library # main: MIT (license.txt) @@ -32,10 +32,6 @@ License: MIT AND BSD-3-Clause AND Zlib Group: Development/Libraries/C and C++ Url: https://github.com/Microsoft/cpprestsdk Source: https://github.com/Microsoft/cpprestsdk/archive/v%{version}.tar.gz#/cpprestsdk-%{version}.tar.gz -# PATCH-FIX-UPSTREAM cpprest-2.10.1-srand-boost-1.66.patch -- Fix build with boost 1.66 -Patch0: cpprest-2.10.1-srand-boost-1.66.patch -# PATCH-FIX-UPSTREAM cpprest-2.10.1-threadpool-boost-1.66.patch -- Fix build with boost 1.66 -Patch1: cpprest-2.10.1-threadpool-boost-1.66.patch BuildRequires: cmake >= 3.0 BuildRequires: gcc-c++ BuildRequires: openssl-devel >= 1.0 @@ -80,8 +76,6 @@ Development files. %prep %setup -q -n cpprestsdk-%{version} -%patch0 -p1 -%patch1 -p1 %build %cmake \ diff --git a/cpprestsdk-2.10.1.tar.gz b/cpprestsdk-2.10.1.tar.gz deleted file mode 100644 index b0065de..0000000 --- a/cpprestsdk-2.10.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f38bc48e6fca969de794dcd65889df6563855cee5ff99742dafc6b2869976e71 -size 2057277 diff --git a/cpprestsdk-2.10.2.tar.gz b/cpprestsdk-2.10.2.tar.gz new file mode 100644 index 0000000..b921a36 --- /dev/null +++ b/cpprestsdk-2.10.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb0b611007732d8de9528bc37bd67468e7ef371672f89c88f225f73cdc4ffcf1 +size 2060497