diff --git a/net/frr5/Makefile b/net/frr5/Makefile index f8bff1d1e28a..42e8f524350c 100644 --- a/net/frr5/Makefile +++ b/net/frr5/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 5.0.1 -PORTREVISION= 5 +PORTVERSION= 5.0.2 DISTVERSIONPREFIX= frr- CATEGORIES= net ipv6 PKGNAMESUFFIX= 5 diff --git a/net/frr5/distinfo b/net/frr5/distinfo index 843c5d744636..8368af86bd0e 100644 --- a/net/frr5/distinfo +++ b/net/frr5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530788283 -SHA256 (FRRouting-frr-frr-5.0.1_GH0.tar.gz) = b2d94960a248f953fef5ee34a95229ff6426ceac27f4d187179f0146275dbf14 -SIZE (FRRouting-frr-frr-5.0.1_GH0.tar.gz) = 4360689 +TIMESTAMP = 1546957578 +SHA256 (FRRouting-frr-frr-5.0.2_GH0.tar.gz) = dd779061d95027419e02454a2b2893fb8f15281161db7e270def8b39618506f4 +SIZE (FRRouting-frr-frr-5.0.2_GH0.tar.gz) = 4367050 diff --git a/net/frr5/files/patch-Makefile.am b/net/frr5/files/patch-Makefile.am index 47cefba72bdd..d83d3d0620d3 100644 --- a/net/frr5/files/patch-Makefile.am +++ b/net/frr5/files/patch-Makefile.am @@ -1,4 +1,4 @@ ---- Makefile.am.orig 2018-06-08 01:39:07 UTC +--- Makefile.am.orig 2019-01-08 08:53:23 UTC +++ Makefile.am @@ -42,7 +42,7 @@ include zebra/subdir.am include watchfrr/subdir.am diff --git a/net/frr5/files/patch-isisd_isis__circuit.c b/net/frr5/files/patch-isisd_isis__circuit.c deleted file mode 100644 index 51d42737d0cf..000000000000 --- a/net/frr5/files/patch-isisd_isis__circuit.c +++ /dev/null @@ -1,51 +0,0 @@ -From d4670f515b7f62bfd8f9bdd750540245aab542c0 Mon Sep 17 00:00:00 2001 -From: Christian Franke -Date: Tue, 17 Jul 2018 15:14:54 -0400 -Subject: [PATCH] isisd: don't crash when isis_sock_init fails - -When isis_sock_init fails in isis_circuit_up, isis_circuit_down would -be called to cancel timers which were scheduled. However -isis_circuit_down would immediately return, since the state had not been -changed to 'UP' yet. - -Fix this by having isis_circuit_down always cancel all the timers. - -Signed-off-by: Christian Franke ---- isisd/isis_circuit.c.orig 2018-07-05 07:40:17 UTC -+++ isisd/isis_circuit.c -@@ -638,7 +638,7 @@ int isis_circuit_up(struct isis_circuit *circuit) - thread_add_timer(master, isis_run_dr_l2, circuit, - 2 * circuit->hello_interval[1], - &circuit->u.bc.t_run_dr[1]); -- } else { -+ } else if (circuit->circ_type == CIRCUIT_T_P2P) { - /* initializing the hello send threads - * for a ptp IF - */ -@@ -682,9 +682,6 @@ int isis_circuit_up(struct isis_circuit *circuit) - - void isis_circuit_down(struct isis_circuit *circuit) - { -- if (circuit->state != C_STATE_UP) -- return; -- - /* Clear the flags for all the lsps of the circuit. */ - isis_circuit_update_all_srmflags(circuit, 0); - -@@ -756,10 +753,12 @@ void isis_circuit_down(struct isis_circuit *circuit) - } - - /* send one gratuitous hello to spead up convergence */ -- if (circuit->is_type & IS_LEVEL_1) -- send_hello(circuit, IS_LEVEL_1); -- if (circuit->is_type & IS_LEVEL_2) -- send_hello(circuit, IS_LEVEL_2); -+ if (circuit->state == C_STATE_UP) { -+ if (circuit->is_type & IS_LEVEL_1) -+ send_hello(circuit, IS_LEVEL_1); -+ if (circuit->is_type & IS_LEVEL_2) -+ send_hello(circuit, IS_LEVEL_2); -+ } - - circuit->upadjcount[0] = 0; - circuit->upadjcount[1] = 0;