Sat Jul 15 18:53:12 2017 UTC ()
Pullup ticket #5506 - requested by he
net/exabgp: NetBSD build fix

Revisions pulled up:
- net/exabgp/Makefile                                           1.21
- net/exabgp/distinfo                                           1.13
- net/exabgp/patches/patch-lib_exabgp_application_healthcheck.py 1.1

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Tue Jul  4 12:35:12 UTC 2017

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

   Log Message:
   Patch the healthcheck.py script in its proper place.
   Provide a default syslog target of /var/run/log for NetBSD, so
   that the healthcheck.py script can run on NetBSD.
   Bump PKGREVISION.


(bsiegert)
diff -r1.20 -r1.20.2.1 pkgsrc/net/exabgp/Makefile
diff -r1.12 -r1.12.2.1 pkgsrc/net/exabgp/distinfo
diff -r0 -r1.1.2.2 pkgsrc/net/exabgp/patches/patch-lib_exabgp_application_healthcheck.py
cvs diff -r1.20 -r1.20.2.1 pkgsrc/net/exabgp/Makefile (expand / switch to unified diff)

--- pkgsrc/net/exabgp/Makefile 2017/06/20 14:10:16 1.20
+++ pkgsrc/net/exabgp/Makefile 2017/07/15 18:53:11 1.20.2.1
@@ -1,48 +1,48 @@ @@ -1,48 +1,48 @@
1# $NetBSD: Makefile,v 1.20 2017/06/20 14:10:16 he Exp $ 1# $NetBSD: Makefile,v 1.20.2.1 2017/07/15 18:53:11 bsiegert Exp $
2 2
3VERSION= 3.4.19 3VERSION= 3.4.19
4DISTNAME= ${VERSION} 4DISTNAME= ${VERSION}
 5PKGREVISION= 1
5PKGNAME= exabgp-${VERSION} 6PKGNAME= exabgp-${VERSION}
6EGG_NAME= exabgp-${VERSION} 7EGG_NAME= exabgp-${VERSION}
7CATEGORIES= net 8CATEGORIES= net
8MASTER_SITES= ${MASTER_SITE_GITHUB:=Exa-Networks/exabgp/archive/} 9MASTER_SITES= ${MASTER_SITE_GITHUB:=Exa-Networks/exabgp/archive/}
9DIST_SUBDIR= exabgp 10DIST_SUBDIR= exabgp
10 11
11MAINTAINER= he@NetBSD.org 12MAINTAINER= he@NetBSD.org
12HOMEPAGE= https://github.com/Exa-Networks/exabgp/ 13HOMEPAGE= https://github.com/Exa-Networks/exabgp/
13COMMENT= ExaBGP is a userspace BGP daemon written in python 14COMMENT= ExaBGP is a userspace BGP daemon written in python
14LICENSE= modified-bsd 15LICENSE= modified-bsd
15 16
16WRKSRC= ${WRKDIR}/exabgp-${VERSION} 17WRKSRC= ${WRKDIR}/exabgp-${VERSION}
17 18
18USE_TOOLS+= perl:run 19USE_TOOLS+= perl:run
19 20
20DEPENDS+= ${PYPKGPREFIX}-ipaddr>=0:../../devel/py-ipaddr 21DEPENDS+= ${PYPKGPREFIX}-ipaddr>=0:../../devel/py-ipaddr
21DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools 22DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
22 23
23REPLACE_PERL+= etc/exabgp/processes/dynamic-1.pl 24REPLACE_PERL+= etc/exabgp/processes/dynamic-1.pl
24REPLACE_PERL+= etc/exabgp/processes/watchdog-1.pl 25REPLACE_PERL+= etc/exabgp/processes/watchdog-1.pl
25 26
26REPLACE_PYTHON+= etc/exabgp/processes/healthcheck.py 
27REPLACE_PYTHON+= etc/exabgp/processes/read-write.py 27REPLACE_PYTHON+= etc/exabgp/processes/read-write.py
28REPLACE_PYTHON+= etc/exabgp/processes/stderr-1.py 28REPLACE_PYTHON+= etc/exabgp/processes/stderr-1.py
29REPLACE_PYTHON+= etc/exabgp/processes/syslog-1.py 29REPLACE_PYTHON+= etc/exabgp/processes/syslog-1.py
30REPLACE_PYTHON+= etc/exabgp/processes/tcp-server 30REPLACE_PYTHON+= etc/exabgp/processes/tcp-server
31REPLACE_PYTHON+= lib/exabgp/application/bmp.py 31REPLACE_PYTHON+= lib/exabgp/application/bmp.py
32REPLACE_PYTHON+= lib/exabgp/application/cli.py 32REPLACE_PYTHON+= lib/exabgp/application/cli.py
 33REPLACE_PYTHON+= lib/exabgp/application/healthcheck.py
