Hi, I wanted to play with exabgp but reading their doc I saw that there are changes between 3.4 and 4.0. I wanted to use directly 4.0 so I updated the port to 4.0.2 only to realize later that it was a alpha release.
I noticed that we're lagging on the 3.x branch so here's a diff to update it. I also enable test. Is anyone against moving it to py3 once we move to the 4.x branch? Also, inline is the diff you can review but I'd like to commit https://chown.me/iota/ports/exabgp.diff as the Makefile is prettier that way. Any objections? Comments? OK? Cheers, Daniel Index: Makefile =================================================================== RCS file: /cvs/ports/net/exabgp/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile 13 Jan 2017 14:08:52 -0000 1.4 +++ Makefile 19 Nov 2017 18:06:12 -0000 @@ -2,7 +2,7 @@ COMMENT= BGP route injector (supporting flow routes, etc) -MODPY_EGG_VERSION= 3.4.17 +MODPY_EGG_VERSION= 3.4.22 GH_ACCOUNT= exa-networks GH_PROJECT= exabgp GH_TAGNAME= ${MODPY_EGG_VERSION} @@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM= Yes MODULES= lang/python MODPY_SETUPTOOLS= Yes +TEST_DEPENDS= devel/py-nose + pre-configure: ${SUBST_CMD} -m 555 -c ${FILESDIR}/exabgp ${WRKSRC}/sbin/exabgp @@ -25,5 +27,8 @@ post-install: .for i in 1 5 ${INSTALL_MAN} ${WRKSRC}/doc/man/*.$i ${PREFIX}/man/man$i/ .endfor + +do-test: + cd ${WRKSRC} && ${MODPY_BIN} -m nose ./qa/tests/*_test.py .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/exabgp/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 13 Jan 2017 14:08:52 -0000 1.3 +++ distinfo 19 Nov 2017 18:06:12 -0000 @@ -1,2 +1,2 @@ -SHA256 (exabgp-3.4.17.tar.gz) = XEDyjhxJybPV0iBsKzswyF8MSkO/KhQKxEMUcroLkVc= -SIZE (exabgp-3.4.17.tar.gz) = 540416 +SHA256 (exabgp-3.4.22.tar.gz) = 9KU4mkpKO6GziUqCqRijZlaEn6CNre3atrAhnFjSA40= +SIZE (exabgp-3.4.22.tar.gz) = 544118 Index: patches/patch-setup_py =================================================================== RCS file: /cvs/ports/net/exabgp/patches/patch-setup_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-setup_py --- patches/patch-setup_py 13 Jan 2017 14:08:52 -0000 1.2 +++ patches/patch-setup_py 19 Nov 2017 18:06:12 -0000 @@ -1,14 +1,15 @@ $OpenBSD: patch-setup_py,v 1.2 2017/01/13 14:08:52 phessler Exp $ ---- setup.py.orig Thu Sep 15 12:57:50 2016 -+++ setup.py Wed Dec 14 20:34:45 2016 -@@ -276,6 +276,10 @@ if os_name == 'NetBSD': - files_definition= [ - ('share/exabgp',configuration('etc/exabgp')), - ] -+elif os_name == 'OpenBSD': -+ files_definition= [ -+ ('share/examples/exabgp',configuration('etc/exabgp')), -+ ] - else: - files_definition = [ - ('etc/exabgp',configuration('etc/exabgp')), +Index: setup.py +--- setup.py.orig ++++ setup.py +@@ -330,8 +330,8 @@ def testFilesOf (direcotry): + os_name = platform.system() + + files_definition = [ +- ('share/exabgp/processes',filesOf('etc/exabgp')), +- ('share/exabgp/etc',testFilesOf('qa/conf')), ++ ('share/examples/exabgp/processes',filesOf('etc/exabgp')), ++ ('share/examples/exabgp/etc',testFilesOf('qa/conf')), + ] + + if os_name != 'NetBSD': Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/exabgp/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 27 Nov 2015 12:16:06 -0000 1.1.1.1 +++ pkg/PLIST 19 Nov 2017 18:06:12 -0000 @@ -6,7 +6,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt lib/python${MODPY_VERSION}/site-packages/exabgp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/exabgp/__init__.py lib/python${MODPY_VERSION}/site-packages/exabgp/__init__.pyc @@ -320,6 +319,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/__init__.py lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/enum.py +lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/enum.pyc lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/family.py lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/family.pyc lib/python${MODPY_VERSION}/site-packages/exabgp/protocol/ip/ @@ -417,11 +418,82 @@ lib/python${MODPY_VERSION}/site-packages @man man/man1/exabgp.1 @man man/man5/exabgp.conf.5 share/examples/exabgp/ -share/examples/exabgp/dynamic-1.pl -share/examples/exabgp/dynamic-1.sh -share/examples/exabgp/read-write.py -share/examples/exabgp/stderr-1.py -share/examples/exabgp/syslog-1.py -share/examples/exabgp/tcp-server -share/examples/exabgp/watchdog-1.pl -share/examples/exabgp/watchdog-1.sh +share/examples/exabgp/etc/ +share/examples/exabgp/etc/addpath.conf +share/examples/exabgp/etc/api-add-remove.conf +share/examples/exabgp/etc/api-add-remove.run +share/examples/exabgp/etc/api-announcement.conf +share/examples/exabgp/etc/api-announcement.run +share/examples/exabgp/etc/api-api.conf +share/examples/exabgp/etc/api-api.nothing.run +share/examples/exabgp/etc/api-api.receive.run +share/examples/exabgp/etc/api-broken-flow.conf +share/examples/exabgp/etc/api-broken-flow.run +share/examples/exabgp/etc/api-check.conf +share/examples/exabgp/etc/api-check.run +share/examples/exabgp/etc/api-eor.conf +share/examples/exabgp/etc/api-eor.run +share/examples/exabgp/etc/api-fast.conf +share/examples/exabgp/etc/api-fast.run +share/examples/exabgp/etc/api-flow.conf +share/examples/exabgp/etc/api-flow.run +share/examples/exabgp/etc/api-multi-neighbor.conf +share/examples/exabgp/etc/api-multi-neighbor.run +share/examples/exabgp/etc/api-multisession.conf +share/examples/exabgp/etc/api-multisession.run +share/examples/exabgp/etc/api-nexthop-self.conf +share/examples/exabgp/etc/api-nexthop-self.run +share/examples/exabgp/etc/api-nexthop.conf +share/examples/exabgp/etc/api-nexthop.run +share/examples/exabgp/etc/api-notification.conf +share/examples/exabgp/etc/api-notification.run +share/examples/exabgp/etc/api-open.conf +share/examples/exabgp/etc/api-open.run +share/examples/exabgp/etc/api-reload.1.conf +share/examples/exabgp/etc/api-reload.2.conf +share/examples/exabgp/etc/api-reload.run +share/examples/exabgp/etc/api-teardown.conf +share/examples/exabgp/etc/api-teardown.run +share/examples/exabgp/etc/api-vpls.conf +share/examples/exabgp/etc/api-vpls.run +share/examples/exabgp/etc/api-vpnv4.conf +share/examples/exabgp/etc/api-vpnv4.run +share/examples/exabgp/etc/community.conf +share/examples/exabgp/etc/dual-neighbor.conf +share/examples/exabgp/etc/flow-redirect.conf +share/examples/exabgp/etc/flow.conf +share/examples/exabgp/etc/generic-attribute.conf +share/examples/exabgp/etc/group.conf +share/examples/exabgp/etc/ipv46routes4family.conf +share/examples/exabgp/etc/ipv46routes6family.conf +share/examples/exabgp/etc/ipv6grouping.conf +share/examples/exabgp/etc/l2vpn.conf +share/examples/exabgp/etc/large-mp.conf +share/examples/exabgp/etc/large.conf +share/examples/exabgp/etc/manual-eor.conf +share/examples/exabgp/etc/manual-eor.run +share/examples/exabgp/etc/md5.conf +share/examples/exabgp/etc/multiple-process.conf +share/examples/exabgp/etc/multisession.conf +share/examples/exabgp/etc/name.conf +share/examples/exabgp/etc/no-asn4.conf +share/examples/exabgp/etc/parity.conf +share/examples/exabgp/etc/path-information.conf +share/examples/exabgp/etc/simple-v4.conf +share/examples/exabgp/etc/simple-v6.conf +share/examples/exabgp/etc/skip.conf +share/examples/exabgp/etc/split.conf +share/examples/exabgp/etc/ttl.conf +share/examples/exabgp/etc/unknowncap.conf +share/examples/exabgp/etc/vpn.conf +share/examples/exabgp/etc/watchdog.conf +share/examples/exabgp/etc/watchdog.run +share/examples/exabgp/processes/ +share/examples/exabgp/processes/dynamic-1.pl +share/examples/exabgp/processes/dynamic-1.sh +share/examples/exabgp/processes/read-write.py +share/examples/exabgp/processes/stderr-1.py +share/examples/exabgp/processes/syslog-1.py +share/examples/exabgp/processes/tcp-server +share/examples/exabgp/processes/watchdog-1.pl +share/examples/exabgp/processes/watchdog-1.sh
