From 2df98084911a00940e3ab23479a159bbc5891dd1 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Sat, 11 Jan 2025 17:38:19 +0100 Subject: [PATCH] bird: update to 2.17.1 remove upstreamed patch --- ...0076fb7365fe91360fa351f311f141a7a303.patch | 28 ------------------- srcpkgs/bird/template | 4 +-- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/bird/patches/cfac0076fb7365fe91360fa351f311f141a7a303.patch diff --git a/srcpkgs/bird/patches/cfac0076fb7365fe91360fa351f311f141a7a303.patch b/srcpkgs/bird/patches/cfac0076fb7365fe91360fa351f311f141a7a303.patch deleted file mode 100644 index 1a8aad5fc77..00000000000 --- a/srcpkgs/bird/patches/cfac0076fb7365fe91360fa351f311f141a7a303.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cfac0076fb7365fe91360fa351f311f141a7a303 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= -Date: Tue, 10 Dec 2024 02:14:06 +0100 -Subject: [PATCH] Babel: fix seqno wrapping on seqno request - -The Babel seqno wraps around when reaching its maximum value (UINT16_MAX). -When comparing seqnos, this has to be taken into account. Therefore, -plain number comparisons do not work. ---- - 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 fe5c0599a..b5cbb63f8 100644 ---- a/proto/babel/babel.c -+++ b/proto/babel/babel.c -@@ -1015,7 +1015,7 @@ babel_send_update_(struct babel_iface *ifa, btime changed, struct fib *rtable) - - /* Our own seqno might have changed, in which case we update the routes we - originate. */ -- if ((e->router_id == p->router_id) && (e->seqno < p->update_seqno)) -+ if ((e->router_id == p->router_id) && gt_mod64k(p->update_seqno, e->seqno)) - { - e->seqno = p->update_seqno; - e->updated = current_time(); --- -GitLab - diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template index d4da6675229..da6c3a08c1d 100644 --- a/srcpkgs/bird/template +++ b/srcpkgs/bird/template @@ -1,6 +1,6 @@ # Template file for 'bird' pkgname=bird -version=2.16 +version=2.17.1 revision=1 build_style=gnu-configure hostmakedepends="flex" @@ -11,7 +11,7 @@ license="GPL-2.0-or-later" homepage="https://bird.network.cz" changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS" distfiles="https://bird.network.cz/download/bird-${version}.tar.gz" -checksum=6629110293af6f1727967121d64f9c8dc94ed6181c4ef8b1dc51c7fdd669871c +checksum=bfd718dfa596819b3801688783212514b467163329aec9bbcd0fa3dee03e10e9 conf_files="/etc/bird.conf" system_accounts="_bird"