From owner-svn-ports-all@freebsd.org Sun Aug 2 17:23:29 2020 Return-Path: Delivered-To: svn-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 03D593A2F66; Sun, 2 Aug 2020 17:23:29 +0000 (UTC) (envelope-from swills@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BKSXc6KCsz3Sg0; Sun, 2 Aug 2020 17:23:28 +0000 (UTC) (envelope-from swills@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 BC43826CCC; Sun, 2 Aug 2020 17:23:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 072HNS6h034654; Sun, 2 Aug 2020 17:23:28 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 072HNSsP034652; Sun, 2 Aug 2020 17:23:28 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202008021723.072HNSsP034652@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sun, 2 Aug 2020 17:23:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543983 - in head/sysutils/consul: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/sysutils/consul: . files X-SVN-Commit-Revision: 543983 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2020 17:23:29 -0000 Author: swills Date: Sun Aug 2 17:23:27 2020 New Revision: 543983 URL: https://svnweb.freebsd.org/changeset/ports/543983 Log: sysutils/consul: update to 1.8.1 Modified: head/sysutils/consul/Makefile (contents, props changed) head/sysutils/consul/distinfo (contents, props changed) head/sysutils/consul/files/consul.in Modified: head/sysutils/consul/Makefile ============================================================================== --- head/sysutils/consul/Makefile Sun Aug 2 17:23:13 2020 (r543982) +++ head/sysutils/consul/Makefile Sun Aug 2 17:23:27 2020 (r543983) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= consul -PORTVERSION= 1.8.0 +PORTVERSION= 1.8.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils Modified: head/sysutils/consul/distinfo ============================================================================== --- head/sysutils/consul/distinfo Sun Aug 2 17:23:13 2020 (r543982) +++ head/sysutils/consul/distinfo Sun Aug 2 17:23:27 2020 (r543983) @@ -1,3 +1,3 @@ -TIMESTAMP = 1594045082 -SHA256 (hashicorp-consul-v1.8.0_GH0.tar.gz) = a87925bde6aecddf532dfd050e907b6a0a6447cdd5dc4f49b46d97c9f73b58f9 -SIZE (hashicorp-consul-v1.8.0_GH0.tar.gz) = 24065255 +TIMESTAMP = 1596388286 +SHA256 (hashicorp-consul-v1.8.1_GH0.tar.gz) = c173e9866e6181b3679a942233adade118976414f6ca2da8deaea0fa2bba9b06 +SIZE (hashicorp-consul-v1.8.1_GH0.tar.gz) = 24233215 Modified: head/sysutils/consul/files/consul.in ============================================================================== --- head/sysutils/consul/files/consul.in Sun Aug 2 17:23:13 2020 (r543982) +++ head/sysutils/consul/files/consul.in Sun Aug 2 17:23:27 2020 (r543983) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: consul -# REQUIRE: LOGIN +# REQUIRE: NETWORKING SERVERS DAEMON # KEYWORD: shutdown # # Add consul_enable="YES" to /etc/rc.conf to enable Consul @@ -17,7 +17,7 @@ # consul_pidfile (string): Set full path to pid file # Default is "/var/run/consul.pid" # consul_datadir (dir): Set dir to run consul in. -# Default is "%%DBDIR%%" +# Default is "%%CONSUL_DBDIR%%" # consul_syslog_output_enable (bool): Set to YES to enable syslog output # Default is "NO". See daemon(8). # consul_syslog_output_tag (str): Set syslog tag if syslog enabled. @@ -49,22 +49,22 @@ extra_commands="reload" # backwards compatibility if [ -n "${consul_dir}" ]; then - consul_datadir=${consul_dir} + consul_datadir=${consul_dir} fi if checkyesno consul_syslog_output_enable; then - if [ -n "${consul_syslog_output_tag}" ]; then - consul_syslog_output_flags="-T ${consul_syslog_output_tag}" - else - consul_syslog_output_flags="-T ${name}" - fi - if [ -n "${consul_syslog_output_priority}" ]; then - consul_syslog_output_flags="${consul_syslog_output_flags} -s ${consul_syslog_output_priority}" - fi + if [ -n "${consul_syslog_output_tag}" ]; then + consul_syslog_output_flags="-T ${consul_syslog_output_tag}" + else + consul_syslog_output_flags="-T ${name}" + fi + if [ -n "${consul_syslog_output_priority}" ]; then + consul_syslog_output_flags="${consul_syslog_output_flags} -s ${consul_syslog_output_priority}" + fi - if [ -n "${consul_syslog_output_facility}" ]; then - consul_syslog_output_flags="${consul_syslog_output_flags} -l ${consul_syslog_output_facility}" - fi + if [ -n "${consul_syslog_output_facility}" ]; then + consul_syslog_output_flags="${consul_syslog_output_flags} -l ${consul_syslog_output_facility}" + fi fi pidfile=${consul_pidfile} @@ -74,17 +74,17 @@ command_args="-f -t ${name} ${consul_syslog_output_fla consul_start_precmd() { - if [ ! -e ${pidfile} ]; then - install -o ${consul_user} -g ${consul_group} /dev/null ${pidfile} - fi + if [ ! -e ${pidfile} ]; then + install -o ${consul_user} -g ${consul_group} /dev/null ${pidfile} + fi - if [ ! -d ${consul_datadir} ]; then - install -d -m 0750 -o ${consul_user} -g ${consul_group} ${consul_datadir} - fi + if [ ! -d ${consul_datadir} ]; then + install -d -m 0750 -o ${consul_user} -g ${consul_group} ${consul_datadir} + fi - if [ ! -d %%ETCDIR%% ]; then - install -d -m 0750 -o ${consul_user} -g ${consul_group} %%ETCDIR%% - fi + if [ ! -d %%ETCDIR%% ]; then + install -d -m 0750 -o ${consul_user} -g ${consul_group} %%ETCDIR%% + fi } run_rc_command "$1"