Index: head/net/frr5/Makefile =================================================================== --- head/net/frr5/Makefile (revision 489704) +++ head/net/frr5/Makefile (revision 489705) @@ -1,86 +1,85 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 5.0.1 -PORTREVISION= 5 +PORTVERSION= 5.0.2 DISTVERSIONPREFIX= frr- CATEGORIES= net ipv6 PKGNAMESUFFIX= 5 MAINTAINER= olivier@FreeBSD.org COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk LIB_DEPENDS= libjson-c.so:devel/json-c CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr6 USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ makeinfo python:2.7,build readline GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= FRRouting INFO= frr OPTIONS_DEFINE= FPM LDPD PAM SHELLACCESS TCPSOCKETS VTYSH MANPAGES \ MULTIPATH TCMALLOC RPKI SNMP OPTIONS_DEFAULT= VTYSH RPKI FPM MANPAGES OPTIONS_SUB= yes FPM_DESC= Enable Forwarding Plane Manager support LDPD_DESC= Build ldpd MULTIPATH_DESC= Enable multipath function PAM_DESC= Use libpam for PAM support in vtysh RPKI_DESC= Add BGP RPKI (RFC 6810) support SHELLACCESS_DESC= Allow users to access shell/telnet/ssh SNMP_DESC= SNMP support TCMALLOC_DESC= Use tcmalloc TCPSOCKETS_DESC= Use TCP/IP sockets for protocol daemons VTYSH_DESC= Build integrated vty shell USERS= frr GROUPS= frr frrvty CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib # PIM compile but didn't work on FreeBSD CONFIGURE_ARGS= --enable-user=frr \ --enable-group=frr \ --enable-vty-group=frrvty \ --sysconfdir=${ETCDIR} \ --localstatedir=/var/run/frr \ --disable-nhrpd \ --disable-pimd MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_OFF= --disable-doc SHELLACCESS_CONFIGURE_ENABLE= shell-access FPM_CONFIGURE_ENABLE= fpm PAM_CONFIGURE_WITH= libpam LDPD_CONFIGURE_ENABLE= ldpd MULTIPATH_CONFIGURE_ON= --enable-multipath=64 RPKI_CONFIGURE_ENABLE= rpki RPKI_LIB_DEPENDS= librtr.so:net-mgmt/rtrlib \ libssh.so:security/libssh TCMALLOC_CONFIGURE_ENABLE= tcmalloc TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools SNMP_CONFIGURE_ENABLE= snmp SNMP_CFLAGS= "-std=gnu99" SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra VTYSH_CONFIGURE_ENABLE= vtysh USE_RC_SUBR= frr watchfrr post-install: ${MKDIR} ${STAGEDIR}/var/run/frr .include Index: head/net/frr5/distinfo =================================================================== --- head/net/frr5/distinfo (revision 489704) +++ head/net/frr5/distinfo (revision 489705) @@ -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 Index: head/net/frr5/files/patch-isisd_isis__circuit.c =================================================================== --- head/net/frr5/files/patch-isisd_isis__circuit.c (revision 489704) +++ head/net/frr5/files/patch-isisd_isis__circuit.c (nonexistent) @@ -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; Property changes on: head/net/frr5/files/patch-isisd_isis__circuit.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/frr5/files/patch-Makefile.am =================================================================== --- head/net/frr5/files/patch-Makefile.am (revision 489704) +++ head/net/frr5/files/patch-Makefile.am (revision 489705) @@ -1,11 +1,11 @@ ---- 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 include qpb/subdir.am include fpm/subdir.am -include tools/subdir.am +#include tools/subdir.am include ripd/subdir.am include ripngd/subdir.am