GNU bug report logs - #40996
[PATCH 0/3] Fix usbguard's warning about 'catch'.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Brice Waegeneire <brice <at> waegenei.re>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#40996: closed ([PATCH 0/3] Fix usbguard's warning about 'catch'.)
Date: Thu, 07 May 2020 09:34:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Thu, 07 May 2020 09:33:04 +0000
with message-id <c31533f70cda131c8fb895a810a562b0 <at> waegenei.re>
and subject line Re: [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'.
has caused the debbugs.gnu.org bug report #40996,
regarding [PATCH 0/3] Fix usbguard's warning about 'catch'.
to be marked as done.

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


-- 
40996: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=40996
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Brice Waegeneire <brice <at> waegenei.re>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/3] Fix usbguard's warning about 'catch'.
Date: Fri,  1 May 2020 15:06:04 +0200

This patch fix the issue in usbguard reported by Ludo[0] about warnings from
'catch' using a wrong include path, usguard now use a packaged 'pegtl'
dependency instead of the bundled one.

[0]: https://issues.guix.info/issue/40607#11

Brice Waegeneire (3):
  gnu: Add pegtl.
  gnu: usbguard: Use packaged 'pegtl'.
  gnu: usbguard: Fix warning about 'catch'.

 gnu/packages/cpp.scm      | 22 ++++++++++++++++++++++
 gnu/packages/hardware.scm | 29 ++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 11 deletions(-)

-- 
2.26.0

[Message part 3 (message/rfc822, inline)]

From: Brice Waegeneire <brice <at> waegenei.re>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 40996-done <at> debbugs.gnu.org
Subject: Re: [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'.
Date: Thu, 07 May 2020 09:33:04 +0000

On 2020-05-04 20:17, Ludovic Courtès wrote:
> Brice Waegeneire <brice <at> waegenei.re> skribis:
> 
>> * gnu/packages/hardware.scm (usgbuard)[source]: Get it from git.
>> [arguments]: Rename phase 'patch-makefile' to 'patch-build-scripts',
>> adjust it for the source from git and fix 'catch' path.
>> [native-inputs]: Add 'libtool'.
> 
> [...]
> 
>>      (source (origin
>> -              (method url-fetch)
>> -              (uri (string-append
>> -                    
>> "https://github.com/USBGuard/usbguard/releases/download/usbguard-"
>> -                    version "/usbguard-" version ".tar.gz"))
>> -              (file-name (git-file-name name version))
>> -              (sha256
>> -               (base32 
>> "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j"))))
>> +               (method git-fetch)
> 
> In this particular case, perhaps you can keep using the tarball, and 
> then…

This part has been dropped.

> [...]
> 
>> +             (delete-file "autogen.sh") ; Want network access
>> +             (substitute* "configure.ac"
>> +               (("/usr/include/catch")
>> +                (string-append (assoc-ref inputs "catch") 
>> "/include")))
> 
> … modify ‘configure’ directly, since it’s a simple and unambiguous
> change.  That avoids the extra autotools dependencies (actually 
> Autoconf
> and Automake were unnecessary before, no?).

Autotools dependencies were needed because I was patching Makefile.am 
files,
but it's not the case anymore by modifying Makefile.in instead.

> Anyway, one way or another, it’s a worthy change, so go for it!

Pushed as f96ddb60962703eaae5433399905b9d81a99ea13.

- Brice

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.