sysutils/consul: update to 0.5.1

PR: 200231 (with minor changes) Submitted by: Robert Barabas <robert.barabas@percona.com>
svn path=/head/; revision=386655
2025-01-23 09:10:43 +00:00 · 2015-05-18 02:05:03 +00:00 · 2015-05-18 02:05:03 +00:00 · 57c77dc587 · 2021-03-31 03:12:20 +00:00
commit 57c77dc587
parent 7157b95b14
4 changed files with 92 additions and 208 deletions
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@ -1,31 +1,31 @@
 # $FreeBSD$

 PORTNAME=	consul
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \
 		https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz?dummy=/:group2 \
 		https://github.com/golang/protobuf/archive/5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz?dummy=/:group3 \
-		https://github.com/armon/go-metrics/archive/88b7658f24511c4b885942b26e9ea7a61ee37ebc.tar.gz?dummy=/:group4 \
-		https://github.com/armon/go-radix/archive/e39d623f12e8e41c7b5529e9a9dd67a1e2261f80.tar.gz?dummy=/:group5 \
+	 	https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz?dummy=/:group4 \
+		https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz?dummy=/:group5 \
 		https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz?dummy=/:group6 \
 		https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz?dummy=/:group7 \
 		https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz?dummy=/:group8 \
 		https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz?dummy=/:group9 \
 		https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz?dummy=/:group10 \
-		https://github.com/hashicorp/golang-lru/archive/f09f965649501e2ac1b0c310c632a7bebdbdc1d4.tar.gz?dummy=/:group11 \
+		https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz?dummy=/:group11 \
 		https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz?dummy=/:group12 \
-		https://github.com/hashicorp/logutils/archive/23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz?dummy=/:group13 \
-		https://github.com/hashicorp/memberlist/archive/9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz?dummy=/:group14 \
-		https://github.com/hashicorp/raft/archive/a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab.tar.gz?dummy=/:group15 \
+		https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz?dummy=/:group13 \
+		https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz?dummy=/:group14 \
+		https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz?dummy=/:group15 \
 		https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz?dummy=/:group16 \
-		https://github.com/hashicorp/serf/archive/cc95df950d69acfd117128c98a3bc6b64c1da3fd.tar.gz?dummy=/:group17 \
+		https://github.com/hashicorp/serf/archive/320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz?dummy=/:group17 \
 		https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz?dummy=/:group18 \
-		https://github.com/hashicorp/yamux/archive/b4f943b3f25da97dec8e26bee1c3269019de070d.tar.gz?dummy=/:group19 \
+		https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz?dummy=/:group19 \
 		https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz?dummy=/:group20 \
-		https://github.com/miekg/dns/archive/64fea017a260b4ccbfbb3f60ab027e0398cd8f6f.tar.gz?dummy=/:group21 \
-		https://github.com/mitchellh/cli/archive/e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz?dummy=/:group22 \
-		https://github.com/mitchellh/mapstructure/archive/740c764bc6149d3f1806231418adb9f52c11bcbf.tar.gz?dummy=/:group23 \
+		https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz?dummy=/:group21 \
+		https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz?dummy=/:group22 \
+		https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz?dummy=/:group23 \
 		https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz?dummy=/:group24 \
 		https://github.com/ugorji/go/archive/e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz?dummy=/:group25 \
 		https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz?dummy=/:group26 \
@ -33,30 +33,34 @@ MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAM
 		https://github.com/prometheus/client_golang/archive/38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz?dummy=/:group28 \
 		https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz?dummy=/:group29 \
 		https://github.com/prometheus/procfs/archive/92faa308558161acab0ada1db048e9996ecec160.tar.gz?dummy=/:group30 \
-		https://dl.bintray.com/mitchellh/consul/:group31
+		https://dl.bintray.com/mitchellh/consul/:group31 \
+		https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz?dummy=/:group32 \
+		https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz?dummy=/:group33 \
+		https://github.com/hashicorp/consul-migrate/archive/4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz?dummy=/:group34 \
+		https://github.com/golang/crypto/archive/74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz?dummy=/:group35
 DISTFILES=	consul-${PORTVERSION}.tar.gz:group1 \
 		armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz:group2 \
 		golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz:group3 \
