Wed Aug 11 10:09:54 2021 UTC ()
net/frr: upgrade to frr 8.0


(kardel)
diff -r1.1 -r1.2 pkgsrc/net/frr/MESSAGE
diff -r1.6 -r1.7 pkgsrc/net/frr/Makefile
diff -r1.2 -r1.3 pkgsrc/net/frr/PLIST
diff -r1.2 -r1.3 pkgsrc/net/frr/distinfo
diff -r0 -r1.1 pkgsrc/net/frr/patches/patch-lib_elf__py.c
diff -r1.1 -r0 pkgsrc/net/frr/patches/patch-zebra_ioctl.c
diff -r1.1 -r1.2 pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c
cvs diff -r1.1 -r1.2 pkgsrc/net/frr/MESSAGE (expand / switch to unified diff)

--- pkgsrc/net/frr/MESSAGE 2020/12/10 16:43:24 1.1
+++ pkgsrc/net/frr/MESSAGE 2021/08/11 10:09:54 1.2
@@ -1,11 +1,8 @@ @@ -1,11 +1,8 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.1 2020/12/10 16:43:24 kardel Exp $ 2$NetBSD: MESSAGE,v 1.2 2021/08/11 10:09:54 kardel Exp $
3 3
4IMPORTANT: 4IMPORTANT:
5To complete the installation you need to add 5To complete the installation you need to add
6the user "${FRR_USER}" to the (secondary) group "${FRR_VTY_GROUP}". 6the user "${FRR_USER}" to the (secondary) group "${FRR_VTY_GROUP}".
7 7
8You can find some example config files in 
9${PREFIX}/share/examples/frr 
10 
11=========================================================================== 8===========================================================================
cvs diff -r1.6 -r1.7 pkgsrc/net/frr/Makefile (expand / switch to unified diff)

