Subject: bug#49497: closed (Re: bug#49497: [PATCH] gnu: libolm: Unbundle unused blob.)

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 16 Jul 2021 01:45:02 +0000

Your bug report

#49497: [PATCH] gnu: libolm: Unbundle unused blob.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
49497: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=49497
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#49497: [PATCH] gnu: libolm: Unbundle unused blob.
From: Maxim Cournoyer <[email-masked]>
To: Maxime Devos <[email-masked]>
Cc: [email-masked], slg <[email-masked]>
Date: Thu, 15 Jul 2021 21:44:26 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello,

Maxime Devos <[email-masked]> writes:

>
> From 686302198208997c170b590b69c2a38a119b55c9 Mon Sep 17 00:00:00 2001
> From: Maxime Devos <[email-masked]>
> 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"))))

I replaced the gexp by a quote, as the extra G-Exp features are not used
here and the import was missing, leading to:

ice-9/eval.scm:293:34: error: gexp: unbound variable
hint: Did you forget `(use-modules (guix gexp))'?

Applied as commit dd98685356.

Thank you!

Maxim

Subject: [PATCH] gnu: libolm: Unbundle unused blob.
From: Maxime Devos <[email-masked]>
To: [email-masked]
Cc: slg <[email-masked]>
Date: Fri, 09 Jul 2021 20:44:53 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi guix,

In the context of <https://issues.guix.gnu.org/49123>,
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 <[email-masked]>
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