CVS commit: pkgsrc/net/frr

["Frank Kardel" <kardel%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kardel
Date:           Wed Aug 11 10:09:54 UTC 2021

Modified Files:
        pkgsrc/net/frr: MESSAGE Makefile PLIST distinfo
        pkgsrc/net/frr/patches: patch-zebra_kernel__socket.c
Added Files:
        pkgsrc/net/frr/patches: patch-lib_elf__py.c
Removed Files:
        pkgsrc/net/frr/patches: patch-zebra_ioctl.c

Log Message:
net/frr: upgrade to frr 8.0


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/frr/MESSAGE
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/frr/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/frr/PLIST pkgsrc/net/frr/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/frr/patches/patch-lib_elf__py.c
cvs rdiff -u -r1.1 -r0 pkgsrc/net/frr/patches/patch-zebra_ioctl.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/frr/MESSAGE
diff -u pkgsrc/net/frr/MESSAGE:1.1 pkgsrc/net/frr/MESSAGE:1.2
--- pkgsrc/net/frr/MESSAGE:1.1  Thu Dec 10 16:43:24 2020
+++ pkgsrc/net/frr/MESSAGE      Wed Aug 11 10:09:54 2021
@@ -1,11 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2020/12/10 16:43:24 kardel Exp $
+$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}".
 
-You can find some example config files in
-${PREFIX}/share/examples/frr
-
 ===========================================================================

Index: pkgsrc/net/frr/Makefile
diff -u pkgsrc/net/frr/Makefile:1.6 pkgsrc/net/frr/Makefile:1.7
--- pkgsrc/net/frr/Makefile:1.6 Mon May 24 19:53:17 2021
+++ pkgsrc/net/frr/Makefile     Wed Aug 11 10:09:54 2021
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2021/05/24 19:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2021/08/11 10:09:54 kardel Exp $
 
 GITHUB_PROJECT=        frr
-VERSION=       7.5.1
+VERSION=       8.0
 GITHUB_TAG=    frr-${VERSION}
 DISTNAME=      frr-${VERSION}
-PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=FRRouting/}
 
@@ -51,8 +50,6 @@ RCD_SCRIPTS=  ${RCD_SUPPLIED} staticd
 RCD_SCRIPT_SRC.${f}=   ${WRKSRC}/pkgsrc/${f}.sh
 .endfor
 
