From patchwork Tue Dec 3 17:58:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Le Vaillant X-Patchwork-Id: 16358 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3CBD617835; Tue, 3 Dec 2019 18:59:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B8CF017833 for ; Tue, 3 Dec 2019 18:59:11 +0000 (GMT) Received: from localhost ([::1]:57482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icDO9-000357-4i for patchwork@mira.cbaines.net; Tue, 03 Dec 2019 13:59:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47441) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icCT4-000371-MF for guix-patches@gnu.org; Tue, 03 Dec 2019 13:00:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icCSz-00051Q-51 for guix-patches@gnu.org; Tue, 03 Dec 2019 13:00:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35051) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1icCSy-0004zF-Cm for guix-patches@gnu.org; Tue, 03 Dec 2019 13:00:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1icCSw-0002CU-A6 for guix-patches@gnu.org; Tue, 03 Dec 2019 13:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38475] [PATCH 1/2] gnu: websocketpp: Add patch for Boost >= 1.70. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Dec 2019 18:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 38475@debbugs.gnu.org Cc: Guillaume Le Vaillant Received: via spool by 38475-submit@debbugs.gnu.org id=B38475.15753959538372 (code B ref 38475); Tue, 03 Dec 2019 18:00:02 +0000 Received: (at 38475) by debbugs.gnu.org; 3 Dec 2019 17:59:13 +0000 Received: from localhost ([127.0.0.1]:41024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icCS8-0002Ax-Lx for submit@debbugs.gnu.org; Tue, 03 Dec 2019 12:59:13 -0500 Received: from mout02.posteo.de ([185.67.36.66]:45693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icCS2-0002AO-Bi for 38475@debbugs.gnu.org; Tue, 03 Dec 2019 12:59:09 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 63089240100 for <38475@debbugs.gnu.org>; Tue, 3 Dec 2019 18:58:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1575395938; bh=W8502BhnDTP2E7cEjUmqKrD8R53hxB9+GtGDs7+QlNw=; h=From:To:Cc:Subject:Date:From; b=hgtMaoyrTuM4G+HDlFQcpiposjV5rjHLgLdwMKNXGkDvp+MrRKjQEytQ343FpGwka UQzV14oYZhCfg02FWRQ87ETNAl5qKQKxTKLqfsioyb205Kg2X3KDlVCo/UpixqCG/g CB+3gUPbSSJWceDY3+hxdisAvZ+HCzHKQ2vFptEU6oLkx1BQzQuZJaa+RZpSniFRnn GGYcGlLsTt8uVEMAXXHIohRecCpLpGGw1zuNADS4Huw3WFkO2iQPaL0ccszw8aWmcg DWLn2VxjypSDUxPojSP9l8bqpF/IjLGJvc/MWhLV1KcMhA9xfd7wE2+jeCOYKcqoON GI6qjLJHvVdtw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47S8qf0MZFz9rxQ; Tue, 3 Dec 2019 18:58:53 +0100 (CET) From: Guillaume Le Vaillant Date: Tue, 3 Dec 2019 18:58:19 +0100 Message-Id: <20191203175820.18356-1-glv@posteo.net> X-Mailer: git-send-email 2.24.0 In-Reply-To: <87blsp9u46.fsf@yamatai> References: <87blsp9u46.fsf@yamatai> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/websocket-fix-for-boost-1.70.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/web.scm (websocketpp): Use it. --- gnu/local.mk | 1 + .../websocketpp-fix-for-boost-1.70.patch | 100 ++++++++++++++++++ gnu/packages/web.scm | 6 +- 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch diff --git a/gnu/local.mk b/gnu/local.mk index e2d922373e..c3a48b43e3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1442,6 +1442,7 @@ dist_patch_DATA = \ %D%/packages/patches/wavpack-CVE-2018-7253.patch \ %D%/packages/patches/wavpack-CVE-2018-7254.patch \ %D%/packages/patches/weasyprint-library-paths.patch \ + %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ diff --git a/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch b/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch new file mode 100644 index 0000000000..4f5f99fad4 --- /dev/null +++ b/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch @@ -0,0 +1,100 @@ +diff -u b/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp +--- b/websocketpp/transport/asio/connection.hpp ++++ b/websocketpp/transport/asio/connection.hpp +@@ -311,9 +311,10 @@ + * 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) { +@@ -461,8 +462,7 @@ + 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 -u b/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp +--- b/websocketpp/transport/asio/endpoint.hpp ++++ b/websocketpp/transport/asio/endpoint.hpp +@@ -195,8 +195,7 @@ + + 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(); +@@ -688,9 +687,7 @@ + * @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 +@@ -854,8 +851,7 @@ + + // 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); +unchanged: +--- a/websocketpp/transport/asio/security/none.hpp ++++ b/websocketpp/transport/asio/security/none.hpp +@@ -168,8 +168,7 @@ protected: + 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); +unchanged: +--- a/websocketpp/transport/asio/security/tls.hpp ++++ b/websocketpp/transport/asio/security/tls.hpp +@@ -193,8 +193,7 @@ protected: + 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()); +only in patch2: +unchanged: +--- 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/gnu/packages/web.scm b/gnu/packages/web.scm index e5f0639b8f..f2e8345b51 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1073,7 +1073,11 @@ other systems that want to manipulate WebAssembly files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy")))) + (base32 "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy")) + (patches + ;; This patch for Boost >= 1.70 was made by merging two patches that + ;; are in the 'develop' branch (c769c92 and f810ca2). + (search-patches "websocketpp-fix-for-boost-1.70.patch")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) ("openssl" ,openssl))) From patchwork Tue Dec 3 18:00:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Le Vaillant X-Patchwork-Id: 16359 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5C84417837; Tue, 3 Dec 2019 19:20:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C91A217833 for ; Tue, 3 Dec 2019 19:20:42 +0000 (GMT) Received: from localhost ([::1]:57740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icDiz-0007rM-5Q for patchwork@mira.cbaines.net; Tue, 03 Dec 2019 14:20:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34649) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icCig-0001p7-O0 for guix-patches@gnu.org; Tue, 03 Dec 2019 13:16:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icCUt-0000ag-15 for guix-patches@gnu.org; Tue, 03 Dec 2019 13:02:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35056) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1icCUs-0000YX-I6 for guix-patches@gnu.org; Tue, 03 Dec 2019 13:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1icCUs-0002Gg-Es for guix-patches@gnu.org; Tue, 03 Dec 2019 13:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38475] [PATCH 2/2] gnu: i2pd: Update to 2.29.0. Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Dec 2019 18:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 38475@debbugs.gnu.org Cc: Guillaume Le Vaillant Received: via spool by 38475-submit@debbugs.gnu.org id=B38475.15753960678656 (code B ref 38475); Tue, 03 Dec 2019 18:02:02 +0000 Received: (at 38475) by debbugs.gnu.org; 3 Dec 2019 18:01:07 +0000 Received: from localhost ([127.0.0.1]:41029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icCTz-0002FY-90 for submit@debbugs.gnu.org; Tue, 03 Dec 2019 13:01:07 -0500 Received: from mout02.posteo.de ([185.67.36.66]:49441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icCTx-0002Eu-NE for 38475@debbugs.gnu.org; Tue, 03 Dec 2019 13:01:06 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 4656B2400FB for <38475@debbugs.gnu.org>; Tue, 3 Dec 2019 19:00:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1575396057; bh=kcgO2AOc+mcegc1ofdJ+59vJW5FGVsc1VwRG0Ps8D5g=; h=From:To:Cc:Subject:Date:From; b=PtASLB3w31jKbMTiegv6VJ/oH0a4ZFZ7Bqsz6Qac0QuOha1qKwluAe+N1V80cKoU0 ewLeRIDB9s9k+GPGqIzWa4vgvkPOGLpmkkECeDH+qeB+JplYxV+w+EiqaZkW/Idp94 MikWetj6vnMU3vTCK5mh5pk5R2CKbKSRZ6mnd+UP969NaCg3S33ovtRf9Gf217TVaA 4OdAlFknZNdvQtejqB36eTcUOQCEU8k/tSsxg/rVDoIlGENts8LbD7L56Ra1JEm/o0 rVqJXK63akV0EgNyx4cxdzgIJI7QjnzWT2lsM1FysjpAv2z3LqE6vT2KqofRnM8CM9 T+wbQGwJbveJw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47S8sx64CNz9rxN; Tue, 3 Dec 2019 19:00:53 +0100 (CET) From: Guillaume Le Vaillant Date: Tue, 3 Dec 2019 19:00:35 +0100 Message-Id: <20191203180035.23121-1-glv@posteo.net> X-Mailer: git-send-email 2.24.0 In-Reply-To: <87blsp9u46.fsf@yamatai> References: <87blsp9u46.fsf@yamatai> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/i2p.scm (i2pd): Update to 2.29.0. [arguments]: Disable x25519 test in the 'check' phase. --- gnu/packages/i2p.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm index 075f1f403f..f8c3f3bb5c 100644 --- a/gnu/packages/i2p.scm +++ b/gnu/packages/i2p.scm @@ -30,7 +30,7 @@ (define-public i2pd (package (name "i2pd") - (version "2.27.0") + (version "2.29.0") (source (origin (method git-fetch) @@ -39,7 +39,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00y0y57z84gakwa88zzm0g3ixgc6y7zm35rjiysiajzvmdq5w1wf")))) + (base32 "1issg3aidwikk4g12sa8q81zzp0hd0g8wdy2dx4899z8yrscl300")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) ("miniupnpc" ,miniupnpc) @@ -68,7 +68,12 @@ "./tests") (with-directory-excursion "tests" (substitute* "Makefile" - (("../libi2pd/") (string-append source "/libi2pd/"))) + (("../libi2pd/") (string-append source "/libi2pd/")) + ;; Disable the x25519 test, which only compiles if + ;; openssl doesn't have X25519 support, but the + ;; version we use has it. + (("test-base-64 test-x25519 test-aeadchacha20poly1305") + "test-base-64 test-aeadchacha20poly1305")) (apply invoke "make" "all" `(,@(if parallel-tests? `("-j" ,(number->string