Attachment 180931 Details for Bug 217838 – v2 patch for new 1.2.2 release

[patch] v2 patch for new 1.2.2 release

5460db982a29f92da187db074d6557fffcd6e873.patch (text/plain), 2.94 KB, created by Dave Cottlehuber on 2017-03-18 19:12:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2017-03-18 19:12:59 UTC

Size: 2.94 KB

patch

obsolete

>From 5460db982a29f92da187db074d6557fffcd6e873 Mon Sep 17 00:00:00 2001
>From: Dave Cottlehuber <dch@skunkwerks.at>
>Date: Fri, 17 Mar 2017 18:25:01 +0000
>Subject: [PATCH] net/zerotier: update to 1.2.2
>
>- require recent C++ compiler
>- take port maintainership due to MIO
>- full list of changes at https://www.zerotier.com/blog/?p=1032
>---
> net/zerotier/Makefile                    | 14 +++++---------
> net/zerotier/distinfo                    |  6 +++---
> net/zerotier/files/patch-make-freebsd.mk | 25 -------------------------
> 3 files changed, 8 insertions(+), 37 deletions(-)
> delete mode 100644 net/zerotier/files/patch-make-freebsd.mk
>
>diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile
>index fba176a..d231e5e 100644
>--- a/net/zerotier/Makefile
>+++ b/net/zerotier/Makefile
>@@ -2,30 +2,26 @@
> # $FreeBSD$
> 
> PORTNAME=	zerotier
>-PORTVERSION=	1.1.14
>+PORTVERSION=	1.2.2
> CATEGORIES=	net
> 
>-MAINTAINER=	corsmith@gmail.com
>+MAINTAINER=	dch@skunkwerks.at
> COMMENT=	Network virtualization everywhere
> 
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE.GPL-3
> 
>-USES=		gmake
>+USES=		gmake compiler:c11
> USE_RC_SUBR=	zerotier
> 
> USE_GITHUB=	yes
>+GH_ACCOUNT=	zerotier
> GH_PROJECT=	ZeroTierOne
>+
> CFLAGS+=	-flax-vector-conversions
> 
> PLIST_FILES=	bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one
> 
>-OPTIONS_DEFINE=	CONTROLLER
>-
>-CONTROLLER_DESC=	Network management controller microservice support
>-CONTROLLER_USES=	sqlite
>-CONTROLLER_MAKE_ARGS=	ZT_ENABLE_NETWORK_CONTROLLER=1
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/zerotier-one ${STAGEDIR}${PREFIX}/sbin/
> .for l in zerotier-cli zerotier-idtool
>diff --git a/net/zerotier/distinfo b/net/zerotier/distinfo
>index 3275881..ade1e9c 100644
>--- a/net/zerotier/distinfo
>+++ b/net/zerotier/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1475533093
>-SHA256 (zerotier-ZeroTierOne-1.1.14_GH0.tar.gz) = d206069ad21c665159cdececb0a20a21758849ad73d91234d709962b26f634af
>-SIZE (zerotier-ZeroTierOne-1.1.14_GH0.tar.gz) = 11320427
>+TIMESTAMP = 1489815977
>+SHA256 (zerotier-ZeroTierOne-1.2.2_GH0.tar.gz) = b00040e859ac1d2b6ad9f22a5f4ad3bd876bb7e7b6bbd37d1ca2e59bbdf11a15
>+SIZE (zerotier-ZeroTierOne-1.2.2_GH0.tar.gz) = 7926523
>diff --git a/net/zerotier/files/patch-make-freebsd.mk b/net/zerotier/files/patch-make-freebsd.mk
>deleted file mode 100644
>index 08c1ae4..0000000
>--- a/net/zerotier/files/patch-make-freebsd.mk
>+++ /dev/null
>@@ -1,25 +0,0 @@
>---- make-freebsd.mk.orig	2016-07-22 03:29:15 UTC
>-+++ make-freebsd.mk
>-@@ -1,5 +1,5 @@
>--CC=cc
>--CXX=c++
>-+CC?=cc
>-+CXX?=c++
>- 
>- INCLUDES=
>- DEFS=
>-@@ -18,6 +18,14 @@ ifeq ($(ZT_ENABLE_CLUSTER),1)
>- 	DEFS+=-DZT_ENABLE_CLUSTER
>- endif
>- 
>-+# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with SQLite network controller
>-+ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1)
>-+	DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER
>-+	INCLUDES+=-I$(LOCALBASE)/include
>-+	LDFLAGS+=-L$(LOCALBASE)/lib -lsqlite3
>-+	OBJS+=controller/SqliteNetworkController.o
>-+endif
>-+
>- # "make debug" is a shortcut for this
>- ifeq ($(ZT_DEBUG),1)
>- 	DEFS+=-DZT_TRACE

Actions: View | Diff

Attachments on bug 217838: 180874 | 180931