Date: Tue, 3 Jul 2018 13:09:00 +0000 (UTC) From: Dave Cottlehuber <dch@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473828 - in head/net/zerotier: . files Message-ID: <201807031309.w63D90k9054318@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dch Date: Tue Jul 3 13:08:59 2018 New Revision: 473828 URL: https://svnweb.freebsd.org/changeset/ports/473828 Log: net/zerotier: update 1.2.8 to 1.2.10 include 3 upstream bugs related to large environments: - Fix bug loading moons.d/ files for federated root operation. - Fix compile problem with ZT_DEBUG on some versions of clang - Fix slow network startup bug related to loading of networks.d/ cache files improve daemon functionality: - improve rc.d dependencies by requiring devfs instead of netif - use daemon(8) to capture debug logging to syslog if > FreeBSD 11.1R and if compiled with debugging option - let rc.d script load if_tap if not already present - add reminder for users about sysctls to avoid race conditions at boot time Reviewed by: mat Approved by: jrm Differential Revision: https://reviews.freebsd.org/D15534 Modified: head/net/zerotier/Makefile head/net/zerotier/distinfo head/net/zerotier/files/zerotier.in head/net/zerotier/pkg-message Modified: head/net/zerotier/Makefile ============================================================================== --- head/net/zerotier/Makefile Tue Jul 3 13:05:51 2018 (r473827) +++ head/net/zerotier/Makefile Tue Jul 3 13:08:59 2018 (r473828) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zerotier -DISTVERSION= 1.2.8 +DISTVERSION= 1.2.10 CATEGORIES= net MAINTAINER= dch@FreeBSD.org @@ -29,10 +29,21 @@ DBG_ALL_TARGET= debug PLIST_FILES= bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one +.include <bsd.port.pre.mk> + +.if ${OPSYS} == "FreeBSD" +# log output via syslog when daemon(8) supports it +.if ((${OSVERSION} >= 1100513 && ${OSVERSION} < 1200000) || ${OSVERSION} >= 1200015) +SUB_LIST+= ZEROTIER_SYSLOG="-s debug -T zerotier" +.else +SUB_LIST+= ZEROTIER_SYSLOG="" +.endif +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/zerotier-one ${STAGEDIR}${PREFIX}/sbin/ .for l in zerotier-cli zerotier-idtool - ${LN} -sf ../sbin/zerotier-one ${STAGEDIR}${PREFIX}/bin/${l} + ${RLN} ${STAGEDIR}${PREFIX}/sbin/zerotier-one ${STAGEDIR}${PREFIX}/bin/${l} .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/net/zerotier/distinfo ============================================================================== --- head/net/zerotier/distinfo Tue Jul 3 13:05:51 2018 (r473827) +++ head/net/zerotier/distinfo Tue Jul 3 13:08:59 2018 (r473828) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525679369 -SHA256 (zerotier-ZeroTierOne-1.2.8_GH0.tar.gz) = 08e2df34550d6bb68e106eaac48babb481160046818b0944ec41f1e158548a47 -SIZE (zerotier-ZeroTierOne-1.2.8_GH0.tar.gz) = 6009764 +TIMESTAMP = 1529964792 +SHA256 (zerotier-ZeroTierOne-1.2.10_GH0.tar.gz) = 1c79ec57e67764079a77704b336e642ae3cf221dc8088b0cf9e9c81e0a9c0c57 +SIZE (zerotier-ZeroTierOne-1.2.10_GH0.tar.gz) = 6056935 Modified: head/net/zerotier/files/zerotier.in ============================================================================== --- head/net/zerotier/files/zerotier.in Tue Jul 3 13:05:51 2018 (r473827) +++ head/net/zerotier/files/zerotier.in Tue Jul 3 13:08:59 2018 (r473828) @@ -3,8 +3,8 @@ # $FreeBSD$ # # PROVIDE: zerotier -# REQUIRE: FILESYSTEMS netif -# BEFORE: pf ipfw ipfilter +# REQUIRE: FILESYSTEMS devfs +# BEFORE: pf ipfw # KEYWORD: shutdown # # Add these lines to /etc/rc.conf.local or /etc/rc.conf @@ -22,8 +22,19 @@ load_rc_config $name : ${zerotier_enable:="NO"} -command=%%PREFIX%%/sbin/${name}-one +required_modules="if_tap" -command_args="-d" +pidfile="/var/run/${name}.pid" +start_precmd="install -o root /dev/null ${pidfile}" +command="/usr/sbin/daemon" +command_args=" \ + -c \ + -t ${name} \ + -r \ + -P ${pidfile} \ + %%ZEROTIER_SYSLOG%% \ + /usr/local/sbin/${name}-one" + run_rc_command "$1" + Modified: head/net/zerotier/pkg-message ============================================================================== --- head/net/zerotier/pkg-message Tue Jul 3 13:05:51 2018 (r473827) +++ head/net/zerotier/pkg-message Tue Jul 3 13:08:59 2018 (r473828) @@ -8,4 +8,13 @@ To connect to a zerotier network: zerotier-cli join <network> +If you are running other daemons or require firewall rules to depend on +zerotier interfaces being available at startup, you may need to enable +the following sysctl in /etc/sysctl.conf: + +net.link.tap.up_on_open=1 + +This avoids a race condition where zerotier interfaces are created, but +not up, prior to firewalls and services trying to use them. + #################################
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807031309.w63D90k9054318>