Index: head/net/frr7/Makefile =================================================================== --- head/net/frr7/Makefile (revision 554859) +++ head/net/frr7/Makefile (revision 554860) @@ -1,138 +1,137 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 7.4 +PORTVERSION= 7.5 DISTVERSIONPREFIX= frr- -PORTREVISION= 4 CATEGORIES= net .if defined(PYTHONTOOLS) PKGNAMESUFFIX= 7-pythontools .else PKGNAMESUFFIX= 7 .endif MAINTAINER= olivier@FreeBSD.org COMMENT?= IP routing protocol suite including BGP, IS-IS, OSPF and RIP LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING .if defined(PYTHONTOOLS) RUN_DEPENDS= frr-reload:net/frr7 USES= python:run shebangfix post-patch: @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ -e 's|/usr/bin|${PREFIX}/bin|g' \ -e 's|/usr/local/bin/tail|${TAIL}|g' \ ${WRKSRC}/tools/frr-reload.py do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/frr ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload.py ${STAGEDIR}/${PREFIX}/lib/frr/ .else 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 shebangfix BINARY_ALIAS= python=${PYTHON_VERSION} CONFLICTS= openbgpd openospfd zebra quagga GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes .endif USE_GITHUB= yes GH_ACCOUNT= FRRouting .if defined(PYTHONTOOLS) NO_BUILD= yes NO_ARCH= yes SHEBANG_FILES= tools/frr-reload.py PLIST= ${.CURDIR}/pkg-plist PKGMESSAGE= "" .else INFO= frr OPTIONS_DEFINE= CONFIGROLLBACKS FPM DATACENTER LDPD PAM SHELLACCESS \ 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 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-backtrace \ --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 SNMP_USES= ssl VTYSH_CONFIGURE_ENABLE= vtysh USE_RC_SUBR= frr watchfrr SHEBANG_FILES= yang/embedmodel.py post-patch: @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ -e 's|/usr/lib/|${PREFIX}/lib/|g' \ -e 's|frr-pythontools|frr7-pythontools|g' \ ${WRKSRC}/tools/frr-reload post-install: ${MKDIR} ${STAGEDIR}/var/run/frr ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload ${STAGEDIR}${PREFIX}/sbin .endif .include Index: head/net/frr7/distinfo =================================================================== --- head/net/frr7/distinfo (revision 554859) +++ head/net/frr7/distinfo (revision 554860) @@ -1,3 +1,3 @@ -TIMESTAMP = 1595492688 -SHA256 (FRRouting-frr-frr-7.4_GH0.tar.gz) = 3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a -SIZE (FRRouting-frr-frr-7.4_GH0.tar.gz) = 6074854 +TIMESTAMP = 1605025656 +SHA256 (FRRouting-frr-frr-7.5_GH0.tar.gz) = 54066e82a82751ec5876d9b67aa0cb24fe94e19e7371af290ac25099eda9f136 +SIZE (FRRouting-frr-frr-7.5_GH0.tar.gz) = 6730659 Index: head/net/frr7/files/patch-vtysh_vtysh.c =================================================================== --- head/net/frr7/files/patch-vtysh_vtysh.c (revision 554859) +++ head/net/frr7/files/patch-vtysh_vtysh.c (nonexistent) @@ -1,22 +0,0 @@ -From b727c12aabf1afc2b6e33f8590c9786e349e4fcb Mon Sep 17 00:00:00 2001 -From: Paul Manley -Date: Thu, 9 Jul 2020 11:25:34 -0500 -Subject: [PATCH] vtysh: properly exit BFD_PEER_NODE when marking file - -vtysh needs to be aware of how to properly exit a bfd peer when subsequent commands only succeed in a higher context. - -https://github.com/FRRouting/frr/issues/6511#issuecomment-656166206 - -Signed-off-by: Paul Manley ---- vtysh/vtysh.c.orig 2020-06-30 11:08:57 UTC -+++ vtysh/vtysh.c -@@ -809,6 +809,9 @@ int vtysh_mark_file(const char *filename) - } else if ((prev_node == KEYCHAIN_KEY_NODE) - && (tried == 1)) { - vty_out(vty, "exit\n"); -+ } else if ((prev_node == BFD_PEER_NODE) -+ && (tried == 1)) { -+ vty_out(vty, "exit\n"); - } else if (tried) { - vty_out(vty, "end\n"); - } Property changes on: head/net/frr7/files/patch-vtysh_vtysh.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/frr7/files/patch-tools_frr-reload.py =================================================================== --- head/net/frr7/files/patch-tools_frr-reload.py (revision 554859) +++ head/net/frr7/files/patch-tools_frr-reload.py (nonexistent) @@ -1,20 +0,0 @@ -From 1c23a0aaa1c5d20af50af75b070e93e1eff21222 Mon Sep 17 00:00:00 2001 -From: Paul Manley -Date: Thu, 9 Jul 2020 11:21:16 -0500 -Subject: [PATCH] tools: create sub-context for bfd peers - -add lines starting with 'peer' to the list of sub-contexts that are handled by frr-reload.py. - -https://github.com/FRRouting/frr/issues/6511#issuecomment-655163833 - -Signed-off-by: Paul Manley ---- tools/frr-reload.py.orig 2020-06-30 11:08:57 UTC -+++ tools/frr-reload.py -@@ -496,6 +496,7 @@ end - line.startswith("vnc defaults") or - line.startswith("vnc l2-group") or - line.startswith("vnc nve-group") or -+ line.startswith("peer") or - line.startswith("member pseudowire")): - main_ctx_key = [] - Property changes on: head/net/frr7/files/patch-tools_frr-reload.py ___________________________________________________________________ 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/frr7/files/patch-lib_zlog.c =================================================================== --- head/net/frr7/files/patch-lib_zlog.c (revision 554859) +++ head/net/frr7/files/patch-lib_zlog.c (nonexistent) @@ -1,16 +0,0 @@ ---- lib/zlog.c.orig 2020-06-30 11:08:57 UTC -+++ lib/zlog.c -@@ -246,10 +246,10 @@ void zlog_tls_buffer_init(void) - fchown(mmfd, zlog_uid, zlog_gid); - - #ifdef HAVE_POSIX_FALLOCATE -- if (posix_fallocate(mmfd, 0, TLS_LOG_BUF_SIZE) < 0) { --#else -- if (ftruncate(mmfd, TLS_LOG_BUF_SIZE) < 0) { -+ if (posix_fallocate(mmfd, 0, TLS_LOG_BUF_SIZE) != 0) -+ /* note next statement is under above if() */ - #endif -+ if (ftruncate(mmfd, TLS_LOG_BUF_SIZE) < 0) { - zlog_err("failed to allocate thread log buffer \"%s\": %s", - mmpath, strerror(errno)); - goto out_anon_unlink; Property changes on: head/net/frr7/files/patch-lib_zlog.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/frr7/pkg-plist =================================================================== --- head/net/frr7/pkg-plist (revision 554859) +++ head/net/frr7/pkg-plist (revision 554860) @@ -1,211 +1,210 @@ %%VTYSH%%bin/vtysh include/frr/agg_table.h include/frr/atomlist.h include/frr/yang.h include/frr/yang_translator.h include/frr/yang_wrappers.h include/frr/bfd.h include/frr/bitfield.h include/frr/buffer.h include/frr/checksum.h include/frr/command.h include/frr/command_graph.h include/frr/command_match.h include/frr/compiler.h include/frr/csv.h include/frr/db.h include/frr/debug.h include/frr/defaults.h include/frr/distribute.h include/frr/eigrpd/eigrp_dump.h include/frr/eigrpd/eigrp_topology.h include/frr/eigrpd/eigrpd.h include/frr/ferr.h include/frr/filter.h include/frr/freebsd-queue.h include/frr/frr_pthread.h include/frr/frratomic.h include/frr/frrcu.h include/frr/frrlua.h include/frr/frrstr.h include/frr/getopt.h include/frr/graph.h include/frr/hash.h include/frr/hook.h include/frr/iana_afi.h include/frr/id_alloc.h include/frr/if.h include/frr/if_rmap.h include/frr/imsg.h include/frr/ipaddr.h include/frr/jhash.h include/frr/json.h include/frr/keychain.h include/frr/lib_errors.h include/frr/lib_vty.h include/frr/libfrr.h include/frr/libospf.h include/frr/linklist.h include/frr/log.h include/frr/log_vty.h include/frr/md5.h include/frr/memory.h include/frr/mlag.h include/frr/module.h include/frr/monotime.h include/frr/mpls.h include/frr/network.h include/frr/nexthop.h include/frr/nexthop_group.h include/frr/nexthop_group_private.h include/frr/northbound.h include/frr/northbound_cli.h include/frr/northbound_db.h include/frr/ns.h include/frr/openbsd-queue.h include/frr/openbsd-tree.h include/frr/ospfapi/ospf_apiclient.h include/frr/ospfd/ospf_api.h include/frr/ospfd/ospf_asbr.h include/frr/ospfd/ospf_dump.h include/frr/ospfd/ospf_dump_api.h include/frr/ospfd/ospf_ism.h include/frr/ospfd/ospf_lsa.h include/frr/ospfd/ospf_lsdb.h include/frr/ospfd/ospf_nsm.h include/frr/ospfd/ospf_opaque.h include/frr/ospfd/ospfd.h include/frr/pbr.h include/frr/plist.h include/frr/prefix.h include/frr/printfrr.h include/frr/privs.h include/frr/ptm_lib.h include/frr/pullwr.h include/frr/pw.h include/frr/queue.h include/frr/qobj.h include/frr/ringbuf.h include/frr/route_types.h include/frr/routemap.h +include/frr/routing_nb.h include/frr/sbuf.h include/frr/seqlock.h include/frr/sha256.h include/frr/sigevent.h include/frr/smux.h include/frr/spf_backoff.h include/frr/skiplist.h include/frr/sockopt.h include/frr/sockunion.h include/frr/srcdest_table.h +include/frr/srte.h include/frr/srv6.h include/frr/stream.h include/frr/systemd.h include/frr/table.h include/frr/termtable.h include/frr/thread.h include/frr/typerb.h include/frr/typesafe.h include/frr/vector.h include/frr/version.h include/frr/vlan.h include/frr/vrf_int.h include/frr/vrf.h include/frr/vty.h include/frr/vxlan.h include/frr/wheel.h include/frr/workqueue.h include/frr/zassert.h include/frr/zclient.h include/frr/zebra.h include/frr/zlog.h include/frr/zlog_targets.h lib/libfrr.a lib/libfrr.so lib/libfrr.so.0 lib/libfrr.so.0.0.0 lib/libfrrospfapiclient.a lib/libfrrospfapiclient.so lib/libfrrospfapiclient.so.0 lib/libfrrospfapiclient.so.0.0.0 %%SNMP%%lib/frr/modules/bgpd_snmp.so %%SNMP%%lib/frr/modules/ospf6d_snmp.so %%SNMP%%lib/frr/modules/ospfd_snmp.so %%SNMP%%lib/frr/modules/ripd_snmp.so %%SNMP%%lib/frr/modules/zebra_snmp.so %%FPM%%lib/frr/modules/zebra_fpm.so %%SNMP%%lib/libfrrsnmp.a %%SNMP%%lib/libfrrsnmp.so %%SNMP%%lib/libfrrsnmp.so.0 %%SNMP%%lib/libfrrsnmp.so.0.0.0 %%RPKI%%lib/frr/modules/bgpd_rpki.so %%MANPAGES%%man/man1/frr.1.gz %%MANPAGES%%man/man8/frr-bfdd.8.gz %%MANPAGES%%man/man8/frr-eigrpd.8.gz %%MANPAGES%%man/man8/frr-isisd.8.gz %%MANPAGES%%man/man8/frr-staticd.8.gz %%MANPAGES%%man/man8/frr-watchfrr.8.gz %%MANPAGES%%%%VTYSH%%man/man1/vtysh.1.gz %%MANPAGES%%man/man8/frr-bgpd.8.gz %%MANPAGES%%%%LDPD%%man/man8/frr-ldpd.8.gz %%MANPAGES%%man/man8/frr-ospf6d.8.gz %%MANPAGES%%man/man8/frr-ospfd.8.gz %%MANPAGES%%man/man8/frr-pbrd.8.gz %%MANPAGES%%man/man8/frr-ripd.8.gz %%MANPAGES%%man/man8/frr-ripngd.8.gz %%MANPAGES%%man/man8/frr-zebra.8.gz sbin/babeld sbin/bfdd sbin/bgpd %%LDPD%%sbin/ldpd sbin/eigrpd sbin/fabricd sbin/frr-reload sbin/ospf6d sbin/ospfd sbin/pbrd sbin/ripd sbin/ripngd sbin/staticd sbin/zebra sbin/isisd sbin/watchfrr share/yang/frr-bfdd.yang share/yang/frr-eigrpd.yang share/yang/frr-interface.yang share/yang/frr-isisd.yang share/yang/frr-module-translator.yang share/yang/frr-ripd.yang share/yang/frr-ripngd.yang share/yang/frr-route-types.yang share/yang/frr-test-module.yang share/yang/frr-filter.yang -share/yang/frr-igmp.yang share/yang/frr-nexthop.yang -share/yang/frr-pim-rp.yang -share/yang/frr-pim.yang share/yang/frr-route-map.yang share/yang/frr-routing.yang share/yang/frr-staticd.yang share/yang/frr-vrf.yang share/yang/frr-zebra.yang share/yang/ietf-interfaces.yang share/yang/ietf-routing-types.yang %%ETCDIR%%/babeld.conf.sample %%ETCDIR%%/bfdd.conf.sample %%ETCDIR%%/bgpd.conf.sample %%ETCDIR%%/bgpd.conf.sample2 %%ETCDIR%%/bgpd.conf.vnc.sample %%ETCDIR%%/eigrpd.conf.sample %%ETCDIR%%/fabricd.conf.sample %%ETCDIR%%/isisd.conf.sample %%LDPD%%%%ETCDIR%%/ldpd.conf.sample %%ETCDIR%%/ospf6d.conf.sample %%ETCDIR%%/ospfd.conf.sample %%ETCDIR%%/pbrd.conf.sample %%ETCDIR%%/ripd.conf.sample %%ETCDIR%%/ripngd.conf.sample %%ETCDIR%%/staticd.conf.sample %%VTYSH%%%%ETCDIR%%/vtysh.conf.sample %%ETCDIR%%/zebra.conf.sample @dir(frr,frr,750) /var/run/frr