From patchwork Thu Apr 28 15:59:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 38984 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 42B5427BBEA; Thu, 28 Apr 2022 17:01:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HTML_MESSAGE,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1543F27BBE9 for ; Thu, 28 Apr 2022 17:01:51 +0100 (BST) Received: from localhost ([::1]:55034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nk6aU-00083m-1H for patchwork@mira.cbaines.net; Thu, 28 Apr 2022 12:01:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nk6Yl-00082L-Jl for guix-patches@gnu.org; Thu, 28 Apr 2022 12:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nk6Yl-00041N-9v for guix-patches@gnu.org; Thu, 28 Apr 2022 12:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nk6Yl-0005k6-7y for guix-patches@gnu.org; Thu, 28 Apr 2022 12:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55168] [PATCH 0/15] Fix aws-lc checksum and use with aws-sdk-cpp. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Apr 2022 16:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55168 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55168@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165116156321976 (code B ref -1); Thu, 28 Apr 2022 16:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2022 15:59:23 +0000 Received: from localhost ([127.0.0.1]:49689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nk6Y3-0005iK-1R for submit@debbugs.gnu.org; Thu, 28 Apr 2022 11:59:23 -0400 Received: from lists.gnu.org ([209.51.188.17]:34448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nk6Y1-0005iB-Ak for submit@debbugs.gnu.org; Thu, 28 Apr 2022 11:59:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nk6Y1-000727-1a for guix-patches@gnu.org; Thu, 28 Apr 2022 11:59:17 -0400 Received: from mail-yb1-xb2f.google.com ([2607:f8b0:4864:20::b2f]:39790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nk6Xx-0003ro-RP for guix-patches@gnu.org; Thu, 28 Apr 2022 11:59:16 -0400 Received: by mail-yb1-xb2f.google.com with SMTP id r189so9827057ybr.6 for ; Thu, 28 Apr 2022 08:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=l3aYvweNi1L6YuhG/cKQKyBCBrbhUUtjcQbupZ1vYOg=; b=bYQdJn7ClNif4VflnNLn7Aknw3HHfTyFEjGrZ8jPg2Y7yjuTtj8Stj3+XdweMFoINj Fbn+QTJsaFCWLmx8v2YbwFIjecNPdMTPDaEXHWYdzR+qrRhp7m9KgHXGTHDl48VPptYr a7rheZHwj1j48ZhIFSiZc41pY5jKmiG9kPO+0fnCLk+dbcgE1yDZXYPWE8L7r6/c2nCF cbcPWPC7BWByUgiIFXnfyH6EchtVFp1paXgM0OaahKbXPGc8+IW9ZIxezYQlxDisDsit 1t/dfnEkn8FpBXr4dzy9REaBB6glSYGaae50WCPWLKxlTDbJ/ls4zPfuljJDd/5CUF7O mvGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=l3aYvweNi1L6YuhG/cKQKyBCBrbhUUtjcQbupZ1vYOg=; b=7wvlm/JVbx73J6O62DM9mizVm5HRkHxNvxgbfZZ5HuqeN3qfmk0WPbS1IkicM+EmOr Eh8qThTAdbYwoU7w08z3E4SbnKPA7P0F/ErXguq60Cn2bJtcfRHTDrpAltRsvzv5laI5 GiN+8b4BqISSZ/3eNpFSVVR1tG+q9law337iWoWK63j3VEBAHYXQRt59UcE74fQWcvcU v2sOiAH+GXJzjUIuOQupcnixnBlmUSQfuNOA6/aq4tresaekYHEkyjiHwpHZVQbBhh65 /vw3z7bU4SfjGGTjk0tLKTBgwd6l2jjNwrDa8k6FLXHru8JNj0bnQtXPxw+YoiGoaAkN Slpg== X-Gm-Message-State: AOAM531+tMERVpurg+pF2hbrRVWBQV8DYI4wE7IDWuL9qOmIlLHObajh EGlL+I8nV95rWmSDsW+uLk7NnqemYcWY3qCuz1REaRu7C/GSk64L X-Google-Smtp-Source: ABdhPJzJLLmwpZhjXZmdav+CjElYT/7b64cWwidStt8HeFsT05SRY1R2v5gk2haDnF/GP1yu0pX6eTIJFCwBS17MjuU= X-Received: by 2002:a25:8304:0:b0:648:87ef:d504 with SMTP id s4-20020a258304000000b0064887efd504mr17933993ybk.27.1651161552121; Thu, 28 Apr 2022 08:59:12 -0700 (PDT) MIME-Version: 1.0 From: Greg Hogan Date: Thu, 28 Apr 2022 11:59:00 -0400 Message-ID: Received-SPF: none client-ip=2607:f8b0:4864:20::b2f; envelope-from=code@greghogan.com; helo=mail-yb1-xb2f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 I happened to notice the broken build for aws-lc when exploring the dashboard at ci.guix.gnu.org. In my last patchset I had updated aws-lc to the proper version but failed to update the checksum since it was not built as a dependency of aws-sdk-cpp. These patches replace openssl with aws-lc as the default dependency of s2n, making aws-lc a transitive dependency of aws-sdk-cpp. I have tested with the following builds: ./pre-inst-env guix build aws-sdk-cpp ./pre-inst-env guix build --with-input=aws-lc=libressl aws-sdk-cpp ./pre-inst-env guix build --with-input=aws-lc=openssl@1.1.1l aws-sdk-cpp aws-c-common is now marked as supported only for i686-linux and x86_64-linux, and s2n as supported only for x86_64-linux, as various tests are failing or timing out on other systems. Greg From ba8787cbad254edb933bd40d2d23a0175921555c Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 22 Apr 2022 17:28:17 +0000 Subject: [PATCH 14/15] gnu: s2n: Link to aws-lc as libcrypto dependency. * gnu/packages/tls.scm (s2n): [arguments]: Fix for openssl as replacement input for aws-lc. [propagated-inputs]: Add aws-lc and remove openssl. [supported-systems]: Only support x86_64-linux. --- gnu/packages/tls.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 54921fdc86..84ed0caa5d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1130,7 +1130,7 @@ (define-public go-github-com-certifi-gocertifi (define-public s2n (package (name "s2n") - ; Update only when updating aws-crt-cpp. + ;; Update only when updating aws-crt-cpp. (version "1.3.10") (source (origin (method git-fetch) @@ -1144,10 +1144,13 @@ (define-public s2n (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) - (propagated-inputs - `(("openssl" ,openssl) - ("openssl:static" ,openssl "static"))) + '("-DBUILD_SHARED_LIBS=ON" + ;; Remove in next update; see https://github.com/aws/s2n-tls/pull/3108 + ;; Building with 'Werror' results in compilation error (even building + ;; with gcc) when replacing the aws-lc input with openssl. + "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF"))) + (propagated-inputs (list aws-lc)) + (supported-systems '("x86_64-linux")) (synopsis "SSL/TLS implementation in C99") (description "This library provides a C99 implementation of SSL/TLS. It is designed to -- 2.36.0