Index: head/net/frr7/Makefile =================================================================== --- head/net/frr7/Makefile (revision 536668) +++ head/net/frr7/Makefile (revision 536669) @@ -1,100 +1,100 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 7.3 +PORTVERSION= 7.3.1 DISTVERSIONPREFIX= frr- -PORTREVISION= 2 +CATEGORIES= net CATEGORIES= net PKGNAMESUFFIX= 7 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 \ libyang.so:net/libyang USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ makeinfo python:build readline BINARY_ALIAS= python=${PYTHON_VERSION} CONFLICTS= openbgpd openospfd zebra quagga frr5 frr6 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= FRRouting INFO= frr OPTIONS_DEFINE= CONFIGROLLBACKS FPM DATACENTER LDPD PAM SHELLACCESS \ TCPSOCKETS VTYSH MANPAGES MULTIPATH TCMALLOC RPKI SNMP OPTIONS_DEFAULT= VTYSH RPKI FPM MANPAGES OPTIONS_SUB= yes CONFIGROLLBACKS_DESC= Enable configuration rollback support FPM_DESC= Enable Forwarding Plane Manager support DATACENTER_DESC= Use reduced BGP timers 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 \ --disable-doc-html \ --sysconfdir=${ETCDIR} \ --localstatedir=/var/run/frr \ --disable-nhrpd \ --disable-pimd \ --disable-vrrpd \ --with-vtysh-pager=cat MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} MANPAGES_CONFIGURE_OFF= --disable-doc CONFIGROLLBACKS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 CONFIGROLLBACKS_CONFIGURE_ENABLE= config-rollbacks DATACENTER_CONFIGURE_ENABLE= datacenter 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 SHEBANG_FILES= yang/embedmodel.py post-install: ${MKDIR} ${STAGEDIR}/var/run/frr .include Index: head/net/frr7/distinfo =================================================================== --- head/net/frr7/distinfo (revision 536668) +++ head/net/frr7/distinfo (revision 536669) @@ -1,3 +1,3 @@ -TIMESTAMP = 1582712493 -SHA256 (FRRouting-frr-frr-7.3_GH0.tar.gz) = c209ed66a0331221649b8c21dc8c6704ce1696e2017ef4d48f8c2ac6b1fa01b7 -SIZE (FRRouting-frr-frr-7.3_GH0.tar.gz) = 5782842 +TIMESTAMP = 1589228942 +SHA256 (FRRouting-frr-frr-7.3.1_GH0.tar.gz) = 81129f83ce9ae31c983bb02b3d8e3e457604bab46f01411c945d9c2cfef1f5c8 +SIZE (FRRouting-frr-frr-7.3.1_GH0.tar.gz) = 5785833 Index: head/net/frr7/files/patch-bgpd_bgp__route.c =================================================================== --- head/net/frr7/files/patch-bgpd_bgp__route.c (revision 536668) +++ head/net/frr7/files/patch-bgpd_bgp__route.c (nonexistent) @@ -1,29 +0,0 @@ ---- bgpd/bgp_route.c.orig 2020-02-14 14:03:09 UTC -+++ bgpd/bgp_route.c -@@ -9922,7 +9922,7 @@ static int bgp_show_route_in_table(struct vty *vty, st - } - } else if (safi == SAFI_EVPN) { - struct bgp_node *longest_pfx; -- bool is_exact_pfxlen_match = FALSE; -+ bool is_exact_pfxlen_match = false; - - for (rn = bgp_table_top(rib); rn; rn = bgp_route_next(rn)) { - if (prd && memcmp(rn->p.u.val, prd->val, 8) != 0) -@@ -9932,7 +9932,7 @@ static int bgp_show_route_in_table(struct vty *vty, st - continue; - - longest_pfx = NULL; -- is_exact_pfxlen_match = FALSE; -+ is_exact_pfxlen_match = false; - /* - * Search through all the prefixes for a match. The - * pfx's are enumerated in ascending order of pfxlens. -@@ -9951,7 +9951,7 @@ static int bgp_show_route_in_table(struct vty *vty, st - int type5_pfxlen = - bgp_evpn_get_type5_prefixlen(&rm->p); - if (type5_pfxlen == match.prefixlen) { -- is_exact_pfxlen_match = TRUE; -+ is_exact_pfxlen_match = true; - bgp_unlock_node(rm); - break; - } Property changes on: head/net/frr7/files/patch-bgpd_bgp__route.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