From: klarasm <klarasm@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] bird: update to 2.0.10
Date: Sun, 03 Jul 2022 20:46:52 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37820@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is a new pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages bird-update
https://github.com/void-linux/void-packages/pull/37820
bird: update to 2.0.10
- upstream has dropped the 'v' in version so remove custom worksrc and
update distfile
- remove patch for babel as it already is upstream
- add changelog
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
- aarch64-musl
- armv7l
- armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/37820.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bird-update-37820.patch --]
[-- Type: text/x-diff, Size: 2997 bytes --]
From aca3258393a5fa37a9bcbb51d6aee69270ab3851 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 3 Jul 2022 20:25:26 +0200
Subject: [PATCH] bird: update to 2.0.10
- upstream has dropped the 'v' in version so remove custom worksrc and
update distfile
- remove patch for babel as it already is upstream
- add changelog
---
...bel-Fix-bug-in-iface-reconfiguration.patch | 29 -------------------
srcpkgs/bird/template | 10 +++----
2 files changed, 5 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
diff --git a/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch b/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
deleted file mode 100644
index bc809171e493..000000000000
--- a/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fcb4dd0c831339c4374ace17d8f2ae6ebfeed279 Mon Sep 17 00:00:00 2001
-From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
-Date: Sun, 27 Feb 2022 03:10:38 +0100
-Subject: [PATCH] Babel: Fix bug in iface reconfiguration
-
-A recent change in Babel causes ifaces to disappear after
-reconfiguration. The patch fixes that.
-
-Thanks to Johannes Kimmel for an insightful bugreport.
----
- proto/babel/babel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proto/babel/babel.c b/proto/babel/babel.c
-index e43818f5..174fc9e2 100644
---- a/proto/babel/babel.c
-+++ b/proto/babel/babel.c
-@@ -1899,7 +1899,7 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf)
- struct babel_iface *ifa = babel_find_iface(p, iface);
- struct babel_iface_config *ic = (void *) iface_patt_find(&cf->iface_list, iface, NULL);
-
-- if (ic && iface_is_valid(p, iface))
-+ if (ic && !iface_is_valid(p, iface))
- ic = NULL;
-
- if (ifa && ic)
---
-2.35.1
-
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index f2351acd7286..f17017e2d187 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,8 +1,7 @@
# Template file for 'bird'
pkgname=bird
-version=2.0.9
-revision=2
-wrksrc=bird-v$version
+version=2.0.10
+revision=1
build_style=gnu-configure
hostmakedepends="flex autoconf"
makedepends="ncurses-devel readline-devel libssh-devel"
@@ -10,8 +9,9 @@ short_desc="BIRD Internet Routing Daemon"
maintainer="Philipp Hirsch <itself@hanspolo.net>"
license="GPL-2.0-or-later"
homepage="https://bird.network.cz"
-distfiles="https://gitlab.labs.nic.cz/labs/bird/-/archive/v${version}/bird-v${version}.tar.gz"
-checksum=912d5c1bbefffd6198b10688ef6e16d0b9dfb2886944f481fc38b4d869ffd2c4
+changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS"
+distfiles="https://gitlab.labs.nic.cz/labs/bird/-/archive/${version}/bird-${version}.tar.gz"
+checksum=ea83dd15ff41024b08ae6fada8e725efae93079dbe83654edd52faabd0acd616
conf_files="/etc/bird.conf"
system_accounts="_bird"
next reply other threads:[~2022-07-03 18:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-03 18:46 klarasm [this message]
2022-07-03 21:26 ` [PR REVIEW] " paper42
2022-07-04 18:47 ` klarasm
2022-07-04 18:47 ` [PR PATCH] [Updated] " klarasm
2022-07-04 22:15 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37820@inbox.vuxu.org \
--to=klarasm@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).