From unknown Fri Jun 13 11:07:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 1/4] New package: bird bgp daemon, versions 1 and 2 Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Jun 2021 21:58:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48889@debbugs.gnu.org Cc: Ryan Sundberg X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162301667612737 (code B ref -1); Sun, 06 Jun 2021 21:58:05 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2021 21:57:56 +0000 Received: from localhost ([127.0.0.1]:54083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lq0mJ-0003JM-BQ for submit@debbugs.gnu.org; Sun, 06 Jun 2021 17:57:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:56236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpxst-0002t8-Eb for submit@debbugs.gnu.org; Sun, 06 Jun 2021 14:52:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpxst-0002jz-5v for guix-patches@gnu.org; Sun, 06 Jun 2021 14:52:31 -0400 Received: from mail.arctype.co ([138.68.9.245]:39183) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpxsq-00081t-8u for guix-patches@gnu.org; Sun, 06 Jun 2021 14:52:30 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 7B61011F07C; Sun, 6 Jun 2021 11:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arctype.co; s=mail; t=1623005543; bh=xhQ3qw0PDcRP9yO8WEMW9EvccslGCx7e0/YcYifLI+4=; h=From:To:Cc:Subject:Date:From; b=W7VYCBY+vkyLNOCDm4arp5RKJDGRaRcUabyN+KK05OH8PSBGTIw6BSGOERJN3G6xe uffSQy1puARIfIbB/ftb1Th0gNahRyIB1Yomz+WW2YgWkZP2Ua/SFbwEj0nZ237451 APH+dIo38nA6+SkL80jPEHvjlmKhZa2qqlk5rDQKROz1jQI/TzpvEYW4yYeO3yEUH4 PxjPHIqolTouP1lxCTuRdr2+iWQWe3Jo31PHN62VhBGJzwhyt5GKq9Q48iowa/cgdF bqEkM6ok+aClAWByQqHpJuz+YlOnLF1c3ajmUiYp38XtXTttqMcgNRs7sTL/n5qT3a tnxx6kSKMea/g== From: Ryan Sundberg Date: Sun, 6 Jun 2021 11:52:01 -0700 Message-Id: <20210606185204.17617-1-ryan@arctype.co> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=138.68.9.245; envelope-from=ryan@arctype.co; helo=mail.arctype.co X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Mailman-Approved-At: Sun, 06 Jun 2021 17:57:53 -0400 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.4 (--) Adds the bird BGP daemon to gnu/packages/bird.scm --- gnu/packages/bird.scm | 74 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 gnu/packages/bird.scm diff --git a/gnu/packages/bird.scm b/gnu/packages/bird.scm new file mode 100644 index 0000000000..5fac395906 --- /dev/null +++ b/gnu/packages/bird.scm @@ -0,0 +1,74 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Ryan Sundberg +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages bird) + #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages readline) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix licenses)) + +(define-public bird-1 + (package + (name "bird") + (version "1.6.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.nic.cz/labs/bird.git") + (commit (string-append "v" version)))) + (sha256 (base32 "0vbjp42c2zqmcrqcwm4g4fq1v93l6rlk0c27i0k08f3v07w75cih")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-ipv6") + #:tests? #f + #:phases (modify-phases %standard-phases + ; Fix "cc not found" in tools/mergedirs + (add-after 'bootstrap 'set-cc + (lambda _ + (setenv "CPP" "gcc -E") + #t))))) + (inputs + `(("autoconf" ,autoconf) + ("bison" ,bison) + ("flex" ,flex) + ("ncurses" ,ncurses) + ("readline" ,readline))) + (home-page "http://bird.network.cz/") + (synopsis "BIRD Internet Routing Daemon") + (description "The BIRD project aims to develop a dynamic IP routing daemon with full support of all modern routing protocols, easy to use configuration interface and powerful route filtering language, primarily targeted on (but not limited to) Linux and other UNIX-like systems and distributed under the GNU General Public License.") + (license gpl2+))) + +(define-public bird + (package + (inherit bird-1) + (version "2.0.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.nic.cz/labs/bird.git") + (commit (string-append "v" version)))) + (sha256 (base32 "07mh41hsmkcpf6f6lnygzp6g59jma542pcqdkl54ysiqnjmi5zz1")))) + (arguments + `(#:configure-flags '("--enable-ipv6"))))) -- 2.31.1 From unknown Fri Jun 13 11:07:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 2/4] Ceph: patch rbd to use $PATH lookups for modprobe Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Jun 2021 22:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48889@debbugs.gnu.org Cc: Ryan Sundberg X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162301757314178 (code B ref -1); Sun, 06 Jun 2021 22:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2021 22:12:53 +0000 Received: from localhost ([127.0.0.1]:54100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lq10k-0003gY-RF for submit@debbugs.gnu.org; Sun, 06 Jun 2021 18:12:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:56232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpxst-0002t7-2Q for submit@debbugs.gnu.org; Sun, 06 Jun 2021 14:52:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpxss-0002ju-D9 for guix-patches@gnu.org; Sun, 06 Jun 2021 14:52:30 -0400 Received: from mail.arctype.co ([138.68.9.245]:55384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpxsq-00084g-Bl for guix-patches@gnu.org; Sun, 06 Jun 2021 14:52:30 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 087CD11FB7C; Sun, 6 Jun 2021 11:52:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arctype.co; s=mail; t=1623005547; bh=wdgPSt3GvZQvZ4M72O3bDobFAG/RZbq/LnxQpD1ecQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bLxLviQrb016QiJLNNmDjrz8NDgGQzcqi6lBSsRbPcZu9JxbKE9SIS35N7BuxZUUa p/fvdVK3ckrcuYdvvqs1aUenS8AB4jUJy24QERQtd+1CCAieJmDNv29V9AZ3Qb2z/a rOhlaYAvPYEb6ElIjAVP9n4p7LvkyIv/3s3ameoqBk1SbAPQMd1pou82T+M+ZlOyKi 7jWBTMtKTRSp3S/BEIAbgf/KBqP+RhpWsro9Z2ekuoE0NdCwkbGS0ijqQbWpF16lzN 9+KyoCuttqGD9vB8mAH1/GrdmPzU8ZXB+Wi2y8OI84MMGZ1usAuEhc92Ofoa31R1wz FNo0bi4gRXWZQ== From: Ryan Sundberg Date: Sun, 6 Jun 2021 11:52:02 -0700 Message-Id: <20210606185204.17617-2-ryan@arctype.co> In-Reply-To: <20210606185204.17617-1-ryan@arctype.co> References: <20210606185204.17617-1-ryan@arctype.co> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=138.68.9.245; envelope-from=ryan@arctype.co; helo=mail.arctype.co X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Mailman-Approved-At: Sun, 06 Jun 2021 18:12:49 -0400 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.4 (--) Removes hardcoded paths assumed in /sbin and /bin compiled into the `rbd` tool. Patch originally discussed at https://github.com/ceph/ceph/pull/20938 and rejected by upstream for ambiguous security concerns related to relative paths. --- .../patches/ceph-relative-paths.patch | 22 +++++++++++++++++++ gnu/packages/storage.scm | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ceph-relative-paths.patch diff --git a/gnu/packages/patches/ceph-relative-paths.patch b/gnu/packages/patches/ceph-relative-paths.patch new file mode 100644 index 0000000000..e1b1d3599f --- /dev/null +++ b/gnu/packages/patches/ceph-relative-paths.patch @@ -0,0 +1,22 @@ +diff --git a/src/common/module.c b/src/common/module.c +index f19f74324c..53355b8185 100644 +--- a/src/common/module.c ++++ b/src/common/module.c +@@ -66,7 +66,7 @@ int module_has_param(const char *module, const char *param) + char command[128]; + + snprintf(command, sizeof(command), +- "/sbin/modinfo -F parm %s | /bin/grep -q ^%s:", ++ "modinfo -F parm %s | grep -q ^%s:", + module, param); + + return run_command(command) == 0; +@@ -76,7 +76,7 @@ int module_load(const char *module, const char *options) + { + char command[128]; + +- snprintf(command, sizeof(command), "/sbin/modprobe %s %s", ++ snprintf(command, sizeof(command), "modprobe %s %s", + module, (options ? options : "")); + + return run_command(command); diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index d53327df75..b4f7d5e301 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -64,7 +64,7 @@ (base32 "0lmdri415hqczc9565s5m5568pnj97ipqxgnw6085kps0flwq5zh")) (patches - (search-patches "ceph-disable-cpu-optimizations.patch")) + (search-patches "ceph-disable-cpu-optimizations.patch" "ceph-relative-paths.patch")) (modules '((guix build utils))) (snippet '(begin -- 2.31.1 From unknown Fri Jun 13 11:07:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 4/4] bpftool: new package Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Jun 2021 22:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48889@debbugs.gnu.org Cc: Ryan Sundberg X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162301757414188 (code B ref -1); Sun, 06 Jun 2021 22:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2021 22:12:54 +0000 Received: from localhost ([127.0.0.1]:54102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lq10m-0003gd-Uy for submit@debbugs.gnu.org; Sun, 06 Jun 2021 18:12:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:56240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpxsy-0002tQ-Er for submit@debbugs.gnu.org; Sun, 06 Jun 2021 14:52:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpxsy-0002kC-5s for guix-patches@gnu.org; Sun, 06 Jun 2021 14:52:36 -0400 Received: from mail.arctype.co ([138.68.9.245]:48079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpxsw-0008Bx-LX for guix-patches@gnu.org; Sun, 06 Jun 2021 14:52:35 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 90E5911F07C; Sun, 6 Jun 2021 11:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arctype.co; s=mail; t=1623005553; bh=JmWAd3G/ya4HiHbmoLCzSsE79WHkrJyQaVwDaJ5NeeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EIzij1AGQ8JGOfdDvfuQK5YzaI++41wcOk1ocDkvIbrhmpzIsQ3ZQRq36FGMj4zK0 3jmEnrJ7KYM3guVo7+aNnN9z9Xv3+xhnCh261q9dboT4I0nlevhw/UMzOtjFA+ChTW vQCwwXBfQKX2V8p8guULU7HzG7oDziOJaGw9Wk6buq4mJa9asMJt8naqldr8O3xvfh HtBUAznF7wG2Vry5ZLfSuGZzdHxD11bD3D9IMB1d6AiCkPst57fawNUj+gD4DFaMcx hJPE2sv8N+eDnxrI6FbagjQqu84LIiqycNT27u6z3r6Pd0bIYsKDC/B9xe5kw1Wdz7 tHpJy6U8V/Q7Q== From: Ryan Sundberg Date: Sun, 6 Jun 2021 11:52:04 -0700 Message-Id: <20210606185204.17617-4-ryan@arctype.co> In-Reply-To: <20210606185204.17617-1-ryan@arctype.co> References: <20210606185204.17617-1-ryan@arctype.co> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=138.68.9.245; envelope-from=ryan@arctype.co; helo=mail.arctype.co X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Mailman-Approved-At: Sun, 06 Jun 2021 18:12:49 -0400 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.4 (--) Adds the bpftool package from the Linux kernel source tree. --- gnu/packages/linux.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c8ec310665..06bb344475 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -54,6 +54,7 @@ ;;; Copyright © 2020 David Dashyan ;;; Copyright © 2020 pukkamustard ;;; Copyright © 2021 B. Wilson +;;; Copyright © 2021 Ryan Sundberg ;;; ;;; This file is part of GNU Guix. ;;; @@ -8108,3 +8109,42 @@ Availability and Serviceability} reports from Linux kernel trace events. These trace events are logged in @file{/sys/kernel/debug/tracing} and reported through standard log mechanisms like syslog.") (license license:gpl2))) + +(define-public bpftool + (package + (name "bpftool") + (version (package-version linux-libre)) + (source (package-source linux-libre)) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ (chdir "tools/bpf") #t)) + (delete 'configure) + (replace 'build + (lambda _ (invoke "make" "CC=gcc" "bpftool") #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/sbin")) + (mkdir-p (string-append out "/share/bash-completion/completions")) + (invoke "make" + (string-append "prefix=" out) + (string-append "bash_compdir=" out "/share/bash-completion/completions") + "-C" "bpftool" + "install") + #t)))))) + (inputs + `(("bison" ,bison) + ("python" ,python-3) + ("readline" ,readline))) + (propagated-inputs + `(("libcap" ,libcap) + ("libelf" ,libelf) + ("zlib" ,zlib))) + (home-page (package-home-page linux-libre)) + (synopsis "bpftool is a tool for inspection and simple manipulation of eBPF programs and maps") + (description "*bpftool* allows for inspection and simple modification of BPF objects on the system. Note that format of the output of all tools is not guaranteed to be stable and should not be depended upon.") + (license (package-license linux-libre)))) -- 2.31.1 From unknown Fri Jun 13 11:07:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 3/4] Ceph: upgrade minor version to latest stable release (14.2.21) Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Jun 2021 22:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48889@debbugs.gnu.org Cc: Ryan Sundberg X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162301757514195 (code B ref -1); Sun, 06 Jun 2021 22:13:03 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2021 22:12:55 +0000 Received: from localhost ([127.0.0.1]:54104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lq10o-0003gn-NL for submit@debbugs.gnu.org; Sun, 06 Jun 2021 18:12:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:56278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpxtP-0002uk-ER for submit@debbugs.gnu.org; Sun, 06 Jun 2021 14:53:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpxtP-0002mt-5R for guix-patches@gnu.org; Sun, 06 Jun 2021 14:53:03 -0400 Received: from mail.arctype.co ([138.68.9.245]:59548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpxtN-0008VJ-DZ for guix-patches@gnu.org; Sun, 06 Jun 2021 14:53:02 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 5C5D211FB7C; Sun, 6 Jun 2021 11:52:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arctype.co; s=mail; t=1623005550; bh=H/IDeVMqlAArMHJWV7MDW7DdKsxsb+2H3xrafQ7xheg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gcr5IErPsUd3aiEbQTU0KKlW61W8NKxD2UV+lvXS9pCurorBZFwLJP6X2UndR0/GA joTJvBgI59hWqO9sfA/SZDdqZ/3M86v5ivWppESo6eu7GsT1dhQoxBHl843IUSpdtQ wk/HdYBChlfsl34QKAvffweNOruYgHyCUoWQYoL2yCNUc7LIsYUmdSLaMEQbPn+HDc R1jQSqt/Dj0hAyvndL7qp5vS8eHtw1icQPjO9XQ1oWboBPexc3ssV601IKjoBz8s+J e+2pKKtOoDuh0JpcyUOL2Q75Javc7e8ZLc5PGjdwKW05lRDhGMM/eRGaTlNc+KQ0It 1tdcDAutuiiaQ== From: Ryan Sundberg Date: Sun, 6 Jun 2021 11:52:03 -0700 Message-Id: <20210606185204.17617-3-ryan@arctype.co> In-Reply-To: <20210606185204.17617-1-ryan@arctype.co> References: <20210606185204.17617-1-ryan@arctype.co> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=138.68.9.245; envelope-from=ryan@arctype.co; helo=mail.arctype.co X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Mailman-Approved-At: Sun, 06 Jun 2021 18:12:49 -0400 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.4 (--) --- gnu/packages/storage.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index b4f7d5e301..9e64b9417f 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2021 Ryan Sundberg ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,14 +56,14 @@ (define-public ceph (package (name "ceph") - (version "14.2.16") + (version "14.2.21") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "0lmdri415hqczc9565s5m5568pnj97ipqxgnw6085kps0flwq5zh")) + "1hhdxrmp7a8n00kmx9s4bib84dvfal98x7i9c65p4q6nknlcdvdw")) (patches (search-patches "ceph-disable-cpu-optimizations.patch" "ceph-relative-paths.patch")) (modules '((guix build utils))) @@ -76,7 +77,6 @@ ;"src/zstd" ;"src/civetweb" ;"src/seastar/fmt" - "src/test/downloads" "src/c-ares" "src/googletest" "src/rapidjson" -- 2.31.1 From unknown Fri Jun 13 11:07:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 1/4] New package: bird bgp daemon, versions 1 and 2 Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Jun 2021 09:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ryan Sundberg , 48889@debbugs.gnu.org Received: via spool by 48889-submit@debbugs.gnu.org id=B48889.162305853514057 (code B ref 48889); Mon, 07 Jun 2021 09:36:01 +0000 Received: (at 48889) by debbugs.gnu.org; 7 Jun 2021 09:35:35 +0000 Received: from localhost ([127.0.0.1]:54469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqBfT-0003ef-4x for submit@debbugs.gnu.org; Mon, 07 Jun 2021 05:35:35 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:49776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqBfO-0003eT-CN for 48889@debbugs.gnu.org; Mon, 07 Jun 2021 05:35:34 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id E9bT2500t0mfAB4019bUNJ; Mon, 07 Jun 2021 11:35:28 +0200 Message-ID: From: Maxime Devos Date: Mon, 07 Jun 2021 11:35:21 +0200 In-Reply-To: <20210606185204.17617-1-ryan@arctype.co> References: <20210606185204.17617-1-ryan@arctype.co> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-lFdR2O6dJRgQPr2TziGW" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623058528; bh=zu4HBxD3/u7m91dfpoHl8E3XVXxTdyHLvUlG0beAVtI=; h=Subject:From:To:Date:In-Reply-To:References; b=BrR5DxZ0A433D0prjg+GiLSbpIWpXO5eriTYLV8tloalQGGgQPhkhcClKUizL1+dD YGUJtr+dLAyBHNmzU/TLSoW+lwlEutS6U4cAg5XjMTmoUmGYeZ6qk/yt7xv7IPQH6G VIz8SjYLTicA2oQqlKHzvPFRRg9dtfk2TZAsESMnzBscf/I6ZLlV3mwxlJTL2RxOPA hbxMRusbx62VqOIkXCAlnoNmDE8k9WhU6GBbQ4YInbAKUOB5eozr+H5JqCib8alq+1 mzdozLY/pRtpjZrxqPrEnJYUCDIEo/YS/XzTN+3iJDrvT6xUzy6EQv/w/tT9ge556l +eyGAAkDrTRpA== X-Spam-Score: -0.7 (/) 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 (-) --=-lFdR2O6dJRgQPr2TziGW Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, Ryan Sundberg via Guix-patches via schreef op zo 06-06-2021 om 11:52 [-0700= ]: > Adds the bird BGP daemon to gnu/packages/bird.scm See commits (e.g. git log -n9) for how to format commit messages. > --- > gnu/packages/bird.scm | 74 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 74 insertions(+) > create mode 100644 gnu/packages/bird.scm >=20 > diff --git a/gnu/packages/bird.scm b/gnu/packages/bird.scm > new file mode 100644 > index 0000000000..5fac395906 > --- /dev/null > +++ b/gnu/packages/bird.scm Maybe gnu/packages/networking.scm, instead of creating a new module for a single package. > + #:phases (modify-phases %standard-phases > + ; Fix "cc not found" in tools/mergedirs > + (add-after 'bootstrap 'set-cc > + (lambda _=20 > + (setenv "CPP" "gcc -E") > + #t))))) This most likely should be ,(string-append (cc-for-target) " -E"), to make sure cross-compiling works. Also, the more declarative #:make-flags is preferred above imperative setenv. > + (inputs > + `(("autoconf" ,autoconf) > + ("bison" ,bison) > + ("flex" ,flex) autoconf, bison & flex most likely should be native inputs. > + ("ncurses" ,ncurses) > + ("readline" ,readline))) > + (home-page "http://bird.network.cz/") > + (synopsis "BIRD Internet Routing Daemon") > + (description "The BIRD project aims to develop a dynamic IP routing = daemon with full support of all modern routing protocols, easy to use confi= guration interface and powerful route filtering language, primarily targete= d on (but not limited to) Linux and other UNIX-like systems and distributed= under the GNU General Public License.") > + (license gpl2+))) The description line is too long. ./pre-inst-env guix lint bird@1.6.7 should detect that. Greetings, Maxime. --=-lFdR2O6dJRgQPr2TziGW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYL3oWRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7hR6AQCtuGRi57sjeXSEode7Xks0lOAB iIUpDETJIxT52t3utQD/YNCV+cZP1Z7rVh3LpCznYZ0Uy2QRs26cEYmjWaUhZw0= =bTxw -----END PGP SIGNATURE----- --=-lFdR2O6dJRgQPr2TziGW-- From unknown Fri Jun 13 11:07:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 2/4] Ceph: patch rbd to use $PATH lookups for modprobe Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Jun 2021 09:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ryan Sundberg , 48889@debbugs.gnu.org Received: via spool by 48889-submit@debbugs.gnu.org id=B48889.162305886814559 (code B ref 48889); Mon, 07 Jun 2021 09:42:01 +0000 Received: (at 48889) by debbugs.gnu.org; 7 Jun 2021 09:41:08 +0000 Received: from localhost ([127.0.0.1]:54481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqBkq-0003ml-5d for submit@debbugs.gnu.org; Mon, 07 Jun 2021 05:41:08 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:51756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqBkk-0003m8-I8 for 48889@debbugs.gnu.org; Mon, 07 Jun 2021 05:41:06 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by xavier.telenet-ops.be with bizsmtp id E9h02500H0mfAB4019h0H6; Mon, 07 Jun 2021 11:41:00 +0200 Message-ID: From: Maxime Devos Date: Mon, 07 Jun 2021 11:40:59 +0200 In-Reply-To: <20210606185204.17617-2-ryan@arctype.co> References: <20210606185204.17617-1-ryan@arctype.co> <20210606185204.17617-2-ryan@arctype.co> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-qkx10WlImDFXtyt4ie1k" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623058860; bh=HsPMaILckFVvwg9JUN7CgfVtIGj5aLWLuFbkIBwaB2A=; h=Subject:From:To:Date:In-Reply-To:References; b=JtjqdTd+Ar4fFPCXwQA40xG7X7JM90XvjKsmnmdueFO0DWn0g0dNRIiTTeX6JdxTv O4JdVq3sRbLUayJOWFBv5DnvzOr1zufyoq7UF8dFD5+R2LT6uYxhrsS0s+n28Torri /PAVcnoeFEMJtIyfD/EmTlhntdkYV0Zp1axiSYLwBCv+rlR/gOOExzlNfggfVIUmrx sbm5g0tzBhxf5PgmYbLPu690tZxReNc9rZw1Qnd9jTL4Ln8vgOQ72ejr8N6wBDSDVK R6IM8pz20JBOrWtRi7e5/pakvI+pOXHjlG6J3o0Zo5fGY8E28Qo1ihM2RjIJmq0mDP 8ajLLPYRStR0g== X-Spam-Score: -0.7 (/) 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 (-) --=-qkx10WlImDFXtyt4ie1k Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ryan Sundberg via Guix-patches via schreef op zo 06-06-2021 om 11:52 [-0700= ]: > Removes hardcoded paths assumed in /sbin and /bin compiled into the > `rbd` tool. >=20 > Patch originally discussed at https://github.com/ceph/ceph/pull/20938 > and rejected by upstream for ambiguous security concerns related to > relative paths. > --- > .../patches/ceph-relative-paths.patch | 22 +++++++++++++++++++ > gnu/packages/storage.scm | 2 +- > 2 files changed, 23 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/ceph-relative-paths.patch >=20 > diff --git a/gnu/packages/patches/ceph-relative-paths.patch b/gnu/package= s/patches/ceph-relative-paths.patch > new file mode 100644 > index 0000000000..e1b1d3599f > --- /dev/null > +++ b/gnu/packages/patches/ceph-relative-paths.patch > @@ -0,0 +1,22 @@ > +diff --git a/src/common/module.c b/src/common/module.c > +index f19f74324c..53355b8185 100644 > +--- a/src/common/module.c > ++++ b/src/common/module.c > +@@ -66,7 +66,7 @@ int module_has_param(const char *module, const char *p= aram) > + char command[128]; > +=20 > + snprintf(command, sizeof(command), > +- "/sbin/modinfo -F parm %s | /bin/grep -q ^%s:", > ++ "modinfo -F parm %s | grep -q ^%s:", modinfo is not necessarily in the profile. I'd recommend using substitute* from a build phase to replace /sbin/modinfo with the appropriate /gnu/store path. ((string-append (assoc-ref inputs "???") "/sbin/modinfo") or something like that, were you'll need to replace "???") > +- snprintf(command, sizeof(command), "/sbin/modprobe %s %s", > ++ snprintf(command, sizeof(command), "modprobe %s %s", > + module, (options ? options : "")); Likewise. Greetings, Maxime. --=-qkx10WlImDFXtyt4ie1k Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYL3prBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7qdpAQCk3YWvoRgiWH0OwYgPtRrv1gSk UEFjwdHwxn7+VpGC3gEA+NdZ567jcb/wuiG6e3kN5dxib7UE1eIredi6tMpueAs= =YRN8 -----END PGP SIGNATURE----- --=-qkx10WlImDFXtyt4ie1k-- From unknown Fri Jun 13 11:07:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 4/4] bpftool: new package Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Jun 2021 09:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ryan Sundberg , 48889@debbugs.gnu.org Received: via spool by 48889-submit@debbugs.gnu.org id=B48889.162305944215463 (code B ref 48889); Mon, 07 Jun 2021 09:51:02 +0000 Received: (at 48889) by debbugs.gnu.org; 7 Jun 2021 09:50:42 +0000 Received: from localhost ([127.0.0.1]:54496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqBu1-00041G-9I for submit@debbugs.gnu.org; Mon, 07 Jun 2021 05:50:41 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:54256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqBtx-000415-Cf for 48889@debbugs.gnu.org; Mon, 07 Jun 2021 05:50:36 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id E9qX2500P0mfAB4019qXsw; Mon, 07 Jun 2021 11:50:31 +0200 Message-ID: <95c21dc7fa0e9c6864df06b307f3375d511847a8.camel@telenet.be> From: Maxime Devos Date: Mon, 07 Jun 2021 11:50:31 +0200 In-Reply-To: <20210606185204.17617-4-ryan@arctype.co> References: <20210606185204.17617-1-ryan@arctype.co> <20210606185204.17617-4-ryan@arctype.co> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-kL+qTxDP/GLos5O6SQJw" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623059431; bh=xeys/O+7CTJqUadzjT3/ac5d1jiTKmdlVBR7xFRG7u8=; h=Subject:From:To:Date:In-Reply-To:References; b=qgCQkrGlHHQvFOU1UiAaV9NIszuaQQRZJ6J9qQV2lDxoBjH5nfykrVpUIJN+gdWEM XCaz+6K0etkuV6kkB1GmJDOtraQxlYu+JYlISl/PRR9i5/Jh9G4m1rZKfDKxxGwc55 T8nBB/XEVRxz5OXrtcgzy6BwDmIRGCpYh/kTc0oItTo/0g9hmeIwfWqHG95E20VsC3 hWOTm8BkCBfB5qriF/hecrZRyAtMSkjJ+Rn5QPywTTcJhjNGByeODXwq/UBVooFPE/ eCyDUYHz5Gu9Xp0kcoKE4dKfDRp4BcsXSHj9MBllUz6g+W/USBirjeK3W0WwOscyFl Vd9CVpBoCxKRQ== X-Spam-Score: -0.7 (/) 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.0 (-) --=-kL+qTxDP/GLos5O6SQJw Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ryan Sundberg via Guix-patches via schreef op zo 06-06-2021 om 11:52 [-0700= ]: > Adds the bpftool package from the Linux kernel source tree. > --- > gnu/packages/linux.scm | 40 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 40 insertions(+) >=20 > diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm > index c8ec310665..06bb344475 100644 > --- a/gnu/packages/linux.scm > +++ b/gnu/packages/linux.scm > @@ -54,6 +54,7 @@ > ;;; Copyright =C2=A9 2020 David Dashyan > ;;; Copyright =C2=A9 2020 pukkamustard > ;;; Copyright =C2=A9 2021 B. Wilson > +;;; Copyright =C2=A9 2021 Ryan Sundberg > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -8108,3 +8109,42 @@ Availability and Serviceability} reports from Linu= x kernel trace events. > These trace events are logged in @file{/sys/kernel/debug/tracing} and re= ported > through standard log mechanisms like syslog.") > (license license:gpl2))) > + > +(define-public bpftool > + (package > + (name "bpftool") > + (version (package-version linux-libre)) > + (source (package-source linux-libre)) > + (build-system gnu-build-system) > + (arguments > + `(#:tests? #f Why are tests disabled? > + #:phases=20 > + (modify-phases %standard-phases > + (add-before 'configure 'chdir=20 > + (lambda _ (chdir "tools/bpf") #t)) > + (delete 'configure) > + (replace 'build=20 > + (lambda _ (invoke "make" "CC=3Dgcc" "bpftool") #t)) Use ,(string-append "CC=3D" (cc-for-target)), to make sure cross-compiling = bpftools works. > + (replace 'install=20 > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")))=20 > + (mkdir-p (string-append out "/sbin")) > + (mkdir-p (string-append out "/share/bash-completion/comp= letions")) > + (invoke "make"=20 > + (string-append "prefix=3D" out) > + (string-append "bash_compdir=3D" out "/share/bas= h-completion/completions") > + "-C" "bpftool" > + "install") > + #t)))))) > + (inputs > + `(("bison" ,bison) Bison looks like a native input to me. > + ("python" ,python-3) Could be input, could be native-input. I don't know what's appropriate for = bpftools. You can check with ./pre-inst-env guix build bpftools --target=3Daarch64-linux-gnu If there is "command not found: python" or something like that, you'll need to move python to native-inputs. > + ("readline" ,readline))) > + (propagated-inputs > + `(("libcap" ,libcap) > + ("libelf" ,libelf) > + ("zlib" ,zlib))) bpftool is a tool, and not a library, right? Then these libraries should be in inputs, not propagated-inputs, to avoid polluting the profile. bpftool should still have access to these libraries by ELF's RPATH or something like that. > + (home-page (package-home-page linux-libre)) I don't see anything about bpftools on . Maybe bpftools has a wiki somewhere? > + (synopsis "bpftool is a tool for inspection and simple manipulation = of eBPF programs and maps") > + (description "*bpftool* allows for inspection and simple modificatio= n of BPF objects on the system. Note that format of the output of all tool= s is not guaranteed to be stable and should not be depended upon.") Line is too long. Also, what's up with surrounding bpftools with *asterisks= *? Greetings, Maxime. --=-kL+qTxDP/GLos5O6SQJw Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYL3r5xccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7tZnAP4w6ax7410R6Llv1PpzKReLDD3a lB81L0kxY+3VXGUu3wEA+vWAOWv438Hb78+9uF8U80TqowvR014O3Yghk4U6GwI= =yDST -----END PGP SIGNATURE----- --=-kL+qTxDP/GLos5O6SQJw-- From unknown Fri Jun 13 11:07:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 1/4] New package: bird bgp daemon, versions 1 and 2 Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Jun 2021 06:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 48889@debbugs.gnu.org Received: via spool by 48889-submit@debbugs.gnu.org id=B48889.162322145324300 (code B ref 48889); Wed, 09 Jun 2021 06:51:02 +0000 Received: (at 48889) by debbugs.gnu.org; 9 Jun 2021 06:50:53 +0000 Received: from localhost ([127.0.0.1]:60351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqs33-0006Jj-7h for submit@debbugs.gnu.org; Wed, 09 Jun 2021 02:50:49 -0400 Received: from mail.arctype.co ([138.68.9.245]:33076) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqs30-0006JR-Q0 for 48889@debbugs.gnu.org; Wed, 09 Jun 2021 02:50:44 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 84FCA11F07C; Tue, 8 Jun 2021 23:50:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arctype.co; s=mail; t=1623221436; bh=L75vR3LmRXzmahOwOa9SUR4T+JCNiNCnFLvTH8g+Xr0=; h=Subject:To:References:From:Date:In-Reply-To:From; b=RNFdCA9W7KDucRuilywsXrjPXU4mkMLbtusAQQiJVGlCQlFVCc6i1wvioieseI9WI P2pNyRwPSAwYGR5DqkOG0DjC43D61MkGiNIgFoc1xHH72qNkRnhtrLntrEWNrztM24 yix4xl6fuaT4i42VDDilrnh5LGy+cyCc0bwlWzp9v6xi2RfykxJ0YY7CXY8PIPfBj2 RivfDX9DN2bpQi4qwE17kyfFec3BWksQctyqrlxyFhKUkSMTQDLWIO3xQhf+TXKZTs cgKAbHRKdo1xGmF0VZLCpDY/BtDTfE+Bou3Bs/OoxKzf64K5s+a0VKb/jsXvZCLoTR MJO4LUy0YvD2A== References: <20210606185204.17617-1-ryan@arctype.co> From: Ryan Sundberg Message-ID: Date: Tue, 8 Jun 2021 23:50:36 -0700 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mjpTdtYiODsLcCSXTt5qJoIkrgltp2x9o" X-Spam-Score: -0.0 (/) 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.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --mjpTdtYiODsLcCSXTt5qJoIkrgltp2x9o Content-Type: multipart/mixed; boundary="ac26DVDMEvWkETWu1SRInGBC3PDZHUp58"; protected-headers="v1" From: Ryan Sundberg To: Maxime Devos , 48889@debbugs.gnu.org Message-ID: Subject: Re: [bug#48889] [PATCH 1/4] New package: bird bgp daemon, versions 1 and 2 References: <20210606185204.17617-1-ryan@arctype.co> In-Reply-To: --ac26DVDMEvWkETWu1SRInGBC3PDZHUp58 Content-Type: multipart/mixed; boundary="------------FBCE853F94381F5881803948" Content-Language: en-US This is a multi-part message in MIME format. --------------FBCE853F94381F5881803948 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Maxime, thanks for the good feedback. Please see the revised patch her= e. -- Sincerely, Ryan Sundberg On 6/7/21 2:35 AM, Maxime Devos wrote: > Hi, >=20 > Ryan Sundberg via Guix-patches via schreef op zo 06-06-2021 om 11:52 [-= 0700]: >> Adds the bird BGP daemon to gnu/packages/bird.scm >=20 > See commits (e.g. git log -n9) for how to format commit messages. >=20 >> --- >> gnu/packages/bird.scm | 74 ++++++++++++++++++++++++++++++++++++++++++= + >> 1 file changed, 74 insertions(+) >> create mode 100644 gnu/packages/bird.scm >> >> diff --git a/gnu/packages/bird.scm b/gnu/packages/bird.scm >> new file mode 100644 >> index 0000000000..5fac395906 >> --- /dev/null >> +++ b/gnu/packages/bird.scm >=20 > Maybe gnu/packages/networking.scm, instead of creating a new > module for a single package. >=20 >> + #:phases (modify-phases %standard-phases >> + ; Fix "cc not found" in tools/mergedi= rs >> + (add-after 'bootstrap 'set-cc >> + (lambda _=20 >> + (setenv "CPP" "gcc -E") >> + #t))))) >=20 > This most likely should be ,(string-append (cc-for-target) " -E"), to > make sure cross-compiling works. Also, the more declarative #:make-flag= s > is preferred above imperative setenv. >=20 >> + (inputs >> + `(("autoconf" ,autoconf) >> + ("bison" ,bison) >> + ("flex" ,flex) >=20 > autoconf, bison & flex most likely should be native inputs. >=20 >> + ("ncurses" ,ncurses) >> + ("readline" ,readline))) >> + (home-page "http://bird.network.cz/") >> + (synopsis "BIRD Internet Routing Daemon") >> + (description "The BIRD project aims to develop a dynamic IP routi= ng daemon with full support of all modern routing protocols, easy to use = configuration interface and powerful route filtering language, primarily = targeted on (but not limited to) Linux and other UNIX-like systems and di= stributed under the GNU General Public License.") >> + (license gpl2+))) >=20 > The description line is too long. > ./pre-inst-env guix lint bird@1.6.7 should detect that. >=20 > Greetings, > Maxime. >=20 --------------FBCE853F94381F5881803948 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-Add-bird-versions-1.6.7-and-2.0.8.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-bird-versions-1.6.7-and-2.0.8.patch" =46rom 4cff7f7e80dd2e46705675aa14d14d95a7ee9a9d Mon Sep 17 00:00:00 2001 From: Ryan Sundberg Date: Fri, 4 Jun 2021 20:53:11 -0700 Subject: [PATCH 1/5] gnu: Add bird versions 1.6.7 and 2.0.8 * gnu/packages/networking.scm (bird): New variable. {bird-1}: New variable. Signed-off-by: Ryan Sundberg --- gnu/packages/networking.scm | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 462215c0f1..6ab23f4ae3 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -43,6 +43,7 @@ ;;; Copyright =C2=A9 2020 Hamzeh Nasajpour ;;; Copyright =C2=A9 2020 Michael Rohleder ;;; Copyright =C2=A9 2021 Hartmut Goebel +;;; Copyright =C2=A9 2021 Ryan Sundberg ;;; ;;; This file is part of GNU Guix. ;;; @@ -4196,3 +4197,54 @@ IPv6 Internet connectivity - it also works over IP= v4.") ;; version. This exception does not (and cannot) modify any license=20 terms ;; which apply to the Application, with which you must still comply= license:lgpl3))) + +(define-public bird-1 + (package + (name "bird") + (version "1.6.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.nic.cz/labs/bird.git") + (commit (string-append "v" version)))) + (sha256 (base32 "0vbjp42c2zqmcrqcwm4g4fq1v93l6rlk0c27i0k08f3v07w= 75cih")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-ipv6") + #:tests? #f ; No tests defined for bird 1 + #:phases + (modify-phases + %standard-phases + ; Fix "cc not found" in tools/mergedirs + (add-after 'bootstrap 'set-cc + (lambda _ + (setenv "CPP" ,(string-append (cc-for-target) " -= E")) + #t))))) + (inputs + `(("ncurses" ,ncurses) + ("readline" ,readline))) + (native-inputs + `(("autoconf" ,autoconf) + ("bison" ,bison) + ("flex" ,flex))) + (home-page "http://bird.network.cz/") + (synopsis "BIRD Internet Routing Daemon") + (description "The BIRD project aims to develop a dynamic IP routing = daemon +with full support of all modern routing protocols, easy to use configura= tion +interface and powerful route filtering language.") + (license license:gpl2+))) + +(define-public bird + (package + (inherit bird-1) + (version "2.0.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.nic.cz/labs/bird.git") + (commit (string-append "v" version)))) + (sha256 (base32 "07mh41hsmkcpf6f6lnygzp6g59jma542pcqdkl54ysiqnjm= i5zz1")))) + (arguments + `(#:configure-flags '("--enable-ipv6"))))) --=20 2.31.1 --------------FBCE853F94381F5881803948-- --ac26DVDMEvWkETWu1SRInGBC3PDZHUp58-- --mjpTdtYiODsLcCSXTt5qJoIkrgltp2x9o Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEyVG5Gm1pvFAzyXC2aiMi+MCr96sFAmDAZLwFAwAAAAAACgkQaiMi+MCr96sa 2ggAkV1M7W98oyDaf80AsVQ5peKsFknqts7iC0VDhlylG97rTIG2+9LsTnGQqAdZcZ27lQ6yQ+lz Am/sy4z9eRZbMoPZl9Loh8MrE1miCIpLFuKaXGJzDLGZMH+JZQiLF35JL0Tg5kYzfutNd6fbTVgP ZJs0i59UClLoXNYqhDMeIKYkH66jUMyWcPoOn10JQ0ysa0QXvc+GBS6ffi2HvkpnTQGas7pTItoS 5zrcHF+gTY8gzDa4w2KU3pa7PEf/u1eupa7RhTWD4j+j827zxN9j2ZRNwEFXBol76f8aPojv5DvH AE3H/HDxVUIZkHQ8+7GeNkjaKCXaOFckYRg8hMVvDA== =2Ahv -----END PGP SIGNATURE----- --mjpTdtYiODsLcCSXTt5qJoIkrgltp2x9o-- From unknown Fri Jun 13 11:07:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 4/4] bpftool: new package Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Jun 2021 07:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 48889@debbugs.gnu.org Received: via spool by 48889-submit@debbugs.gnu.org id=B48889.162322237725773 (code B ref 48889); Wed, 09 Jun 2021 07:07:02 +0000 Received: (at 48889) by debbugs.gnu.org; 9 Jun 2021 07:06:17 +0000 Received: from localhost ([127.0.0.1]:60356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqsI1-0006hY-9x for submit@debbugs.gnu.org; Wed, 09 Jun 2021 03:06:17 -0400 Received: from mail.arctype.co ([138.68.9.245]:54603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqsHy-0006hK-Nt for 48889@debbugs.gnu.org; Wed, 09 Jun 2021 03:06:12 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id EB50611F07C; Wed, 9 Jun 2021 00:06:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arctype.co; s=mail; t=1623222365; bh=A0/Pc+yhzRil3ccEhXsL9vQ0xeMoOIAVb3WaV1XZ0Jk=; h=To:References:From:Cc:Subject:Date:In-Reply-To:From; b=Z75Ssh/slkotzzj1LbQpdTA8VSr8qRhDoePFKR8skBv/i5DmXjrECvswOaaKAlAiN EoDKPWNKyqxo4BhHAsnpxCFBHaUiefw8PhGai/N3aobAaWqXozkMUTsJmMhCVf+Z0X 51rCrN73GuqEoS+mlkuvk4m4DtJ8VFLlItn5SnM1BQ9JvH3TwKaMPW+4fwf25u3NOA drXmuIgbmwZkIc7QaCHaBPcIoUWEpPJF8ArBHG/10t32jJyQg/qRxPCor7hBbbmI5V BiSchY6x6MCXVvYlRP/AXS9pf5kDgvpVz72O3fV9la/9/NUV092u4qO8JsBgYJnRKT 1vLaeL5zVCd2w== References: <20210606185204.17617-1-ryan@arctype.co> <20210606185204.17617-4-ryan@arctype.co> <95c21dc7fa0e9c6864df06b307f3375d511847a8.camel@telenet.be> From: Ryan Sundberg Message-ID: <9f6bfb31-ad8a-a45f-2c80-e4423647aa28@arctype.co> Date: Wed, 9 Jun 2021 00:06:04 -0700 MIME-Version: 1.0 In-Reply-To: <95c21dc7fa0e9c6864df06b307f3375d511847a8.camel@telenet.be> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="RzPwQE9kgMZatucz9vpko1JubAlfdZIec" X-Spam-Score: -0.0 (/) 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.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --RzPwQE9kgMZatucz9vpko1JubAlfdZIec Content-Type: multipart/mixed; boundary="ia0E5TvZq7M684atCJOCjoPtl5UtfU5wE"; protected-headers="v1" From: Ryan Sundberg To: Maxime Devos Cc: 48889@debbugs.gnu.org Message-ID: <9f6bfb31-ad8a-a45f-2c80-e4423647aa28@arctype.co> Subject: Re: [bug#48889] [PATCH 4/4] bpftool: new package References: <20210606185204.17617-1-ryan@arctype.co> <20210606185204.17617-4-ryan@arctype.co> <95c21dc7fa0e9c6864df06b307f3375d511847a8.camel@telenet.be> In-Reply-To: <95c21dc7fa0e9c6864df06b307f3375d511847a8.camel@telenet.be> --ia0E5TvZq7M684atCJOCjoPtl5UtfU5wE Content-Type: multipart/mixed; boundary="------------B62D333A8DF5097C53D7C68B" Content-Language: en-US This is a multi-part message in MIME format. --------------B62D333A8DF5097C53D7C68B Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Here is the revised bpftool patch. Responses below. -- Sincerely, Ryan Sundberg On 6/7/21 2:50 AM, Maxime Devos wrote: > Ryan Sundberg via Guix-patches via schreef op zo 06-06-2021 om 11:52 [-= 0700]: >> Adds the bpftool package from the Linux kernel source tree. >> --- >> gnu/packages/linux.scm | 40 ++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 40 insertions(+) >> >> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm >> index c8ec310665..06bb344475 100644 >> --- a/gnu/packages/linux.scm >> +++ b/gnu/packages/linux.scm >> @@ -54,6 +54,7 @@ >> ;;; Copyright =C2=A9 2020 David Dashyan >> ;;; Copyright =C2=A9 2020 pukkamustard >> ;;; Copyright =C2=A9 2021 B. Wilson >> +;;; Copyright =C2=A9 2021 Ryan Sundberg >> ;;; >> ;;; This file is part of GNU Guix. >> ;;; >> @@ -8108,3 +8109,42 @@ Availability and Serviceability} reports from L= inux kernel trace events. >> These trace events are logged in @file{/sys/kernel/debug/tracing} and=20 reported >> through standard log mechanisms like syslog.") >> (license license:gpl2))) >> + >> +(define-public bpftool >> + (package >> + (name "bpftool") >> + (version (package-version linux-libre)) >> + (source (package-source linux-libre)) >> + (build-system gnu-build-system) >> + (arguments >> + `(#:tests? #f >=20 > Why are tests disabled? This program has no tests. I commented as such in the new patch. >=20 >> + #:phases=20 >> + (modify-phases %standard-phases >> + (add-before 'configure 'chdir=20 >> + (lambda _ (chdir "tools/bpf") #t)) >> + (delete 'configure) >> + (replace 'build=20 >> + (lambda _ (invoke "make" "CC=3Dgcc" "bpftool") #t)) >=20 > Use ,(string-append "CC=3D" (cc-for-target)), to make sure cross-compil= ing bpftools > works. >=20 >> + (replace 'install=20 >> + (lambda* (#:key outputs #:allow-other-keys) >> + (let* ((out (assoc-ref outputs "out")))=20 >> + (mkdir-p (string-append out "/sbin")) >> + (mkdir-p (string-append out "/share/bash-completion/c= ompletions")) >> + (invoke "make"=20 >> + (string-append "prefix=3D" out) >> + (string-append "bash_compdir=3D" out "/share/= bash-completion/completions") >> + "-C" "bpftool" >> + "install") >> + #t)))))) >> + (inputs >> + `(("bison" ,bison) >=20 > Bison looks like a native input to me. >=20 >> + ("python" ,python-3) >=20 > Could be input, could be native-input. I don't know what's appropriate = for bpftools. You are right, python should be a native-input. >=20 > You can check with > ./pre-inst-env guix build bpftools --target=3Daarch64-linux-gnu Cross-compiling produced this linker error I'm not sure how to deal with right now: ld: staticobjs/libbpf.o: error adding symbols: file in wrong format >=20 > If there is "command not found: python" or something like that, > you'll need to move python to native-inputs. >=20 >> + ("readline" ,readline))) >> + (propagated-inputs >> + `(("libcap" ,libcap) >> + ("libelf" ,libelf) >> + ("zlib" ,zlib))) >=20 > bpftool is a tool, and not a library, right? > Then these libraries should be in inputs, not propagated-inputs, > to avoid polluting the profile. >=20 > bpftool should still have access to these libraries by ELF's RPATH > or something like that. >=20 >> + (home-page (package-home-page linux-libre)) >=20 > I don't see anything about bpftools on . > Maybe bpftools has a wiki somewhere? I linked https://lwn.net/Articles/739357/ as the new home-page, which is the closest this program gets to online documentation that I could find. >=20 >> + (synopsis "bpftool is a tool for inspection and simple manipulati= on of eBPF programs and maps") >> + (description "*bpftool* allows for inspection and simple modifica= tion of BPF objects on the system. Note that format of the output of all=20 tools is not guaranteed to be stable and should not be depended upon.") >=20 > Line is too long. Also, what's up with surrounding bpftools with *aster= isks*? Copy-paste error >=20 > Greetings, > Maxime. >=20 --------------B62D333A8DF5097C53D7C68B Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-Add-bpftool-in-sync-with-the-Linux-kernel-versio.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0001-gnu-Add-bpftool-in-sync-with-the-Linux-kernel-versio.pa"; filename*1="tch" =46rom 87104ca47671801f34848326a17f4eb453dc3c9a Mon Sep 17 00:00:00 2001 From: Ryan Sundberg Date: Sun, 6 Jun 2021 09:53:43 -0700 Subject: [PATCH] gnu: Add bpftool in sync with the Linux kernel version. * gnu/packages/linux.scm (bpftool): New variable Signed-off-by: Ryan Sundberg --- gnu/packages/linux.scm | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c8ec310665..5d4d1669c2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -54,6 +54,7 @@ ;;; Copyright =C2=A9 2020 David Dashyan ;;; Copyright =C2=A9 2020 pukkamustard ;;; Copyright =C2=A9 2021 B. Wilson +;;; Copyright =C2=A9 2021 Ryan Sundberg ;;; ;;; This file is part of GNU Guix. ;;; @@ -8108,3 +8109,48 @@ Availability and Serviceability} reports from Linu= x kernel trace events. These trace events are logged in @file{/sys/kernel/debug/tracing} and re= ported through standard log mechanisms like syslog.") (license license:gpl2))) + +(define-public bpftool + (package + (name "bpftool") + (version (package-version linux-libre)) + (source (package-source linux-libre)) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; This package has no tests. + #:phases + (modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ (chdir "tools/bpf") #t)) + (delete 'configure) + (replace 'build + (lambda _ (invoke "make" + ,(string-append "CC=3D" (cc-for-target)) + "bpftool") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/sbin")) + (mkdir-p (string-append out "/share/bash-completion/comp= letions")) + (invoke "make" + (string-append "prefix=3D" out) + (string-append "bash_compdir=3D" out + "/share/bash-completion/completio= ns") + "-C" "bpftool" + "install") + #t)))))) + (inputs + `(("readline" ,readline) + ("libcap" ,libcap) + ("libelf" ,libelf) + ("zlib" ,zlib))) + (native-inputs + `(("bison" ,bison) + ("python" ,python-3))) + ; This tool does not have a proper web page. + (home-page "https://lwn.net/Articles/739357/") + (synopsis "Tool for inspection and simple manipulation of eBPF progr= ams and maps") + (description "bpftool allows for inspection and simple modification = of BPF +objects on the system.") + (license (package-license linux-libre)))) --=20 2.31.1 --------------B62D333A8DF5097C53D7C68B-- --ia0E5TvZq7M684atCJOCjoPtl5UtfU5wE-- --RzPwQE9kgMZatucz9vpko1JubAlfdZIec Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEyVG5Gm1pvFAzyXC2aiMi+MCr96sFAmDAaFwFAwAAAAAACgkQaiMi+MCr96sh jwf/a7l4EK5SqB+t1vwt5aLYCioT2N1PBR2gstpk6+6pRk+dUBAJmm+rOEkybHA7cVX29f3GOclb zMrBqF/uS1BllaJL0t/A09d8FzMLtPstg9UMkZ1/ygYO40Vmc8PVLAuSSRo8Ybhq4DBwhXdDDRbT KQGyL7RCLk1gy6iyTPl9xCLmtsESLy/7spJ2Y+FEpUzQR4+rWhWpnodhJjFSDMrUmcDcb5aKdXc0 7U4jLd9+ITaqMg5YqkMnUN+HABGoprWotC9sVZGO0a6dKDjpw+C6ytWmeA4a/21+jp7V32etdhrD XLrHKuvFP6gaItrT+hZbvySeAne9NmyLv3q6J0yMdQ== =DI/e -----END PGP SIGNATURE----- --RzPwQE9kgMZatucz9vpko1JubAlfdZIec-- From unknown Fri Jun 13 11:07:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48889] [PATCH 1/4] New package: bird bgp daemon, versions 1 and 2 Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 15:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48889@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16240308918087 (code B ref -1); Fri, 18 Jun 2021 15:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Jun 2021 15:41:31 +0000 Received: from localhost ([127.0.0.1]:57668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luGcY-00026H-GB for submit@debbugs.gnu.org; Fri, 18 Jun 2021 11:41:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:50118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luGcW-000269-4T for submit@debbugs.gnu.org; Fri, 18 Jun 2021 11:41:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luGcV-0000rj-SV for guix-patches@gnu.org; Fri, 18 Jun 2021 11:41:23 -0400 Received: from mail.arctype.co ([138.68.9.245]:34280) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luGcP-0008El-0b for guix-patches@gnu.org; Fri, 18 Jun 2021 11:41:23 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 08B4111F074 for ; Fri, 18 Jun 2021 08:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arctype.co; s=mail; t=1624030843; bh=6AGy6nw/A7Fu6EacuzNu8K+VC/sIu6UVIWPoAJxF9y8=; h=Subject:To:References:From:Date:In-Reply-To:From; b=fY3UT4eCLvklPYs6woVs17oKZ9piq0qd6aZTQtdKKT7odlVN9onhf9yXWrC/Tn3EH G/Ag2R1sD15O+AHpLIhA3skUxB2YfKEq4H5AmCKCA/wjUsBOJfKAAXxTOoophxkZnS CPoMviuIjhi5IUM0gp28RTCvwRFzAyvSY4zGx823ZGG2qPOovvD+co09FebLmvBLYU iVQCgsVMYLT58JFf3P1QYmzia9S+NDedCcbE+1uJqV/9/A3S/JVRcf/LatmRcoz7Cn JxMTjLkbLkK3gDVFM7MYJPPrYm6+3GGZqrPq3KKPVA2dZd2C1Sw+lmljJg1IqK3Ssf kLd9ME7UuViag== References: <20210606185204.17617-1-ryan@arctype.co> From: Ryan Sundberg Message-ID: <121011e9-4626-bdd1-ab77-cfef163b903e@arctype.co> Date: Fri, 18 Jun 2021 08:40:42 -0700 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="pyEVg8xQxNQM7E7UG2g0f5MGOFqRhtTsj" Received-SPF: pass client-ip=138.68.9.245; envelope-from=ryan@arctype.co; helo=mail.arctype.co X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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.1 (/) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --pyEVg8xQxNQM7E7UG2g0f5MGOFqRhtTsj Content-Type: multipart/mixed; boundary="SQW1JvSgmLLPewDFjIvRVshXGXpDhGZr1"; protected-headers="v1" From: Ryan Sundberg To: guix-patches@gnu.org Message-ID: <121011e9-4626-bdd1-ab77-cfef163b903e@arctype.co> Subject: Re: [bug#48889] [PATCH 1/4] New package: bird bgp daemon, versions 1 and 2 References: <20210606185204.17617-1-ryan@arctype.co> In-Reply-To: --SQW1JvSgmLLPewDFjIvRVshXGXpDhGZr1 Content-Type: multipart/mixed; boundary="------------2FB22A0BEDE1EBA8143DA473" Content-Language: en-US This is a multi-part message in MIME format. --------------2FB22A0BEDE1EBA8143DA473 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Guix, here is one more version of this patch to add the bird daemon. This time it builds both bird and bird6 individually for bird version 1.x, since --enable-ipv6 is a mutually exclusive config option,the binaries have to be built separately. -- Sincerely, Ryan Sundberg On 6/8/21 11:50 PM, Ryan Sundberg via Guix-patches via wrote: > Hi Maxime, thanks for the good feedback. Please see the revised patch h= ere. >=20 > -- > Sincerely, > Ryan Sundberg >=20 > On 6/7/21 2:35 AM, Maxime Devos wrote: >> Hi, >> >> Ryan Sundberg via Guix-patches via schreef op zo 06-06-2021 om 11:52 [= -0700]: >>> Adds the bird BGP daemon to gnu/packages/bird.scm >> >> See commits (e.g. git log -n9) for how to format commit messages. >> >>> --- >>> gnu/packages/bird.scm | 74 +++++++++++++++++++++++++++++++++++++++++= ++ >>> 1 file changed, 74 insertions(+) >>> create mode 100644 gnu/packages/bird.scm >>> >>> diff --git a/gnu/packages/bird.scm b/gnu/packages/bird.scm >>> new file mode 100644 >>> index 0000000000..5fac395906 >>> --- /dev/null >>> +++ b/gnu/packages/bird.scm >> >> Maybe gnu/packages/networking.scm, instead of creating a new >> module for a single package. >> >>> + #:phases (modify-phases %standard-phases >>> + ; Fix "cc not found" in tools/merged= irs >>> + (add-after 'bootstrap 'set-cc >>> + (lambda _=20 >>> + (setenv "CPP" "gcc -E")= >>> + #t))))) >> >> This most likely should be ,(string-append (cc-for-target) " -E"), to >> make sure cross-compiling works. Also, the more declarative #:make-fla= gs >> is preferred above imperative setenv. >> >>> + (inputs >>> + `(("autoconf" ,autoconf) >>> + ("bison" ,bison) >>> + ("flex" ,flex) >> >> autoconf, bison & flex most likely should be native inputs. >> >>> + ("ncurses" ,ncurses) >>> + ("readline" ,readline))) >>> + (home-page "http://bird.network.cz/") >>> + (synopsis "BIRD Internet Routing Daemon") >>> + (description "The BIRD project aims to develop a dynamic IP rout= ing daemon with full support of all modern routing protocols, easy to use=20 configuration interface and powerful route filtering language, primarily = targeted on (but not limited to) Linux and other UNIX-like systems and di= stributed under the GNU General Public License.") >>> + (license gpl2+))) >> >> The description line is too long. >> ./pre-inst-env guix lint bird@1.6.7 should detect that. >> >> Greetings, >> Maxime. >> --------------2FB22A0BEDE1EBA8143DA473 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-Add-bird-versions-1.6.7-and-2.0.8.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-bird-versions-1.6.7-and-2.0.8.patch" =46rom ed01b4254a54e43ce66d910c780b5a1ee885e243 Mon Sep 17 00:00:00 2001 From: Ryan Sundberg Date: Fri, 4 Jun 2021 20:53:11 -0700 Subject: [PATCH] gnu: Add bird versions 1.6.7 and 2.0.8 * gnu/packages/networking.scm (bird): New variable. {bird-1}: New variable. --- gnu/packages/networking.scm | 63 +++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f7357a263b..0c14331a5b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -43,6 +43,7 @@ ;;; Copyright =C2=A9 2020 Hamzeh Nasajpour ;;; Copyright =C2=A9 2020 Michael Rohleder ;;; Copyright =C2=A9 2021 Hartmut Goebel +;;; Copyright =C2=A9 2021 Ryan Sundberg ;;; ;;; This file is part of GNU Guix. ;;; @@ -4199,3 +4200,65 @@ IPv6 Internet connectivity - it also works over IP= v4.") ;; version. This exception does not (and cannot) modify any license=20 terms ;; which apply to the Application, with which you must still comply= license:lgpl3))) + +(define configure-bird6 + `(lambda* (#:key #:allow-other-keys #:rest args) + (let ((configure-phase (assoc-ref %standard-phases 'configure))) + (apply=20 + configure-phase=20 + (append args '(#:configure-flags ("--enable-ipv6"))))))) + +(define-public bird-1 + (package + (name "bird") + (version "1.6.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.nic.cz/labs/bird.git") + (commit (string-append "v" version)))) + (sha256 (base32 "0vbjp42c2zqmcrqcwm4g4fq1v93l6rlk0c27i0k08f3v07w= 75cih")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;; No tests defined for bird 1 + #:phases + (modify-phases + %standard-phases + ;; Fix "cc not found" in tools/mergedirs + (add-after 'bootstrap 'set-cc + (lambda _ + (setenv "CPP" ,(string-append (cc-for-target) " -E")))) + ;; Build bird6 after building bird. + ;; bird6 and bird are configured independently. + (add-after 'install 'configure-bird6 ,configure-bird6) + (add-after 'configure-bird6 'build-bird6=20 + (assoc-ref %standard-phases 'build)) + (add-after 'build-bird6 'install-bird6=20 + (assoc-ref %standard-phases 'install))))) + (inputs + `(("ncurses" ,ncurses) + ("readline" ,readline))) + (native-inputs + `(("autoconf" ,autoconf) + ("bison" ,bison) + ("flex" ,flex))) + (home-page "http://bird.network.cz/") + (synopsis "BIRD Internet Routing Daemon") + (description "The BIRD project aims to develop a dynamic IP routing = daemon +with full support of all modern routing protocols, easy to use configura= tion +interface and powerful route filtering language.") + (license license:gpl2+))) + +(define-public bird + (package + (inherit bird-1) + (version "2.0.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.nic.cz/labs/bird.git") + (commit (string-append "v" version)))) + (sha256 (base32 "07mh41hsmkcpf6f6lnygzp6g59jma542pcqdkl54ysiqnjm= i5zz1")))) + (arguments `()))) --=20 2.31.1 --------------2FB22A0BEDE1EBA8143DA473-- --SQW1JvSgmLLPewDFjIvRVshXGXpDhGZr1-- --pyEVg8xQxNQM7E7UG2g0f5MGOFqRhtTsj Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEyVG5Gm1pvFAzyXC2aiMi+MCr96sFAmDMvnoFAwAAAAAACgkQaiMi+MCr96t+ cQgAkrZLT50n0osNR+Je/cdGwtiAxNA22hwm6CZRjrHZpQ+F1I1UJWZZpl4/awbInDq1iPWqNyUW 51wK8zjVdw4fgcJoHl/A+84Eqe6dbjHeCtx50TaeJS+ea97DMyXTYXckWfu4qygv3yM5OOdntIAO QbmfWQv8ZHWN4i6wvZeyypwAmQKrVWbzwOOo0fcqzG79pWIXOwqkDizd3A5/vviuO2fOA0ye8pwy Gv3sP8oTA6JMPHGzET86ZunG911oGlIf8w8bVOVH6vp3aY+JO5Oi1RXW+fo7GR3tKLfu+yk0BDjd YaJL/g1ykT9kHkg3bv+j5xVEv51kVA/1+Ribrk8xvQ== =lrVM -----END PGP SIGNATURE----- --pyEVg8xQxNQM7E7UG2g0f5MGOFqRhtTsj--