Index: INSTALL =================================================================== RCS file: INSTALL diff -N INSTALL --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ INSTALL 3 Aug 2025 01:15:09 -0000 @@ -0,0 +1,37 @@ +# $NetBSD$ + +FRR_VTY_GROUP="@FRR_VTY_GROUP@" +FRR_USER="@FRR_USER@" + +message() +{ + "${CAT}" << EOM +=========================================================================== + +IMPORTANT: +To complete the installation you need to add the user "${FRR_USER}" +to the (secondary) group "${FRR_VTY_GROUP}". + +=========================================================================== +EOM +} + +case ${STAGE} in +POST-INSTALL) + found="${FALSE}" + for group in $("${ID}" -Gn "${FRR_USER}") + do + case "${group}" in + "${FRR_VTY_GROUP}") + found="${TRUE}" + break + ;; + esac + done + if ! "${found}" + then + #"${USERMOD}" -G "${FRR_VTY_GROUP}" "${FRR_USER}" + message + fi + ;; +esac Index: MESSAGE =================================================================== RCS file: MESSAGE diff -N MESSAGE --- MESSAGE 11 Aug 2021 10:09:54 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,8 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2021/08/11 10:09:54 kardel Exp $ - -IMPORTANT: -To complete the installation you need to add -the user "${FRR_USER}" to the (secondary) group "${FRR_VTY_GROUP}". - -=========================================================================== Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/net/frr/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile 3 Jul 2025 06:28:33 -0000 1.24 +++ Makefile 3 Aug 2025 01:15:09 -0000 @@ -1,10 +1,9 @@ # $NetBSD: Makefile,v 1.24 2025/07/03 06:28:33 wiz Exp $ GITHUB_PROJECT= frr -VERSION= 9.1 +VERSION= 10.4.0 GITHUB_TAG= frr-${VERSION} DISTNAME= frr-${VERSION} -PKGREVISION= 7 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=FRRouting/} @@ -44,6 +43,9 @@ PKG_SHELL.${FRR_USER}= /bin/sh PKG_GROUPS= ${FRR_GROUP} ${FRR_VTY_GROUP} PKG_USERS= ${FRR_USER}:${FRR_GROUP} +FILES_SUBST+= FRR_VTY_GROUP=${FRR_VTY_GROUP} +FILES_SUBST+= FRR_USER=${FRR_USER} + RCD_SUPPLIED= bgpd ospf6d ospfd ripd ripngd zebra RCD_SCRIPTS= ${RCD_SUPPLIED} staticd @@ -59,6 +61,8 @@ REPLACE_PYTHON= tools/generate_support_b MESSAGE_SUBST+= FRR_USER=${FRR_USER} MESSAGE_SUBST+= FRR_VTY_GROUP=${FRR_VTY_GROUP} +PRINT_PLIST_AWK+= { sub(/^(info|man|share\/doc)\//, "$${PLIST.doc}&"); } + SUBST_CLASSES+= ids SUBST_STAGE.ids= pre-configure SUBST_MESSAGE.ids= Fixing user/group references. @@ -95,15 +99,10 @@ CONFIGURE_ARGS+= --with-pkg-git-version CONFIGURE_ARGS+= --with-pkg-extra-version=/${DISTNAME} # CONFIGURE_ARGS+= --enable-address-sanitizer CONFIGURE_ARGS+= --enable-dev-build + pre-configure: cd ${WRKSRC} && ${SH} bootstrap.sh -# -# remove dynamically acquired .js files -# -post-build: - cd ${WRKSRC} && rm -f doc/user/_build/html/_static/jquery-*.js doc/user/_build/html/_static/underscore-*.js - .include "../../devel/libyang2/buildlink3.mk" .include "../../devel/protobuf-c/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" Index: PLIST =================================================================== RCS file: /cvsroot/pkgsrc/net/frr/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- PLIST 9 Jan 2024 20:17:41 -0000 1.8 +++ PLIST 3 Aug 2025 01:15:10 -0000 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2024/01/09 20:17:41 chopps Exp $ +@comment $NetBSD$ bin/mtracebis bin/vtysh include/frr/admin_group.h @@ -34,13 +34,16 @@ include/frr/freebsd-queue.h include/frr/frr_pthread.h include/frr/frratomic.h include/frr/frrcu.h +include/frr/frrdistance.h include/frr/frrevent.h include/frr/frrlua.h include/frr/frrscript.h +include/frr/frrsendmmsg.h include/frr/frrstr.h include/frr/graph.h include/frr/hash.h include/frr/hook.h +include/frr/host_nb.h include/frr/iana_afi.h include/frr/id_alloc.h include/frr/if.h @@ -54,6 +57,7 @@ include/frr/keychain.h include/frr/ldp_sync.h include/frr/lib_errors.h include/frr/lib_vty.h +include/frr/libagentx.h include/frr/libfrr.h include/frr/libfrr_trace.h include/frr/libospf.h @@ -63,12 +67,11 @@ include/frr/log.h include/frr/log_vty.h include/frr/md5.h include/frr/memory.h -include/frr/mgmt.pb-c.h include/frr/mgmt_be_client.h +include/frr/mgmt_defines.h include/frr/mgmt_fe_client.h include/frr/mgmt_msg.h -include/frr/mgmt_pb.h -include/frr/mgmtd/mgmt_defines.h +include/frr/mgmt_msg_native.h include/frr/mlag.h include/frr/module.h include/frr/monotime.h @@ -148,6 +151,7 @@ include/frr/zebra.h include/frr/zlog.h include/frr/zlog_5424.h include/frr/zlog_live.h +include/frr/zlog_recirculate.h include/frr/zlog_targets.h ${PLIST.doc}info/frr.info lib/frr/modules/bgpd_bmp.la @@ -159,6 +163,7 @@ lib/libfrr_pb.la lib/libfrrcares.la lib/libfrrfpm_pb.la lib/libmgmt_be_nb.la +lib/libmlag_pb.la ${PLIST.doc}man/man1/frr.1 ${PLIST.doc}man/man1/vtysh.1 ${PLIST.doc}man/man8/frr-bfdd.8 @@ -182,6 +187,7 @@ sbin/bfdd sbin/bgpd sbin/eigrpd sbin/fabricd +sbin/fpm_listener sbin/frr sbin/frr-reload sbin/frr-reload.py @@ -219,13 +225,16 @@ ${PLIST.doc}share/doc/frr/html/_images/f ${PLIST.doc}share/doc/frr/html/_images/pathd_config.png ${PLIST.doc}share/doc/frr/html/_images/pathd_general.png ${PLIST.doc}share/doc/frr/html/_images/pathd_initiated_multi.png +${PLIST.doc}share/doc/frr/html/_sources/about.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/affinitymap.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/babeld.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/basic.rst.txt +${PLIST.doc}share/doc/frr/html/_sources/basics.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/bfd.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/bgp.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/bmp.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/bugs.rst.txt +${PLIST.doc}share/doc/frr/html/_sources/config-include.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/eigrpd.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/evpn.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/extlog.rst.txt @@ -236,6 +245,7 @@ ${PLIST.doc}share/doc/frr/html/_sources/ ${PLIST.doc}share/doc/frr/html/_sources/grpc.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/index.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/installation.rst.txt +${PLIST.doc}share/doc/frr/html/_sources/introduction.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/ipv6.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/isisd.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/kernel.rst.txt @@ -245,15 +255,17 @@ ${PLIST.doc}share/doc/frr/html/_sources/ ${PLIST.doc}share/doc/frr/html/_sources/nhrpd.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/ospf6d.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/ospfd.rst.txt -${PLIST.doc}share/doc/frr/html/_sources/overview.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/packet-dumps.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/pathd.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/pbr.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/pim.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/pimv6.rst.txt +${PLIST.doc}share/doc/frr/html/_sources/prior-config-files.rst.txt +${PLIST.doc}share/doc/frr/html/_sources/protocols.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/ripd.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/ripngd.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/routemap.rst.txt +${PLIST.doc}share/doc/frr/html/_sources/sbfd.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/scripting.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/setup.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/sharp.rst.txt @@ -264,14 +276,60 @@ ${PLIST.doc}share/doc/frr/html/_sources/ ${PLIST.doc}share/doc/frr/html/_sources/vtysh.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/watchfrr.rst.txt ${PLIST.doc}share/doc/frr/html/_sources/zebra.rst.txt +${PLIST.doc}share/doc/frr/html/_static/_sphinx_javascript_frameworks_compat.js ${PLIST.doc}share/doc/frr/html/_static/basic.css -${PLIST.doc}share/doc/frr/html/_static/classic.css -${PLIST.doc}share/doc/frr/html/_static/default.css +${PLIST.doc}share/doc/frr/html/_static/css/badge_only.css +${PLIST.doc}share/doc/frr/html/_static/css/fonts/Roboto-Slab-Bold.woff +${PLIST.doc}share/doc/frr/html/_static/css/fonts/Roboto-Slab-Bold.woff2 +${PLIST.doc}share/doc/frr/html/_static/css/fonts/Roboto-Slab-Regular.woff +${PLIST.doc}share/doc/frr/html/_static/css/fonts/Roboto-Slab-Regular.woff2 +${PLIST.doc}share/doc/frr/html/_static/css/fonts/fontawesome-webfont.eot +${PLIST.doc}share/doc/frr/html/_static/css/fonts/fontawesome-webfont.svg +${PLIST.doc}share/doc/frr/html/_static/css/fonts/fontawesome-webfont.ttf +${PLIST.doc}share/doc/frr/html/_static/css/fonts/fontawesome-webfont.woff +${PLIST.doc}share/doc/frr/html/_static/css/fonts/fontawesome-webfont.woff2 +${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-bold-italic.woff +${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-bold-italic.woff2 +${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-bold.woff +${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-bold.woff2 +${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-normal-italic.woff +${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-normal-italic.woff2 +${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-normal.woff +${PLIST.doc}share/doc/frr/html/_static/css/fonts/lato-normal.woff2 +${PLIST.doc}share/doc/frr/html/_static/css/theme.css ${PLIST.doc}share/doc/frr/html/_static/doctools.js ${PLIST.doc}share/doc/frr/html/_static/documentation_options.js ${PLIST.doc}share/doc/frr/html/_static/file.png +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bold.eot +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bold.ttf +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bold.woff +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bold.woff2 +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bolditalic.eot +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bolditalic.ttf +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bolditalic.woff +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-bolditalic.woff2 +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-italic.eot +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-italic.ttf +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-italic.woff +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-italic.woff2 +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-regular.eot +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-regular.ttf +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-regular.woff +${PLIST.doc}share/doc/frr/html/_static/fonts/Lato/lato-regular.woff2 +${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.eot +${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.ttf +${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff +${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff2 +${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.eot +${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.ttf +${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff +${PLIST.doc}share/doc/frr/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff2 ${PLIST.doc}share/doc/frr/html/_static/frr-icon.svg ${PLIST.doc}share/doc/frr/html/_static/frr-logo-icon.png +${PLIST.doc}share/doc/frr/html/_static/jquery.js +${PLIST.doc}share/doc/frr/html/_static/js/badge_only.js +${PLIST.doc}share/doc/frr/html/_static/js/theme.js +${PLIST.doc}share/doc/frr/html/_static/js/versions.js ${PLIST.doc}share/doc/frr/html/_static/language_data.js ${PLIST.doc}share/doc/frr/html/_static/minus.png ${PLIST.doc}share/doc/frr/html/_static/overrides.css @@ -279,15 +337,17 @@ ${PLIST.doc}share/doc/frr/html/_static/o ${PLIST.doc}share/doc/frr/html/_static/plus.png ${PLIST.doc}share/doc/frr/html/_static/pygments.css ${PLIST.doc}share/doc/frr/html/_static/searchtools.js -${PLIST.doc}share/doc/frr/html/_static/sidebar.js ${PLIST.doc}share/doc/frr/html/_static/sphinx_highlight.js +${PLIST.doc}share/doc/frr/html/about.html ${PLIST.doc}share/doc/frr/html/affinitymap.html ${PLIST.doc}share/doc/frr/html/babeld.html ${PLIST.doc}share/doc/frr/html/basic.html +${PLIST.doc}share/doc/frr/html/basics.html ${PLIST.doc}share/doc/frr/html/bfd.html ${PLIST.doc}share/doc/frr/html/bgp.html ${PLIST.doc}share/doc/frr/html/bmp.html ${PLIST.doc}share/doc/frr/html/bugs.html +${PLIST.doc}share/doc/frr/html/config-include.html ${PLIST.doc}share/doc/frr/html/eigrpd.html ${PLIST.doc}share/doc/frr/html/evpn.html ${PLIST.doc}share/doc/frr/html/extlog.html @@ -299,6 +359,7 @@ ${PLIST.doc}share/doc/frr/html/glossary. ${PLIST.doc}share/doc/frr/html/grpc.html ${PLIST.doc}share/doc/frr/html/index.html ${PLIST.doc}share/doc/frr/html/installation.html +${PLIST.doc}share/doc/frr/html/introduction.html ${PLIST.doc}share/doc/frr/html/ipv6.html ${PLIST.doc}share/doc/frr/html/isisd.html ${PLIST.doc}share/doc/frr/html/kernel.html @@ -309,15 +370,17 @@ ${PLIST.doc}share/doc/frr/html/nhrpd.htm ${PLIST.doc}share/doc/frr/html/objects.inv ${PLIST.doc}share/doc/frr/html/ospf6d.html ${PLIST.doc}share/doc/frr/html/ospfd.html -${PLIST.doc}share/doc/frr/html/overview.html ${PLIST.doc}share/doc/frr/html/packet-dumps.html ${PLIST.doc}share/doc/frr/html/pathd.html ${PLIST.doc}share/doc/frr/html/pbr.html ${PLIST.doc}share/doc/frr/html/pim.html ${PLIST.doc}share/doc/frr/html/pimv6.html +${PLIST.doc}share/doc/frr/html/prior-config-files.html +${PLIST.doc}share/doc/frr/html/protocols.html ${PLIST.doc}share/doc/frr/html/ripd.html ${PLIST.doc}share/doc/frr/html/ripngd.html ${PLIST.doc}share/doc/frr/html/routemap.html +${PLIST.doc}share/doc/frr/html/sbfd.html ${PLIST.doc}share/doc/frr/html/scripting.html ${PLIST.doc}share/doc/frr/html/search.html ${PLIST.doc}share/doc/frr/html/searchindex.js @@ -331,6 +394,7 @@ ${PLIST.doc}share/doc/frr/html/vtysh.htm ${PLIST.doc}share/doc/frr/html/watchfrr.html ${PLIST.doc}share/doc/frr/html/zebra.html share/yang/frr-affinity-map.yang +share/yang/frr-backend.yang share/yang/frr-bfdd.yang share/yang/frr-bgp-bmp.yang share/yang/frr-bgp-common-multiprotocol.yang @@ -344,9 +408,11 @@ share/yang/frr-bgp-rpki.yang share/yang/frr-bgp-types.yang share/yang/frr-bgp.yang share/yang/frr-deviations-bgp-datacenter.yang +share/yang/frr-deviations-ietf-key-chain.yang share/yang/frr-eigrpd.yang share/yang/frr-filter.yang share/yang/frr-gmp.yang +share/yang/frr-host.yang share/yang/frr-if-rmap.yang share/yang/frr-interface.yang share/yang/frr-isisd.yang @@ -356,6 +422,7 @@ share/yang/frr-ospf-route-map.yang share/yang/frr-ospf6-route-map.yang share/yang/frr-ospfd.yang share/yang/frr-pathd.yang +share/yang/frr-pim-candidate.yang share/yang/frr-pim-rp.yang share/yang/frr-pim.yang share/yang/frr-ripd.yang @@ -370,4 +437,9 @@ share/yang/frr-zebra-route-map.yang share/yang/frr-zebra.yang share/yang/ietf-bgp-types.yang share/yang/ietf-interfaces.yang +share/yang/ietf-key-chain.yang +share/yang/ietf-netconf-acm.yang +share/yang/ietf-netconf-with-defaults.yang +share/yang/ietf-netconf.yang share/yang/ietf-routing-types.yang +share/yang/ietf-srv6-types.yang Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/net/frr/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo 9 Jan 2024 20:17:41 -0000 1.9 +++ distinfo 3 Aug 2025 01:15:10 -0000 @@ -1,8 +1,8 @@ $NetBSD: distinfo,v 1.9 2024/01/09 20:17:41 chopps Exp $ -BLAKE2s (frr-9.1.tar.gz) = c09d3967700a1a385d2b055d603e5291c6863767581a9115d46c96e40908a296 -SHA512 (frr-9.1.tar.gz) = 77b278a3ea87da9dfd7b87e4f9ae67f08ed0f24809f6dd228d2ab2e2c29e2b3191d59d50fc474e53e159ac6c79c302481b462125d0657889516f07b8e05e8562 -Size (frr-9.1.tar.gz) = 10779477 bytes +BLAKE2s (frr-10.4.0.tar.gz) = d45ef39b2777792bda108a99ff7244a1f281176fd1d42ea0de650b925a329ff5 +SHA512 (frr-10.4.0.tar.gz) = eb06e65f7cb64b037967ec459804258b0a3ee879f179bb8afe21ff11aa8e4c94e84628157e4d863b85099b3757260350797e89216b24c4f6e8b8e4a9d3114ba5 +Size (frr-10.4.0.tar.gz) = 11550413 bytes SHA1 (patch-configure.ac) = d10b406ff371ffab7ce8eb63392c856a87300aa3 SHA1 (patch-lib_frr__pthread.c) = 566b2a54ebbcf79abaae7f39e563b4b83bd8f474 SHA1 (patch-pkgsrc_zebra.sh.in) = a466eef102995b1627f031986d10b1d1519dc59e Index: options.mk =================================================================== RCS file: /cvsroot/pkgsrc/net/frr/options.mk,v retrieving revision 1.4 diff -u -p -r1.4 options.mk --- options.mk 23 Feb 2025 16:59:21 -0000 1.4 +++ options.mk 3 Aug 2025 01:15:10 -0000 @@ -14,12 +14,13 @@ PLIST_VARS+= doc ### doc/man support ### .if !empty(PKG_OPTIONS:Mdoc) -USE_TOOLS+= makeinfo -CONFIGURE_ARGS+= --enable-doc-html +USE_TOOLS+= makeinfo +CONFIGURE_ARGS+= --enable-doc-html PYTHON_VERSIONS_INCOMPATIBLE= 39 310 # py-sphinx -TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=7.0:../../textproc/py-sphinx -PLIST.doc= yes -INFO_FILES= yes +TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=8.2:../../textproc/py-sphinx +TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-rtd-theme>=3.0.2:../../textproc/py-sphinx-rtd-theme +PLIST.doc= yes +INFO_FILES= yes .else -CONFIGURE_ARGS+= --disable-doc +CONFIGURE_ARGS+= --disable-doc .endif