--- pkgsrc/net/frr/Makefile 2021/05/24 19:53:17 1.6
+++ pkgsrc/net/frr/Makefile 2021/08/11 10:09:54 1.7
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.6 2021/05/24 19:53:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2021/08/11 10:09:54 kardel Exp $
2 2
3GITHUB_PROJECT= frr 3GITHUB_PROJECT= frr
4VERSION= 7.5.1 4VERSION= 8.0
5GITHUB_TAG= frr-${VERSION} 5GITHUB_TAG= frr-${VERSION}
6DISTNAME= frr-${VERSION} 6DISTNAME= frr-${VERSION}
7PKGREVISION= 1 
8CATEGORIES= net 7CATEGORIES= net
9MASTER_SITES= ${MASTER_SITE_GITHUB:=FRRouting/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=FRRouting/}
10 9
11MAINTAINER= kardel@NetBSD.org 10MAINTAINER= kardel@NetBSD.org
12HOMEPAGE= https://github.com/FRRouting/frr/ 11HOMEPAGE= https://github.com/FRRouting/frr/
13COMMENT= Frr routing multi protocol suite 12COMMENT= Frr routing multi protocol suite
14LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
15 14
16CONFLICTS= quagga-[0-9]* 15CONFLICTS= quagga-[0-9]*
17 16
18WRKSRC= ${WRKDIR}/frr-frr-${VERSION} 17WRKSRC= ${WRKDIR}/frr-frr-${VERSION}
19USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
20USE_TOOLS+= gmake perl bash pkg-config autoconf automake autoreconf bison 19USE_TOOLS+= gmake perl bash pkg-config autoconf automake autoreconf bison
@@ -41,73 +40,65 @@ PKG_GECOS.${FRR_USER}= FRRouting User @@ -41,73 +40,65 @@ PKG_GECOS.${FRR_USER}= FRRouting User
41PKG_HOME.${FRR_USER}= /nonexistent 40PKG_HOME.${FRR_USER}= /nonexistent
42PKG_SHELL.${FRR_USER}= /bin/sh 41PKG_SHELL.${FRR_USER}= /bin/sh
43 42
44PKG_GROUPS= ${FRR_GROUP} ${FRR_VTY_GROUP} 43PKG_GROUPS= ${FRR_GROUP} ${FRR_VTY_GROUP}
45PKG_USERS= ${FRR_USER}:${FRR_GROUP} 44PKG_USERS= ${FRR_USER}:${FRR_GROUP}
46 45
47RCD_SUPPLIED= bgpd ospf6d ospfd ripd ripngd zebra 46RCD_SUPPLIED= bgpd ospf6d ospfd ripd ripngd zebra
48RCD_SCRIPTS= ${RCD_SUPPLIED} staticd 47RCD_SCRIPTS= ${RCD_SUPPLIED} staticd
49 48
50.for f in ${RCD_SUPPLIED} 49.for f in ${RCD_SUPPLIED}
51RCD_SCRIPT_SRC.${f}= ${WRKSRC}/pkgsrc/${f}.sh 50RCD_SCRIPT_SRC.${f}= ${WRKSRC}/pkgsrc/${f}.sh
52.endfor 51.endfor
53 52
54CONFIG_TEMPLATE_PATH= share/examples/${PKG_SYSCONFSUBDIR}/configsamples 
55 
56USE_TOOLS+= bash:run 53USE_TOOLS+= bash:run
57REPLACE_BASH= tools/frr.in tools/*.sh.in 54REPLACE_BASH= tools/frr.in tools/*.sh.in
58 55
59REPLACE_PYTHON= tools/generate_support_bundle.py tools/frr-reload.py 56REPLACE_PYTHON= tools/generate_support_bundle.py tools/frr-reload.py
60 57
61MESSAGE_SUBST+= FRR_USER=${FRR_USER} 58MESSAGE_SUBST+= FRR_USER=${FRR_USER}
62MESSAGE_SUBST+= FRR_VTY_GROUP=${FRR_VTY_GROUP} 59MESSAGE_SUBST+= FRR_VTY_GROUP=${FRR_VTY_GROUP}
63 60
64SUBST_CLASSES+= ids 61SUBST_CLASSES+= ids
65SUBST_STAGE.ids= pre-configure 62SUBST_STAGE.ids= pre-configure
66SUBST_MESSAGE.ids= Fixing user/group references. 63SUBST_MESSAGE.ids= Fixing user/group references.
67SUBST_FILES.ids= pkgsrc/zebra.sh.in 64SUBST_FILES.ids= pkgsrc/zebra.sh.in
68SUBST_VARS.ids= FRR_USER FRR_VTY_GROUP 65SUBST_VARS.ids= FRR_USER FRR_VTY_GROUP
69 66
70SUBST_CLASSES+= workdir 67SUBST_CLASSES+= workdir
71SUBST_STAGE.workdir= post-configure 68SUBST_STAGE.workdir= post-configure
72SUBST_MESSAGE.workdir= Fixing absolute workdir references. 69SUBST_MESSAGE.workdir= Fixing absolute workdir references.
73SUBST_FILES.workdir= lib/version.h 70SUBST_FILES.workdir= lib/version.h
74SUBST_SED.workdir= -e "s,${WRKDIR},"'{WRKDIR},g' 71SUBST_SED.workdir= -e "s,${WRKDIR},"'{WRKDIR},g'
75SUBST_VARS.workdir= 72SUBST_VARS.workdir=
76 73
 74.if ${OPSYS} == "NetBSD"
 75# prohibit cluttering NetBSD executables with notes
 76# that are not recognized by the kernel leading to
 77# confusing but harmless warning messages
 78CFLAGS+= -DFRR_XREF_NO_NOTE
 79.endif
 80
77CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 81CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
78CONFIGURE_ARGS+= --enable-user=${FRR_USER} 82CONFIGURE_ARGS+= --enable-user=${FRR_USER}
79CONFIGURE_ARGS+= --enable-group=${FRR_GROUP} 83CONFIGURE_ARGS+= --enable-group=${FRR_GROUP}
80CONFIGURE_ARGS+= --enable-exampledir=${PREFIX}/${CONFIG_TEMPLATE_PATH} 
81CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run/frr 84CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run/frr
82CONFIGURE_ARGS+= --enable-multipath=64 85CONFIGURE_ARGS+= --enable-multipath=64
83CONFIGURE_ARGS+= --enable-vty-group=${FRR_VTY_GROUP} 86CONFIGURE_ARGS+= --enable-vty-group=${FRR_VTY_GROUP}
84CONFIGURE_ARGS+= --enable-configfile-mask=${FRR_CONF_MODE} 87CONFIGURE_ARGS+= --enable-configfile-mask=${FRR_CONF_MODE}
85CONFIGURE_ARGS+= --enable-logfile-mask=${FRR_LOG_MODE} 88CONFIGURE_ARGS+= --enable-logfile-mask=${FRR_LOG_MODE}
86CONFIGURE_ARGS+= --enable-fpm 89CONFIGURE_ARGS+= --enable-fpm
87CONFIGURE_ARGS+= --with-pkg-git-version 90CONFIGURE_ARGS+= --with-pkg-git-version
88CONFIGURE_ARGS+= --with-pkg-extra-version=/${DISTNAME} 91CONFIGURE_ARGS+= --with-pkg-extra-version=/${DISTNAME}
89# CONFIGURE_ARGS+= --enable-address-sanitizer 92# CONFIGURE_ARGS+= --enable-address-sanitizer
90 93
91pre-configure: 94pre-configure:
92 cd ${WRKSRC} && ${SH} bootstrap.sh 95 cd ${WRKSRC} && ${SH} bootstrap.sh
93 96
94.include "../../devel/libyang/buildlink3.mk" 97.include "../../devel/libyang2/buildlink3.mk"
95.include "../../textproc/json-c/buildlink3.mk" 
96.include "../../lang/python/application.mk" 
97.include "../../devel/readline/buildlink3.mk" 98.include "../../devel/readline/buildlink3.mk"
 99.include "../../lang/python/application.mk"
 100.include "../../net/libcares/buildlink3.mk"
 101.include "../../textproc/json-c/buildlink3.mk"
 102
98.include "../../mk/atomic64.mk" 103.include "../../mk/atomic64.mk"
99.include "../../mk/bsd.pkg.mk" 104.include "../../mk/bsd.pkg.mk"
100 
101# needs to be here to have ${EGREP} defined 
102CONFIG_TEMPLATES!= ${EGREP} ${CONFIG_TEMPLATE_PATH:Q} PLIST 2>/dev/null 
103CONF_FILES?= 
104 
105.for l in ${CONFIG_TEMPLATES} 
106. if ${l:C,^${CONFIG_TEMPLATE_PATH}/(.*)\.sample,\1,} == "vtysh.conf" 
107CONF_FILES_PERMS+= /dev/null ${PKG_SYSCONFDIR}${l:C,^${CONFIG_TEMPLATE_PATH}(/.*)\.sample,\1,} \ 
108 ${FRR_USER} ${FRR_VTY_GROUP} ${FRR_CONF_MODE} 
109. else 
110CONF_FILES_PERMS+= /dev/null ${PKG_SYSCONFDIR}${l:C,^${CONFIG_TEMPLATE_PATH}(/.*)\.sample,\1,} \ 
111 ${FRR_USER} ${FRR_GROUP} ${FRR_CONF_MODE} 
112. endif 
113.endfor 
cvs diff -r1.2 -r1.3 pkgsrc/net/frr/PLIST (expand / switch to unified diff)

--- pkgsrc/net/frr/PLIST 2021/06/05 02:48:21 1.2
+++ pkgsrc/net/frr/PLIST 2021/08/11 10:09:54 1.3
@@ -1,59 +1,65 @@ @@ -1,59 +1,65 @@
1@comment $NetBSD: PLIST,v 1.2 2021/06/05 02:48:21 mef Exp $ 1@comment $NetBSD: PLIST,v 1.3 2021/08/11 10:09:54 kardel Exp $
2bin/mtracebis 2bin/mtracebis
3bin/vtysh 3bin/vtysh
4include/frr/agg_table.h 4include/frr/agg_table.h
 5include/frr/assert.h
5include/frr/atomlist.h 6include/frr/atomlist.h
6include/frr/bfd.h 7include/frr/bfd.h
 8include/frr/bfdd/bfddp_packet.h
7include/frr/bitfield.h 9include/frr/bitfield.h
8include/frr/buffer.h 10include/frr/buffer.h
9include/frr/checksum.h 11include/frr/checksum.h
10include/frr/command.h 12include/frr/command.h
11include/frr/command_graph.h 13include/frr/command_graph.h
12include/frr/command_match.h 14include/frr/command_match.h
13include/frr/compiler.h 15include/frr/compiler.h
14include/frr/csv.h 16include/frr/csv.h
15include/frr/db.h 17include/frr/db.h
16include/frr/debug.h 18include/frr/debug.h
17include/frr/defaults.h 19include/frr/defaults.h
18include/frr/distribute.h 20include/frr/distribute.h
19include/frr/eigrpd/eigrp_dump.h 21include/frr/eigrpd/eigrp_dump.h
20include/frr/eigrpd/eigrp_topology.h 22include/frr/eigrpd/eigrp_topology.h
21include/frr/eigrpd/eigrpd.h 23include/frr/eigrpd/eigrpd.h
22include/frr/ferr.h 24include/frr/ferr.h
23include/frr/filter.h 25include/frr/filter.h
24include/frr/freebsd-queue.h 26include/frr/freebsd-queue.h
25include/frr/frr_pthread.h 27include/frr/frr_pthread.h
26include/frr/frratomic.h 28include/frr/frratomic.h
27include/frr/frrcu.h 29include/frr/frrcu.h
28include/frr/frrlua.h 30include/frr/frrlua.h
 31include/frr/frrscript.h
29include/frr/frrstr.h 32include/frr/frrstr.h
30include/frr/getopt.h 33include/frr/getopt.h
31include/frr/graph.h 34include/frr/graph.h
32include/frr/hash.h 35include/frr/hash.h
33include/frr/hook.h 36include/frr/hook.h
34include/frr/iana_afi.h 37include/frr/iana_afi.h
35include/frr/id_alloc.h 38include/frr/id_alloc.h
36include/frr/if.h 39include/frr/if.h
37include/frr/if_rmap.h 40include/frr/if_rmap.h
38include/frr/imsg.h 41include/frr/imsg.h
39include/frr/ipaddr.h 42include/frr/ipaddr.h
40include/frr/jhash.h 43include/frr/jhash.h
41include/frr/json.h 44include/frr/json.h
42include/frr/keychain.h 45include/frr/keychain.h
 46include/frr/ldp_sync.h
43include/frr/lib_errors.h 47include/frr/lib_errors.h
44include/frr/lib_vty.h 48include/frr/lib_vty.h
45include/frr/libfrr.h 49include/frr/libfrr.h
 50include/frr/libfrr_trace.h
46include/frr/libospf.h 51include/frr/libospf.h
 52include/frr/link_state.h
47include/frr/linklist.h 53include/frr/linklist.h
48include/frr/log.h 54include/frr/log.h
49include/frr/log_vty.h 55include/frr/log_vty.h
50include/frr/md5.h 56include/frr/md5.h
51include/frr/memory.h 57include/frr/memory.h
52include/frr/mlag.h 58include/frr/mlag.h
53include/frr/module.h 59include/frr/module.h
54include/frr/monotime.h 60include/frr/monotime.h
55include/frr/mpls.h 61include/frr/mpls.h
56include/frr/network.h 62include/frr/network.h
57include/frr/nexthop.h 63include/frr/nexthop.h
58include/frr/nexthop_group.h 64include/frr/nexthop_group.h
59include/frr/nexthop_group_private.h 65include/frr/nexthop_group_private.h
@@ -74,69 +80,74 @@ include/frr/ospfd/ospf_lsdb.h @@ -74,69 +80,74 @@ include/frr/ospfd/ospf_lsdb.h
74include/frr/ospfd/ospf_nsm.h 80include/frr/ospfd/ospf_nsm.h
75include/frr/ospfd/ospf_opaque.h 81include/frr/ospfd/ospf_opaque.h
76include/frr/ospfd/ospfd.h 82include/frr/ospfd/ospfd.h
77include/frr/pbr.h 83include/frr/pbr.h
78include/frr/plist.h 84include/frr/plist.h
79include/frr/prefix.h 85include/frr/prefix.h
80include/frr/printfrr.h 86include/frr/printfrr.h
81include/frr/privs.h 87include/frr/privs.h
82include/frr/ptm_lib.h 88include/frr/ptm_lib.h
83include/frr/pullwr.h 89include/frr/pullwr.h
84include/frr/pw.h 90include/frr/pw.h
85include/frr/qobj.h 91include/frr/qobj.h
86include/frr/queue.h 92include/frr/queue.h
 93include/frr/resolver.h
87include/frr/ringbuf.h 94include/frr/ringbuf.h
88include/frr/route_types.h 95include/frr/route_types.h
89include/frr/routemap.h 96include/frr/routemap.h
90include/frr/routing_nb.h 97include/frr/routing_nb.h
91include/frr/sbuf.h 98include/frr/sbuf.h
92include/frr/seqlock.h 99include/frr/seqlock.h
93include/frr/sha256.h 100include/frr/sha256.h
94include/frr/sigevent.h 101include/frr/sigevent.h
95include/frr/skiplist.h 102include/frr/skiplist.h
96include/frr/smux.h 103include/frr/smux.h
97include/frr/sockopt.h 104include/frr/sockopt.h
98include/frr/sockunion.h 105include/frr/sockunion.h
99include/frr/spf_backoff.h 106include/frr/spf_backoff.h
100include/frr/srcdest_table.h 107include/frr/srcdest_table.h
101include/frr/srte.h 108include/frr/srte.h
102include/frr/srv6.h 109include/frr/srv6.h
103include/frr/stream.h 110include/frr/stream.h
104include/frr/systemd.h 111include/frr/systemd.h
105include/frr/table.h 112include/frr/table.h
106include/frr/termtable.h 113include/frr/termtable.h
107include/frr/thread.h 114include/frr/thread.h
 115include/frr/trace.h
108include/frr/typerb.h 116include/frr/typerb.h
109include/frr/typesafe.h 117include/frr/typesafe.h
110include/frr/vector.h 118include/frr/vector.h
111include/frr/version.h 119include/frr/version.h
112include/frr/vlan.h 120include/frr/vlan.h
113include/frr/vrf.h 121include/frr/vrf.h
114include/frr/vrf_int.h 122include/frr/vrf_int.h
115include/frr/vty.h 123include/frr/vty.h
116include/frr/vxlan.h 124include/frr/vxlan.h
117include/frr/wheel.h 125include/frr/wheel.h
118include/frr/workqueue.h 126include/frr/workqueue.h
 127include/frr/xref.h
119include/frr/yang.h 128include/frr/yang.h
120include/frr/yang_translator.h 129include/frr/yang_translator.h
121include/frr/yang_wrappers.h 130include/frr/yang_wrappers.h
122include/frr/zassert.h 
123include/frr/zclient.h 131include/frr/zclient.h
124include/frr/zebra.h 132include/frr/zebra.h
125include/frr/zlog.h 133include/frr/zlog.h
126include/frr/zlog_targets.h 134include/frr/zlog_targets.h
127${PLIST.doc}info/frr.info 135${PLIST.doc}info/frr.info
 136lib/frr/modules/bgpd_bmp.la
 137lib/frr/modules/pathd_pcep.la
128lib/frr/modules/zebra_fpm.la 138lib/frr/modules/zebra_fpm.la
129lib/libfrr.la 139lib/libfrr.la
 140lib/libfrrcares.la
130lib/libfrrospfapiclient.la 141lib/libfrrospfapiclient.la
131${PLIST.doc}man/man1/frr.1 142${PLIST.doc}man/man1/frr.1
132${PLIST.doc}man/man1/vtysh.1 143${PLIST.doc}man/man1/vtysh.1
133${PLIST.doc}man/man8/frr-bfdd.8 144${PLIST.doc}man/man8/frr-bfdd.8
134${PLIST.doc}man/man8/frr-bgpd.8 145${PLIST.doc}man/man8/frr-bgpd.8
135${PLIST.doc}man/man8/frr-eigrpd.8 146${PLIST.doc}man/man8/frr-eigrpd.8
136${PLIST.doc}man/man8/frr-isisd.8 147${PLIST.doc}man/man8/frr-isisd.8
137${PLIST.doc}man/man8/frr-ldpd.8 148${PLIST.doc}man/man8/frr-ldpd.8
138${PLIST.doc}man/man8/frr-ospf6d.8 149${PLIST.doc}man/man8/frr-ospf6d.8
139${PLIST.doc}man/man8/frr-ospfd.8 150${PLIST.doc}man/man8/frr-ospfd.8
140${PLIST.doc}man/man8/frr-pbrd.8 151${PLIST.doc}man/man8/frr-pbrd.8
141${PLIST.doc}man/man8/frr-pimd.8 152${PLIST.doc}man/man8/frr-pimd.8
142${PLIST.doc}man/man8/frr-ripd.8 153${PLIST.doc}man/man8/frr-ripd.8
@@ -150,26 +161,27 @@ sbin/bfdd @@ -150,26 +161,27 @@ sbin/bfdd
150sbin/bgpd 161sbin/bgpd
151sbin/eigrpd 162sbin/eigrpd
152sbin/fabricd 163sbin/fabricd
153sbin/frr 164sbin/frr
154sbin/frr-reload 165sbin/frr-reload
155sbin/frr-reload.py 166sbin/frr-reload.py
156sbin/frrcommon.sh 167sbin/frrcommon.sh
157sbin/frrinit.sh 168sbin/frrinit.sh
158sbin/generate_support_bundle.py 169sbin/generate_support_bundle.py
159sbin/isisd 170sbin/isisd
160sbin/ldpd 171sbin/ldpd
161sbin/ospf6d 172sbin/ospf6d
162sbin/ospfd 173sbin/ospfd
 174sbin/pathd
163sbin/pbrd 175sbin/pbrd
164sbin/pimd 176sbin/pimd
165sbin/ripd 177sbin/ripd
166sbin/ripngd 178sbin/ripngd
167sbin/ssd 179sbin/ssd
168sbin/staticd 180sbin/staticd
169sbin/watchfrr 181sbin/watchfrr
170sbin/watchfrr.sh 182sbin/watchfrr.sh
171sbin/zebra 183sbin/zebra
172${PLIST.doc}share/doc/frr/html/.buildinfo 184${PLIST.doc}share/doc/frr/html/.buildinfo
173${PLIST.doc}share/doc/frr/html/_images/fig-normal-processing.png 185${PLIST.doc}share/doc/frr/html/_images/fig-normal-processing.png
174${PLIST.doc}share/doc/frr/html/_images/fig-rs-processing.png 186${PLIST.doc}share/doc/frr/html/_images/fig-rs-processing.png
175${PLIST.doc}share/doc/frr/html/_images/fig-vnc-commercial-route-reflector.png 187${PLIST.doc}share/doc/frr/html/_images/fig-vnc-commercial-route-reflector.png
@@ -193,127 +205,130 @@ ${PLIST.doc}share/doc/frr/html/_sources/ @@ -193,127 +205,130 @@ ${PLIST.doc}share/doc/frr/html/_sources/
193${PLIST.doc}share/doc/frr/html/_sources/glossary.rst.txt 205${PLIST.doc}share/doc/frr/html/_sources/glossary.rst.txt
194${PLIST.doc}share/doc/frr/html/_sources/grpc.rst.txt 206${PLIST.doc}share/doc/frr/html/_sources/grpc.rst.txt
195${PLIST.doc}share/doc/frr/html/_sources/index.rst.txt 207${PLIST.doc}share/doc/frr/html/_sources/index.rst.txt
196${PLIST.doc}share/doc/frr/html/_sources/installation.rst.txt 208${PLIST.doc}share/doc/frr/html/_sources/installation.rst.txt
197${PLIST.doc}share/doc/frr/html/_sources/ipv6.rst.txt 209${PLIST.doc}share/doc/frr/html/_sources/ipv6.rst.txt
198${PLIST.doc}share/doc/frr/html/_sources/isisd.rst.txt 210${PLIST.doc}share/doc/frr/html/_sources/isisd.rst.txt
199${PLIST.doc}share/doc/frr/html/_sources/kernel.rst.txt 211${PLIST.doc}share/doc/frr/html/_sources/kernel.rst.txt
200${PLIST.doc}share/doc/frr/html/_sources/ldpd.rst.txt 212${PLIST.doc}share/doc/frr/html/_sources/ldpd.rst.txt
201${PLIST.doc}share/doc/frr/html/_sources/nhrpd.rst.txt 213${PLIST.doc}share/doc/frr/html/_sources/nhrpd.rst.txt
202${PLIST.doc}share/doc/frr/html/_sources/ospf6d.rst.txt 214${PLIST.doc}share/doc/frr/html/_sources/ospf6d.rst.txt
203${PLIST.doc}share/doc/frr/html/_sources/ospfd.rst.txt 215${PLIST.doc}share/doc/frr/html/_sources/ospfd.rst.txt
204${PLIST.doc}share/doc/frr/html/_sources/overview.rst.txt 216${PLIST.doc}share/doc/frr/html/_sources/overview.rst.txt
205${PLIST.doc}share/doc/frr/html/_sources/packet-dumps.rst.txt 217${PLIST.doc}share/doc/frr/html/_sources/packet-dumps.rst.txt
 218${PLIST.doc}share/doc/frr/html/_sources/pathd.rst.txt
206${PLIST.doc}share/doc/frr/html/_sources/pbr.rst.txt 219${PLIST.doc}share/doc/frr/html/_sources/pbr.rst.txt
207${PLIST.doc}share/doc/frr/html/_sources/pim.rst.txt 220${PLIST.doc}share/doc/frr/html/_sources/pim.rst.txt
208${PLIST.doc}share/doc/frr/html/_sources/ripd.rst.txt 221${PLIST.doc}share/doc/frr/html/_sources/ripd.rst.txt
209${PLIST.doc}share/doc/frr/html/_sources/ripngd.rst.txt 222${PLIST.doc}share/doc/frr/html/_sources/ripngd.rst.txt
210${PLIST.doc}share/doc/frr/html/_sources/routemap.rst.txt 223${PLIST.doc}share/doc/frr/html/_sources/routemap.rst.txt
 224${PLIST.doc}share/doc/frr/html/_sources/scripting.rst.txt
211${PLIST.doc}share/doc/frr/html/_sources/setup.rst.txt 225${PLIST.doc}share/doc/frr/html/_sources/setup.rst.txt
212${PLIST.doc}share/doc/frr/html/_sources/sharp.rst.txt 226${PLIST.doc}share/doc/frr/html/_sources/sharp.rst.txt
213${PLIST.doc}share/doc/frr/html/_sources/snmp.rst.txt 227${PLIST.doc}share/doc/frr/html/_sources/snmp.rst.txt
214${PLIST.doc}share/doc/frr/html/_sources/static.rst.txt 228${PLIST.doc}share/doc/frr/html/_sources/static.rst.txt
215${PLIST.doc}share/doc/frr/html/_sources/vnc.rst.txt 229${PLIST.doc}share/doc/frr/html/_sources/vnc.rst.txt
216${PLIST.doc}share/doc/frr/html/_sources/vrrp.rst.txt 230${PLIST.doc}share/doc/frr/html/_sources/vrrp.rst.txt
217${PLIST.doc}share/doc/frr/html/_sources/vtysh.rst.txt 231${PLIST.doc}share/doc/frr/html/_sources/vtysh.rst.txt
218${PLIST.doc}share/doc/frr/html/_sources/watchfrr.rst.txt 232${PLIST.doc}share/doc/frr/html/_sources/watchfrr.rst.txt
219${PLIST.doc}share/doc/frr/html/_sources/zebra.rst.txt 233${PLIST.doc}share/doc/frr/html/_sources/zebra.rst.txt
220${PLIST.doc}share/doc/frr/html/_static/basic.css 234${PLIST.doc}share/doc/frr/html/_static/basic.css
221${PLIST.doc}share/doc/frr/html/_static/classic.css 235${PLIST.doc}share/doc/frr/html/_static/classic.css
222${PLIST.doc}share/doc/frr/html/_static/default.css 236${PLIST.doc}share/doc/frr/html/_static/default.css
223${PLIST.doc}share/doc/frr/html/_static/doctools.js 237${PLIST.doc}share/doc/frr/html/_static/doctools.js
224${PLIST.doc}share/doc/frr/html/_static/documentation_options.js 238${PLIST.doc}share/doc/frr/html/_static/documentation_options.js
225${PLIST.doc}share/doc/frr/html/_static/file.png 239${PLIST.doc}share/doc/frr/html/_static/file.png
226${PLIST.doc}share/doc/frr/html/_static/frr-icon.svg 240${PLIST.doc}share/doc/frr/html/_static/frr-icon.svg
227${PLIST.doc}share/doc/frr/html/_static/frr-logo-icon.png 241${PLIST.doc}share/doc/frr/html/_static/frr-logo-icon.png
228${PLIST.doc}share/doc/frr/html/_static/jquery-3.5.1.js 242${PLIST.doc}share/doc/frr/html/_static/jquery-3.4.1.js
229${PLIST.doc}share/doc/frr/html/_static/jquery.js 243${PLIST.doc}share/doc/frr/html/_static/jquery.js
230${PLIST.doc}share/doc/frr/html/_static/language_data.js 244${PLIST.doc}share/doc/frr/html/_static/language_data.js
231${PLIST.doc}share/doc/frr/html/_static/minus.png 245${PLIST.doc}share/doc/frr/html/_static/minus.png
232${PLIST.doc}share/doc/frr/html/_static/overrides.css 246${PLIST.doc}share/doc/frr/html/_static/overrides.css
233${PLIST.doc}share/doc/frr/html/_static/overrides.js 247${PLIST.doc}share/doc/frr/html/_static/overrides.js
234${PLIST.doc}share/doc/frr/html/_static/plus.png 248${PLIST.doc}share/doc/frr/html/_static/plus.png
235${PLIST.doc}share/doc/frr/html/_static/pygments.css 249${PLIST.doc}share/doc/frr/html/_static/pygments.css
236${PLIST.doc}share/doc/frr/html/_static/searchtools.js 250${PLIST.doc}share/doc/frr/html/_static/searchtools.js
237${PLIST.doc}share/doc/frr/html/_static/sidebar.js 251${PLIST.doc}share/doc/frr/html/_static/sidebar.js
238${PLIST.doc}share/doc/frr/html/_static/underscore-1.12.0.js 252${PLIST.doc}share/doc/frr/html/_static/underscore-1.3.1.js
239${PLIST.doc}share/doc/frr/html/_static/underscore.js 253${PLIST.doc}share/doc/frr/html/_static/underscore.js
240${PLIST.doc}share/doc/frr/html/babeld.html 254${PLIST.doc}share/doc/frr/html/babeld.html
241${PLIST.doc}share/doc/frr/html/basic.html 255${PLIST.doc}share/doc/frr/html/basic.html
242${PLIST.doc}share/doc/frr/html/bfd.html 256${PLIST.doc}share/doc/frr/html/bfd.html
243${PLIST.doc}share/doc/frr/html/bgp.html 257${PLIST.doc}share/doc/frr/html/bgp.html
244${PLIST.doc}share/doc/frr/html/bmp.html 258${PLIST.doc}share/doc/frr/html/bmp.html
245${PLIST.doc}share/doc/frr/html/bugs.html 259${PLIST.doc}share/doc/frr/html/bugs.html
246${PLIST.doc}share/doc/frr/html/eigrpd.html 260${PLIST.doc}share/doc/frr/html/eigrpd.html
247${PLIST.doc}share/doc/frr/html/fabricd.html 261${PLIST.doc}share/doc/frr/html/fabricd.html
248${PLIST.doc}share/doc/frr/html/filter.html 262${PLIST.doc}share/doc/frr/html/filter.html
249${PLIST.doc}share/doc/frr/html/frr-reload.html 263${PLIST.doc}share/doc/frr/html/frr-reload.html
250${PLIST.doc}share/doc/frr/html/genindex.html 264${PLIST.doc}share/doc/frr/html/genindex.html
251${PLIST.doc}share/doc/frr/html/glossary.html 265${PLIST.doc}share/doc/frr/html/glossary.html
252${PLIST.doc}share/doc/frr/html/grpc.html 266${PLIST.doc}share/doc/frr/html/grpc.html
253${PLIST.doc}share/doc/frr/html/index.html 267${PLIST.doc}share/doc/frr/html/index.html
254${PLIST.doc}share/doc/frr/html/installation.html 268${PLIST.doc}share/doc/frr/html/installation.html
255${PLIST.doc}share/doc/frr/html/ipv6.html 269${PLIST.doc}share/doc/frr/html/ipv6.html
256${PLIST.doc}share/doc/frr/html/isisd.html 270${PLIST.doc}share/doc/frr/html/isisd.html
257${PLIST.doc}share/doc/frr/html/kernel.html 271${PLIST.doc}share/doc/frr/html/kernel.html
258${PLIST.doc}share/doc/frr/html/ldpd.html 272${PLIST.doc}share/doc/frr/html/ldpd.html
259${PLIST.doc}share/doc/frr/html/nhrpd.html 273${PLIST.doc}share/doc/frr/html/nhrpd.html
260${PLIST.doc}share/doc/frr/html/objects.inv 274${PLIST.doc}share/doc/frr/html/objects.inv
261${PLIST.doc}share/doc/frr/html/ospf6d.html 275${PLIST.doc}share/doc/frr/html/ospf6d.html
262${PLIST.doc}share/doc/frr/html/ospfd.html 276${PLIST.doc}share/doc/frr/html/ospfd.html
263${PLIST.doc}share/doc/frr/html/overview.html 277${PLIST.doc}share/doc/frr/html/overview.html
264${PLIST.doc}share/doc/frr/html/packet-dumps.html 278${PLIST.doc}share/doc/frr/html/packet-dumps.html
 279${PLIST.doc}share/doc/frr/html/pathd.html
265${PLIST.doc}share/doc/frr/html/pbr.html 280${PLIST.doc}share/doc/frr/html/pbr.html
266${PLIST.doc}share/doc/frr/html/pim.html 281${PLIST.doc}share/doc/frr/html/pim.html
267${PLIST.doc}share/doc/frr/html/ripd.html 282${PLIST.doc}share/doc/frr/html/ripd.html
268${PLIST.doc}share/doc/frr/html/ripngd.html 283${PLIST.doc}share/doc/frr/html/ripngd.html
269${PLIST.doc}share/doc/frr/html/routemap.html 284${PLIST.doc}share/doc/frr/html/routemap.html
 285${PLIST.doc}share/doc/frr/html/scripting.html
270${PLIST.doc}share/doc/frr/html/search.html 286${PLIST.doc}share/doc/frr/html/search.html
271${PLIST.doc}share/doc/frr/html/searchindex.js 287${PLIST.doc}share/doc/frr/html/searchindex.js
272${PLIST.doc}share/doc/frr/html/setup.html 288${PLIST.doc}share/doc/frr/html/setup.html
273${PLIST.doc}share/doc/frr/html/sharp.html 289${PLIST.doc}share/doc/frr/html/sharp.html
274${PLIST.doc}share/doc/frr/html/snmp.html 290${PLIST.doc}share/doc/frr/html/snmp.html
275${PLIST.doc}share/doc/frr/html/static.html 291${PLIST.doc}share/doc/frr/html/static.html
276${PLIST.doc}share/doc/frr/html/vnc.html 292${PLIST.doc}share/doc/frr/html/vnc.html
277${PLIST.doc}share/doc/frr/html/vrrp.html 293${PLIST.doc}share/doc/frr/html/vrrp.html
278${PLIST.doc}share/doc/frr/html/vtysh.html 294${PLIST.doc}share/doc/frr/html/vtysh.html
279${PLIST.doc}share/doc/frr/html/watchfrr.html 295${PLIST.doc}share/doc/frr/html/watchfrr.html
280${PLIST.doc}share/doc/frr/html/zebra.html 296${PLIST.doc}share/doc/frr/html/zebra.html
281share/examples/frr/configsamples/babeld.conf.sample 
282share/examples/frr/configsamples/bfdd.conf.sample 
283share/examples/frr/configsamples/bgpd.conf.sample 
284share/examples/frr/configsamples/bgpd.conf.sample2 
285share/examples/frr/configsamples/bgpd.conf.vnc.sample 
286share/examples/frr/configsamples/eigrpd.conf.sample 
287share/examples/frr/configsamples/fabricd.conf.sample 
288share/examples/frr/configsamples/isisd.conf.sample 
289share/examples/frr/configsamples/ldpd.conf.sample 
290share/examples/frr/configsamples/ospf6d.conf.sample 
291share/examples/frr/configsamples/ospfd.conf.sample 
292share/examples/frr/configsamples/pbrd.conf.sample 
293share/examples/frr/configsamples/pimd.conf.sample 
294share/examples/frr/configsamples/ripd.conf.sample 
295share/examples/frr/configsamples/ripngd.conf.sample 
296share/examples/frr/configsamples/staticd.conf.sample 
297share/examples/frr/configsamples/vtysh.conf.sample 
298share/examples/frr/configsamples/zebra.conf.sample 
299share/yang/frr-bfdd.yang 297share/yang/frr-bfdd.yang
 298share/yang/frr-bgp-bmp.yang
 299share/yang/frr-bgp-common-multiprotocol.yang
 300share/yang/frr-bgp-common-structure.yang
 301share/yang/frr-bgp-common.yang
 302share/yang/frr-bgp-filter.yang
 303share/yang/frr-bgp-neighbor.yang
 304share/yang/frr-bgp-peer-group.yang
 305share/yang/frr-bgp-route-map.yang
 306share/yang/frr-bgp-rpki.yang
 307share/yang/frr-bgp-types.yang
 308share/yang/frr-bgp.yang
 309share/yang/frr-deviations-bgp-datacenter.yang
300share/yang/frr-eigrpd.yang 310share/yang/frr-eigrpd.yang
301share/yang/frr-filter.yang 311share/yang/frr-filter.yang
302share/yang/frr-igmp.yang 312share/yang/frr-igmp.yang
303share/yang/frr-interface.yang 313share/yang/frr-interface.yang
304share/yang/frr-isisd.yang 314share/yang/frr-isisd.yang
305share/yang/frr-module-translator.yang 315share/yang/frr-module-translator.yang
306share/yang/frr-nexthop.yang 316share/yang/frr-nexthop.yang
 317share/yang/frr-ospf-route-map.yang
 318share/yang/frr-ospf6-route-map.yang
 319share/yang/frr-pathd.yang
307share/yang/frr-pim-rp.yang 320share/yang/frr-pim-rp.yang
308share/yang/frr-pim.yang 321share/yang/frr-pim.yang
309share/yang/frr-ripd.yang 322share/yang/frr-ripd.yang
310share/yang/frr-ripngd.yang 323share/yang/frr-ripngd.yang
311share/yang/frr-route-map.yang 324share/yang/frr-route-map.yang
312share/yang/frr-route-types.yang 325share/yang/frr-route-types.yang
313share/yang/frr-routing.yang 326share/yang/frr-routing.yang
314share/yang/frr-staticd.yang 327share/yang/frr-staticd.yang
315share/yang/frr-test-module.yang 328share/yang/frr-test-module.yang
316share/yang/frr-vrf.yang 329share/yang/frr-vrf.yang
 330share/yang/frr-zebra-route-map.yang
317share/yang/frr-zebra.yang 331share/yang/frr-zebra.yang
 332share/yang/ietf-bgp-types.yang
318share/yang/ietf-interfaces.yang 333share/yang/ietf-interfaces.yang
319share/yang/ietf-routing-types.yang 334share/yang/ietf-routing-types.yang
cvs diff -r1.2 -r1.3 pkgsrc/net/frr/distinfo (expand / switch to unified diff)

--- pkgsrc/net/frr/distinfo 2021/03/09 08:56:38 1.2
+++ pkgsrc/net/frr/distinfo 2021/08/11 10:09:54 1.3
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.2 2021/03/09 08:56:38 kardel Exp $ 1$NetBSD: distinfo,v 1.3 2021/08/11 10:09:54 kardel Exp $
2 2
3SHA1 (frr-7.5.1.tar.gz) = 8c43b85f56605b5726e0133468f5779bfece7739 3SHA1 (frr-8.0.tar.gz) = dc3fc27d812394817ddf8946e58b0c5bbd61a146
4RMD160 (frr-7.5.1.tar.gz) = 9dd66025b22f2cfd8aa9c281d31b5f5aef12e12f 4RMD160 (frr-8.0.tar.gz) = a6f0e77baf7d4c66ff9956c311b0b52cdb7b40fd
5SHA512 (frr-7.5.1.tar.gz) = cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e 5SHA512 (frr-8.0.tar.gz) = fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a
6Size (frr-7.5.1.tar.gz) = 6746148 bytes 6Size (frr-8.0.tar.gz) = 8195258 bytes
 7SHA1 (patch-lib_elf__py.c) = a766923c906f1b0f9fa80a9e16e5275bae165187
7SHA1 (patch-pkgsrc_zebra.sh.in) = d458e74a1f3319f6e075d3d3a81414bc7d7022f2 8SHA1 (patch-pkgsrc_zebra.sh.in) = d458e74a1f3319f6e075d3d3a81414bc7d7022f2
8SHA1 (patch-zebra_ioctl.c) = 99b7606564f4dc620df997889156b5c09f7fb396 9SHA1 (patch-zebra_kernel__socket.c) = 8238f389efd4d3fbfefa29b8292132aafc56cdac
9SHA1 (patch-zebra_kernel__socket.c) = 9bf24d86923715e3e15cad073df1210bc0608e89 
File Added: pkgsrc/net/frr/patches/Attic/patch-lib_elf__py.c
$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,
File Deleted: pkgsrc/net/frr/patches/Attic/patch-zebra_ioctl.c
cvs diff -r1.1 -r1.2 pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c (expand / switch to unified diff)

--- pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c 2020/12/10 16:43:24 1.1
+++ pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c 2021/08/11 10:09:54 1.2
@@ -1,30 +1,44 @@ @@ -1,30 +1,44 @@
1$NetBSD: patch-zebra_kernel__socket.c,v 1.1 2020/12/10 16:43:24 kardel Exp $ 1$NetBSD: patch-zebra_kernel__socket.c,v 1.2 2021/08/11 10:09:54 kardel Exp $
2 2
3 Pass IFP interface index if known (normal case) to make 3 Pass IFP interface index if known (normal case) to make
4 interface specific routes work such as in 4 interface specific routes work such as in
5 5
6 ipv6 route ::/0 <ipv6 address> carp0 100 6 ipv6 route ::/0 <ipv6 address> carp0 100
7 ivv6 route ::/0 <other ipv6 address> 200 7 ivv6 route ::/0 <other ipv6 address> 200
8 8
9--- zebra/kernel_socket.c.orig 2020-06-30 11:08:57.000000000 +0000 9 frr-8 now enables SO_RERROR but exits cowardly when the
 10 routing socket returns ENOBUFS. ensure at least a bit more
 11 socket buffer space by increasing SO_RCVBUF.
 12
 13--- zebra/kernel_socket.c.orig 2021-07-21 13:06:19.000000000 +0000
10+++ zebra/kernel_socket.c 14+++ zebra/kernel_socket.c
11@@ -1277,6 +1277,19 @@ int rtm_write(int message, union sockuni 15@@ -1243,6 +1243,19 @@ int rtm_write(int message, union sockuni
12 #ifdef __OpenBSD__ 16 #ifdef __OpenBSD__
13 SOCKADDRSET(mpls, RTA_SRC); 17 SOCKADDRSET(mpls, RTA_SRC);
14 #endif 18 #endif
15+#ifdef __NetBSD__ 19+#ifdef __NetBSD__
16+ if (index > 0) { 20+ if (index > 0) {
17+ struct sockaddr_dl sdl; 21+ struct sockaddr_dl sdl;
18+ 22+
19+ memset(&sdl, 0, sizeof(sdl)); 23+ memset(&sdl, 0, sizeof(sdl));
20+ sdl.sdl_len = sizeof(sdl); 24+ sdl.sdl_len = sizeof(sdl);
21+ sdl.sdl_family = AF_LINK; 25+ sdl.sdl_family = AF_LINK;
22+ sdl.sdl_index = index; 26+ sdl.sdl_index = index;
23+ 27+
24+ msg.rtm.rtm_addrs |= RTA_IFP; 28+ msg.rtm.rtm_addrs |= RTA_IFP;
25+ SOCKADDRSET(&sdl, RTA_IFP); 29+ SOCKADDRSET(&sdl, RTA_IFP);
26+ } 30+ }
27+#endif 31+#endif
28  32
29 msg.rtm.rtm_msglen = pnt - (caddr_t)&msg; 33 msg.rtm.rtm_msglen = pnt - (caddr_t)&msg;
30  34
 35@@ -1425,6 +1438,9 @@ static void routing_socket(struct zebra_
 36 return;
 37 }
 38
 39+ setsockopt_so_recvbuf(routing_sock, 1048576);
 40+ setsockopt_so_recvbuf(dplane_routing_sock, 1048576);
 41+
 42 #ifdef SO_RERROR
 43 /* Allow reporting of route(4) buffer overflow errors */
 44 int n = 1;