summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/exabgp/Makefile28
-rw-r--r--net/exabgp/PLIST93
-rw-r--r--net/exabgp/distinfo11
-rw-r--r--net/exabgp/patches/patch-setup.py28
4 files changed, 111 insertions, 49 deletions
diff --git a/net/exabgp/Makefile b/net/exabgp/Makefile
index 9b45d9c0fc7..0c6e2aec83d 100644
--- a/net/exabgp/Makefile
+++ b/net/exabgp/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.19 2017/01/01 14:43:49 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2017/06/20 14:10:16 he Exp $
-VERSION= 3.4.11
+VERSION= 3.4.19
DISTNAME= ${VERSION}
PKGNAME= exabgp-${VERSION}
-PKGREVISION= 2
EGG_NAME= exabgp-${VERSION}
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=Exa-Networks/exabgp/archive/}
DIST_SUBDIR= exabgp
-MAINTAINER= pettai@NetBSD.org
+MAINTAINER= he@NetBSD.org
HOMEPAGE= https://github.com/Exa-Networks/exabgp/
COMMENT= ExaBGP is a userspace BGP daemon written in python
LICENSE= modified-bsd
@@ -35,6 +34,27 @@ REPLACE_PYTHON+= lib/exabgp/application/netlink.py
REPLACE_PYTHON+= lib/exabgp/netlink/old.py
REPLACE_PYTHON+= lib/exabgp/netlink/route.py
REPLACE_PYTHON+= lib/exabgp/reactor/api/encoding.py
+REPLACE_PYTHON+= qa/conf/api-add-remove.run
+REPLACE_PYTHON+= qa/conf/api-announcement.run
+REPLACE_PYTHON+= qa/conf/api-api.nothing.run
+REPLACE_PYTHON+= qa/conf/api-api.receive.run
+REPLACE_PYTHON+= qa/conf/api-broken-flow.run
+REPLACE_PYTHON+= qa/conf/api-check.run
+REPLACE_PYTHON+= qa/conf/api-eor.run
+REPLACE_PYTHON+= qa/conf/api-fast.run
+REPLACE_PYTHON+= qa/conf/api-flow.run
+REPLACE_PYTHON+= qa/conf/api-multi-neighbor.run
+REPLACE_PYTHON+= qa/conf/api-multisession.run
+REPLACE_PYTHON+= qa/conf/api-nexthop-self.run
+REPLACE_PYTHON+= qa/conf/api-nexthop.run
+REPLACE_PYTHON+= qa/conf/api-notification.run
+REPLACE_PYTHON+= qa/conf/api-open.run
+REPLACE_PYTHON+= qa/conf/api-reload.run
+REPLACE_PYTHON+= qa/conf/api-teardown.run
+REPLACE_PYTHON+= qa/conf/api-vpls.run
+REPLACE_PYTHON+= qa/conf/api-vpnv4.run
+REPLACE_PYTHON+= qa/conf/manual-eor.run
+REPLACE_PYTHON+= qa/conf/watchdog.run
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 3.2.19
diff --git a/net/exabgp/PLIST b/net/exabgp/PLIST
index e5fad611ed4..46d28bdfb90 100644
--- a/net/exabgp/PLIST
+++ b/net/exabgp/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2015/05/27 12:26:26 he Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/06/20 14:10:16 he Exp $
+bin/exabgp
${PYSITELIB}/${EGG_FILE}/PKG-INFO
${PYSITELIB}/${EGG_FILE}/SOURCES.txt
${PYSITELIB}/${EGG_FILE}/dependency_links.txt
@@ -7,6 +8,9 @@ ${PYSITELIB}/${EGG_FILE}/top_level.txt
${PYSITELIB}/exabgp/__init__.py
${PYSITELIB}/exabgp/__init__.pyc
${PYSITELIB}/exabgp/__init__.pyo
+${PYSITELIB}/exabgp/__main__.py
+${PYSITELIB}/exabgp/__main__.pyc
+${PYSITELIB}/exabgp/__main__.pyo
${PYSITELIB}/exabgp/application/__init__.py
${PYSITELIB}/exabgp/application/__init__.pyc
${PYSITELIB}/exabgp/application/__init__.pyo
@@ -562,15 +566,82 @@ ${PYSITELIB}/exabgp/util/usage.pyo
${PYSITELIB}/exabgp/version.py
${PYSITELIB}/exabgp/version.pyc
${PYSITELIB}/exabgp/version.pyo
-bin/exabgp
-bin/healthcheck
man/man1/exabgp.1
man/man5/exabgp.conf.5
-share/exabgp/dynamic-1.pl
-share/exabgp/dynamic-1.sh
-share/exabgp/read-write.py
-share/exabgp/stderr-1.py
-share/exabgp/syslog-1.py
-share/exabgp/tcp-server
-share/exabgp/watchdog-1.pl
-share/exabgp/watchdog-1.sh
+share/exabgp/etc/addpath.conf
+share/exabgp/etc/api-add-remove.conf
+share/exabgp/etc/api-add-remove.run
+share/exabgp/etc/api-announcement.conf
+share/exabgp/etc/api-announcement.run
+share/exabgp/etc/api-api.conf
+share/exabgp/etc/api-api.nothing.run
+share/exabgp/etc/api-api.receive.run
+share/exabgp/etc/api-broken-flow.conf
+share/exabgp/etc/api-broken-flow.run
+share/exabgp/etc/api-check.conf
+share/exabgp/etc/api-check.run
+share/exabgp/etc/api-eor.conf
+share/exabgp/etc/api-eor.run
+share/exabgp/etc/api-fast.conf
+share/exabgp/etc/api-fast.run
+share/exabgp/etc/api-flow.conf
+share/exabgp/etc/api-flow.run
+share/exabgp/etc/api-multi-neighbor.conf
+share/exabgp/etc/api-multi-neighbor.run
+share/exabgp/etc/api-multisession.conf
+share/exabgp/etc/api-multisession.run
+share/exabgp/etc/api-nexthop-self.conf
+share/exabgp/etc/api-nexthop-self.run
+share/exabgp/etc/api-nexthop.conf
+share/exabgp/etc/api-nexthop.run
+share/exabgp/etc/api-notification.conf
+share/exabgp/etc/api-notification.run
+share/exabgp/etc/api-open.conf
+share/exabgp/etc/api-open.run
+share/exabgp/etc/api-reload.1.conf
+share/exabgp/etc/api-reload.2.conf
+share/exabgp/etc/api-reload.run
+share/exabgp/etc/api-teardown.conf
+share/exabgp/etc/api-teardown.run
+share/exabgp/etc/api-vpls.conf
+share/exabgp/etc/api-vpls.run
+share/exabgp/etc/api-vpnv4.conf
+share/exabgp/etc/api-vpnv4.run
+share/exabgp/etc/community.conf
+share/exabgp/etc/dual-neighbor.conf
+share/exabgp/etc/flow-redirect.conf
+share/exabgp/etc/flow.conf
+share/exabgp/etc/generic-attribute.conf
+share/exabgp/etc/group.conf
+share/exabgp/etc/ipv46routes4family.conf
+share/exabgp/etc/ipv46routes6family.conf
+share/exabgp/etc/ipv6grouping.conf
+share/exabgp/etc/l2vpn.conf
+share/exabgp/etc/large-mp.conf
+share/exabgp/etc/large.conf
+share/exabgp/etc/manual-eor.conf
+share/exabgp/etc/manual-eor.run
+share/exabgp/etc/md5.conf
+share/exabgp/etc/multiple-process.conf
+share/exabgp/etc/multisession.conf
+share/exabgp/etc/name.conf
+share/exabgp/etc/no-asn4.conf
+share/exabgp/etc/parity.conf
+share/exabgp/etc/path-information.conf
+share/exabgp/etc/simple-v4.conf
+share/exabgp/etc/simple-v6.conf
+share/exabgp/etc/skip.conf
+share/exabgp/etc/split.conf
+share/exabgp/etc/ttl.conf
+share/exabgp/etc/unknowncap.conf
+share/exabgp/etc/vpn.conf
+share/exabgp/etc/watchdog.conf
+share/exabgp/etc/watchdog.run
+share/exabgp/processes/dynamic-1.pl
+share/exabgp/processes/dynamic-1.sh
+share/exabgp/processes/read-write.py
+share/exabgp/processes/stderr-1.py
+share/exabgp/processes/syslog-1.py
+share/exabgp/processes/tcp-server
+share/exabgp/processes/watchdog-1.pl
+share/exabgp/processes/watchdog-1.sh
diff --git a/net/exabgp/distinfo b/net/exabgp/distinfo
index b68fd026954..11587191a21 100644
--- a/net/exabgp/distinfo
+++ b/net/exabgp/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2015/11/04 00:34:59 agc Exp $
+$NetBSD: distinfo,v 1.12 2017/06/20 14:10:16 he Exp $
-SHA1 (exabgp/3.4.11.tar.gz) = 62b4da0291cfa72ca8be6c176b97f06c1123ba87
-RMD160 (exabgp/3.4.11.tar.gz) = 4a28c954f34667165def4646d7cfd106ee0e0360
-SHA512 (exabgp/3.4.11.tar.gz) = a41bda0f159cf11669d7f8c7bbdd3811e2866e7de289af0d4a9792af7c08bfa3a03d3ec7551ad362ca34d268864136a70b3cf3bb90f4eb085eb3904472c5df99
-Size (exabgp/3.4.11.tar.gz) = 536372 bytes
-SHA1 (patch-setup.py) = 8181a726cead85e6e06d49f9b474ac97210a069c
+SHA1 (exabgp/3.4.19.tar.gz) = 8199eb40f3b533a7db1ee43e4a97213f550a4261
+RMD160 (exabgp/3.4.19.tar.gz) = 4596ea5663169e09d8be5a0b5833c2f9426a7ff2
+SHA512 (exabgp/3.4.19.tar.gz) = 92fb0aea9b2594433acacdc196cfda217867f59ea6524b409b69dff506fdc9a9a815b93807ff06d4c81404b1f6568a1a41e64178122eaf9ce7732416474f3455
+Size (exabgp/3.4.19.tar.gz) = 543475 bytes
diff --git a/net/exabgp/patches/patch-setup.py b/net/exabgp/patches/patch-setup.py
deleted file mode 100644
index 29c82056cb4..00000000000
--- a/net/exabgp/patches/patch-setup.py
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-setup.py,v 1.4 2015/03/19 09:20:30 he Exp $
-
-Do away with the special handling for NetBSD, to avoid PLIST issues
-between different pkgsrc-using platforms.
-Install helper scripts outside of the config tree (use share/exabgp).
-On the other hand, only do the systemd dance on Linux.
-
---- setup.py.orig 2015-03-14 15:32:13.000000000 +0000
-+++ setup.py
-@@ -364,14 +364,10 @@ def configuration (etc):
-
- os_name = platform.system()
-
--if os_name == 'NetBSD':
-- files_definition= [
-- ('share/exabgp',configuration('etc/exabgp')),
-- ]
--else:
-- files_definition = [
-- ('etc/exabgp',configuration('etc/exabgp')),
-- ]
-+files_definition= [
-+ ('share/exabgp',configuration('etc/exabgp')),
-+]
-+if os_name == 'Linux':
- if sys.argv[-1] == 'systemd':
- files_definition.append(('/usr/lib/systemd/system',configuration('etc/systemd')))
-