From patchwork Sun Jun 6 18:52:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ryan Sundberg X-Patchwork-Id: 29978 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 F0CDE27BC86; Sun, 6 Jun 2021 23:10:17 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0897A27BC84 for ; Sun, 6 Jun 2021 23:10:16 +0100 (BST) Received: from localhost ([::1]:36194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lq0yF-0000qq-1W for patchwork@mira.cbaines.net; Sun, 06 Jun 2021 18:10:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lq0mU-0006W5-Sf for guix-patches@gnu.org; Sun, 06 Jun 2021 17:58:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lq0mT-0001v9-EE for guix-patches@gnu.org; Sun, 06 Jun 2021 17:58:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lq0mT-0003Kg-Dy for guix-patches@gnu.org; Sun, 06 Jun 2021 17:58:05 -0400 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== Date: Sun, 6 Jun 2021 11:52:01 -0700 Message-Id: <20210606185204.17617-1-ryan@arctype.co> MIME-Version: 1.0 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-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 X-Mailman-Approved-At: Sun, 06 Jun 2021 18:10:06 -0400 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" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches X-Patchwork-Original-From: Ryan Sundberg via Guix-patches via From: Ryan Sundberg X-getmail-retrieved-from-mailbox: Patches 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"))))) From patchwork Sun Jun 6 18:52:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Sundberg X-Patchwork-Id: 29982 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 A22B027BC83; Sun, 6 Jun 2021 23:13:11 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5B6AD27BC78 for ; Sun, 6 Jun 2021 23:13:11 +0100 (BST) Received: from localhost ([::1]:37314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lq114-0001oL-Dl for patchwork@mira.cbaines.net; Sun, 06 Jun 2021 18:13:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lq10w-0001nh-RT for guix-patches@gnu.org; Sun, 06 Jun 2021 18:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lq10w-0002lk-Kw for guix-patches@gnu.org; Sun, 06 Jun 2021 18:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lq10w-0003hF-DS for guix-patches@gnu.org; Sun, 06 Jun 2021 18:13:02 -0400 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== 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 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-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 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" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches X-Patchwork-Original-From: Ryan Sundberg via Guix-patches via From: Ryan Sundberg X-getmail-retrieved-from-mailbox: Patches 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 From patchwork Sun Jun 6 18:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ryan Sundberg X-Patchwork-Id: 29984 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 3237B27BC81; Sun, 6 Jun 2021 23:13:16 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E96E527BC78 for ; Sun, 6 Jun 2021 23:13:15 +0100 (BST) Received: from localhost ([::1]:37346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lq119-0001pu-0w for patchwork@mira.cbaines.net; Sun, 06 Jun 2021 18:13:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lq10x-0001ny-Iy for guix-patches@gnu.org; Sun, 06 Jun 2021 18:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lq10x-0002mw-Bh for guix-patches@gnu.org; Sun, 06 Jun 2021 18:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lq10x-0003hT-6k for guix-patches@gnu.org; Sun, 06 Jun 2021 18:13:03 -0400 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== 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 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-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 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" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches X-Patchwork-Original-From: Ryan Sundberg via Guix-patches via From: Ryan Sundberg X-getmail-retrieved-from-mailbox: Patches --- 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" From patchwork Sun Jun 6 18:52:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ryan Sundberg X-Patchwork-Id: 29983 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 BCD4927BC81; Sun, 6 Jun 2021 23:13:13 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 47C2527BC78 for ; Sun, 6 Jun 2021 23:13:13 +0100 (BST) Received: from localhost ([::1]:37330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lq115-0001pG-Kr for patchwork@mira.cbaines.net; Sun, 06 Jun 2021 18:13:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lq10x-0001nq-9C for guix-patches@gnu.org; Sun, 06 Jun 2021 18:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42559) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lq10w-0002mZ-UW for guix-patches@gnu.org; Sun, 06 Jun 2021 18:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lq10w-0003hM-Pn for guix-patches@gnu.org; Sun, 06 Jun 2021 18:13:02 -0400 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== 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 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-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 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" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches X-Patchwork-Original-From: Ryan Sundberg via Guix-patches via From: Ryan Sundberg X-getmail-retrieved-from-mailbox: Patches 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))))