From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kK5cAAnWs15kCQAA0tVLHw (envelope-from ) for ; Thu, 07 May 2020 09:34:01 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id mAlwBxXWs14FNQAAbx9fmQ (envelope-from ) for ; Thu, 07 May 2020 09:34:13 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 30E0C940E6F for ; Thu, 7 May 2020 09:34:09 +0000 (UTC) Received: from localhost ([::1]:53866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWcuv-00056D-Ej for larch@yhetil.org; Thu, 07 May 2020 05:34:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcup-00055D-51 for guix-patches@gnu.org; Thu, 07 May 2020 05:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58761) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jWcun-0000qb-RZ for guix-patches@gnu.org; Thu, 07 May 2020 05:34:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jWcun-0004OM-Of for guix-patches@gnu.org; Thu, 07 May 2020 05:34:01 -0400 Subject: bug#40996: [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 07 May 2020 09:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 40996 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 40996-done@debbugs.gnu.org Mail-Followup-To: 40996@debbugs.gnu.org, brice@waegenei.re, brice@waegenei.re Received: via spool by 40996-done@debbugs.gnu.org id=D40996.158884399716815 (code D ref 40996); Thu, 07 May 2020 09:34:01 +0000 Received: (at 40996-done) by debbugs.gnu.org; 7 May 2020 09:33:17 +0000 Received: from localhost ([127.0.0.1]:42072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWcu2-0004N7-N4 for submit@debbugs.gnu.org; Thu, 07 May 2020 05:33:16 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:49809) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWctz-0004Ms-Oo for 40996-done@debbugs.gnu.org; Thu, 07 May 2020 05:33:13 -0400 Received: from webmail.gandi.net (webmail18.sd4.0x35.net [10.200.201.18]) (Authenticated sender: brice@waegenei.re) by relay2-d.mail.gandi.net (Postfix) with ESMTPA id D84BE40002; Thu, 7 May 2020 09:33:04 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Thu, 07 May 2020 09:33:04 +0000 From: Brice Waegeneire In-Reply-To: <87pnbjpi97.fsf@gnu.org> References: <20200501130930.5888-1-brice@waegenei.re> <20200501130930.5888-3-brice@waegenei.re> <87pnbjpi97.fsf@gnu.org> Message-ID: X-Sender: brice@waegenei.re User-Agent: Roundcube Webmail/1.3.8 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: -1.01 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [-1.01 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.4976521073557]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.11), country: US(-0.00), ip: 2001:470:142::17(-0.50)]; DWL_DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; RCPT_COUNT_TWO(0.00)[2]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[larch=yhetil.org]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[brice@waegenei.re,guix-patches-bounces@gnu.org]; FROM_HAS_DN(0.00)[]; URIBL_BLOCKED(0.00)[makefile.am:url,makefile.in:url,waegenei.re:email]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[waegenei.re]; HAS_LIST_UNSUB(-0.01)[]; RCVD_COUNT_SEVEN(0.00)[8]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: 8/uR/9rTVJED On 2020-05-04 20:17, Ludovic Courtès wrote: > Brice Waegeneire 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