diff options
| author | Jakub Ružička <jakub.ruzicka@nic.cz> | 2022-06-27 19:36:57 +0200 |
|---|---|---|
| committer | Jakub Ružička <jakub.ruzicka@nic.cz> | 2022-06-27 19:36:57 +0200 |
| commit | 4a805a5788cb45095090c89d4b809aea725c0809 (patch) | |
| tree | 805e42d28601d375263e37f9b5e5779e6327a4b5 | |
| parent | 8530dba95e37f895726e916c94c9580a1ff9d92c (diff) | |
| download | bird-4a805a5788cb45095090c89d4b809aea725c0809.tar.gz | |
d/patches: remove patch included upstream
Upstream commit: https://gitlab.nic.cz/labs/bird/-/commit/fcb4dd0c8313
included in 2.0.10
| -rw-r--r-- | debian/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 30 deletions
diff --git a/debian/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch b/debian/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch deleted file mode 100644 index bc694d57..00000000 --- a/debian/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.30.2 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2d8a5da3..00000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Babel-Fix-bug-in-iface-reconfiguration.patch |