From unknown Tue Aug 12 07:34:44 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#40996 <40996@debbugs.gnu.org> To: bug#40996 <40996@debbugs.gnu.org> Subject: Status: [PATCH 0/3] Fix usbguard's warning about 'catch'. Reply-To: bug#40996 <40996@debbugs.gnu.org> Date: Tue, 12 Aug 2025 14:34:44 +0000 retitle 40996 [PATCH 0/3] Fix usbguard's warning about 'catch'. reassign 40996 guix-patches submitter 40996 Brice Waegeneire severity 40996 normal tag 40996 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 09:06:31 2020 Received: (at submit) by debbugs.gnu.org; 1 May 2020 13:06:31 +0000 Received: from localhost ([127.0.0.1]:48412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUVN8-0006UW-Op for submit@debbugs.gnu.org; Fri, 01 May 2020 09:06:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:53748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUVMt-0006UB-MP for submit@debbugs.gnu.org; Fri, 01 May 2020 09:06:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42688) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUVMt-00056Z-8U for guix-patches@gnu.org; Fri, 01 May 2020 09:06:15 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUVMr-00033S-01 for guix-patches@gnu.org; Fri, 01 May 2020 09:06:14 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:34945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUVMq-000330-8d for guix-patches@gnu.org; Fri, 01 May 2020 09:06:12 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 8344DE0005 for ; Fri, 1 May 2020 13:06:08 +0000 (UTC) From: Brice Waegeneire To: guix-patches@gnu.org Subject: [PATCH 0/3] Fix usbguard's warning about 'catch'. Date: Fri, 1 May 2020 15:06:04 +0200 Message-Id: <20200501130604.4180-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.196; envelope-from=brice@waegenei.re; helo=relay4-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/01 09:06:09 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Received-From: 217.70.183.196 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) 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 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 09:09:45 2020 Received: (at 40996) by debbugs.gnu.org; 1 May 2020 13:09:46 +0000 Received: from localhost ([127.0.0.1]:48424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUVQH-0006Zm-LB for submit@debbugs.gnu.org; Fri, 01 May 2020 09:09:45 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:55893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUVQF-0006ZQ-31 for 40996@debbugs.gnu.org; Fri, 01 May 2020 09:09:43 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 96E991C0002 for <40996@debbugs.gnu.org>; Fri, 1 May 2020 13:09:36 +0000 (UTC) From: Brice Waegeneire To: 40996@debbugs.gnu.org Subject: [PATCH 1/3] gnu: Add pegtl. Date: Fri, 1 May 2020 15:09:28 +0200 Message-Id: <20200501130930.5888-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/cpp.scm (pegtl): New variable. --- gnu/packages/cpp.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 2248ebfc4b..cdc1c0e0f4 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Nicolò Balzaro [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.197 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] X-Debbugs-Envelope-To: 40996 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) * gnu/packages/cpp.scm (pegtl): New variable. --- gnu/packages/cpp.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 2248ebfc4b..cdc1c0e0f4 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -485,3 +486,24 @@ point and then, after each tween step, plugging back the result.") augment the C++ standard library. The Abseil library code is collected from Google's C++ code base.") (license license:asl2.0))) + +(define-public pegtl + (package + (name "pegtl") + (version "2.8.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/taocpp/PEGTL.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17crgjfdx55imi2dqnz6xpvsxq07390yfgkz5nd2g77ydkvq9db3")))) + (build-system cmake-build-system) + (home-page "https://github.com/taocpp/PEGTL") + (synopsis "Parsing Expression Grammar Template Library") + (description "The Parsing Expression Grammar Template Library (PEGTL) is +a zero-dependency C++ header-only parser combinator library for creating +parsers according to a Parsing Expression Grammar (PEG).") + (license license:expat))) -- 2.26.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 09:09:46 2020 Received: (at 40996) by debbugs.gnu.org; 1 May 2020 13:09:46 +0000 Received: from localhost ([127.0.0.1]:48426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUVQH-0006Zo-Tg for submit@debbugs.gnu.org; Fri, 01 May 2020 09:09:46 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:50635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUVQG-0006ZS-F9 for 40996@debbugs.gnu.org; Fri, 01 May 2020 09:09:45 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id D84A61BF203 for <40996@debbugs.gnu.org>; Fri, 1 May 2020 13:09:37 +0000 (UTC) From: Brice Waegeneire To: 40996@debbugs.gnu.org Subject: [PATCH 2/3] gnu: usbguard: Use packaged 'pegtl'. Date: Fri, 1 May 2020 15:09:29 +0200 Message-Id: <20200501130930.5888-2-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200501130930.5888-1-brice@waegenei.re> References: <20200501130930.5888-1-brice@waegenei.re> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40996 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/hardware.scm (usbguard)[arguments]: Remove configure flag '--with-bundled-pegtl'. [inputs]: Add 'pegtl' --- gnu/packages/hardware.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index ce3f396d0a..74fd282191 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -24,6 +24,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages check) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) @@ -429,7 +430,6 @@ applications.") #:configure-flags (list "--localstatedir=/var" - "--with-bundled-pegtl" "--enable-systemd=no" "--with-ldap" "--with-dbus" @@ -442,6 +442,7 @@ applications.") ("libcap-ng" ,libcap-ng) ("libseccomp" ,libseccomp) ("libsodium" ,libsodium) + ("pegtl" ,pegtl) ("polkit" ,polkit) ("protobuf" ,protobuf) ("libqb" ,libqb))) -- 2.26.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 09:09:51 2020 Received: (at 40996) by debbugs.gnu.org; 1 May 2020 13:09:51 +0000 Received: from localhost ([127.0.0.1]:48428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUVQL-0006a9-3Z for submit@debbugs.gnu.org; Fri, 01 May 2020 09:09:51 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:49573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUVQG-0006ZU-F9 for 40996@debbugs.gnu.org; Fri, 01 May 2020 09:09:47 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id BC7631C0008 for <40996@debbugs.gnu.org>; Fri, 1 May 2020 13:09:38 +0000 (UTC) From: Brice Waegeneire To: 40996@debbugs.gnu.org Subject: [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'. Date: Fri, 1 May 2020 15:09:30 +0200 Message-Id: <20200501130930.5888-3-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200501130930.5888-1-brice@waegenei.re> References: <20200501130930.5888-1-brice@waegenei.re> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40996 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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'. --- gnu/packages/hardware.scm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 74fd282191..de4f82e105 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -389,21 +389,26 @@ applications.") (name "usbguard") (version "0.7.6") (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) + (uri (git-reference + (url "https://github.com/USBGuard/usbguard.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x8pvlfy3b87iqxh2bjzjd4w26fllwd25c4haz9rqkrvrl27nx38")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'configure 'patch-makefile - (lambda _ + (add-after 'unpack 'patch-build-scripts + (lambda* (#:key inputs #:allow-other-keys) + (delete-file "autogen.sh") ; Want network access + (substitute* "configure.ac" + (("/usr/include/catch") + (string-append (assoc-ref inputs "catch") "/include"))) ;; Do not create log directory. - (substitute* "Makefile" ((".*/log/usbguard.*") "")) + (substitute* "Makefile.am" ((".*/log/usbguard.*") "")) ;; Disable LDAP tests: they use 'sudo'. (substitute* "src/Tests/Makefile.am" (("WITH_LDAP") "FALSE")) @@ -452,6 +457,7 @@ applications.") ("automake" ,automake) ("bash-completion" ,bash-completion) ("gdbus-codegen" ,glib "bin") + ("libtool" ,libtool) ("umockdev" ,umockdev) ("xmllint" ,libxml2) ("xsltproc" ,libxslt) -- 2.26.0 From debbugs-submit-bounces@debbugs.gnu.org Mon May 04 16:13:34 2020 Received: (at 40996) by debbugs.gnu.org; 4 May 2020 20:13:34 +0000 Received: from localhost ([127.0.0.1]:34056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVhT4-0005tS-JP for submit@debbugs.gnu.org; Mon, 04 May 2020 16:13:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVhT2-0005tC-MC for 40996@debbugs.gnu.org; Mon, 04 May 2020 16:13:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39871) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVhSw-00058g-V0; Mon, 04 May 2020 16:13:26 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=54784 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jVhSw-0007QT-FI; Mon, 04 May 2020 16:13:26 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Brice Waegeneire Subject: Re: [bug#40996] [PATCH 1/3] gnu: Add pegtl. References: <20200501130604.4180-1-brice@waegenei.re> <20200501130930.5888-1-brice@waegenei.re> Date: Mon, 04 May 2020 22:13:25 +0200 In-Reply-To: <20200501130930.5888-1-brice@waegenei.re> (Brice Waegeneire's message of "Fri, 1 May 2020 15:09:28 +0200") Message-ID: <87zhanpifu.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-Debbugs-Envelope-To: 40996 Cc: 40996@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Brice Waegeneire skribis: > * gnu/packages/cpp.scm (pegtl): New variable. [...] > +(define-public pegtl > + (package ^ Indentation is off. > + (synopsis "Parsing Expression Grammar Template Library") I=E2=80=99d remove at least the capital T and L. :-) Otherwise LGTM! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon May 04 16:13:49 2020 Received: (at 40996) by debbugs.gnu.org; 4 May 2020 20:13:49 +0000 Received: from localhost ([127.0.0.1]:34061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVhTJ-0005u2-7R for submit@debbugs.gnu.org; Mon, 04 May 2020 16:13:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVhTI-0005tp-C3 for 40996@debbugs.gnu.org; Mon, 04 May 2020 16:13:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39878) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVhTD-0005V7-6H; Mon, 04 May 2020 16:13:43 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=54786 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jVhTC-0007Ti-Jl; Mon, 04 May 2020 16:13:42 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Brice Waegeneire Subject: Re: [bug#40996] [PATCH 2/3] gnu: usbguard: Use packaged 'pegtl'. References: <20200501130930.5888-1-brice@waegenei.re> <20200501130930.5888-2-brice@waegenei.re> Date: Mon, 04 May 2020 22:13:41 +0200 In-Reply-To: <20200501130930.5888-2-brice@waegenei.re> (Brice Waegeneire's message of "Fri, 1 May 2020 15:09:29 +0200") Message-ID: <87v9lbpife.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 40996 Cc: 40996@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Brice Waegeneire skribis: > * gnu/packages/hardware.scm (usbguard)[arguments]: Remove configure flag > '--with-bundled-pegtl'. > [inputs]: Add 'pegtl' LGTM! From debbugs-submit-bounces@debbugs.gnu.org Mon May 04 16:17:38 2020 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: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Brice Waegeneire Subject: Re: [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'. 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-Debbugs-Envelope-To: 40996 Cc: 40996@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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. From debbugs-submit-bounces@debbugs.gnu.org Thu May 07 05:33:16 2020 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 To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Subject: Re: [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'. 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-Debbugs-Envelope-To: 40996-done Cc: 40996-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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 From unknown Tue Aug 12 07:34:44 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 04 Jun 2020 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator