From 794989d41e23844151a283443a4e331a2878a6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Mon, 20 Apr 2020 21:39:43 +0200 Subject: [PATCH] New upstream version 0.8.2 - Drop patches (fixed upstream): websocketpp-0.8.1-boost_1.70.patch websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch --- .gitignore | 1 + sources | 2 +- websocketpp-0.8.1-boost_1.70.patch | 139 ------------------ ....1-fix_CMakeLists.txt_version_number.patch | 22 --- websocketpp.pc | 2 +- websocketpp.spec | 17 +-- 6 files changed, 11 insertions(+), 172 deletions(-) delete mode 100644 websocketpp-0.8.1-boost_1.70.patch delete mode 100644 websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch diff --git a/.gitignore b/.gitignore index ca0a2d9..8b6b169 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /websocketpp-0.7.0.tar.gz /websocketpp-0.8.1.tar.gz +/websocketpp-0.8.2.tar.gz diff --git a/sources b/sources index 6af2eff..77d9040 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (websocketpp-0.8.1.tar.gz) = 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c +SHA512 (websocketpp-0.8.2.tar.gz) = b2afc63edb69ce81a3a6c06b3d857b3e8820f0e22300ac32bb20ab30ff07bd58bd5ada3e526ed8ab52de934e0e3a26cad2118b0e68ecf3e5e9e8d7101348fd06 diff --git a/websocketpp-0.8.1-boost_1.70.patch b/websocketpp-0.8.1-boost_1.70.patch deleted file mode 100644 index 40ae155..0000000 --- a/websocketpp-0.8.1-boost_1.70.patch +++ /dev/null @@ -1,139 +0,0 @@ -From c769c9238ad62178f506038178714a1c35aa2769 Mon Sep 17 00:00:00 2001 -From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> -Date: Tue, 16 Apr 2019 08:38:01 +0200 -Subject: [PATCH 1/2] Replace make_shared with new in some cases - -Replace make_shared for asio types that take a lib::ref as a parameter. -This should fix the ASIO change (boostorg/asio@59066d8) for 1.70, -while keeping it backwards compatible to older boost versions. ---- - websocketpp/transport/asio/connection.hpp | 7 ++++--- - websocketpp/transport/asio/endpoint.hpp | 3 +-- - websocketpp/transport/asio/security/none.hpp | 3 +-- - websocketpp/transport/asio/security/tls.hpp | 3 +-- - 4 files changed, 7 insertions(+), 9 deletions(-) - -diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp -index 60f88a79..1ccda8f3 100644 ---- a/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type { - * needed. - */ - timer_ptr set_timer(long duration, timer_handler callback) { -- timer_ptr new_timer = lib::make_shared( -- lib::ref(*m_io_service), -- lib::asio::milliseconds(duration) -+ timer_ptr new_timer( -+ new lib::asio::steady_timer( -+ *m_io_service, -+ lib::asio::milliseconds(duration)) - ); - - if (config::enable_multithreading) { -diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp -index ddab2c74..4b719a97 100644 ---- a/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -195,8 +195,7 @@ class endpoint : public config::socket_type { - - m_io_service = ptr; - m_external_io_service = true; -- m_acceptor = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); - - m_state = READY; - ec = lib::error_code(); -diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp -index 5c8293db..6c7d3524 100644 ---- a/websocketpp/transport/asio/security/none.hpp -+++ b/websocketpp/transport/asio/security/none.hpp -@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this { - return socket::make_error_code(socket::error::invalid_state); - } - -- m_socket = lib::make_shared( -- lib::ref(*service)); -+ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, *m_socket); -diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp -index c76fd9aa..04ac3790 100644 ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this { - if (!m_context) { - return socket::make_error_code(socket::error::invalid_tls_context); - } -- m_socket = lib::make_shared( -- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); -+ m_socket.reset(new socket_type(*service, *m_context)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, get_socket()); - -From f810ca2e800e9b55be41c5911cf1d1185fcd516b Mon Sep 17 00:00:00 2001 -From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com> -Date: Wed, 17 Apr 2019 10:06:18 +0000 -Subject: [PATCH 2/2] Fix missed entries; fix testing - ---- - CMakeLists.txt | 2 +- - websocketpp/transport/asio/connection.hpp | 3 +-- - websocketpp/transport/asio/endpoint.hpp | 7 ++----- - 3 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2786aba9..951de975 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) - endif () - - if (NOT Boost_USE_STATIC_LIBS) -- add_definitions (/DBOOST_TEST_DYN_LINK) -+ add_definitions (-DBOOST_TEST_DYN_LINK) - endif () - - set (Boost_FIND_REQUIRED TRUE) -diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp -index 1ccda8f3..57dda74a 100644 ---- a/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -462,8 +462,7 @@ class connection : public config::socket_type::socket_con_type { - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared( -- lib::ref(*io_service)); -+ m_strand.reset(new lib::asio::io_service::strand(*io_service)); - } - - lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, -diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp -index 4b719a97..94509adb 100644 ---- a/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -687,9 +687,7 @@ class endpoint : public config::socket_type { - * @since 0.3.0 - */ - void start_perpetual() { -- m_work = lib::make_shared( -- lib::ref(*m_io_service) -- ); -+ m_work.reset(new lib::asio::io_service::work(*m_io_service)); - } - - /// Clears the endpoint's perpetual flag, allowing it to exit when empty -@@ -853,8 +851,7 @@ class endpoint : public config::socket_type { - - // Create a resolver - if (!m_resolver) { -- m_resolver = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); - } - - tcon->set_uri(u); diff --git a/websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch b/websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch deleted file mode 100644 index bc65efb..0000000 --- a/websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4bccfb04a264704ec9b80ba332ee1cf113ce7f1b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= -Date: Thu, 1 Nov 2018 20:58:10 +0100 -Subject: [PATCH] Update version number in CMakeLists.txt to 0.8.1 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2786aba9..2d13117b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ endif () - ############ Project name and version - set (WEBSOCKETPP_MAJOR_VERSION 0) - set (WEBSOCKETPP_MINOR_VERSION 8) --set (WEBSOCKETPP_PATCH_VERSION 0) -+set (WEBSOCKETPP_PATCH_VERSION 1) - set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION}) - - if(POLICY CMP0048) diff --git a/websocketpp.pc b/websocketpp.pc index 58f7548..6af5aeb 100644 --- a/websocketpp.pc +++ b/websocketpp.pc @@ -4,6 +4,6 @@ includedir=${prefix}/include Name: websocketpp Description: WebSocket API -Version: 0.8.1 +Version: 0.8.2 URL: https://www.zaphoyd.com/websocketpp/ Cflags: -I${includedir}/ diff --git a/websocketpp.spec b/websocketpp.spec index fd2bf77..4332982 100644 --- a/websocketpp.spec +++ b/websocketpp.spec @@ -1,8 +1,8 @@ Name: websocketpp Summary: C++ WebSocket Protocol Library -Version: 0.8.1 -Release: 8%{?dist} +Version: 0.8.2 +Release: 1%{?dist} License: BSD Url: https://www.zaphoyd.com/websocketpp @@ -24,13 +24,6 @@ Patch2: websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patc # Disable the following tests, which fail occasionally: test_transport, test_transport_asio_timers Patch3: websocketpp-0.7.0-disable-test_transport-test_transport_asio_timers.patch -# Update version number in CMakeLists.txt to 0.8.1 -# Upstream commit: https://github.com/zaphoyd/websocketpp/commit/72e2760 -Patch4: websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch - -# Upstream PR: https://github.com/zaphoyd/websocketpp/pull/814 -Patch5: websocketpp-0.8.1-boost_1.70.patch - BuildRequires: boost-devel BuildRequires: cmake @@ -94,6 +87,12 @@ make test -C %{_target_platform} %changelog +* Mon Apr 20 2020 Wolfgang Stöggl - 0.8.2-1 +- New upstream version +- Drop patches (fixed upstream): + websocketpp-0.8.1-boost_1.70.patch + websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch + * Fri Jan 31 2020 Fedora Release Engineering - 0.8.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild