!9 Update to 2.13.1

From: @starlet-dx 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2023-07-14 08:07:29 +00:00 committed by Gitee
commit e79b2e2ffa
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 7 additions and 31 deletions

View File

@ -1,25 +0,0 @@
From 5b9df34e09da9091d19355fba8236d3c36e24660 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
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

Binary file not shown.

BIN
bird-2.13.1.tar.gz Normal file

Binary file not shown.

View File

@ -5,8 +5,9 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
ExecStartPre=/usr/sbin/bird -p
ExecStart=/usr/sbin/bird -f -u bird -g bird ExecStart=/usr/sbin/bird -f -u bird -g bird
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/usr/sbin/birdc configure
Restart=on-failure Restart=on-failure
[Install] [Install]

View File

@ -1,6 +1,6 @@
%global _hardened_build 1 %global _hardened_build 1
Name: bird Name: bird
Version: 2.0.9 Version: 2.13.1
Release: 1 Release: 1
Summary: BIRD Internet Routing Daemon Summary: BIRD Internet Routing Daemon
License: GPLv2+ License: GPLv2+
@ -8,8 +8,6 @@ URL: https://bird.network.cz/
Source0: https://bird.network.cz/download/bird-%{version}.tar.gz Source0: https://bird.network.cz/download/bird-%{version}.tar.gz
Source1: bird.service Source1: bird.service
Source2: bird.tmpfilesd 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 BuildRequires: flex bison ncurses-devel readline-devel sed gcc make libssh-devel systemd
Requires(pre): shadow-utils Requires(pre): shadow-utils
Obsoletes: bird-sysvinit Obsoletes: bird-sysvinit
@ -41,8 +39,7 @@ powerful language for route filtering.
%endif %endif
%prep %prep
%setup -q %autosetup -p1
%patch0 -p1 -b .babel-iface
%build %build
%configure --runstatedir=%{_rundir}/bird %configure --runstatedir=%{_rundir}/bird
@ -95,6 +92,9 @@ exit 0
%endif %endif
%changelog %changelog
* Thu Jul 13 2023 yaoxin <yao_xin001@hoperun.com> - 2.13.1-1
- Update to 2.13.1
* Fri May 13 2022 baizhonggui <baizhonggui@h-partners.com> - 2.0.9-1 * Fri May 13 2022 baizhonggui <baizhonggui@h-partners.com> - 2.0.9-1
- update to 2.0.9 - update to 2.0.9