From patchwork Wed Mar 31 05:23:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28210 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 4969A27BC66; Wed, 31 Mar 2021 06:25:11 +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 B99EB27BC65 for ; Wed, 31 Mar 2021 06:25:10 +0100 (BST) Received: from localhost ([::1]:43678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTLp-0000Pa-Tv for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:25:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLi-0000PN-Fg for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41716) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLi-0006N1-6Y for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLi-00036d-3d for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 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 05:25: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.161716824311753 (code B ref 47513); Wed, 31 Mar 2021 05:25:02 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:03 +0000 Received: from localhost ([127.0.0.1]:53233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKj-00032n-0F for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:03 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:44948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKh-00032L-8U for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:23:59 -0400 Received: by mail-qk1-f179.google.com with SMTP id x11so42878qkp.11 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:23:59 -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=zKAKBmu8SpR75faE/aCuPYcRitQMKgpZWoesJi5jTuQ=; b=p+uccSDBgEQcFf9rr/wFRnxtsX/vrULKoFIY8+X4SpdPOAts++cd4lB+xZjRIXTYSB 5B6EDw8MbnyHyfUPamXq3AduK8mErbT7UtVLgl0XlwZaFS0sDrtjf8HFbEUz7D4OBX4P 3NztNoimGUQOd2t3wIMnegxdue/YeN1rCOlA/xlgVFEmBsSDIx9qxSoHnrKQv2lvv+AR Wntk2NsE2FyOqY/aRswwc8JXIIpGGwpWeBt8zREbP4KKBM/cX97oQ1u/Piv5GnYmWQnN 8hhQJr+bbtOvdGWrgjdM9IatZmX3VUDKIJBYIJrOItihv5gHmJ7ynqotPl/Qg1DxASeN iuOQ== 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=zKAKBmu8SpR75faE/aCuPYcRitQMKgpZWoesJi5jTuQ=; b=tlFz44BDe83qQyITIqfRzfZa80VlGbu4gGyQCUISz0/6tlKKXaoVhHOVx3+dwfnaU7 38Da9y0RSLov5p49bEus5yew6I9m3lFUQBoyMRFHYwdGZf/YNT0p9B600mQbB5kUw+Bj b6Q6nVUtNnVp/9IF9HhrBgR0G7RPCP4IBtWoaw223upk8iDBcGDKm0TOPwXSGfmTnZwu fy/gNntYZCsUCgkCt872pE5ChoCFsgyprHrVW5yKn+uzEyVrWGpixoGEwtxCZu3JSdXq 5bqgveuJjwPsU0t7vOyvyD/I/CaB1MYjlITnDon8zOlBa2TH2WdOyjBif3OSz+gbn2ta Tl4Q== X-Gm-Message-State: AOAM531/ZvWBTvjV/XMUCKp5ek9LY6C6P0M+pVeeexTeUmh8pFFv3B7E +55Ij+P3HchaYoV5Y7ZRastLVEktpfA= X-Google-Smtp-Source: ABdhPJyoIJLVJVSO+wy+4nLB/kkO9GZYbF8AYzMaXBp9XYXLoeDCss2w70t5eZljUGfr3TNyKO1T3A== X-Received: by 2002:a05:620a:108f:: with SMTP id g15mr1640250qkk.298.1617168233606; Tue, 30 Mar 2021 22:23:53 -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:53 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:38 -0400 Message-Id: <20210331052348.5164-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> 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 (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 fe2499815b..ff0ccc95fc 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