From owner-svn-ports-head@freebsd.org Sat May 19 22:19:56 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FC71EE65B9; Sat, 19 May 2018 22:19:56 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B53AD82863; Sat, 19 May 2018 22:19:55 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 90DA7566A; Sat, 19 May 2018 22:19:55 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4JMJtmD081407; Sat, 19 May 2018 22:19:55 GMT (envelope-from dch@FreeBSD.org) Received: (from dch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4JMJsJY081402; Sat, 19 May 2018 22:19:54 GMT (envelope-from dch@FreeBSD.org) Message-Id: <201805192219.w4JMJsJY081402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dch set sender to dch@FreeBSD.org using -f From: Dave Cottlehuber Date: Sat, 19 May 2018 22:19:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470435 - in head/net/zerotier: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dch X-SVN-Commit-Paths: in head/net/zerotier: . files X-SVN-Commit-Revision: 470435 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 22:19:56 -0000 Author: dch Date: Sat May 19 22:19:54 2018 New Revision: 470435 URL: https://svnweb.freebsd.org/changeset/ports/470435 Log: net/zerotier: update 1.2.4 to 1.2.8 - add debugging support to stdout as ports option - fix clang++ 6.0.0 compatibility - add ipfilter to rcorder list Reviewed by: mat Approved by: jrm (mentor) Differential Revision: https://reviews.freebsd.org/D15133 Added: head/net/zerotier/files/patch-make-bsd.mk (contents, props changed) head/net/zerotier/files/patch-node_Packet.cpp (contents, props changed) Modified: head/net/zerotier/Makefile head/net/zerotier/distinfo head/net/zerotier/files/zerotier.in Modified: head/net/zerotier/Makefile ============================================================================== --- head/net/zerotier/Makefile Sat May 19 21:08:22 2018 (r470434) +++ head/net/zerotier/Makefile Sat May 19 22:19:54 2018 (r470435) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= zerotier -PORTVERSION= 1.2.4 -PORTREVISION= 2 +DISTVERSION= 1.2.8 CATEGORIES= net MAINTAINER= dch@FreeBSD.org @@ -23,6 +22,10 @@ USE_GITHUB= yes GH_PROJECT= ZeroTierOne CFLAGS+= -flax-vector-conversions + +OPTIONS_DEFINE= DBG +DBG_DESC= Enable foreground debugging for zerotier-one daemon +DBG_ALL_TARGET= debug PLIST_FILES= bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one Modified: head/net/zerotier/distinfo ============================================================================== --- head/net/zerotier/distinfo Sat May 19 21:08:22 2018 (r470434) +++ head/net/zerotier/distinfo Sat May 19 22:19:54 2018 (r470435) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493361909 -SHA256 (zerotier-ZeroTierOne-1.2.4_GH0.tar.gz) = 9f275b3732b721f02cc4b8df75b51e6a8fb56dfe1a542a7bd681538d852b0358 -SIZE (zerotier-ZeroTierOne-1.2.4_GH0.tar.gz) = 7963254 +TIMESTAMP = 1525679369 +SHA256 (zerotier-ZeroTierOne-1.2.8_GH0.tar.gz) = 08e2df34550d6bb68e106eaac48babb481160046818b0944ec41f1e158548a47 +SIZE (zerotier-ZeroTierOne-1.2.8_GH0.tar.gz) = 6009764 Added: head/net/zerotier/files/patch-make-bsd.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/zerotier/files/patch-make-bsd.mk Sat May 19 22:19:54 2018 (r470435) @@ -0,0 +1,11 @@ +--- make-bsd.mk.orig 2018-05-18 08:50:17 UTC ++++ make-bsd.mk +@@ -159,7 +159,7 @@ clean: + rm -rf *.a *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli $(ONE_OBJS) $(CORE_OBJS) + + debug: FORCE +- gmake -j 4 ZT_DEBUG=1 ++ $(MAKE) -j ZT_DEBUG=1 + + install: one + rm -f /usr/local/sbin/zerotier-one Added: head/net/zerotier/files/patch-node_Packet.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/zerotier/files/patch-node_Packet.cpp Sat May 19 22:19:54 2018 (r470435) @@ -0,0 +1,11 @@ +--- node/Packet.cpp.orig 2018-05-18 09:03:14 UTC ++++ node/Packet.cpp +@@ -332,7 +332,7 @@ static const int LZ4_minLength = (MFLIMIT+1); + + #define LZ4_STATIC_ASSERT(c) { enum { LZ4_static_assert = 1/(int)(!!(c)) }; } /* use only *after* variable declarations */ + +-static inline unsigned LZ4_NbCommonBytes (register reg_t val) ++static inline unsigned LZ4_NbCommonBytes (reg_t val) + { + if (LZ4_isLittleEndian()) { + if (sizeof(val)==8) { Modified: head/net/zerotier/files/zerotier.in ============================================================================== --- head/net/zerotier/files/zerotier.in Sat May 19 21:08:22 2018 (r470434) +++ head/net/zerotier/files/zerotier.in Sat May 19 22:19:54 2018 (r470435) @@ -4,7 +4,7 @@ # # PROVIDE: zerotier # REQUIRE: FILESYSTEMS netif -# BEFORE: pf ipfw +# BEFORE: pf ipfw ipfilter # KEYWORD: shutdown # # Add these lines to /etc/rc.conf.local or /etc/rc.conf