From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YKl4FAq/zGCJMAAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 17:43:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id ALE+EAq/zGBhfQAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 15:43:06 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9CD3F1BEC2 for ; Fri, 18 Jun 2021 17:43:05 +0200 (CEST) Received: from localhost ([::1]:37628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luGe8-00035x-8B for larch@yhetil.org; Fri, 18 Jun 2021 11:43:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luGd8-0001WO-SN for guix-patches@gnu.org; Fri, 18 Jun 2021 11:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46122) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luGd8-0000Lf-H8 for guix-patches@gnu.org; Fri, 18 Jun 2021 11:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luGd8-000279-2L for guix-patches@gnu.org; Fri, 18 Jun 2021 11:42: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: 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> 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-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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches From: Ryan Sundberg via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624030985; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=rDDEluxgwcQKhezLZ1t1fgyblXNe0abT7sshTVoOUgE=; b=rShquzdKzQvbFhMKUR59aYYMzK8EDiuET2weKNlXy+WJUdsex21eVqDV4+t8xH0W6LmkDc 4t1+SjJpG3f1OU2iDQctwcfTmTXGnxhU9FOxCfYgdcuPfc5A4MCgi5bAt/EW0ILWocERU0 USpuoFiAlGaPm2FHttobJ78ZvGgck9c58XAXiKr15XstUY9EZMdARMXhI6VDYN9wilODia ZSZpPJdKwkCNMurE0HEAZVwN14mZgGsVSUKOh6EAeDnF4ITiIKUcJdewYtttmiGlPWC5CG qBkRmz5g7Tsu8tkKYiy+2ldABGHbA4727kbUtzh5VN/P67kRix5cQdIIKc8qOw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624030985; a=rsa-sha256; cv=none; b=BqZwTUp1CQDYSEkWRs4181ay2YVjuZ51yGsFQe6mKSB8YT2jg3lUMqiKukSsGlA9Ij0sTn 6FGPufdcdfndy1qDRAJkHUVUvqLyEfcdKW5rgMW+9Vmi4zlVWKFW90nkytzkX7qiMrjl0y dlBar5EQP8DswID+ZclxVwyO28EovGqDUFvg45+sCal6jqMpyY+0K6ooBy3epip3QqqVfa JokC5fbVMDLDTcnwwZn1wv6H6qocaqIHkJmU5zjVFgW9MrggoSkQyGagbqbfblX5U798c0 A417wFxx9Rw405EssBhdCXXeWMB5uv9eNSqMNfkp1vMekPFq/0h2AMeoKVyF5w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=arctype.co header.s=mail header.b=fY3UT4eC; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=arctype.co header.s=mail header.b=fY3UT4eC; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 9CD3F1BEC2 X-Spam-Score: -3.53 X-Migadu-Scanner: scn1.migadu.com X-TUID: +REMERBqkMoM 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--