CVS commit: pkgsrc/net/frr

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

Module Name:    pkgsrc
Committed By:   kardel
Date:           Sun Aug 15 14:54:31 UTC 2021

Modified Files:
        pkgsrc/net/frr: Makefile PLIST distinfo
        pkgsrc/net/frr/patches: patch-zebra_kernel__socket.c

Log Message:
net/frr: fix PLIST issue (versioned .js files), improve kernel route interface


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/frr/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/frr/PLIST pkgsrc/net/frr/distinfo
cvs rdiff -u -r1.2 -r1.3 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/Makefile
diff -u pkgsrc/net/frr/Makefile:1.7 pkgsrc/net/frr/Makefile:1.8
--- pkgsrc/net/frr/Makefile:1.7 Wed Aug 11 10:09:54 2021
+++ pkgsrc/net/frr/Makefile     Sun Aug 15 14:54:31 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/08/11 10:09:54 kardel Exp $
+# $NetBSD: Makefile,v 1.8 2021/08/15 14:54:31 kardel Exp $
 
 GITHUB_PROJECT=        frr
 VERSION=       8.0
@@ -94,6 +94,12 @@ CONFIGURE_ARGS+=     --with-pkg-extra-versio
 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/readline/buildlink3.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/net/frr/PLIST
diff -u pkgsrc/net/frr/PLIST:1.3 pkgsrc/net/frr/PLIST:1.4
--- pkgsrc/net/frr/PLIST:1.3    Wed Aug 11 10:09:54 2021
+++ pkgsrc/net/frr/PLIST        Sun Aug 15 14:54:31 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/08/11 10:09:54 kardel Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/08/15 14:54:31 kardel Exp $
 bin/mtracebis
 bin/vtysh
 include/frr/agg_table.h
@@ -239,7 +239,6 @@ ${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.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
@@ -249,7 +248,6 @@ ${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.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
Index: pkgsrc/net/frr/distinfo
diff -u pkgsrc/net/frr/distinfo:1.3 pkgsrc/net/frr/distinfo:1.4
--- pkgsrc/net/frr/distinfo:1.3 Wed Aug 11 10:09:54 2021
+++ pkgsrc/net/frr/distinfo     Sun Aug 15 14:54:31 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2021/08/11 10:09:54 kardel Exp $
+$NetBSD: distinfo,v 1.4 2021/08/15 14:54:31 kardel Exp $
 
 SHA1 (frr-8.0.tar.gz) = dc3fc27d812394817ddf8946e58b0c5bbd61a146
 RMD160 (frr-8.0.tar.gz) = a6f0e77baf7d4c66ff9956c311b0b52cdb7b40fd
@@ -6,4 +6,4 @@ SHA512 (frr-8.0.tar.gz) = fdf1e68c16e266
 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_kernel__socket.c) = 8238f389efd4d3fbfefa29b8292132aafc56cdac
+SHA1 (patch-zebra_kernel__socket.c) = 845c3132d21aefcff5c41fa9aa9a31f2bf2ac5af

Index: pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c
diff -u pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c:1.2 pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c:1.3
--- pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c:1.2     Wed Aug 11 10:09:54 2021
+++ pkgsrc/net/frr/patches/patch-zebra_kernel__socket.c Sun Aug 15 14:54:31 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-zebra_kernel__socket.c,v 1.2 2021/08/11 10:09:54 kardel Exp $
+$NetBSD: patch-zebra_kernel__socket.c,v 1.3 2021/08/15 14:54:31 kardel Exp $
 
        Pass IFP interface index if known (normal case) to make
        interface specific routes work such as in
@@ -12,7 +12,15 @@ $NetBSD: patch-zebra_kernel__socket.c,v 
 
 --- zebra/kernel_socket.c.orig 2021-07-21 13:06:19.000000000 +0000
 +++ zebra/kernel_socket.c
-@@ -1243,6 +1243,19 @@ int rtm_write(int message, union sockuni
+@@ -39,6 +39,7 @@
+ #include "privs.h"
+ #include "vrf.h"
+ #include "lib_errors.h"
++#include "lib/sockopt.h"
+ 
+ #include "zebra/rt.h"
+ #include "zebra/interface.h"
+@@ -1243,6 +1244,20 @@ int rtm_write(int message, union sockuni
  #ifdef __OpenBSD__
        SOCKADDRSET(mpls, RTA_SRC);
  #endif
@@ -26,13 +34,14 @@ $NetBSD: patch-zebra_kernel__socket.c,v 
 +              sdl.sdl_index = index;
 +
 +              msg.rtm.rtm_addrs |= RTA_IFP;
-+              SOCKADDRSET(&sdl, RTA_IFP);
++              memcpy(pnt, &sdl, sdl.sdl_len);
++              pnt += SAROUNDUP(&sdl);
 +      }
 +#endif
  
        msg.rtm.rtm_msglen = pnt - (caddr_t)&msg;
  
-@@ -1425,6 +1438,9 @@ static void routing_socket(struct zebra_
+@@ -1425,6 +1440,9 @@ static void routing_socket(struct zebra_
                return;
        }