From aca3258393a5fa37a9bcbb51d6aee69270ab3851 Mon Sep 17 00:00:00 2001 From: Klara Modin 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)" -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 " 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"