CVS commit: pkgsrc/net/exabgp

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Feb 19 12:54:09 UTC 2024

Modified Files:
        pkgsrc/net/exabgp: Makefile distinfo
Added Files:
        pkgsrc/net/exabgp/patches: patch-lib_exabgp_application_healthcheck.py
            patch-lib_exabgp_reactor_api_command_limit.py

Log Message:
Add a patch to exabgp-4.2.21:

Allow "neighbor *" in route announce command, to match
"all configured neighbors".
Ref. https://github.com/Exa-Networks/exabgp/issues/1179
Adapt the healthcheck module to allow this argument.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/exabgp/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/exabgp/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/net/exabgp/patches/patch-lib_exabgp_application_healthcheck.py
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/exabgp/patches/patch-lib_exabgp_reactor_api_command_limit.py

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

Modified files:

Index: pkgsrc/net/exabgp/Makefile
diff -u pkgsrc/net/exabgp/Makefile:1.41 pkgsrc/net/exabgp/Makefile:1.42
--- pkgsrc/net/exabgp/Makefile:1.41     Mon Aug 14 05:24:58 2023
+++ pkgsrc/net/exabgp/Makefile  Mon Feb 19 12:54:09 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2023/08/14 05:24:58 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2024/02/19 12:54:09 he Exp $
 
 DISTNAME=      exabgp-4.2.21
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Exa-Networks/}
 

Index: pkgsrc/net/exabgp/distinfo
diff -u pkgsrc/net/exabgp/distinfo:1.19 pkgsrc/net/exabgp/distinfo:1.20
--- pkgsrc/net/exabgp/distinfo:1.19     Sun Sep 18 12:02:00 2022
+++ pkgsrc/net/exabgp/distinfo  Mon Feb 19 12:54:09 2024
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.19 2022/09/18 12:02:00 he Exp $
+$NetBSD: distinfo,v 1.20 2024/02/19 12:54:09 he Exp $
 
 BLAKE2s (exabgp-4.2.21.tar.gz) = 16efdd84722201dc7dac7297a9367535c1b5184f952728123a856a93ec4e302a
 SHA512 (exabgp-4.2.21.tar.gz) = 0efc7143191e8b557297e9329354c01e2418e0c4c45753941eba3a1f063e77d17a0efa7a14a3062764e45e709f0598f491c10e2c02e751590bb7c0943b61932b
 Size (exabgp-4.2.21.tar.gz) = 2933721 bytes
+SHA1 (patch-lib_exabgp_application_healthcheck.py) = af35c59feb16bcf79abbf615d9ed13205127c534
+SHA1 (patch-lib_exabgp_reactor_api_command_limit.py) = 322747424f646d1e1e22bde6baa6e057ace51805

Added files:

Index: pkgsrc/net/exabgp/patches/patch-lib_exabgp_application_healthcheck.py
diff -u /dev/null pkgsrc/net/exabgp/patches/patch-lib_exabgp_application_healthcheck.py:1.3
--- /dev/null   Mon Feb 19 12:54:09 2024
+++ pkgsrc/net/exabgp/patches/patch-lib_exabgp_application_healthcheck.py       Mon Feb 19 12:54:09 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_exabgp_application_healthcheck.py,v 1.3 2024/02/19 12:54:09 he Exp $
+
+Change type of `--neighbor` argument from ip_address to str
+so that it can support '*' as a value.
+
+--- lib/exabgp/application/healthcheck.py.orig 2024-02-19 12:45:30.545761963 +0000
++++ lib/exabgp/application/healthcheck.py
+@@ -222,7 +222,7 @@ def parse():
+         help=("Instead of increasing the metric on health failure, " "withdraw the route"),
+     )
+     g.add_argument("--path-id", metavar='PATHID', type=int, default=None, help="path ID to advertise for the route")
+-    g.add_argument("--neighbor", metavar='NEIGHBOR', type=ip_address, dest="neighbors", action="append", help="advertise the route to the selected neigbors")
++    g.add_argument("--neighbor", metavar='NEIGHBOR', type=str, dest="neighbors", action="append", help="advertise the route to the selected neigbors")
+ 
+     g = parser.add_argument_group("reporting")
+     g.add_argument("--execute", metavar='CMD', type=str, action="append", help="execute CMD on state change")

Index: pkgsrc/net/exabgp/patches/patch-lib_exabgp_reactor_api_command_limit.py
diff -u /dev/null pkgsrc/net/exabgp/patches/patch-lib_exabgp_reactor_api_command_limit.py:1.1
--- /dev/null   Mon Feb 19 12:54:09 2024
+++ pkgsrc/net/exabgp/patches/patch-lib_exabgp_reactor_api_command_limit.py     Mon Feb 19 12:54:09 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_exabgp_reactor_api_command_limit.py,v 1.1 2024/02/19 12:54:09 he Exp $
+
+Allow "neighbor *" in route announce command, to match
+"all configured neighbors".
+Ref. https://github.com/Exa-Networks/exabgp/issues/1179
+
+--- lib/exabgp/reactor/api/command/limit.py.orig       2024-02-19 12:41:58.477150474 +0000
++++ lib/exabgp/reactor/api/command/limit.py
+@@ -63,6 +63,8 @@ def extract_neighbors(command):
+ 
+ def match_neighbor(description, name):
+     for string in description:
++        if string.strip() == 'neighbor *':
++            return True
+         if re.search(r'(^|\s)%s($|\s|,)' % re.escape(string), name) is None:
+             return False
+     return True