-		armon_go-metrics_88b7658f24511c4b885942b26e9ea7a61ee37ebc.tar.gz:group4 \
-		armon_go-radix_e39d623f12e8e41c7b5529e9a9dd67a1e2261f80.tar.gz:group5 \
+		armon_go-metrics_a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz:group4 \
+		armon_go-radix_0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz:group5 \
 		armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz:group6 \
 		hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz:group7 \
 		hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz:group8 \
 		hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz:group9 \
 		hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz:group10 \
-		hashicorp_golang-lru_f09f965649501e2ac1b0c310c632a7bebdbdc1d4.tar.gz:group11 \
+		hashicorp_golang-lru_995efda3e073b6946b175ed93901d729ad47466a.tar.gz:group11 \
 		hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz:group12 \
-		hashicorp_logutils_23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz:group13 \
-		hashicorp_memberlist_9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz:group14 \
-		hashicorp_raft_a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab.tar.gz:group15 \
+		hashicorp_logutils_367a65d59043b4f846d179341d138f01f988c186.tar.gz:group13 \
+		hashicorp_memberlist_6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz:group14 \
+		hashicorp_raft_a8065f298505708bf60f518c09178149f3c06f21.tar.gz:group15 \
 		hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz:group16 \
-		hashicorp_serf_cc95df950d69acfd117128c98a3bc6b64c1da3fd.tar.gz:group17 \
+		hashicorp_serf_320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz:group17 \
 		hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz:group18 \
-		hashicorp_yamux_b4f943b3f25da97dec8e26bee1c3269019de070d.tar.gz:group19 \
+		hashicorp_yamux_b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz:group19 \
 		inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz:group20 \
-		miekg_dns_64fea017a260b4ccbfbb3f60ab027e0398cd8f6f.tar.gz:group21 \
-		mitchellh_cli_e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz:group22 \
-		mitchellh_mapstructure_740c764bc6149d3f1806231418adb9f52c11bcbf.tar.gz:group23 \
+		miekg_dns_bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz:group21 \
+		mitchellh_cli_6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz:group22 \
+		mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz:group23 \
 		ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz:group24 \
 		ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz:group25 \
 		net-rpc-msgpackrpc_d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz:group26 \
@ -64,7 +68,11 @@ DISTFILES=	consul-${PORTVERSION}.tar.gz:group1 \
 		prometheus_client_golang_38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz:group28 \
 		prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz:group29 \
 		prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz:group30 \
-		${PORTVERSION}_web_ui.zip:group31
+		${PORTVERSION}_web_ui.zip:group31 \
+		hashicorp_raft-boltdb_d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz:group32 \
+		boltdb_bolt_2c04100eb9793f2b8541d243494e2909d2112325.tar.gz:group33 \
+		hashicorp_consul-migrate_4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz:group34 \
+		golang_crypto_74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz:group35

 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Service discovery and configuration made easy
@ -98,6 +106,7 @@ post-patch:
 		${WRKSRC}/src/github.com/hashicorp/consul
 .endfor
 	@${MKDIR} ${WRKSRC}/src/github.com/armon
+	@${MKDIR} ${WRKSRC}/src/github.com/boltdb
 	@${MKDIR} ${WRKSRC}/src/github.com/inconshreveable
 	@${MKDIR} ${WRKSRC}/src/github.com/miekg
 	@${MKDIR} ${WRKSRC}/src/github.com/mitchellh
@ -106,11 +115,12 @@ post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/golang
 	@${MKDIR} ${WRKSRC}/src/github.com/matttproud
 	@${MKDIR} ${WRKSRC}/src/github.com/prometheus
+	@${MKDIR} ${WRKSRC}/src/golang.org/x
 	@${MV} ${WRKDIR}/circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf \
 		${WRKSRC}/src/github.com/armon/circbuf
-	@${MV} ${WRKDIR}/go-metrics-88b7658f24511c4b885942b26e9ea7a61ee37ebc \
+	@${MV} ${WRKDIR}/go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6 \
 		${WRKSRC}/src/github.com/armon/go-metrics
-	@${MV} ${WRKDIR}/go-radix-e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 \
+	@${MV} ${WRKDIR}/go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c \
 		${WRKSRC}/src/github.com/armon/go-radix
 	@${MV} ${WRKDIR}/gomdb-151f2e08ef45cb0e57d694b2562f351955dff572 \
 		${WRKSRC}/src/github.com/armon/gomdb
@ -124,31 +134,31 @@ post-patch:
 		${WRKSRC}/src/github.com/hashicorp/go-checkpoint
 	@${MV} ${WRKDIR}/go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba \
 		${WRKSRC}/src/github.com/hashicorp/go-syslog
