From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 21:30:14 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 935A85DF72E; Mon, 12 Apr 2021 21:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FK22Z3m3Rz4vRg; Mon, 12 Apr 2021 21:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F9281EAB7; Mon, 12 Apr 2021 21:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13CLUEp5062619; Mon, 12 Apr 2021 21:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13CLUEiQ062616; Mon, 12 Apr 2021 21:30:14 GMT (envelope-from git) Date: Mon, 12 Apr 2021 21:30:14 GMT Message-Id: <202104122130.13CLUEiQ062616@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?Vmluw61jaXVzIFphdmFt?= Subject: git: 3490a531954e - main - net/cloudflared: update 2021.3.5 to 2021.4.0, and fix rc script MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: egypcio X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3490a531954e1746ee3ce97d5a75e4cef298a214 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 21:30:14 -0000 The branch main has been updated by egypcio: URL: https://cgit.FreeBSD.org/ports/commit/?id=3490a531954e1746ee3ce97d5a75e4cef298a214 commit 3490a531954e1746ee3ce97d5a75e4cef298a214 Author: Vinícius Zavam AuthorDate: 2021-04-12 21:22:13 +0000 Commit: Vinícius Zavam CommitDate: 2021-04-12 21:27:58 +0000 net/cloudflared: update 2021.3.5 to 2021.4.0, and fix rc script - add notes about tunnel modes - default mode starts a free tunnel, using trycloudflare.com PR: 254854 Reported by: ale@ --- net/cloudflared/Makefile | 2 +- net/cloudflared/distinfo | 6 +++--- net/cloudflared/files/cloudflared.in | 10 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile index 23ee2146d8d4..44f09c115df2 100644 --- a/net/cloudflared/Makefile +++ b/net/cloudflared/Makefile @@ -1,5 +1,5 @@ PORTNAME= cloudflared -DISTVERSION= 2021.3.5 +DISTVERSION= 2021.4.0 CATEGORIES= net www MAINTAINER= egypcio@FreeBSD.org diff --git a/net/cloudflared/distinfo b/net/cloudflared/distinfo index 91794f38bddd..585830e41266 100644 --- a/net/cloudflared/distinfo +++ b/net/cloudflared/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616836174 -SHA256 (cloudflare-cloudflared-2021.3.5_GH0.tar.gz) = 1521846ee97e066ca18ec4cefed1a84b634b57d989c76d186086fff19b4746d4 -SIZE (cloudflare-cloudflared-2021.3.5_GH0.tar.gz) = 7471623 +TIMESTAMP = 1618260846 +SHA256 (cloudflare-cloudflared-2021.4.0_GH0.tar.gz) = d3d395f1cdabcd7421c647bf4c9f64dc799206c5d9042f797d65e5356f84f99d +SIZE (cloudflare-cloudflared-2021.4.0_GH0.tar.gz) = 7471792 diff --git a/net/cloudflared/files/cloudflared.in b/net/cloudflared/files/cloudflared.in index d54cd1d55846..45ceb4e384f5 100644 --- a/net/cloudflared/files/cloudflared.in +++ b/net/cloudflared/files/cloudflared.in @@ -11,14 +11,16 @@ # cloudflared_conf (str) Config file to use # Default: %%ETCDIR%%/config.yml # -# cloudflared_mode (str) Mode to run cloudflared as (tunnel, or proxy-dns) -# Default: tunnel +# cloudflared_mode (str) Mode to run cloudflared as (e.g. 'tunnel', 'tunnel run' +# or 'proxy-dns'). Should you use the default, a free +# tunnel is set up for you. +# Default: "tunnel" . /etc/rc.subr name="cloudflared" rcvar="cloudflared_enable" -logfile="/var/log/cloudflared/cloudflared.log" +logfile="/var/log/cloudflared.log" pidfile="/var/run/cloudflared.pid" procname="%%PREFIX%%/bin/cloudflared" @@ -29,6 +31,6 @@ load_rc_config $name : ${cloudflared_mode:="tunnel"} command="/usr/sbin/daemon" -command_args="-o ${logfile} -p ${pidfile} -f ${procname} --cred-file ${cloudflared_conf} ${cloudflared_mode}" +command_args="-o ${logfile} -p ${pidfile} -f ${procname} --config ${cloudflared_conf} ${cloudflared_mode}" run_rc_command "$1"