From patchwork Tue Feb 23 23:18:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 27225 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 7B90F27BC4B; Tue, 23 Feb 2021 23:19:26 +0000 (GMT) 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_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,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 8C39827BC4A for ; Tue, 23 Feb 2021 23:19:25 +0000 (GMT) Received: from localhost ([::1]:55478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEgxg-0003My-Px for patchwork@mira.cbaines.net; Tue, 23 Feb 2021 18:19:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEgxK-0003MJ-NI for guix-patches@gnu.org; Tue, 23 Feb 2021 18:19:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49364) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEgxK-0004rW-GH for guix-patches@gnu.org; Tue, 23 Feb 2021 18:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lEgxK-0003gC-Bu for guix-patches@gnu.org; Tue, 23 Feb 2021 18:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46728] [PATCH 5/7] gnu: Add aws-c-io. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Feb 2021 23:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46728 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46728@debbugs.gnu.org Received: via spool by 46728-submit@debbugs.gnu.org id=B46728.161412231414111 (code B ref 46728); Tue, 23 Feb 2021 23:19:02 +0000 Received: (at 46728) by debbugs.gnu.org; 23 Feb 2021 23:18:34 +0000 Received: from localhost ([127.0.0.1]:60910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEgwr-0003fX-Q7 for submit@debbugs.gnu.org; Tue, 23 Feb 2021 18:18:34 -0500 Received: from mail-io1-f41.google.com ([209.85.166.41]:33438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEgwp-0003fG-F5 for 46728@debbugs.gnu.org; Tue, 23 Feb 2021 18:18:32 -0500 Received: by mail-io1-f41.google.com with SMTP id 74so76660iob.0 for <46728@debbugs.gnu.org>; Tue, 23 Feb 2021 15:18:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=CAC5JLQzz17z2CTx/xwhA9qXpG03wdKR6VS7wxiJsPE=; b=f1BQdWjBJc891qoKA/M12YM38BeEiV1cLJ3mDkXh2BhCJtP9V77zoUnFv76QgCNa7H pEiaEvwfHfRIb+kl74Q1Plbnu7x6QMXKT2ZaN98y5pU9mg1HIKt16EFV+i3UT5zg7nGK 4GIlxS9bVsO15JVnk4tHRMf4mHWp4OIPWRBphlQJyamehn1DAk7q6eV8o3M0tI++tz6b 4jQIfYTpEoAH45m5gG8ds6d0q5q4EnnrknRyemeNohulDjMHUdD2jegmpF1JQT8MUk70 CDbVsMCnqlWKbkva1uaKAzbNmXgaIhGAhCwM82honLtp5pR4/wT4TE9xHvPsiqDpjaFG CobQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=CAC5JLQzz17z2CTx/xwhA9qXpG03wdKR6VS7wxiJsPE=; b=ROTXTiqcqW09qd1y82q/h86dSOXputq7hKgVj+brC+wbq0UkdqASIRTgBuBrj8+2xk kmg9OEZMpf45vMnibh8+T/KiSBYy9c5pqylAtUHmx4BZ5WSJa2lXBbABvV6ew1Atsww3 cviAZpjQQ7UzimWeJHegg9p1T0sfCOcB/GHktojuLNG2jVmRzZnqwHZ6JIjACJRzIVzd GoV3T+DWVsxNXhOJOBZj/SmOe6QlgxNo74ruzPVCJeO58nurqsBO7C6aUm41BEmretVq 4oKw+1PdoxF0RpOW7DVbsPDEhD4PY1TEGeEpvi/UzXbpGYkuDxO/iCxA85u8Z6G5k9eF jP2Q== X-Gm-Message-State: AOAM531WaxDjWPkEyt3bzmYMvM98I4SmPrAMY9Dk/NiTjgD0Oa8TO2FK dMaNJ3It4SWK/mTZQycATtgnKn7n6/Csd29ZZBE5UqsneQYCD3pz X-Google-Smtp-Source: ABdhPJyGQSaFTtYGWHITfvE1kCZlyKWPfELVXiRIqkZA2t0nMKLXHeJr+fx9TgMNr4t8Y6qR8lGtBabJgv4ZZBSf23Q= X-Received: by 2002:a5e:870d:: with SMTP id y13mr21424656ioj.60.1614122305691; Tue, 23 Feb 2021 15:18:25 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Greg Hogan Date: Tue, 23 Feb 2021 18:18:14 -0500 Message-ID: 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 From 822ab358fdf54c3795894d062913abd533d546d9 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 19 Jan 2021 12:53:18 +0000 Subject: [PATCH 5/7] gnu: Add aws-c-io. * gnu/packages/c.scm (aws-c-io): New variable. * gnu/packages/patches/aws-c-io-cmake-prefix.patch, gnu/packages/patches/aws-c-io-disable-networking-tests.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 2 + gnu/packages/c.scm | 28 +++++++ .../patches/aws-c-io-cmake-prefix.patch | 13 +++ .../aws-c-io-disable-networking-tests.patch | 81 +++++++++++++++++++ 4 files changed, 124 insertions(+) create mode 100644 gnu/packages/patches/aws-c-io-cmake-prefix.patch create mode 100644 gnu/packages/patches/aws-c-io-disable-networking-tests.patch -- 2.30.1 diff --git a/gnu/local.mk b/gnu/local.mk index f16c1ae240..7f176b96f8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -832,6 +832,8 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-cal-cmake-prefix.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ + %D%/packages/patches/aws-c-io-cmake-prefix.patch \ + %D%/packages/patches/aws-c-io-disable-networking-tests.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 48230b41c3..63b9d5dc27 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -616,6 +616,34 @@ communication.") (home-page "https://github.com/awslabs/aws-c-event-stream") (license license:asl2.0))) +(define-public aws-c-io + (package + (name "aws-c-io") + (version "0.9.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/awslabs/" name)) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i1i88fb8cazrbx3cy5vn1a09zlx6kdk3rr3m7s7165b6drix8bm")) + (patches + (search-patches + "aws-c-io-cmake-prefix.patch" + "aws-c-io-disable-networking-tests.patch")))) + (build-system cmake-build-system) + (propagated-inputs + `(("aws-c-cal" ,aws-c-cal) + ("aws-c-common" ,aws-c-common) + ("s2n" ,s2n))) + (synopsis "Event driven framework for implementing application protocols") + (description "This library provides a C99 framework for constructing +event-driven, asynchronous network application protocols.") + (home-page "https://github.com/awslabs/aws-c-io") + (license license:asl2.0))) + (define-public aws-c-cal (package (name "aws-c-cal") diff --git a/gnu/packages/patches/aws-c-io-cmake-prefix.patch b/gnu/packages/patches/aws-c-io-cmake-prefix.patch new file mode 100644 index 0000000000..da3e4eb4a5 --- /dev/null +++ b/gnu/packages/patches/aws-c-io-cmake-prefix.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,10 @@ if (POLICY CMP0069) + cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags + endif() + ++if (DEFINED ENV{CMAKE_PREFIX_PATH}) ++ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) ++endif() ++ + if (DEFINED CMAKE_PREFIX_PATH) + file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) + endif() diff --git a/gnu/packages/patches/aws-c-io-disable-networking-tests.patch b/gnu/packages/patches/aws-c-io-disable-networking-tests.patch new file mode 100644 index 0000000000..77f5f658fd --- /dev/null +++ b/gnu/packages/patches/aws-c-io-disable-networking-tests.patch @@ -0,0 +1,81 @@ +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -52,8 +52,8 @@ add_test_case(local_socket_communication) + add_net_test_case(tcp_socket_communication) + add_net_test_case(udp_socket_communication) + add_test_case(udp_bind_connect_communication) +-add_net_test_case(connect_timeout) +-add_net_test_case(connect_timeout_cancelation) ++#add_net_test_case(connect_timeout) ++#add_net_test_case(connect_timeout_cancelation) + if (USE_VSOCK) + add_test_case(vsock_loopback_socket_communication) + endif () +@@ -64,7 +64,7 @@ add_test_case(incoming_tcp_sock_errors) + add_test_case(incoming_duplicate_tcp_bind_errors) + add_test_case(incoming_udp_sock_errors) + add_test_case(wrong_thread_read_write_fails) +-add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode) ++#add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode) + add_test_case(cleanup_in_accept_doesnt_explode) + add_test_case(cleanup_in_write_cb_doesnt_explode) + +@@ -80,21 +80,21 @@ add_test_case(channel_tasks_run) + add_test_case(channel_rejects_post_shutdown_tasks) + add_test_case(channel_cancels_pending_tasks) + add_test_case(channel_duplicate_shutdown) +-add_net_test_case(channel_connect_some_hosts_timeout) ++#add_net_test_case(channel_connect_some_hosts_timeout) + +-add_net_test_case(test_default_with_ipv6_lookup) ++#add_net_test_case(test_default_with_ipv6_lookup) + add_test_case(test_resolver_ipv6_address_lookup) +-add_net_test_case(test_default_with_multiple_lookups) ++#add_net_test_case(test_default_with_multiple_lookups) + add_test_case(test_resolver_ipv4_address_lookup) +-add_net_test_case(test_default_with_ipv4_only_lookup) ++#add_net_test_case(test_default_with_ipv4_only_lookup) + add_test_case(test_resolver_ttls) + add_test_case(test_resolver_connect_failure_recording) + add_test_case(test_resolver_ttl_refreshes_on_resolve) + + add_net_test_case(test_resolver_listener_create_destroy) +-add_net_test_case(test_resolver_add_listener_before_host) +-add_net_test_case(test_resolver_add_listener_after_host) +-add_net_test_case(test_resolver_add_multiple_listeners_fn) ++#add_net_test_case(test_resolver_add_listener_before_host) ++#add_net_test_case(test_resolver_add_listener_after_host) ++#add_net_test_case(test_resolver_add_multiple_listeners_fn) + add_net_test_case(test_resolver_listener_host_re_add_fn) + add_net_test_case(test_resolver_listener_multiple_results) + add_net_test_case(test_resolver_listener_address_expired_fn) +@@ -116,20 +116,20 @@ add_test_case(socket_handler_echo_and_backpressure) + add_test_case(socket_handler_close) + + add_test_case(tls_channel_echo_and_backpressure_test) +-add_net_test_case(tls_client_channel_negotiation_error_expired) +-add_net_test_case(tls_client_channel_negotiation_error_wrong_host) +-add_net_test_case(tls_client_channel_negotiation_error_self_signed) +-add_net_test_case(tls_client_channel_negotiation_error_untrusted_root) ++#add_net_test_case(tls_client_channel_negotiation_error_expired) ++#add_net_test_case(tls_client_channel_negotiation_error_wrong_host) ++#add_net_test_case(tls_client_channel_negotiation_error_self_signed) ++#add_net_test_case(tls_client_channel_negotiation_error_untrusted_root) + #track these down in s2n and find out why that aren't failing. + #add_net_test_case(tls_client_channel_negotiation_error_revoked) + #add_net_test_case(tls_client_channel_negotiation_error_pinning) +-add_net_test_case(tls_client_channel_negotiation_error_socket_closed) +-add_net_test_case(tls_client_channel_negotiation_success) +-add_net_test_case(tls_client_channel_negotiation_success_ecc256) +-add_net_test_case(tls_client_channel_negotiation_success_ecc384) ++#add_net_test_case(tls_client_channel_negotiation_error_socket_closed) ++#add_net_test_case(tls_client_channel_negotiation_success) ++#add_net_test_case(tls_client_channel_negotiation_success_ecc256) ++#add_net_test_case(tls_client_channel_negotiation_success_ecc384) + add_net_test_case(tls_server_multiple_connections) + add_net_test_case(tls_server_hangup_during_negotiation) +-add_net_test_case(tls_client_channel_no_verify) ++#add_net_test_case(tls_client_channel_no_verify) + add_net_test_case(test_tls_negotiation_timeout) + add_test_case(tls_destroy_null_context) +