From patchwork Fri May 1 13:09:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 21786 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ABD6327BBE4; Fri, 1 May 2020 14:12:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 64F3927BBE1 for ; Fri, 1 May 2020 14:12:41 +0100 (BST) Received: from localhost ([::1]:50632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUVT6-0001CB-SK for patchwork@mira.cbaines.net; Fri, 01 May 2020 09:12:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44918) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUVST-0000zc-HA for guix-patches@gnu.org; Fri, 01 May 2020 09:12:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUVQY-0007Zf-UX for guix-patches@gnu.org; Fri, 01 May 2020 09:12:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUVQY-0007ZE-Hs for guix-patches@gnu.org; Fri, 01 May 2020 09:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUVQY-0006al-Cy for guix-patches@gnu.org; Fri, 01 May 2020 09:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40996] [PATCH 1/3] gnu: Add pegtl. References: <20200501130604.4180-1-brice@waegenei.re> In-Reply-To: <20200501130604.4180-1-brice@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 May 2020 13:10:02 +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: 40996@debbugs.gnu.org Received: via spool by 40996-submit@debbugs.gnu.org id=B40996.158833858625287 (code B ref 40996); Fri, 01 May 2020 13:10:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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))) From patchwork Fri May 1 13:09:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 21787 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0861027BBE1; Fri, 1 May 2020 14:12:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 8F00D27BBE4 for ; Fri, 1 May 2020 14:12:52 +0100 (BST) Received: from localhost ([::1]:51392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUVTI-0001Vq-3V for patchwork@mira.cbaines.net; Fri, 01 May 2020 09:12:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44910) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUVST-0000zb-8t for guix-patches@gnu.org; Fri, 01 May 2020 09:12:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUVQZ-0007Zv-BJ for guix-patches@gnu.org; Fri, 01 May 2020 09:12:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUVQY-0007Zk-Vp for guix-patches@gnu.org; Fri, 01 May 2020 09:10:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUVQY-0006as-QD for guix-patches@gnu.org; Fri, 01 May 2020 09:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40996] [PATCH 2/3] gnu: usbguard: Use packaged 'pegtl'. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 May 2020 13:10:02 +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: 40996@debbugs.gnu.org Received: via spool by 40996-submit@debbugs.gnu.org id=B40996.158833858625294 (code B ref 40996); Fri, 01 May 2020 13:10:02 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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))) From patchwork Fri May 1 13:09:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 21788 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 881C627BBE1; Fri, 1 May 2020 14:14:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id D09E427BBE4 for ; Fri, 1 May 2020 14:14:01 +0100 (BST) Received: from localhost ([::1]:56688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUVUP-0003gr-Dx for patchwork@mira.cbaines.net; Fri, 01 May 2020 09:14:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44986) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUVSc-0000zk-Kx for guix-patches@gnu.org; Fri, 01 May 2020 09:12:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUVQZ-0007a9-On for guix-patches@gnu.org; Fri, 01 May 2020 09:12:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUVQZ-0007a0-Ca for guix-patches@gnu.org; Fri, 01 May 2020 09:10:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUVQZ-0006az-7r for guix-patches@gnu.org; Fri, 01 May 2020 09:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 May 2020 13:10:03 +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: 40996@debbugs.gnu.org Received: via spool by 40996-submit@debbugs.gnu.org id=B40996.158833859125311 (code B ref 40996); Fri, 01 May 2020 13:10:03 +0000 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)