From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IOcBBkiwZGCxBgAAgWs5BA (envelope-from ) for ; Wed, 31 Mar 2021 19:24:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id aFxkO0ewZGAxRQAAbx9fmQ (envelope-from ) for ; Wed, 31 Mar 2021 17:24:23 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 75E6D1B773 for ; Wed, 31 Mar 2021 19:24:23 +0200 (CEST) Received: from localhost ([::1]:45946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lReZq-0007U2-Kt for larch@yhetil.org; Wed, 31 Mar 2021 13:24:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lReZY-0007Sj-P7 for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lReZX-0006DO-3i for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lReZW-0002x6-Ut for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH v2 02/12] gnu: restbed: Update to 4.7. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 17: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: Jack Hill , Maxime Devos , Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161721138411149 (code B ref 47513); Wed, 31 Mar 2021 17:24:02 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 17:23:04 +0000 Received: from localhost ([127.0.0.1]:55399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYZ-0002tZ-Ud for submit@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:04 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:38900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYY-0002sY-BQ for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:02 -0400 Received: by mail-qv1-f48.google.com with SMTP id t5so10307621qvs.5 for <47513@debbugs.gnu.org>; Wed, 31 Mar 2021 10:23:02 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=P1iKQyB9FSK88Pi+z9rapYanqWG55aGkXEG7q6QfagA=; b=R2w9vJHBedVBtKlNpBvpYx4cIet8OvZOd+ZTvWbezh6Z/8kTkM0HfbG1buYw3BMSgE wEHz7tVPbCOlYrYb/+6ShRs/qqqAy6AOdldmqUtNYvv2vYQomMIKbGQuaJwJY14z1hSr R+EBAg+Xnkx7dZeT44vthIie8NOyCMJ5uznDoe70C0mWSlea46pbBkr1RBAhO0yXkXPh vzx/PFJNKWnjxRbENnDAssa/6WN7HtnJXisS7+f6T91kSq1NtT9uXRPnxcanzzTOTiGI /5Lfs3BTX1aaW7Jd+kZot2sd28LWHtwq7K5t2qiChk3bw9mWmAP+hRR55jabKX1W2pPf YCJQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=P1iKQyB9FSK88Pi+z9rapYanqWG55aGkXEG7q6QfagA=; b=sGwfiRJ7EIQYAgapBq5yIB01hLZDbIYcerabAlTwaAyz4SbiV9lh18xvcM55BePU8o WRNrUTSpMf+heC9byrfqHVOIE3x1G7BoQIOzEhvVme3ZMTExVX2lDyV/XTt05rCbskaZ 6oqwNALwlhG78WLEBGwbRsWm6XCM4yQgo0v+Rm+TAjb/iPFUeac58/5iRWgPPfVEH10Z lnJDGXgfbrbE9xes8srorg1CZNTOfk20vF+qg+KCuUxbv6pU4JNTHmQIHW4v1dGS6/XK 4spy/xjxBrJiIscwQtZCi/vW1ZKmRDlXi9IQ3rrWd6CEps81cshG3Vzb3D0tSRmu8VQ0 7Uzg== X-Gm-Message-State: AOAM532Pi/4JJOlmKJPSXvc1k0habGnOlV6lWyobppowDcDNf6x9QaXb 3g2t1w/eYxMsKknN0WhvV72EUUVL+Gj/cw== X-Google-Smtp-Source: ABdhPJxgCEM4NaxQ6S+TSXpzQVq5OnPdsQ3y4XKxfA0fF92AHBQ/vO4lm9vBLpjb8D1hWx06Md1x2g== X-Received: by 2002:a05:6214:18d2:: with SMTP id cy18mr4114297qvb.50.1617211376515; Wed, 31 Mar 2021 10:22:56 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id c5sm1891349qkg.105.2021.03.31.10.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 10:22:56 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 13:22:22 -0400 Message-Id: <20210331172232.22483-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331172232.22483-1-maxim.cournoyer@gmail.com> References: <20210331172232.22483-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617211463; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=P1iKQyB9FSK88Pi+z9rapYanqWG55aGkXEG7q6QfagA=; b=f7UpV4yuH4AL9GYf47O/pLIUK50UrHLsItvFQ4NHyzB+wfG4xZhDlvMgS5lcN/fHYZR65M 3Qwpjdas/h8OJKsSbwj31s031a8JEQT9IVGwJL1QzU70OVnKEqVDpeKhrPNFm5xaZenZhj 97jyjlcRCOonrPmp4CjvYWRAbgIMQLYnf4SPMDDwDWI7CsQcpfzgcYxdXedXspyBGP2cMm nztOk6p51vl21Ce3qBFKG+T+b7jz4HVTRY7axMGZ9Gb0mnShNMPJbkrgxKK7ckZr3rFhTs SlIDCagq3SndD00e6ld7gWA8LjoYC0cX+s6HuaXVE0HFcgDQGYNDk0DwjrRBaA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617211463; a=rsa-sha256; cv=none; b=QZmt8yV4XgzTQzPPM5fCEsa5WvRJ7/xNx8nfDBHG8Oj50cXcC0R/um24mSOmeA3dMCjK+V ipnzzRMfsRSp5Fo9q/bh1R0dOyzPrL+CmRh9OHKDx1/oTubJyEzWAM5dBqmymw+MLPC1QP eMpXM+9QaQ1jKvCsVNu20bwem3Mz3dqNUBO7DsuJfe8GX96Eg7Ky4U5218jO+G5HbEYOBG VsKaDVl8x7v5s6yyGVcMivpoIcqSokPMh9YATcxYtpvBXGRB3Ew8mwIb6ozHu/sEeZdZsO AP6AeuYM1SsT1S5H2Gn/rXD1Y0KRRB1+EVkhsAxtM3IU6JlzU6Uky2U/iAL38w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=R2w9vJHB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 4.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=R2w9vJHB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 75E6D1B773 X-Spam-Score: 4.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: ixdlrqmLtrXR * gnu/packages/networking.scm (restbed): Update to 4.7. --- gnu/packages/networking.scm | 97 ++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index efbcb68e23..f114e65d17 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3332,57 +3332,56 @@ never see any machines other than the one Dante is running on.") (license (license:non-copyleft "file://LICENSE")))) (define-public restbed - (let ((commit "6eb385fa9051203f28bf96cc1844bbb5a9a6481f")) - (package - (name "restbed") - (version (git-version "4.6" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Corvusoft/restbed/") - (commit commit))) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0k60i5drklqqrb4khb25fzkgz9y0sncxf1sp6lh2bm1m0gh0661n")))) - (build-system cmake-build-system) - (inputs - `(("asio" ,asio) - ("catch" ,catch-framework) - ("openssl" ,openssl))) - (arguments - `(#:tests? #f - #:configure-flags - '("-DBUILD_TESTS=NO" - "-DBUILD_EXAMPLES=NO" - "-DBUILD_SSL=NO" - "-DBUILD_SHARED=NO") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'apply-patches-and-fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((asio (assoc-ref inputs "asio")) - (catch (assoc-ref inputs "catch")) - (openssl (assoc-ref inputs "openssl"))) - (substitute* "cmake/Findasio.cmake" - (("(find_path\\( asio_INCLUDE asio\\.hpp HINTS ).*$" all begin) - (string-append begin " \"" asio "/include\" )"))) - (substitute* "cmake/Findcatch.cmake" - (("(find_path\\( catch_INCLUDE catch\\.hpp HINTS ).*$" all begin) - (string-append begin " \"" catch "/include\" )"))) - (substitute* "cmake/Findopenssl.cmake" - (("(find_library\\( ssl_LIBRARY ssl ssleay32 HINTS ).*$" all begin) - (string-append begin " \"" openssl "/lib\" )")) - (("(find_library\\( crypto_LIBRARY crypto libeay32 HINTS ).*$" all begin) - (string-append begin " \"" openssl "/lib\" )")) - (("(find_path\\( ssl_INCLUDE openssl/ssl\\.h HINTS ).*$" all begin) - (string-append begin " \"" openssl "/include\" )"))))))))) - (synopsis "Asynchronous RESTful functionality to C++11 applications") - (description "Restbed is a comprehensive and consistent programming + (package + (name "restbed") + (version "4.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Corvusoft/restbed/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "055qicb773a599dsqbcz5xf0xj1wpk33mdrkyi0fsmyjmn8d2p9d")))) + (build-system cmake-build-system) + (inputs + `(("asio" ,asio-1.12) + ("catch" ,catch-framework) + ("openssl" ,openssl))) + (arguments + `(#:tests? #f + #:configure-flags + '("-DBUILD_TESTS=NO" + "-DBUILD_EXAMPLES=NO" + "-DBUILD_SSL=NO" + "-DBUILD_SHARED=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'apply-patches-and-fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((asio (assoc-ref inputs "asio")) + (catch (assoc-ref inputs "catch")) + (openssl (assoc-ref inputs "openssl"))) + (substitute* "cmake/Findasio.cmake" + (("(find_path\\( asio_INCLUDE asio\\.hpp HINTS ).*$" all begin) + (string-append begin " \"" asio "/include\" )"))) + (substitute* "cmake/Findcatch.cmake" + (("(find_path\\( catch_INCLUDE catch\\.hpp HINTS ).*$" all begin) + (string-append begin " \"" catch "/include\" )"))) + (substitute* "cmake/Findopenssl.cmake" + (("(find_library\\( ssl_LIBRARY ssl ssleay32 HINTS ).*$" all begin) + (string-append begin " \"" openssl "/lib\" )")) + (("(find_library\\( crypto_LIBRARY crypto libeay32 HINTS ).*$" all begin) + (string-append begin " \"" openssl "/lib\" )")) + (("(find_path\\( ssl_INCLUDE openssl/ssl\\.h HINTS ).*$" all begin) + (string-append begin " \"" openssl "/include\" )"))))))))) + (synopsis "Asynchronous RESTful functionality to C++11 applications") + (description "Restbed is a comprehensive and consistent programming model for building applications that require seamless and secure communication over HTTP.") - (home-page "https://github.com/Corvusoft/restbed") - (license license:agpl3+)))) + (home-page "https://github.com/Corvusoft/restbed") + (license license:agpl3+))) (define-public restinio (package -- 2.31.1