-	@${MV} ${WRKDIR}/golang-lru-f09f965649501e2ac1b0c310c632a7bebdbdc1d4 \
+	@${MV} ${WRKDIR}/golang-lru-995efda3e073b6946b175ed93901d729ad47466a \
 		${WRKSRC}/src/github.com/hashicorp/golang-lru
 	@${MV} ${WRKDIR}/hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84 \
 		${WRKSRC}/src/github.com/hashicorp/hcl
-	@${MV} ${WRKDIR}/logutils-23b0af5510a2d1442103ef83ffcf53eb82f3debc \
+	@${MV} ${WRKDIR}/logutils-367a65d59043b4f846d179341d138f01f988c186 \
 		${WRKSRC}/src/github.com/hashicorp/logutils
-	@${MV} ${WRKDIR}/memberlist-9a1e242e454d2443df330bdd51a436d5a9058fc4 \
+	@${MV} ${WRKDIR}/memberlist-6025015f2dc659ca2c735112d37e753bda6e329d \
 		${WRKSRC}/src/github.com/hashicorp/memberlist
-	@${MV} ${WRKDIR}/raft-a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab \
+	@${MV} ${WRKDIR}/raft-a8065f298505708bf60f518c09178149f3c06f21 \
 		${WRKSRC}/src/github.com/hashicorp/raft
 	@${MV} ${WRKDIR}/raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0 \
 		${WRKSRC}/src/github.com/hashicorp/raft-mdb
-	@${MV} ${WRKDIR}/serf-cc95df950d69acfd117128c98a3bc6b64c1da3fd \
+	@${MV} ${WRKDIR}/serf-320787d8567bdcf9d77f8c5d65031fcb19e71ebc \
 		${WRKSRC}/src/github.com/hashicorp/serf
 	@${MV} ${WRKDIR}/scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae \
 		${WRKSRC}/src/github.com/hashicorp/scada-client
-	@${MV} ${WRKDIR}/yamux-b4f943b3f25da97dec8e26bee1c3269019de070d \
+	@${MV} ${WRKDIR}/yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d \
 		${WRKSRC}/src/github.com/hashicorp/yamux
 	@${MV} ${WRKDIR}/muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848 \
 		${WRKSRC}/src/github.com/inconshreveable/muxado
-	@${MV} ${WRKDIR}/dns-64fea017a260b4ccbfbb3f60ab027e0398cd8f6f \
+	@${MV} ${WRKDIR}/dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1 \
 		${WRKSRC}/src/github.com/miekg/dns
-	@${MV} ${WRKDIR}/cli-e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0 \
+	@${MV} ${WRKDIR}/cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9 \
 		${WRKSRC}/src/github.com/mitchellh/cli
-	@${MV} ${WRKDIR}/mapstructure-740c764bc6149d3f1806231418adb9f52c11bcbf \
+	@${MV} ${WRKDIR}/mapstructure-442e588f213303bec7936deba67901f8fc8f18b1 \
 		${WRKSRC}/src/github.com/mitchellh/mapstructure
 	@${MV} ${WRKDIR}/columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a \
 		${WRKSRC}/src/github.com/ryanuber/columnize
@ -162,6 +172,14 @@ post-patch:
 		${WRKSRC}/src/github.com/prometheus/client_model
 	@${MV} ${WRKDIR}/procfs-92faa308558161acab0ada1db048e9996ecec160 \
 		${WRKSRC}/src/github.com/prometheus/procfs
+	@${MV} ${WRKDIR}/raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee \
+		${WRKSRC}/src/github.com/hashicorp/raft-boltdb
+	@${MV} ${WRKDIR}/bolt-2c04100eb9793f2b8541d243494e2909d2112325 \
+		${WRKSRC}/src/github.com/boltdb/bolt
+	@${MV} ${WRKDIR}/consul-migrate-4977886fc950a0db1a6f0bbadca56dfabf170f9c \
+		${WRKSRC}/src/github.com/hashicorp/consul-migrate
+	@${MV} ${WRKDIR}/crypto-74f810a0152f4c50a16195f6b9ff44afc35594e8 \
+		${WRKSRC}/src/golang.org/x/crypto

 do-build:
 	@cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -o bin/consul
