From patchwork Fri Jul 9 18:44:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 31268 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 DE95827BC81; Fri, 9 Jul 2021 19:46:12 +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_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 7818127BC78 for ; Fri, 9 Jul 2021 19:46:12 +0100 (BST) Received: from localhost ([::1]:38470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1vVr-0000Gu-Di for patchwork@mira.cbaines.net; Fri, 09 Jul 2021 14:46:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1vVi-0000GE-5U for guix-patches@gnu.org; Fri, 09 Jul 2021 14:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48136) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1vVh-0007k7-US for guix-patches@gnu.org; Fri, 09 Jul 2021 14:46:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m1vVh-0008BV-Ne for guix-patches@gnu.org; Fri, 09 Jul 2021 14:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49497] [PATCH] gnu: libolm: Unbundle unused blob. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jul 2021 18:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49497 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49497@debbugs.gnu.org Cc: slg <0x2d@disroot.org> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162585632031409 (code B ref -1); Fri, 09 Jul 2021 18:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jul 2021 18:45:20 +0000 Received: from localhost ([127.0.0.1]:59682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1vV1-0008AX-PP for submit@debbugs.gnu.org; Fri, 09 Jul 2021 14:45:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:53558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1vUx-0008AM-2G for submit@debbugs.gnu.org; Fri, 09 Jul 2021 14:45:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1vUw-0008FQ-H2 for guix-patches@gnu.org; Fri, 09 Jul 2021 14:45:14 -0400 Received: from xavier.telenet-ops.be ([2a02:1800:120:4::f00:14]:48088) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1vUu-0007II-4g for guix-patches@gnu.org; Fri, 09 Jul 2021 14:45:14 -0400 Received: from butterfly.local ([213.119.223.147]) by xavier.telenet-ops.be with bizsmtp id T6l22500G3BRdlx016l350; Fri, 09 Jul 2021 20:45:03 +0200 Message-ID: <846621f26464358f595a8df895c68f9ee7e61175.camel@telenet.be> From: Maxime Devos Date: Fri, 09 Jul 2021 20:44:53 +0200 User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1625856303; bh=dghzbKALWjsegsAQIdNuNhoIyGSpW3iwxjSw9HfIN4M=; h=Subject:From:To:Cc:Date; b=XR26lvF9x1B/OHTggqzxjv+NkwE07br3Idprkqkn3nr59YWTDC/W/Q855w4m1T7Ar ZveGHZlwN2s87iGlWOmNyaO35CqEvEX2yYxsvluVR/Kv+MXj0skQqItGdo95OWkLvw 0ffRbs6VU7QKR7sg740zNMGv6gLp1NDQ3MYHbRNz+FtWz90Hlz1C8MJgj3E8zA71Ey M/BH5fvPFme69ZFlXhHOEJWno+AM4OBr4qgyziwxIjy9NZgXigBhNx00iRh60tNqjA bwZRatLkq7r9wtr6hehkD7FD82WptWBihI0UO+Bz8xlQ9n6zjboOrkgFWvWy+Kb/4C FzpOnyIA8UdLw== Received-SPF: pass client-ip=2a02:1800:120:4::f00:14; envelope-from=maximedevos@telenet.be; helo=xavier.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 Hi guix, In the context of , I'm improving the package definitions of some dependencies of 'mirage'. The git repo of libolm bundles a compiled (!) version of gradle. libolm doesn't have a Java input, so it cannot be used accidentally in Guix, but remove it anyways to be really sure. This causes only two rebuilds, which succeeded on x86_64-linux. Greetings, Maxime. From 686302198208997c170b590b69c2a38a119b55c9 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Fri, 9 Jul 2021 19:58:42 +0200 Subject: [PATCH] gnu: libolm: Unbundle unused blob. The git repo of libolm bundles a compiled (!) version of gradle. libolm doesn't have a Java input, so it cannot be used accidentally in Guix, but remove it anyways to be really sure. * gnu/package/crypto.scm (libolm)[source][snippet]: Delete "gradle-wrapper.jar". It is a bundled compiled (!) version of gradle. --- gnu/packages/crypto.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index bd2c462b96..f502da1af9 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1309,7 +1309,11 @@ Trusted comments are signed, thus verified, before being displayed.") (sha256 (base32 "0bixly6jqpwfx3p37c1qp1j685yg6m429r1nazwh43w4n527bs3y")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + ;; Delete the bundled blob. It's free, but unauditable, + ;; and apparently only required for android. + (snippet #~(delete-file + "android/gradle/wrapper/gradle-wrapper.jar")))) (build-system cmake-build-system) (arguments `(#:phases -- 2.32.0