Attachment 160850 Details for Bug 202981 – update influxdb to 0.9.3, bump dependencies

[patch] update influxdb to 0.9.3, bump dependencies

databases__influxdb__0.9.3.diff (text/plain), 8.51 KB, created by Johannes Jost Meixner on 2015-09-09 02:54:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Jost Meixner

Created: 2015-09-09 02:54:41 UTC

Size: 8.51 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 396451)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	influxdb
>-PORTVERSION=	0.9.0
>+PORTVERSION=	0.9.3
> DISTVERSIONPREFIX=	v
> CATEGORIES=	databases net-mgmt
> 
>@@ -24,23 +24,24 @@
> 		bmizerany:pat \
> 		boltdb:bolt \
> 		cheffo:crypto,go_uuid \
>+		collectd:go_collectd \
> 		fatih:pool \
> 		gogo:gogo_protobuf \
>-		golang:golang_protobuf \
>+		golang:golang_protobuf,golang_snappy \
> 		hashicorp:raft,raft_boltdb,go_msgpack \
> 		kimor79:gollectd \
> 		peterh:liner \
> 		rakyll:statik
>-GH_PROJECT=	bolt:bolt crypto:crypto go-metrics:go_metrics \
>+GH_PROJECT=	bolt:bolt crypto:crypto go-collectd:go_collectd go-metrics:go_metrics \
> 		go-msgpack:go_msgpack gollectd:gollectd liner:liner \
> 		log4go:log4go pat:pat pool:pool protobuf:gogo_protobuf \
> 		protobuf:golang_protobuf raft-boltdb:raft_boltdb raft:raft \
>-		statik:statik toml:toml go-uuid:go_uuid
>-GH_TAGNAME=	04a3e85:bolt 056c9bc:toml 1351f93:crypto 1bb0d1c:liner \
>-		1bcc57d:log4go 274df12:statik 58bbd41:gogo_protobuf \
>-		61d0dee:gollectd aece6fb:golang_protobuf b2d95e5:go_metrics \
>+		snappy:golang_snappy, statik:statik toml:toml go-uuid:go_uuid
>+GH_TAGNAME=	0c24824:bolt 056c9bc:toml 1351f93:crypto 1bb0d1c:liner \
>+		1bcc57d:log4go 274df12:statik 932b70a:gogo_protobuf \
>+		61d0dee:gollectd 1dceb1a:golang_protobuf 6c5fa0d:go_metrics \
> 		b8a3500:pat cba550e:pool d1e82c1:raft_boltdb ed3ca8a:go_uuid \
>-		f0f02dd:raft fa3f638:go_msgpack
>+		9dabbba:raft fa3f638:go_msgpack 723cc1e:golang_snappy a1cfcc9:go_collectd
> 
> SUB_FILES=	influxd
> SUB_LIST+=	INFLUXD_USER=${INFLUXD_USER} \
>@@ -73,6 +74,7 @@
> 	@${MKDIR} ${WRKSRC}/src/github.com/armon
> 	@${MKDIR} ${WRKSRC}/src/github.com/bmizerany
> 	@${MKDIR} ${WRKSRC}/src/github.com/boltdb
>+	@${MKDIR} ${WRKSRC}/src/collectd.org
> 	@${MKDIR} ${WRKSRC}/src/github.com/fatih
> 	@${MKDIR} ${WRKSRC}/src/github.com/gogo
> 	@${MKDIR} ${WRKSRC}/src/github.com/golang
>@@ -83,19 +85,22 @@
> 	@${MKDIR} ${WRKSRC}/src/github.com/rakyll
> 	@${MKDIR} ${WRKSRC}/src/golang.org/x
> 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
>-.for src in CHANGELOG.md CONTRIBUTING.md LICENSE QUERIES.md README.md \
>-	balancer.go balancer_test.go circle-test.sh circle.yml client \
>-	cluster cmd continuous_queries.md diagnostics.go errors.go etc \
>-	influxql meta package.sh scripts services shared snapshot statik \
>-	stats.go stats_test.go tcp tests toml tsdb uuid
>+.for src in CHANGELOG.md CONTRIBUTING.md DOCKER.md Dockerfile \
>+	LICENSE QUERIES.md README.md \
>+	balancer.go balancer_test.go build-docker.sh circle-test.sh circle.yml client \
>+	cluster cmd errors.go etc importer influxql meta package.sh \
>+	scripts services shared snapshot statik tcp tests toml tsdb uuid
> 	@${MV} ${WRKSRC}/${src} \
> 		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
> .endfor
> 	@${MV} ${WRKSRC_bolt} ${WRKSRC}/src/github.com/boltdb/bolt
> 	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
>+	@${MV} ${WRKSRC_go_collectd}/api ${WRKSRC}/src/collectd.org/api
>+	@${MV} ${WRKSRC_go_collectd}/network ${WRKSRC}/src/collectd.org/network
>+	@${MV} ${WRKSRC_go_collectd}/cdtime ${WRKSRC}/src/collectd.org/cdtime
> 	@${MV} ${WRKSRC_go_metrics} ${WRKSRC}/src/github.com/armon/go-metrics
>+	@${MV} ${WRKSRC_go_uuid} ${WRKSRC}/src/code.google.com/p/go-uuid
> 	@${MV} ${WRKSRC_go_msgpack} ${WRKSRC}/src/github.com/hashicorp/go-msgpack
>-	@${MV} ${WRKSRC_go_uuid} ${WRKSRC}/src/code.google.com/p/go-uuid
> 	@${MV} ${WRKSRC_gogo_protobuf} ${WRKSRC}/src/github.com/gogo/protobuf
> 	@${MV} ${WRKSRC_golang_protobuf} ${WRKSRC}/src/github.com/golang/protobuf
> 	@${MV} ${WRKSRC_gollectd} ${WRKSRC}/src/github.com/kimor79/gollectd
>@@ -106,6 +111,7 @@
> 	@${MV} ${WRKSRC_raft_boltdb} ${WRKSRC}/src/github.com/hashicorp/raft-boltdb
> 	@${MV} ${WRKSRC_raft} ${WRKSRC}/src/github.com/hashicorp/raft
> 	@${MV} ${WRKSRC_statik} ${WRKSRC}/src/github.com/rakyll/statik
>+	@${MV} ${WRKSRC_golang_snappy} ${WRKSRC}/src/github.com/golang/snappy
> 	@${MV} ${WRKSRC_toml} ${WRKSRC}/src/github.com/BurntSushi/toml
> 
> do-build:
>Index: distinfo
>===================================================================
>--- distinfo	(revision 396451)
>+++ distinfo	(working copy)
>@@ -1,27 +1,31 @@
>-SHA256 (influxdb-influxdb-v0.9.0_GH0.tar.gz) = c7cc869754d7bfb9374b0a16a9b91073d9588adedbd7bfda1d5709e22d3a3d75
>-SIZE (influxdb-influxdb-v0.9.0_GH0.tar.gz) = 2554827
>+SHA256 (influxdb-influxdb-v0.9.3_GH0.tar.gz) = f49f7a007f821991984dd8716a6ddccc94a1832c5ac1abf4bb1cb88d9616c2e9
>+SIZE (influxdb-influxdb-v0.9.3_GH0.tar.gz) = 942487
> SHA256 (alecthomas-log4go-1bcc57d_GH0.tar.gz) = f15f25fb0d4d88ce9817f1a04c32c5ca7cf35358615b61601ef47be388733604
> SIZE (alecthomas-log4go-1bcc57d_GH0.tar.gz) = 16190
>-SHA256 (armon-go-metrics-b2d95e5_GH0.tar.gz) = a3c2f9b16157249cf248c5a21fc9ade43c35c451005ed9dcc2d4b52b0f2f9680
>-SIZE (armon-go-metrics-b2d95e5_GH0.tar.gz) = 11360
>+SHA256 (armon-go-metrics-6c5fa0d_GH0.tar.gz) = d70e7e6d7243cb447eaf017a713952e421c948a303c96fe8052d2d060e20aec1
>+SIZE (armon-go-metrics-6c5fa0d_GH0.tar.gz) = 13221
> SHA256 (BurntSushi-toml-056c9bc_GH0.tar.gz) = 73125940543e2922a77bee42f068f35383b5e260e5fbab867efcb7a59a05671a
> SIZE (BurntSushi-toml-056c9bc_GH0.tar.gz) = 37104
> SHA256 (bmizerany-pat-b8a3500_GH0.tar.gz) = 6468a8b27db2bed1edf6eb845da6f7466221c7b0b41112d77710e4ac76926a2f
> SIZE (bmizerany-pat-b8a3500_GH0.tar.gz) = 5205
>-SHA256 (boltdb-bolt-04a3e85_GH0.tar.gz) = 63ea778d7f9f82e94610ed0a96cd4135993704440d6e3e9b09cdfb5c96c8d54e
>-SIZE (boltdb-bolt-04a3e85_GH0.tar.gz) = 72745
>+SHA256 (boltdb-bolt-0c24824_GH0.tar.gz) = 04f492fafbead764d60c7ba707d08f05a056c439cb6d0796aae12f5b6f00087e
>+SIZE (boltdb-bolt-0c24824_GH0.tar.gz) = 73122
> SHA256 (cheffo-crypto-1351f93_GH0.tar.gz) = 29ddf6009158914fb35f9d8e27c48164428dedac6a1314215e1717ae913d96f0
> SIZE (cheffo-crypto-1351f93_GH0.tar.gz) = 860364
> SHA256 (cheffo-go-uuid-ed3ca8a_GH0.tar.gz) = 3ad72804ee9b735add1039ec8cffd445fefd66852a3b7c0b82baf428696ca921
> SIZE (cheffo-go-uuid-ed3ca8a_GH0.tar.gz) = 41022
>+SHA256 (collectd-go-collectd-a1cfcc9_GH0.tar.gz) = b68e435de580367f5d9f4892419af0e6ed83f749b661eba7c79c6b15f4e8a444
>+SIZE (collectd-go-collectd-a1cfcc9_GH0.tar.gz) = 24543
> SHA256 (fatih-pool-cba550e_GH0.tar.gz) = fdcbcf67872333b16b74647bc4c8aa8100de81f58f0ea99ff83a519bf142e4cb
> SIZE (fatih-pool-cba550e_GH0.tar.gz) = 4854
>-SHA256 (gogo-protobuf-58bbd41_GH0.tar.gz) = 1d50a318b50a5f07e8111972081bef9d9dd2a7b9e3915fc88b10291620981498
>-SIZE (gogo-protobuf-58bbd41_GH0.tar.gz) = 1147405
>-SHA256 (golang-protobuf-aece6fb_GH0.tar.gz) = 3f4db232b0548a3b527f087539c9de28068c2f5603f66b1ff16b84ed222884b0
>-SIZE (golang-protobuf-aece6fb_GH0.tar.gz) = 142325
>-SHA256 (hashicorp-raft-f0f02dd_GH0.tar.gz) = 93fa0a92f3ef54a133c71d1b5f0288e12f3d933a392693c6d947c8f55637ee73
>-SIZE (hashicorp-raft-f0f02dd_GH0.tar.gz) = 57418
>+SHA256 (gogo-protobuf-932b70a_GH0.tar.gz) = 718ff983992cf9e5db22bafa100045c429f3c3d90bb3639a62ebf166a7fac149
>+SIZE (gogo-protobuf-932b70a_GH0.tar.gz) = 1255330
>+SHA256 (golang-protobuf-1dceb1a_GH0.tar.gz) = 92845bb399851159d849e7c347ffdf07238a10a371f95e46fff149a4cd0f40a0
>+SIZE (golang-protobuf-1dceb1a_GH0.tar.gz) = 162466
>+SHA256 (golang-snappy-723cc1e_GH0.tar.gz) = 205b26745b6ceb62b762f07282842cafb4f4b0395b9ab14b0349a990e299fbed
>+SIZE (golang-snappy-723cc1e_GH0.tar.gz) = 10075
>+SHA256 (hashicorp-raft-9dabbba_GH0.tar.gz) = bc35eea32cd7c9ab05ba0be1d177e5996d864243237e90a892942f9514cb0570
>+SIZE (hashicorp-raft-9dabbba_GH0.tar.gz) = 58878
> SHA256 (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 68bb2996a4ec490c099612efcc255ad721014aaf42afbf9f0b21fcf8361162d9
> SIZE (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 8879
> SHA256 (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 6353c623d5d58c7ca03e2bdac63f9da7da8848fb1f5f7f239b33e3ce6fe6c6bd
>Index: files/patch-cluster_shard__mapper.go
>===================================================================
>--- files/patch-cluster_shard__mapper.go	(revision 0)
>+++ files/patch-cluster_shard__mapper.go	(working copy)
>@@ -0,0 +1,11 @@
>+--- cluster/shard_mapper.go.orig	2015-09-09 02:19:46 UTC
>++++ cluster/shard_mapper.go
>+@@ -10,7 +10,7 @@ import (
>+ 
>+ 	"github.com/influxdb/influxdb/meta"
>+ 	"github.com/influxdb/influxdb/tsdb"
>+-	"gopkg.in/fatih/pool.v2"
>++	"github.com/fatih/pool"
>+ )
>+ 
>+ // ShardMapper is responsible for providing mappers for requested shards. It is
>
>Property changes on: files/patch-cluster_shard__mapper.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 202981: 160850 | 160851 | 161077 | 161099 | 161337 | 161338 | 161339