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 fmmeN3V4sF6MfwAA0tVLHw (envelope-from ) for ; Mon, 04 May 2020 20:17:57 +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 mPO0CoF4sF5PMAAAbx9fmQ (envelope-from ) for ; Mon, 04 May 2020 20:18:09 +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 E05EE9434CC for ; Mon, 4 May 2020 20:18:06 +0000 (UTC) Received: from localhost ([::1]:60270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVhXT-0004Gp-0O for larch@yhetil.org; Mon, 04 May 2020 16:18:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVhXO-0004Gc-1w for guix-patches@gnu.org; Mon, 04 May 2020 16:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50755) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVhXN-0006Tr-Ot for guix-patches@gnu.org; Mon, 04 May 2020 16:18:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jVhXN-00061G-Iy for guix-patches@gnu.org; Mon, 04 May 2020 16:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 May 2020 20:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40996 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Cc: 40996@debbugs.gnu.org Received: via spool by 40996-submit@debbugs.gnu.org id=B40996.158862345823102 (code B ref 40996); Mon, 04 May 2020 20:18:01 +0000 Received: (at 40996) by debbugs.gnu.org; 4 May 2020 20:17:38 +0000 Received: from localhost ([127.0.0.1]:34068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVhWy-00060T-Ln for submit@debbugs.gnu.org; Mon, 04 May 2020 16:17:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVhWt-00060C-Tg for 40996@debbugs.gnu.org; Mon, 04 May 2020 16:17:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39973) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVhWo-0006JG-NH; Mon, 04 May 2020 16:17:26 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=54788 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jVhWo-0007nE-B1; Mon, 04 May 2020 16:17:26 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200501130930.5888-1-brice@waegenei.re> <20200501130930.5888-3-brice@waegenei.re> Date: Mon, 04 May 2020 22:17:24 +0200 In-Reply-To: <20200501130930.5888-3-brice@waegenei.re> (Brice Waegeneire's message of "Fri, 1 May 2020 15:09:30 +0200") Message-ID: <87pnbjpi97.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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.49497088778277]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.13), country: US(-0.00), ip: 2001:470:142::17(-0.49)]; 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_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)[ludo@gnu.org,guix-patches-bounces@gnu.org]; FROM_HAS_DN(0.00)[]; URIBL_BLOCKED(0.00)[waegenei.re:email]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[gnu.org]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; RCVD_COUNT_SEVEN(0.00)[9]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: 5Du7cPXIzFeB 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/downl= oad/usbguard-" > - version "/usbguard-" version ".tar.gz")) > - (file-name (git-file-name name version)) > - (sha256 > - (base32 "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fix= ad3j")))) > + (method git-fetch) In this particular case, perhaps you can keep using the tarball, and then= =E2=80=A6 [...] > + (delete-file "autogen.sh") ; Want network access > + (substitute* "configure.ac" > + (("/usr/include/catch") > + (string-append (assoc-ref inputs "catch") "/include"))) =E2=80=A6 modify =E2=80=98configure=E2=80=99 directly, since it=E2=80=99s a= simple and unambiguous change. That avoids the extra autotools dependencies (actually Autoconf and Automake were unnecessary before, no?). Anyway, one way or another, it=E2=80=99s a worthy change, so go for it! Ludo=E2=80=99.