From patchwork Wed Mar 31 05:23:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28209 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 10F1027BC66; Wed, 31 Mar 2021 06:24:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BD61C27BC65 for ; Wed, 31 Mar 2021 06:24:13 +0100 (BST) Received: from localhost ([::1]:43404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTKu-0000Eu-W1 for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:24:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTKl-0000Ei-Ee for guix-patches@gnu.org; Wed, 31 Mar 2021 01:24:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTKl-0005n1-6p for guix-patches@gnu.org; Wed, 31 Mar 2021 01:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTKl-00033L-1G for guix-patches@gnu.org; Wed, 31 Mar 2021 01:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 01/12] gnu: asio: Update to 1.18.1. References: <87y2e3kifn.fsf@gmail.com> In-Reply-To: <87y2e3kifn.fsf@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47513@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716824111708 (code B ref 47513); Wed, 31 Mar 2021 05:24:02 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:01 +0000 Received: from localhost ([127.0.0.1]:53230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKi-00032k-Ll for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:00 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:46825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKg-00032J-Or for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:23:59 -0400 Received: by mail-qk1-f177.google.com with SMTP id z10so18252134qkz.13 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uHj020zj79wwTXZp70p2UYiqSuHglBr1fyNs9B1OAyA=; b=qidCBoXJqYJMRjOz35NbH96k6n7H6oMPZOtEAPxr1J6jQ2G0sbzc//c3eFbHXABKxc F7Gk3vH95tKu8MZOykTZdn+CCrt7+2cvcVJVXIyQXBjlOtW57VzZ2k8C37ZW07E9naXe dyKjYR3Yb6wTo59C4uglKxum26TvA83p/KTPIKoVQujVXEHe4ilfFxlBM0pHO3SlMtbu zNx1OfCEKWzlFMLQzjijr2mSVrjX3GKHqNDrsJUCx1XoCQxHlfr5jyVAxc4SwqgyeUBO EKIRDcNXIr99JmQpADhj2vZ/1yQox7ilVas1CsI/3+HyXGTs4FA3p92M3YraGEr6d9fv kBwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uHj020zj79wwTXZp70p2UYiqSuHglBr1fyNs9B1OAyA=; b=B25I3xwz2F02hFqLJsVj9nvdItD+PLetE0qk4BPNQpHRlPjXp7LKcORpjo38y38JEm Q7aSwfAruEjl0KKovZ4qq6wL8AYPNyiCGFagOMWAAl7rP344ku5U/+HgRYb+tFqEsPKb Qwkza+pejqJg/8KqMWctTuQUSGb5pruwFZZJIO4N1POb0XInUecVxiN4zfDLplrH6Y7n DKMTCyPPypGXPbKJWL7r4A7gQOcltAZFPSQZYFAqixc2PgdoDuPQ7War/ndVdoxVMGrh ufTED/Ke2pla/pW/y55Ijc9uQrqD3v4la1V5yTZnHarjKJp8kzqq7qJEev3PTmcEt/4L Oc1g== X-Gm-Message-State: AOAM533WBIESQ1//oJ/RU+fpBYATMgwT0CmXJGn7NqFHKMHoTrdz0wSl DvWtTjjWQcOsz3SQQl/eV/86TcBokvU= X-Google-Smtp-Source: ABdhPJx0ybZH6qTyCgMe5VsoMyhmIY3pzqJ5juXryBZSULZ5jAJq9XyRqP/zPd7syBBuVXnmMLx1Fg== X-Received: by 2002:a37:5b84:: with SMTP id p126mr1661198qkb.142.1617168232872; Tue, 30 Mar 2021 22:23:52 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:52 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:37 -0400 Message-Id: <20210331052348.5164-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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/networking.scm (asio): Update to 1.18.1. (asio-1.12): New variable. * gnu/packages/emulators.scm (mame)[inputs]: Use asio-1.12, otherwise it fails to build. --- gnu/packages/emulators.scm | 2 +- gnu/packages/networking.scm | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 1cd23c3e6c..cfe909b3a6 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1743,7 +1743,7 @@ This is a part of the TiLP project.") ("texinfo" ,texinfo))) (inputs `(("alsa-lib" ,alsa-lib) - ("asio" ,asio) + ("asio" ,asio-1.12) ;the bundled copy is at 1.11 ("expat" ,expat) ("flac" ,flac) ("fontconfig" ,fontconfig) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ecc6f57f4e..fe2499815b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2018, 2020 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2019, 2020 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Vasile Dumitrascu ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar @@ -3027,7 +3027,8 @@ eight bytes) tools ;; Either BSD-3 or GPL-2 can be used. (license (list license:bsd-3 license:gpl2)))) -(define-public asio +;;; This is an old version required by rested. +(define-public asio-1.12 (package (name "asio") (version "1.12.2") @@ -3054,6 +3055,18 @@ low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.") (license license:boost1.0))) +(define-public asio + (package + (inherit asio-1.12) + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/asio/asio/" + version " (Stable)/asio-" version ".tar.bz2")) + (sha256 + (base32 "04wi69d72l1p5c7d63z1dz06zn8pdqsbgx1if98dszs9ymfqgyaa")))))) + (define-public shadowsocks ;; There are some security fixes after the last release. (let* ((commit "e332ec93e9c90f1cbee676b022bf2c5d5b7b1239")