sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 5.0.2

Browse source
This commit is contained in:
Olivier Cochard 2019-01-08 15:22:52 +00:00
parent 77b91aeda7
commit 86a494e55c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=489705
4 changed files with 5 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/frr5/Makefile
View file

@ -1,8 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= frr PORTNAME= frr
PORTVERSION= 5.0.1 PORTVERSION= 5.0.2
PORTREVISION= 5
DISTVERSIONPREFIX= frr- DISTVERSIONPREFIX= frr-
CATEGORIES= net ipv6 CATEGORIES= net ipv6
PKGNAMESUFFIX= 5 PKGNAMESUFFIX= 5

6
net/frr5/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1530788283 TIMESTAMP = 1546957578
SHA256 (FRRouting-frr-frr-5.0.1_GH0.tar.gz) = b2d94960a248f953fef5ee34a95229ff6426ceac27f4d187179f0146275dbf14 SHA256 (FRRouting-frr-frr-5.0.2_GH0.tar.gz) = dd779061d95027419e02454a2b2893fb8f15281161db7e270def8b39618506f4
SIZE (FRRouting-frr-frr-5.0.1_GH0.tar.gz) = 4360689 SIZE (FRRouting-frr-frr-5.0.2_GH0.tar.gz) = 4367050

2
net/frr5/files/patch-Makefile.am
View file

@ -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 +++ Makefile.am
@@ -42,7 +42,7 @@ include zebra/subdir.am @@ -42,7 +42,7 @@ include zebra/subdir.am
include watchfrr/subdir.am include watchfrr/subdir.am

51
net/frr5/files/patch-isisd_isis__circuit.c
View file

@ -1,51 +0,0 @@
From d4670f515b7f62bfd8f9bdd750540245aab542c0 Mon Sep 17 00:00:00 2001
From: Christian Franke <chris@opensourcerouting.org>
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 <chris@opensourcerouting.org>
--- 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;