Hello community, here is the log from the commit of package websocketpp for openSUSE:Leap:15.2 checked in at 2020-02-04 17:59:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/websocketpp (Old) and /work/SRC/openSUSE:Leap:15.2/.websocketpp.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "websocketpp" Tue Feb 4 17:59:12 2020 rev:9 rq:769118 version:0.8.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/websocketpp/websocketpp.changes 2020-01-15 16:28:57.876771739 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.websocketpp.new.26092/websocketpp.changes 2020-02-04 17:59:21.604928241 +0100 @@ -1,0 +2,30 @@ +Thu May 9 16:54:52 UTC 2019 - Wolfgang Bauer <[email protected]> + +- Add Replace-make_shared-with-new-in-some-cases.patch to fix + incompatibilities with Boost 1.70.0 (boo#1134611) + +------------------------------------------------------------------- +Thu Mar 28 15:30:30 UTC 2019 - manuel <[email protected]> + +- updated to version 0.8.1 (boo#1130861) + + This is a bug fix patch to fix a major test suite regression + introduced in 0.8.0 and adjust installation behavior to make + downstream packaging easier. + + Note: There are no changes to the library itself, only to the + test and installation systems. + +------------------------------------------------------------------- +Fri Jul 27 06:37:06 UTC 2018 - [email protected] + +- Trim redundancies from description and fix spellos. + +------------------------------------------------------------------- +Fri Jul 13 12:20:26 UTC 2018 - [email protected] + +- update to 0.8.0: + * various bug fixes and improvements + * various developer visible changes + +------------------------------------------------------------------- Old: ---- websocketpp-0.7.0.tar.gz New: ---- Replace-make_shared-with-new-in-some-cases.patch websocketpp-0.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ websocketpp.spec ++++++ --- /var/tmp/diff_new_pack.Kjf0Lw/_old 2020-02-04 17:59:22.128928558 +0100 +++ /var/tmp/diff_new_pack.Kjf0Lw/_new 2020-02-04 17:59:22.132928560 +0100 @@ -1,7 +1,7 @@ # # spec file for package websocketpp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,44 +17,47 @@ Name: websocketpp -Version: 0.7.0 +Version: 0.8.1 Release: 0 Summary: C++ WebSocket Protocol Library License: BSD-3-Clause Group: Development/Libraries/C and C++ -Url: http://www.zaphoyd.com/websocketpp +URL: http://www.zaphoyd.com/websocketpp Source0: https://github.com/zaphoyd/websocketpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: websocketpp.pc +# PATCH-FIX-UPSTREAM -- https://github.com/zaphoyd/websocketpp/pull/814 +Patch0: Replace-make_shared-with-new-in-some-cases.patch +BuildRequires: cmake >= 2.6 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildArch: noarch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else BuildRequires: boost-devel %endif -BuildRequires: cmake >= 2.6 -BuildRequires: gcc-c++ -BuildRequires: pkg-config -BuildArch: noarch %description -WebSocket++ is an open source (BSD license) header only C++ library -that impliments RFC6455 The WebSocket Protocol. It allows integrating +WebSocket++ is a header-only C++ library +that implements RFC6455, the WebSocket protocol. It allows integrating WebSocket client and server functionality into C++ programs. It uses interchangeable network transport modules including one based on C++ iostreams and one based on Boost Asio. %package devel -Summary: C++ WebSocket Protocol Library +Summary: Development files for websocketpp, a C++ WebSocket Protocol Library Group: Development/Libraries/C and C++ %description devel -WebSocket++ is an open source (BSD license) header only C++ library -that impliments RFC6455 The WebSocket Protocol. It allows integrating +WebSocket++ is a header-only C++ library +that implements RFC6455, the WebSocket protocol. It allows integrating WebSocket client and server functionality into C++ programs. It uses interchangeable network transport modules including one based on C++ iostreams and one based on Boost Asio. %prep %setup -q +%patch0 -p1 %build %if 0%{?suse_version} >= 1310 @@ -79,8 +82,8 @@ install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/pkgconfig/websocketpp.pc %files devel -%defattr(-,root,root,-) -%doc COPYING changelog.md readme.md roadmap.md +%license COPYING +%doc changelog.md readme.md roadmap.md %{_includedir}/websocketpp %{_libexecdir}/cmake %{_libexecdir}/cmake/websocketpp ++++++ Replace-make_shared-with-new-in-some-cases.patch ++++++ 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 60f88a79..57dda74a 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::asio::steady_timer>( - 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) { @@ -461,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::asio::io_service::strand>( - 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 ddab2c74..94509adb 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::asio::ip::tcp::acceptor>( - lib::ref(*m_io_service)); + m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); m_state = READY; ec = lib::error_code(); @@ -688,9 +687,7 @@ class endpoint : public config::socket_type { * @since 0.3.0 */ void start_perpetual() { - m_work = lib::make_shared<lib::asio::io_service::work>( - 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 @@ -854,8 +851,7 @@ class endpoint : public config::socket_type { // Create a resolver if (!m_resolver) { - m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>( - 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/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<connection> { return socket::make_error_code(socket::error::invalid_state); } - m_socket = lib::make_shared<lib::asio::ip::tcp::socket>( - 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<connection> { if (!m_context) { return socket::make_error_code(socket::error::invalid_tls_context); } - m_socket = lib::make_shared<socket_type>( - _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()); ++++++ websocketpp-0.7.0.tar.gz -> websocketpp-0.8.1.tar.gz ++++++ ++++ 6089 lines of diff (skipped) ++++++ websocketpp.pc ++++++ --- /var/tmp/diff_new_pack.Kjf0Lw/_old 2020-02-04 17:59:22.280928649 +0100 +++ /var/tmp/diff_new_pack.Kjf0Lw/_new 2020-02-04 17:59:22.280928649 +0100 @@ -4,6 +4,6 @@ Name: websocketpp Description: WebSocket API -Version: 0.7.0 +Version: 0.8.0 URL: http://www.zaphoyd.com/websocketpp/ Cflags: -I${includedir}/
