From patchwork Wed Jun 9 06:50:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ryan Sundberg X-Patchwork-Id: 30071 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 E081F27BC78; Wed, 9 Jun 2021 07:51:12 +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 E075327BC81 for ; Wed, 9 Jun 2021 07:51:09 +0100 (BST) Received: from localhost ([::1]:60270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqs3Q-0007hE-U3 for patchwork@mira.cbaines.net; Wed, 09 Jun 2021 02:51:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqs3K-0007go-Kz for guix-patches@gnu.org; Wed, 09 Jun 2021 02:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48805) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqs3K-00055J-E1 for guix-patches@gnu.org; Wed, 09 Jun 2021 02:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lqs3K-0006KH-8s for guix-patches@gnu.org; Wed, 09 Jun 2021 02:51:02 -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: 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> Message-ID: Date: Tue, 8 Jun 2021 23:50:36 -0700 MIME-Version: 1.0 In-Reply-To: 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 Hi Maxime, thanks for the good feedback. Please see the revised patch here. --- Sincerely, Ryan Sundberg 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/mergedirs >> + (add-after 'bootstrap 'set-cc >> + (lambda _ >> + (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 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+))) > > The description line is too long. > ./pre-inst-env guix lint bird@1.6.7 should detect that. > > Greetings, > Maxime. > From 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 © 2020 Hamzeh Nasajpour ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Hartmut Goebel +;;; Copyright © 2021 Ryan Sundberg ;;; ;;; This file is part of GNU Guix. ;;; @@ -4196,3 +4197,54 @@ IPv6 Internet connectivity - it also works over IPv4.") ;; version. This exception does not (and cannot) modify any license 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 "0vbjp42c2zqmcrqcwm4g4fq1v93l6rlk0c27i0k08f3v07w75cih")))) + (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 configuration +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 "07mh41hsmkcpf6f6lnygzp6g59jma542pcqdkl54ysiqnjmi5zz1")))) + (arguments + `(#:configure-flags '("--enable-ipv6"))))) -- 2.31.1