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

[GNU bug Tracking System]

Your message dated Thu, 15 Jul 2021 21:44:26 -0400
with message-id <875yxbnibp.fsf@gmail.com>
and subject line Re: bug#49497: [PATCH] gnu: libolm: Unbundle unused blob.
has caused the debbugs.gnu.org bug report #49497,
regarding [PATCH] gnu: libolm: Unbundle unused blob.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
49497: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=49497
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems

--- Begin Message --- Subject: [PATCH] gnu: libolm: Unbundle unused blob. Date: Fri, 09 Jul 2021 20:44:53 +0200 User-agent: Evolution 3.34.2

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 <maximedevos@telenet.be>
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

signature.asc
Description: This is a digitally signed message part

--- End Message ---

> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#49497: [PATCH] gnu: libolm: Unbundle unused blob.
>
>
>
>
> Date: 
>
> Thu, 15 Jul 2021 21:44:26 -0400
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)
>
>
>
>
> Hello,
>
> Maxime Devos <maximedevos@telenet.be> writes:
>
> >
> > From 686302198208997c170b590b69c2a38a119b55c9 Mon Sep 17 00:00:00 2001
> > From: Maxime Devos <maximedevos@telenet.be>
> > 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
>
>
> --- End Message ---