33REPLACE_PYTHON+= lib/exabgp/application/netlink.py 34REPLACE_PYTHON+= lib/exabgp/application/netlink.py
34REPLACE_PYTHON+= lib/exabgp/netlink/old.py 35REPLACE_PYTHON+= lib/exabgp/netlink/old.py
35REPLACE_PYTHON+= lib/exabgp/netlink/route.py 
36REPLACE_PYTHON+= lib/exabgp/reactor/api/encoding.py 36REPLACE_PYTHON+= lib/exabgp/reactor/api/encoding.py
37REPLACE_PYTHON+= qa/conf/api-add-remove.run 37REPLACE_PYTHON+= qa/conf/api-add-remove.run
38REPLACE_PYTHON+= qa/conf/api-announcement.run 38REPLACE_PYTHON+= qa/conf/api-announcement.run
39REPLACE_PYTHON+= qa/conf/api-api.nothing.run 39REPLACE_PYTHON+= qa/conf/api-api.nothing.run
40REPLACE_PYTHON+= qa/conf/api-api.receive.run 40REPLACE_PYTHON+= qa/conf/api-api.receive.run
41REPLACE_PYTHON+= qa/conf/api-broken-flow.run 41REPLACE_PYTHON+= qa/conf/api-broken-flow.run
42REPLACE_PYTHON+= qa/conf/api-check.run 42REPLACE_PYTHON+= qa/conf/api-check.run
43REPLACE_PYTHON+= qa/conf/api-eor.run 43REPLACE_PYTHON+= qa/conf/api-eor.run
44REPLACE_PYTHON+= qa/conf/api-fast.run 44REPLACE_PYTHON+= qa/conf/api-fast.run
45REPLACE_PYTHON+= qa/conf/api-flow.run 45REPLACE_PYTHON+= qa/conf/api-flow.run
46REPLACE_PYTHON+= qa/conf/api-multi-neighbor.run 46REPLACE_PYTHON+= qa/conf/api-multi-neighbor.run
47REPLACE_PYTHON+= qa/conf/api-multisession.run 47REPLACE_PYTHON+= qa/conf/api-multisession.run
48REPLACE_PYTHON+= qa/conf/api-nexthop-self.run 48REPLACE_PYTHON+= qa/conf/api-nexthop-self.run
cvs diff -r1.12 -r1.12.2.1 pkgsrc/net/exabgp/distinfo (expand / switch to unified diff)

--- pkgsrc/net/exabgp/distinfo 2017/06/20 14:10:16 1.12
+++ pkgsrc/net/exabgp/distinfo 2017/07/15 18:53:11 1.12.2.1
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.12 2017/06/20 14:10:16 he Exp $ 1$NetBSD: distinfo,v 1.12.2.1 2017/07/15 18:53:11 bsiegert Exp $
2 2
3SHA1 (exabgp/3.4.19.tar.gz) = 8199eb40f3b533a7db1ee43e4a97213f550a4261 3SHA1 (exabgp/3.4.19.tar.gz) = 8199eb40f3b533a7db1ee43e4a97213f550a4261
4RMD160 (exabgp/3.4.19.tar.gz) = 4596ea5663169e09d8be5a0b5833c2f9426a7ff2 4RMD160 (exabgp/3.4.19.tar.gz) = 4596ea5663169e09d8be5a0b5833c2f9426a7ff2
5SHA512 (exabgp/3.4.19.tar.gz) = 92fb0aea9b2594433acacdc196cfda217867f59ea6524b409b69dff506fdc9a9a815b93807ff06d4c81404b1f6568a1a41e64178122eaf9ce7732416474f3455 5SHA512 (exabgp/3.4.19.tar.gz) = 92fb0aea9b2594433acacdc196cfda217867f59ea6524b409b69dff506fdc9a9a815b93807ff06d4c81404b1f6568a1a41e64178122eaf9ce7732416474f3455
6Size (exabgp/3.4.19.tar.gz) = 543475 bytes 6Size (exabgp/3.4.19.tar.gz) = 543475 bytes
 7SHA1 (patch-lib_exabgp_application_healthcheck.py) = d3b3c511e8d4fae60bcc21b7ee23585ee83ae9d8
File Added: pkgsrc/net/exabgp/patches/patch-lib_exabgp_application_healthcheck.py
$NetBSD: patch-lib_exabgp_application_healthcheck.py,v 1.1.2.2 2017/07/15 18:53:11 bsiegert Exp $

Provide a default syslog destination on NetBSD as well.
Fix spelling...

--- lib/exabgp/application/healthcheck.py.orig	2017-07-04 09:41:30.000000000 +0000
+++ lib/exabgp/application/healthcheck.py
@@ -203,11 +203,13 @@ def setup_logging (debug, silent, name, 
     """Setup logger"""
 
     def syslog_address():
-        """Return a sensitive syslog address"""
+        """Return a sensible syslog address"""
         if sys.platform == "darwin":
             return "/var/run/syslog"
         if sys.platform.startswith("freebsd"):
             return "/var/run/log"
+        if sys.platform.startswith("netbsd"):
+            return "/var/run/log"
         if sys.platform.startswith("linux"):
             return "/dev/log"
         raise EnvironmentError("Unable to guess syslog address for your "