diff --git a/srcpkgs/babeld/patches/Convert-src_plen-to-v4mapped-encoding-on-import.patch b/srcpkgs/babeld/patches/Convert-src_plen-to-v4mapped-encoding-on-import.patch deleted file mode 100644 index 204f43df8b9..00000000000 --- a/srcpkgs/babeld/patches/Convert-src_plen-to-v4mapped-encoding-on-import.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cd8a9ba8014688092060eebe4a67e92d9083099b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= -Date: Wed, 26 Dec 2018 00:44:29 +0100 -Subject: [PATCH] kernel_netlink: Convert src_plen to v4mapped encoding on - import -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -src_plen for IPv4 routes imported from kernel has not been adjusted -to v4mapped encoding. Therefore IPv4 xroutes used an inconsistent encoding -which lead to failed comparisons when sending updates. - -Routes received from neighbors with the same prefix as xroutes therefore -have been announced to neighbours instead. - -This issue is fixed by converting src_plen on import. - -Signed-off-by: Fabian Bläse ---- - kernel_netlink.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git kernel_netlink.c kernel_netlink.c -index 618d74bc..c424f0ed 100644 ---- kernel_netlink.c -+++ kernel_netlink.c -@@ -1119,6 +1119,7 @@ parse_kernel_route_rta(struct rtmsg *rtm, int len, struct kernel_route *route) - v4tov6(route->prefix, zeroes); - v4tov6(route->src_prefix, zeroes); - route->plen = 96; -+ route->src_plen = 96; - } - route->proto = rtm->rtm_protocol; - - diff --git a/srcpkgs/babeld/template b/srcpkgs/babeld/template index 05d26248794..a810d6a6522 100644 --- a/srcpkgs/babeld/template +++ b/srcpkgs/babeld/template @@ -1,7 +1,7 @@ # Template file for 'babeld' pkgname=babeld -version=1.8.4 -revision=3 +version=1.8.5 +revision=1 wrksrc=babeld-babeld-${version} build_style=gnu-makefile short_desc="Babel loop-avoiding distance-vector routing daemon" @@ -9,7 +9,7 @@ maintainer="lemmi " license="MIT" homepage="https://www.irif.fr/~jch/software/babel/" distfiles="https://github.com/jech/babeld/archive/babeld-${version}.tar.gz" -checksum=952e7a4ad109d5ec33940b17f7a980857e0fbe483f5b19c42a7966ae8baae85b +checksum=91192a7d6f7e99ad6a68d696c2e7b174f8e1413c693d4dc31c77d04e24b64f3c do_install() { vbin babeld