diff --git a/bird-2.0.9-babel-iface.patch b/bird-2.0.9-babel-iface.patch deleted file mode 100644 index 45be5ee..0000000 --- a/bird-2.0.9-babel-iface.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5b9df34e09da9091d19355fba8236d3c36e24660 Mon Sep 17 00:00:00 2001 -From: baizg1107 -Date: Fri, 13 May 2022 10:46:46 +0800 -Subject: [PATCH] bird 2.0.9 babel iface - ---- - 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 e43818f..174fc9e 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.27.0 - diff --git a/bird-2.0.9.tar.gz b/bird-2.0.9.tar.gz deleted file mode 100644 index 67505ca..0000000 Binary files a/bird-2.0.9.tar.gz and /dev/null differ diff --git a/bird-2.13.1.tar.gz b/bird-2.13.1.tar.gz new file mode 100644 index 0000000..90ce55e Binary files /dev/null and b/bird-2.13.1.tar.gz differ diff --git a/bird.service b/bird.service index fa203c7..26bcb8a 100644 --- a/bird.service +++ b/bird.service @@ -5,8 +5,9 @@ After=network.target [Service] Type=simple +ExecStartPre=/usr/sbin/bird -p ExecStart=/usr/sbin/bird -f -u bird -g bird -ExecReload=/bin/kill -HUP $MAINPID +ExecReload=/usr/sbin/birdc configure Restart=on-failure [Install] diff --git a/bird.spec b/bird.spec index 8919d22..0b0297a 100644 --- a/bird.spec +++ b/bird.spec @@ -1,6 +1,6 @@ %global _hardened_build 1 Name: bird -Version: 2.0.9 +Version: 2.13.1 Release: 1 Summary: BIRD Internet Routing Daemon License: GPLv2+ @@ -8,8 +8,6 @@ URL: https://bird.network.cz/ Source0: https://bird.network.cz/download/bird-%{version}.tar.gz Source1: bird.service Source2: bird.tmpfilesd -#patch from upstream: https://gitlab.nic.cz/labs/bird/-/commit/fcb4dd0c831339c4374ace17d8f2ae6ebfeed279.diff -Patch0: bird-2.0.9-babel-iface.patch BuildRequires: flex bison ncurses-devel readline-devel sed gcc make libssh-devel systemd Requires(pre): shadow-utils Obsoletes: bird-sysvinit @@ -41,8 +39,7 @@ powerful language for route filtering. %endif %prep -%setup -q -%patch0 -p1 -b .babel-iface +%autosetup -p1 %build %configure --runstatedir=%{_rundir}/bird @@ -95,6 +92,9 @@ exit 0 %endif %changelog +* Thu Jul 13 2023 yaoxin - 2.13.1-1 +- Update to 2.13.1 + * Fri May 13 2022 baizhonggui - 2.0.9-1 - update to 2.0.9