--- a/sysutils/consul/distinfo
+++ b/sysutils/consul/distinfo
@ -1,13 +1,13 @@
-SHA256 (consul-0.5.0.tar.gz) = 282f561c814fdb1f61106f3bb64b881c8eabc71f79f70f581509714e96f0449a
-SIZE (consul-0.5.0.tar.gz) = 1608079
+SHA256 (consul-0.5.1.tar.gz) = 7f8807b2371be95a4f2ee8ba94f35be30b4ae789f7bad0dd0489131c0e9846f0
+SIZE (consul-0.5.1.tar.gz) = 1820473
 SHA256 (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = b67d2ffc0a725b6844895680d52ba4a63757987637c8dabbb2c3e4d836512d52
 SIZE (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = 2748
 SHA256 (golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz) = 683d5562625ed05baaffc265bfda73a6f9afa04fc1436c98df2c9bba2f3667f1
 SIZE (golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz) = 133649
-SHA256 (armon_go-metrics_88b7658f24511c4b885942b26e9ea7a61ee37ebc.tar.gz) = 6410bc676927b92b5c01e87255724dd83f92c1a7994a586466d6d781fbc71e33
-SIZE (armon_go-metrics_88b7658f24511c4b885942b26e9ea7a61ee37ebc.tar.gz) = 11059
-SHA256 (armon_go-radix_e39d623f12e8e41c7b5529e9a9dd67a1e2261f80.tar.gz) = f7278ebcd73b9ffcbf7ef52ae42153ad6bc81c6fa91bb4d93eaa4bab86289411
-SIZE (armon_go-radix_e39d623f12e8e41c7b5529e9a9dd67a1e2261f80.tar.gz) = 5177
+SHA256 (armon_go-metrics_a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz) = 2f4206d5d50eaab383cdc4f5c57179e285b93649c028a69dd9e2a4a45b69afe3
+SIZE (armon_go-metrics_a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz) = 11268
+SHA256 (armon_go-radix_0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz) = f4e628adceee06d7717dce0bf566d5ebd8c009599807f2436b3cda259011b331
+SIZE (armon_go-radix_0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz) = 5446
 SHA256 (armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz) = de5119016d4e12885c474f4f1e682c80984b464a0ae2809f28699aeba1badc68
 SIZE (armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz) = 100298
 SHA256 (hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz) = ea62599bfbe3ec9b616a8b75a14013ccfc288b8b0ccdcac4dac93c82503d41ae
@ -18,32 +18,32 @@ SHA256 (hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz)
 SIZE (hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz) = 8058
 SHA256 (hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz) = 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907
 SIZE (hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz) = 4397
-SHA256 (hashicorp_golang-lru_f09f965649501e2ac1b0c310c632a7bebdbdc1d4.tar.gz) = fa569f45059b204bef6fc8f816be1ac17dd0e2d12eae9a7712bd657596f75b13
-SIZE (hashicorp_golang-lru_f09f965649501e2ac1b0c310c632a7bebdbdc1d4.tar.gz) = 7201
+SHA256 (hashicorp_golang-lru_995efda3e073b6946b175ed93901d729ad47466a.tar.gz) = cac6e889020e8b31e46d50b98e0af9acbb44bf352ad0ca9d30db79b6235849e2
+SIZE (hashicorp_golang-lru_995efda3e073b6946b175ed93901d729ad47466a.tar.gz) = 7872
 SHA256 (hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz) = 109ec067ff8ff7f30538e0d2ba1384c1fe25694c99d56972003b1c669d19d0b2
 SIZE (hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz) = 28692
-SHA256 (hashicorp_logutils_23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz) = d07a719321f39c5095f7922888cd798c78bf0268499562de8de3fa30acd8cbb2
-SIZE (hashicorp_logutils_23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz) = 7686
-SHA256 (hashicorp_memberlist_9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz) = 5ea2bb19997bce12b1d67a19611535233a76f84714ec8ecf5efb7e7f2faee5d8
-SIZE (hashicorp_memberlist_9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz) = 49719
-SHA256 (hashicorp_raft_a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab.tar.gz) = 4085c391207244adca664c1f76437b4a2d5dd8da36e0172834328091b89c3871
-SIZE (hashicorp_raft_a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab.tar.gz) = 57280
+SHA256 (hashicorp_logutils_367a65d59043b4f846d179341d138f01f988c186.tar.gz) = 9b2173d9277574adbc45400101cb0b65534a5cd3defe62eeb3bff652eeb3e34c
+SIZE (hashicorp_logutils_367a65d59043b4f846d179341d138f01f988c186.tar.gz) = 7704
+SHA256 (hashicorp_memberlist_6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz) = 7b808ff100db2e484e6cf338d32ed55512f4c371c5cbba498aeca632f21c830f
+SIZE (hashicorp_memberlist_6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz) = 51853
+SHA256 (hashicorp_raft_a8065f298505708bf60f518c09178149f3c06f21.tar.gz) = a952ce8348085be36a1accbb7555e8c5a1a1c2292066d1966f17994ec90276ef
+SIZE (hashicorp_raft_a8065f298505708bf60f518c09178149f3c06f21.tar.gz) = 56934
 SHA256 (hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz) = 9873fa73d17174e0e7175216848a2a7c58a9c66701459ed4d4866ab063ef58c1
 SIZE (hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz) = 9811
-SHA256 (hashicorp_serf_cc95df950d69acfd117128c98a3bc6b64c1da3fd.tar.gz) = 734c9eeef13f4d21fdb42c61d5bcf06ecff48887ce6d001f857e1a5741c4022f
-SIZE (hashicorp_serf_cc95df950d69acfd117128c98a3bc6b64c1da3fd.tar.gz) = 572134
+SHA256 (hashicorp_serf_320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz) = 65806140d10ef5e7922acd1b89a7b3024c9feca64dd26a25601059821061e7a4
+SIZE (hashicorp_serf_320787d8567bdcf9d77f8c5d65031fcb19e71ebc.tar.gz) = 572427
 SHA256 (hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz) = 74d7195f4d7b213cb82278ed34c16808a79923be9009aab7e8f1267d5a6675f7
 SIZE (hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz) = 15805
-SHA256 (hashicorp_yamux_b4f943b3f25da97dec8e26bee1c3269019de070d.tar.gz) = 33f0cc2aeaf2fb2ca0dc87e030a5c7bb1932dff6865e15c3bac6ad9b02e30496
-SIZE (hashicorp_yamux_b4f943b3f25da97dec8e26bee1c3269019de070d.tar.gz) = 18680
+SHA256 (hashicorp_yamux_b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz) = e4ca04b27f2899bd04033d4bb8cf2c5d0eac6e916c87851ded9cfa57d1f70b5f
+SIZE (hashicorp_yamux_b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz) = 19249
 SHA256 (inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz) = 237354d5acf550d05d20841e0ec6e88cea29ece70fdf8fc73a2d59884ea6be01
 SIZE (inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz) = 25816
-SHA256 (miekg_dns_64fea017a260b4ccbfbb3f60ab027e0398cd8f6f.tar.gz) = 1c32a13a0326fa8646509580453d8464b36e55d3bc1e3d60e23b353cff253930
-SIZE (miekg_dns_64fea017a260b4ccbfbb3f60ab027e0398cd8f6f.tar.gz) = 113168
-SHA256 (mitchellh_cli_e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz) = 0a05aa6d4a4968c00689e6b28575140c3832812bfffe4e909ecbf05e7b7bce8a
-SIZE (mitchellh_cli_e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz) = 12189
-SHA256 (mitchellh_mapstructure_740c764bc6149d3f1806231418adb9f52c11bcbf.tar.gz) = 8cc486fb6ee94d4a5597906fa5ca1c934dcd96ab1e2df6a0923d33024c3dc6a5
-SIZE (mitchellh_mapstructure_740c764bc6149d3f1806231418adb9f52c11bcbf.tar.gz) = 11941
+SHA256 (miekg_dns_bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz) = 4b539f47f2ccf7fffd35490b4840fa4503506223bdb25ce957797b5a373d2743
+SIZE (miekg_dns_bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz) = 117777
+SHA256 (mitchellh_cli_6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz) = 87d7f733c0f2e778fa72951c55a7fe65ea8694f2a1f621c368ecffb111098b05
+SIZE (mitchellh_cli_6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz) = 12690
+SHA256 (mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz) = b4fa5d3b888734f849c5d6784fc1c5749e4ece168fda65c604676fca39c085d2
+SIZE (mitchellh_mapstructure_442e588f213303bec7936deba67901f8fc8f18b1.tar.gz) = 12220
 SHA256 (ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz) = 504519c9befbac3045a00a7a70e82cc437622294ece6ac19b85ffd4aa915369f
 SIZE (ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz) = 3680
 SHA256 (ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz) = 035386ecdb37ee268507890c627f222960839db2757b22a9e64c4947f9f06c4d
@ -58,5 +58,13 @@ SHA256 (prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz)
 SIZE (prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz) = 54855
 SHA256 (prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz) = fafefa92613aec2aa2f411d98c7f677c7beb7cb3bc78f961a900ae5b49af061c
 SIZE (prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz) = 11214
-SHA256 (0.5.0_web_ui.zip) = 0081d08be9c0b1172939e92af5a7cf9ba4f90e54fae24a353299503b24bb8be9
-SIZE (0.5.0_web_ui.zip) = 252567
+SHA256 (0.5.1_web_ui.zip) = ad883aa52e1c0136ab1492bbcedad1210235f26d59719fb6de3ef6464f1ff3b1
+SIZE (0.5.1_web_ui.zip) = 252584
+SHA256 (hashicorp_raft-boltdb_d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz) = 490ced07cc72baede9b997dcf92499fa0d4298926fbc51ee632bde3d3ea0979e
+SIZE (hashicorp_raft-boltdb_d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz) = 8881
+SHA256 (boltdb_bolt_2c04100eb9793f2b8541d243494e2909d2112325.tar.gz) = c0cdbaa6ec724c73799003ba166a4c9f1c6f1cc1b9760f98ef2d2a2a431577da
+SIZE (boltdb_bolt_2c04100eb9793f2b8541d243494e2909d2112325.tar.gz) = 69587
+SHA256 (hashicorp_consul-migrate_4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz) = 5a2334dd710f775a50ccffe8b02431e43ef30ad71d4eedb184fa0c77a24b4365
+SIZE (hashicorp_consul-migrate_4977886fc950a0db1a6f0bbadca56dfabf170f9c.tar.gz) = 12871
+SHA256 (golang_crypto_74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz) = 432fd0fd3e7c2701e1111147af13f1f6b566ed674342d417c0d8eec503e79989
+SIZE (golang_crypto_74f810a0152f4c50a16195f6b9ff44afc35594e8.tar.gz) = 864744
--- a/sysutils/consul/files/consul.in
+++ b/sysutils/consul/files/consul.in
@ -17,6 +17,8 @@
 #                               Default is "consul".
 # consul_dir (dir):          Set dir to run consul in.
 #                               Default is "/var/tmp/consul".
+# consul_env (dir):          Set environment variables used with consul
+#                               Default is "".

 . /etc/rc.subr

@ -29,11 +31,12 @@ load_rc_config $name
 : ${consul_user:="consul"}
 : ${consul_group:="consul"}
 : ${consul_dir:="/var/tmp/consul"}
+: ${consul_env:=""}

 pidfile=/var/run/consul.pid
 procname="%%PREFIX%%/bin/consul"
 command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} ${procname} agent -data-dir=${consul_dir} -ui-dir=%%PREFIX%%/share/consul -config-dir=%%PREFIX%%/etc/consul.d ${consul_args}"
+command_args="-f -p ${pidfile} /usr/bin/env ${consul_env} ${procname} agent -data-dir=${consul_dir} -ui-dir=%%PREFIX%%/share/consul -config-dir=%%PREFIX%%/etc/consul.d ${consul_args}"

 start_precmd=consul_startprecmd

--- a/sysutils/consul/files/patch-deps_v0-5-0.json
+++ b/sysutils/consul/files/patch-deps_v0-5-0.json
@ -1,145 +0,0 @@
--- deps/v0-5-0.json.orig	2015-04-05 04:09:06 UTC
-+++ deps/v0-5-0.json
-@@ -0,0 +1,142 @@
-+{
-+	"ImportPath": "github.com/hashicorp/consul",
-+	"GoVersion": "go1.4.2",
-+	"Deps": [
-+		{
-+			"ImportPath": "github.com/armon/circbuf",
-+			"Rev": "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"
-+		},
-+		{
-+			"ImportPath": "github.com/armon/go-metrics",
-+			"Rev": "88b7658f24511c4b885942b26e9ea7a61ee37ebc"
-+		},
-+		{
-+			"ImportPath": "github.com/armon/go-radix",
-+			"Rev": "e39d623f12e8e41c7b5529e9a9dd67a1e2261f80"
-+		},
-+		{
-+			"ImportPath": "github.com/armon/gomdb",
-+			"Rev": "151f2e08ef45cb0e57d694b2562f351955dff572"
-+		},
-+		{
-+			"ImportPath": "github.com/golang/protobuf/proto",
-+			"Rev": "5677a0e3d5e89854c9974e1256839ee23f8233ca"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/go-checkpoint",
-+			"Rev": "88326f6851319068e7b34981032128c0b1a6524d"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/go-msgpack/codec",
-+			"Rev": "71c2886f5a673a35f909803f38ece5810165097b"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/go-multierror",
-+			"Rev": "fcdddc395df1ddf4247c69bd436e84cfa0733f7e"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/go-syslog",
-+			"Rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/golang-lru",
-+			"Rev": "f09f965649501e2ac1b0c310c632a7bebdbdc1d4"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/hcl",
-+			"Rev": "513e04c400ee2e81e97f5e011c08fb42c6f69b84"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/logutils",
-+			"Rev": "23b0af5510a2d1442103ef83ffcf53eb82f3debc"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/memberlist",
-+			"Rev": "9a1e242e454d2443df330bdd51a436d5a9058fc4"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/net-rpc-msgpackrpc",
-+			"Rev": "d377902b7aba83dd3895837b902f6cf3f71edcb2"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/raft",
-+			"Rev": "a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/raft-mdb",
-+			"Rev": "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/scada-client",
-+			"Rev": "c26580cfe35393f6f4bf1b9ba55e6afe33176bae"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/serf/serf",
-+			"Comment": "v0.6.4-3-gcc95df9",
-+			"Rev": "cc95df950d69acfd117128c98a3bc6b64c1da3fd"
-+		},
-+		{
-+			"ImportPath": "github.com/hashicorp/yamux",
-+			"Rev": "b4f943b3f25da97dec8e26bee1c3269019de070d"
-+		},
-+		{
-+			"ImportPath": "github.com/inconshreveable/muxado",
-+			"Rev": "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848"
-+		},
-+		{
-+			"ImportPath": "github.com/matttproud/golang_protobuf_extensions/ext",
-+			"Rev": "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c"
-+		},
-+		{
-+			"ImportPath": "github.com/miekg/dns",
-+			"Rev": "64fea017a260b4ccbfbb3f60ab027e0398cd8f6f"
-+		},
-+		{
-+			"ImportPath": "github.com/mitchellh/cli",
-+			"Rev": "e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0"
-+		},
-+		{
-+			"ImportPath": "github.com/mitchellh/mapstructure",
-+			"Rev": "442e588f213303bec7936deba67901f8fc8f18b1"
-+		},
-+		{
-+			"ImportPath": "github.com/prometheus/client_golang/_vendor/goautoneg",
-+			"Comment": "0.1.0-33-g38dbb2e",
-+			"Rev": "38dbb2e26868d15db0275ddbaac0cbe450ec03de"
-+		},
-+		{
-+			"ImportPath": "github.com/prometheus/client_golang/_vendor/perks/quantile",
-+			"Comment": "0.1.0-33-g38dbb2e",
-+			"Rev": "38dbb2e26868d15db0275ddbaac0cbe450ec03de"
-+		},
-+		{
-+			"ImportPath": "github.com/prometheus/client_golang/model",
-+			"Comment": "0.1.0-33-g38dbb2e",
-+			"Rev": "38dbb2e26868d15db0275ddbaac0cbe450ec03de"
-+		},
-+		{
-+			"ImportPath": "github.com/prometheus/client_golang/prometheus",
-+			"Comment": "0.1.0-33-g38dbb2e",
-+			"Rev": "38dbb2e26868d15db0275ddbaac0cbe450ec03de"
-+		},
-+		{
-+			"ImportPath": "github.com/prometheus/client_golang/text",
-+			"Comment": "0.1.0-33-g38dbb2e",
-+			"Rev": "38dbb2e26868d15db0275ddbaac0cbe450ec03de"
-+		},
-+		{
-+			"ImportPath": "github.com/prometheus/client_model/go",
-+			"Comment": "model-0.0.2-12-gfa8ad6f",
-+			"Rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-+		},
-+		{
-+			"ImportPath": "github.com/prometheus/procfs",
-+			"Rev": "92faa308558161acab0ada1db048e9996ecec160"
-+		},
-+		{
-+			"ImportPath": "github.com/ryanuber/columnize",
-+			"Comment": "v2.0.1-6-g44cb478",
-+			"Rev": "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"
-+		}
-+	]
-+}