-CONFIG_TEMPLATE_PATH=  share/examples/${PKG_SYSCONFSUBDIR}/configsamples
-
 USE_TOOLS+=    bash:run
 REPLACE_BASH=  tools/frr.in tools/*.sh.in
 
@@ -74,10 +71,16 @@ SUBST_FILES.workdir=        lib/version.h
 SUBST_SED.workdir=     -e "s,${WRKDIR},"'{WRKDIR},g'
 SUBST_VARS.workdir=
 
+.if ${OPSYS} == "NetBSD"
+# prohibit cluttering NetBSD executables with notes
+# that are not recognized by the kernel leading to
+# confusing but harmless warning messages
+CFLAGS+=               -DFRR_XREF_NO_NOTE
+.endif
+
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --enable-user=${FRR_USER}
 CONFIGURE_ARGS+=       --enable-group=${FRR_GROUP}
-CONFIGURE_ARGS+=       --enable-exampledir=${PREFIX}/${CONFIG_TEMPLATE_PATH}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}/run/frr
 CONFIGURE_ARGS+=       --enable-multipath=64
 CONFIGURE_ARGS+=       --enable-vty-group=${FRR_VTY_GROUP}
@@ -91,23 +94,11 @@ CONFIGURE_ARGS+=    --with-pkg-extra-versio
 pre-configure:
        cd ${WRKSRC} && ${SH} bootstrap.sh
 
-.include "../../devel/libyang/buildlink3.mk"
-.include "../../textproc/json-c/buildlink3.mk"
-.include "../../lang/python/application.mk"
+.include "../../devel/libyang2/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../net/libcares/buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
+
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# needs to be here to have ${EGREP} defined
-CONFIG_TEMPLATES!=     ${EGREP} ${CONFIG_TEMPLATE_PATH:Q} PLIST 2>/dev/null
-CONF_FILES?=
-
-.for l in ${CONFIG_TEMPLATES}
-.  if ${l:C,^${CONFIG_TEMPLATE_PATH}/(.*)\.sample,\1,} == "vtysh.conf"
-CONF_FILES_PERMS+=     /dev/null ${PKG_SYSCONFDIR}${l:C,^${CONFIG_TEMPLATE_PATH}(/.*)\.sample,\1,} \
-                       ${FRR_USER} ${FRR_VTY_GROUP} ${FRR_CONF_MODE}
-.  else
-CONF_FILES_PERMS+=     /dev/null ${PKG_SYSCONFDIR}${l:C,^${CONFIG_TEMPLATE_PATH}(/.*)\.sample,\1,} \
-                       ${FRR_USER} ${FRR_GROUP} ${FRR_CONF_MODE}
-.  endif
-.endfor

Index: pkgsrc/net/frr/PLIST
diff -u pkgsrc/net/frr/PLIST:1.2 pkgsrc/net/frr/PLIST:1.3
--- pkgsrc/net/frr/PLIST:1.2    Sat Jun  5 02:48:21 2021
+++ pkgsrc/net/frr/PLIST        Wed Aug 11 10:09:54 2021
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2021/06/05 02:48:21 mef Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/08/11 10:09:54 kardel Exp $
 bin/mtracebis
 bin/vtysh
 include/frr/agg_table.h
+include/frr/assert.h
 include/frr/atomlist.h
 include/frr/bfd.h
+include/frr/bfdd/bfddp_packet.h
 include/frr/bitfield.h
 include/frr/buffer.h
 include/frr/checksum.h
@@ -26,6 +28,7 @@ include/frr/frr_pthread.h
 include/frr/frratomic.h
 include/frr/frrcu.h
 include/frr/frrlua.h
+include/frr/frrscript.h
 include/frr/frrstr.h
 include/frr/getopt.h
 include/frr/graph.h
@@ -40,10 +43,13 @@ include/frr/ipaddr.h
 include/frr/jhash.h
 include/frr/json.h
 include/frr/keychain.h
+include/frr/ldp_sync.h
 include/frr/lib_errors.h
 include/frr/lib_vty.h
 include/frr/libfrr.h
+include/frr/libfrr_trace.h
 include/frr/libospf.h
+include/frr/link_state.h
 include/frr/linklist.h
 include/frr/log.h
 include/frr/log_vty.h
@@ -84,6 +90,7 @@ include/frr/pullwr.h
 include/frr/pw.h
 include/frr/qobj.h
 include/frr/queue.h
+include/frr/resolver.h
 include/frr/ringbuf.h
 include/frr/route_types.h
 include/frr/routemap.h
@@ -105,6 +112,7 @@ include/frr/systemd.h
 include/frr/table.h
 include/frr/termtable.h
 include/frr/thread.h
+include/frr/trace.h
 include/frr/typerb.h
 include/frr/typesafe.h
 include/frr/vector.h
@@ -116,17 +124,20 @@ include/frr/vty.h
 include/frr/vxlan.h
 include/frr/wheel.h
 include/frr/workqueue.h
+include/frr/xref.h
 include/frr/yang.h
 include/frr/yang_translator.h
 include/frr/yang_wrappers.h
-include/frr/zassert.h
 include/frr/zclient.h
 include/frr/zebra.h
 include/frr/zlog.h
 include/frr/zlog_targets.h
 ${PLIST.doc}info/frr.info
+lib/frr/modules/bgpd_bmp.la
+lib/frr/modules/pathd_pcep.la
 lib/frr/modules/zebra_fpm.la
 lib/libfrr.la
+lib/libfrrcares.la
 lib/libfrrospfapiclient.la
 ${PLIST.doc}man/man1/frr.1
 ${PLIST.doc}man/man1/vtysh.1
@@ -160,6 +171,7 @@ sbin/isisd
 sbin/ldpd
 sbin/ospf6d
 sbin/ospfd
+sbin/pathd
 sbin/pbrd
 sbin/pimd
 sbin/ripd
@@ -203,11 +215,13 @@ ${PLIST.doc}share/doc/frr/html/_sources/
 ${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/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/scripting.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/setup.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/sharp.rst.txt
 ${PLIST.doc}share/doc/frr/html/_sources/snmp.rst.txt
@@ -225,7 +239,7 @@ ${PLIST.doc}share/doc/frr/html/_static/d
 ${PLIST.doc}share/doc/frr/html/_static/file.png
 ${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-3.5.1.js
+${PLIST.doc}share/doc/frr/html/_static/jquery-3.4.1.js
 ${PLIST.doc}share/doc/frr/html/_static/jquery.js
 ${PLIST.doc}share/doc/frr/html/_static/language_data.js
 ${PLIST.doc}share/doc/frr/html/_static/minus.png
@@ -235,7 +249,7 @@ ${PLIST.doc}share/doc/frr/html/_static/p
 ${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/underscore-1.12.0.js
+${PLIST.doc}share/doc/frr/html/_static/underscore-1.3.1.js
 ${PLIST.doc}share/doc/frr/html/_static/underscore.js
 ${PLIST.doc}share/doc/frr/html/babeld.html
 ${PLIST.doc}share/doc/frr/html/basic.html
@@ -262,11 +276,13 @@ ${PLIST.doc}share/doc/frr/html/ospf6d.ht
 ${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/ripd.html
 ${PLIST.doc}share/doc/frr/html/ripngd.html
 ${PLIST.doc}share/doc/frr/html/routemap.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
 ${PLIST.doc}share/doc/frr/html/setup.html
@@ -278,25 +294,19 @@ ${PLIST.doc}share/doc/frr/html/vrrp.html
 ${PLIST.doc}share/doc/frr/html/vtysh.html
 ${PLIST.doc}share/doc/frr/html/watchfrr.html
 ${PLIST.doc}share/doc/frr/html/zebra.html
-share/examples/frr/configsamples/babeld.conf.sample
-share/examples/frr/configsamples/bfdd.conf.sample
-share/examples/frr/configsamples/bgpd.conf.sample
-share/examples/frr/configsamples/bgpd.conf.sample2
-share/examples/frr/configsamples/bgpd.conf.vnc.sample
-share/examples/frr/configsamples/eigrpd.conf.sample
-share/examples/frr/configsamples/fabricd.conf.sample
-share/examples/frr/configsamples/isisd.conf.sample
-share/examples/frr/configsamples/ldpd.conf.sample
-share/examples/frr/configsamples/ospf6d.conf.sample
-share/examples/frr/configsamples/ospfd.conf.sample
-share/examples/frr/configsamples/pbrd.conf.sample
-share/examples/frr/configsamples/pimd.conf.sample
-share/examples/frr/configsamples/ripd.conf.sample
-share/examples/frr/configsamples/ripngd.conf.sample
-share/examples/frr/configsamples/staticd.conf.sample
-share/examples/frr/configsamples/vtysh.conf.sample
-share/examples/frr/configsamples/zebra.conf.sample
 share/yang/frr-bfdd.yang
+share/yang/frr-bgp-bmp.yang
+share/yang/frr-bgp-common-multiprotocol.yang
+share/yang/frr-bgp-common-structure.yang
+share/yang/frr-bgp-common.yang
+share/yang/frr-bgp-filter.yang
+share/yang/frr-bgp-neighbor.yang
+share/yang/frr-bgp-peer-group.yang
+share/yang/frr-bgp-route-map.yang
+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-eigrpd.yang
 share/yang/frr-filter.yang
 share/yang/frr-igmp.yang
@@ -304,6 +314,9 @@ share/yang/frr-interface.yang
 share/yang/frr-isisd.yang
 share/yang/frr-module-translator.yang
 share/yang/frr-nexthop.yang
+share/yang/frr-ospf-route-map.yang
+share/yang/frr-ospf6-route-map.yang
+share/yang/frr-pathd.yang
 share/yang/frr-pim-rp.yang
 share/yang/frr-pim.yang
 share/yang/frr-ripd.yang
@@ -314,6 +327,8 @@ share/yang/frr-routing.yang
 share/yang/frr-staticd.yang
 share/yang/frr-test-module.yang
 share/yang/frr-vrf.yang
+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-routing-types.yang
Index: pkgsrc/net/frr/distinfo
diff -u pkgsrc/net/frr/distinfo:1.2 pkgsrc/net/frr/distinfo:1.3
--- pkgsrc/net/frr/distinfo:1.2 Tue Mar  9 08:56:38 2021
+++ pkgsrc/net/frr/distinfo     Wed Aug 11 10:09:54 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2021/03/09 08:56:38 kardel Exp $
+$NetBSD: distinfo,v 1.3 2021/08/11 10:09:54 kardel Exp $
 
-SHA1 (frr-7.5.1.tar.gz) = 8c43b85f56605b5726e0133468f5779bfece7739
-RMD160 (frr-7.5.1.tar.gz) = 9dd66025b22f2cfd8aa9c281d31b5f5aef12e12f
-SHA512 (frr-7.5.1.tar.gz) = cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
-Size (frr-7.5.1.tar.gz) = 6746148 bytes
+SHA1 (frr-8.0.tar.gz) = dc3fc27d812394817ddf8946e58b0c5bbd61a146
+RMD160 (frr-8.0.tar.gz) = a6f0e77baf7d4c66ff9956c311b0b52cdb7b40fd
+SHA512 (frr-8.0.tar.gz) = fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a
+Size (frr-8.0.tar.gz) = 8195258 bytes
+SHA1 (patch-lib_elf__py.c) = a766923c906f1b0f9fa80a9e16e5275bae165187
 SHA1 (patch-pkgsrc_zebra.sh.in) = d458e74a1f3319f6e075d3d3a81414bc7d7022f2
-SHA1 (patch-zebra_ioctl.c) = 99b7606564f4dc620df997889156b5c09f7fb396
-SHA1 (patch-zebra_kernel__socket.c) = 9bf24d86923715e3e15cad073df1210bc0608e89
+SHA1 (patch-zebra_kernel__socket.c) = 8238f389efd4d3fbfefa29b8292132aafc56cdac

Index: pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c
diff -u pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c:1.1 pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c:1.2
--- pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c:1.1     Thu Dec 10 16:43:24 2020
+++ pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c Wed Aug 11 10:09:54 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-zebra_kernel__socket.c,v 1.1 2020/12/10 16:43:24 kardel Exp $
+$NetBSD: patch-zebra_kernel__socket.c,v 1.2 2021/08/11 10:09:54 kardel Exp $
 
        Pass IFP interface index if known (normal case) to make
        interface specific routes work such as in
@@ -6,9 +6,13 @@ $NetBSD: patch-zebra_kernel__socket.c,v 
                ipv6 route ::/0 <ipv6 address> carp0 100
                ivv6 route ::/0 <other ipv6 address> 200
 
---- zebra/kernel_socket.c.orig 2020-06-30 11:08:57.000000000 +0000
+       frr-8 now enables SO_RERROR but exits cowardly when the
+       routing socket returns ENOBUFS. ensure at least a bit more
+       socket buffer space by increasing SO_RCVBUF.
+
+--- zebra/kernel_socket.c.orig 2021-07-21 13:06:19.000000000 +0000
 +++ zebra/kernel_socket.c
-@@ -1277,6 +1277,19 @@ int rtm_write(int message, union sockuni
+@@ -1243,6 +1243,19 @@ int rtm_write(int message, union sockuni
  #ifdef __OpenBSD__
        SOCKADDRSET(mpls, RTA_SRC);
  #endif
@@ -28,3 +32,13 @@ $NetBSD: patch-zebra_kernel__socket.c,v 
  
        msg.rtm.rtm_msglen = pnt - (caddr_t)&msg;
  
+@@ -1425,6 +1438,9 @@ static void routing_socket(struct zebra_
+               return;
+       }
+ 
++      setsockopt_so_recvbuf(routing_sock, 1048576);
++      setsockopt_so_recvbuf(dplane_routing_sock, 1048576);
++
+ #ifdef SO_RERROR
+       /* Allow reporting of route(4) buffer overflow errors */
+       int n = 1;

