Skip to contentSkip to conversation

package/websocketpp: bump to version 0.8.2

PATCH Superseded Fabrice Fontaine 2 participants 2 messages Apr 19, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/websocketpp: bump to version 0.8.2

Drop patches (already in version)

---
 ...e-make_shared-with-new-in-some-cases.patch | 79 -------------------
 .../0002-Fix-missed-entries-fix-testing.patch | 66 ----------------
 package/websocketpp/websocketpp.hash          |  2 +-
 package/websocketpp/websocketpp.mk            |  2 +-
 4 files changed, 2 insertions(+), 147 deletions(-)
 delete mode 100644 package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch
 delete mode 100644 package/websocketpp/0002-Fix-missed-entries-fix-testing.patch
package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch deleted +0 -79
deleted file mode 100644
index 3b37834f55..0000000000
@@ -1,79 +0,0 @@
-From c769c9238ad62178f506038178714a1c35aa2769 Mon Sep 17 00:00:00 2001
-From: Stefan Floeren <[email protected]>
-Date: Tue, 16 Apr 2019 08:38:01 +0200
-Subject: [PATCH] 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 at 59066d8) for 1.70,
-while keeping it backwards compatible to older boost versions.
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Retrieved from:
-https://github.com/zaphoyd/websocketpp/pull/814/commits/c769c9238ad62178f506038178714a1c35aa2769]
----
- 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::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) {
-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::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();
-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());
package/websocketpp/0002-Fix-missed-entries-fix-testing.patch deleted +0 -66

66 lines not on this page · raw message

package/websocketpp/websocketpp.hash +1 -1
index 8bf671d96e..e4d0c929d5 100644
@@ -1,3 +1,3 @@
 # Locally Computed:
-sha256  178899de48c02853b55b1ea8681599641cedcdfce59e56beaff3dd0874bf0286  websocketpp-0.8.1.tar.gz
+sha256  6ce889d85ecdc2d8fa07408d6787e7352510750daa66b5ad44aacb47bea76755  websocketpp-0.8.2.tar.gz
 sha256  b31e597bc777d884a39663c11d0557a0af40780e1f451de11ea5103924a69667  COPYING
package/websocketpp/websocketpp.mk +1 -1
index 47da4dbe2f..26595a00d3 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WEBSOCKETPP_VERSION = 0.8.1
+WEBSOCKETPP_VERSION = 0.8.2
 WEBSOCKETPP_SITE = $(call github,zaphoyd,websocketpp,$(WEBSOCKETPP_VERSION))
 WEBSOCKETPP_LICENSE = BSD-3c, MIT, Zlib
 WEBSOCKETPP_LICENSE_FILES = COPYING
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/websocketpp: bump to version 0.8.2

Quoted 11 lines · On Sun, 19 Apr 2020 21:48:45 +0200 Fabrice Fontaine…

Drop patches (already in version)

---
 ...e-make_shared-with-new-in-some-cases.patch | 79 -------------------
 .../0002-Fix-missed-entries-fix-testing.patch | 66 ----------------
 package/websocketpp/websocketpp.hash          |  2 +-
 package/websocketpp/websocketpp.mk            |  2 +-
 4 files changed, 2 insertions(+), 147 deletions(-)
 delete mode 100644 package/websocketpp/0001-Replace-make_shared-with-new-in-some-cases.patch
 delete mode 100644 package/websocketpp/0002-Fix-missed-entries-fix-testing.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com