Added files:

Index: pkgsrc/net/frr/patches/patch-lib_elf__py.c
diff -u /dev/null pkgsrc/net/frr/patches/patch-lib_elf__py.c:1.1
--- /dev/null   Wed Aug 11 10:09:54 2021
+++ pkgsrc/net/frr/patches/patch-lib_elf__py.c  Wed Aug 11 10:09:54 2021
@@ -0,0 +1,26 @@
+$NetBSD: patch-lib_elf__py.c,v 1.1 2021/08/11 10:09:54 kardel Exp $
+
+       frr 8 now embeds Xref information in executables and
+       adds notes to the ELF files. On NetBSD these notes
+       create kernel messages at exec time. Allow the
+       note mechanism to be disabled by allowing lib/elf_py.c
+       to be compiled in that configuration.
+
+--- lib/elf_py.c.orig  2021-08-06 11:34:16.683867232 +0000
++++ lib/elf_py.c
+@@ -1030,6 +1030,7 @@ static char *elfdata_strptr(Elf_Data *da
+       return p;
+ }
+ 
++#ifdef HAVE_ELF_GETDATA_RAWCHUNK
+ static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
+                                size_t entries, Elf_Data *symdata,
+                                Elf_Data *strdata, Elf_Type typ)
+@@ -1124,6 +1125,7 @@ static void elffile_add_dynreloc(struct 
+       }
+ 
+ }
++#endif
+ 
+ /* primary (only, really) entry point to anything in this module */
+ static PyObject *elffile_load(PyTypeObject *type, PyObject *args,