diff -urN influxdb.orig/Makefile influxdb/Makefile --- influxdb.orig/Makefile 2015-11-10 16:35:37.218622000 +0200 +++ influxdb/Makefile 2015-12-10 17:30:45.826394603 +0200 @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= influxdb -PORTVERSION= 0.9.4.1 +PORTVERSION= 0.9.6 DISTVERSIONPREFIX= v CATEGORIES= databases net-mgmt @@ -25,23 +25,32 @@ boltdb:bolt \ cheffo:crypto,go_uuid \ collectd:go_collectd \ + dgryski:go_bits,go_bitstream \ fatih:pool \ gogo:gogo_protobuf \ golang:golang_protobuf,golang_snappy \ hashicorp:raft,raft_boltdb,go_msgpack \ + influxdb:enterprise_client \ + jwilder:encoding \ kimor79:gollectd \ peterh:liner \ - rakyll:statik -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 \ + rakyll:statik \ + paulbellamy:ratecounter +GH_PROJECT= bolt:bolt crypto:crypto encoding:encoding \ + enterprise-client:enterprise_client go-bits:go_bits \ + go-bitstream:go_bitstream 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 ratecounter:ratecounter \ 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 \ +GH_TAGNAME= b34b35e:bolt 056c9bc:toml 1351f93:crypto 4d47685:liner \ + 5c3c713:log4go 274df12:statik e492fd3:gogo_protobuf \ + 61d0dee:gollectd 68415e7:golang_protobuf 06b6099:go_metrics \ b8a3500:pat cba550e:pool d1e82c1:raft_boltdb ed3ca8a:go_uuid \ - 9dabbba:raft fa3f638:go_msgpack 723cc1e:golang_snappy a1cfcc9:go_collectd + d136cd1:raft fa3f638:go_msgpack 723cc1e:golang_snappy \ + 9fc824c:go_collectd 86c69b3:go_bits 27cd597:go_bitstream \ + 07d88d4:encoding 25665cb:enterprise_client 5a11f58:ratecounter SUB_FILES= influxd SUB_LIST+= INFLUXD_USER=${INFLUXD_USER} \ @@ -75,26 +84,33 @@ @${MKDIR} ${WRKSRC}/src/github.com/bmizerany @${MKDIR} ${WRKSRC}/src/github.com/boltdb @${MKDIR} ${WRKSRC}/src/collectd.org + @${MKDIR} ${WRKSRC}/src/github.com/dgryski @${MKDIR} ${WRKSRC}/src/github.com/fatih @${MKDIR} ${WRKSRC}/src/github.com/gogo @${MKDIR} ${WRKSRC}/src/github.com/golang @${MKDIR} ${WRKSRC}/src/github.com/hashicorp + @${MKDIR} ${WRKSRC}/src/github.com/jwilder @${MKDIR} ${WRKSRC}/src/github.com/influxdb @${MKDIR} ${WRKSRC}/src/github.com/kimor79 + @${MKDIR} ${WRKSRC}/src/github.com/paulbellamy @${MKDIR} ${WRKSRC}/src/github.com/peterh @${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 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 influxvar.go meta monitor package.sh pkg \ - scripts services shared snapshot statik tcp tests toml tsdb uuid +.for src in LICENSE_OF_DEPENDENCIES.md Makefile build-docker.sh build.py \ + circle-test.sh circle.yml client cluster cmd errors.go etc importer \ + influxql influxvar.go meta models monitor nightly.sh package.sh \ + pkg scripts services shared snapshot statik stress tcp \ + test-32bit-docker.sh 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_encoding} ${WRKSRC}/src/github.com/jwilder/encoding + @${MV} ${WRKSRC_enterprise_client} ${WRKSRC}/src/github.com/influxdb/enterprise-client + @${MV} ${WRKSRC_go_bits} ${WRKSRC}/src/github.com/dgryski/go-bits + @${MV} ${WRKSRC_go_bitstream} ${WRKSRC}/src/github.com/dgryski/go-bitstream @${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 @@ -110,6 +126,7 @@ @${MV} ${WRKSRC_pool} ${WRKSRC}/src/github.com/fatih/pool @${MV} ${WRKSRC_raft_boltdb} ${WRKSRC}/src/github.com/hashicorp/raft-boltdb @${MV} ${WRKSRC_raft} ${WRKSRC}/src/github.com/hashicorp/raft + @${MV} ${WRKSRC_ratecounter} ${WRKSRC}/src/github.com/paulbellamy/ratecounter @${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 diff -urN influxdb.orig/distinfo influxdb/distinfo --- influxdb.orig/distinfo 2015-11-10 16:35:37.218622000 +0200 +++ influxdb/distinfo 2015-12-10 17:28:27.965409478 +0200 @@ -1,38 +1,48 @@ -SHA256 (influxdb-influxdb-v0.9.4.1_GH0.tar.gz) = a15dcb1173ca4016111d2d8dcea75c098f10838f54d67256b384e65b1cbcf2de -SIZE (influxdb-influxdb-v0.9.4.1_GH0.tar.gz) = 977672 -SHA256 (alecthomas-log4go-1bcc57d_GH0.tar.gz) = f15f25fb0d4d88ce9817f1a04c32c5ca7cf35358615b61601ef47be388733604 -SIZE (alecthomas-log4go-1bcc57d_GH0.tar.gz) = 16190 -SHA256 (armon-go-metrics-6c5fa0d_GH0.tar.gz) = d70e7e6d7243cb447eaf017a713952e421c948a303c96fe8052d2d060e20aec1 -SIZE (armon-go-metrics-6c5fa0d_GH0.tar.gz) = 13221 +SHA256 (influxdb-influxdb-v0.9.6_GH0.tar.gz) = c782d03b3ce3a0b2512277225b3163f82fd3fd28356c06a592690e56f6cb8580 +SIZE (influxdb-influxdb-v0.9.6_GH0.tar.gz) = 1135911 +SHA256 (alecthomas-log4go-5c3c713_GH0.tar.gz) = ea492017025d02f1204ba744fc01130b547da7e07b661598cac83a3ca63c6255 +SIZE (alecthomas-log4go-5c3c713_GH0.tar.gz) = 16187 +SHA256 (armon-go-metrics-06b6099_GH0.tar.gz) = 9536fa2418200cc060edeb24fa3c778abbed7dfce626784663aa39b411477a8a +SIZE (armon-go-metrics-06b6099_GH0.tar.gz) = 13229 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-0c24824_GH0.tar.gz) = 04f492fafbead764d60c7ba707d08f05a056c439cb6d0796aae12f5b6f00087e -SIZE (boltdb-bolt-0c24824_GH0.tar.gz) = 73122 +SHA256 (boltdb-bolt-b34b35e_GH0.tar.gz) = e1ab58b0a50d6b3537b0c5be8d5ef358ddcd64ecb112cadd9046173af1747156 +SIZE (boltdb-bolt-b34b35e_GH0.tar.gz) = 76007 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 (collectd-go-collectd-9fc824c_GH0.tar.gz) = 4d6f6d88f85e48eff7fa5443145ab62c30463b102dbcc70c3309519b7e01e546 +SIZE (collectd-go-collectd-9fc824c_GH0.tar.gz) = 24548 +SHA256 (dgryski-go-bits-86c69b3_GH0.tar.gz) = 92e7227b8527dacd387bd89536b8d349e7d57131ead1071329a94133a5e67780 +SIZE (dgryski-go-bits-86c69b3_GH0.tar.gz) = 2137 +SHA256 (dgryski-go-bitstream-27cd597_GH0.tar.gz) = 9bd56e5019d84d31b7ffd68feca5f61db683588c9bb2033763dfc84c99d5c370 +SIZE (dgryski-go-bitstream-27cd597_GH0.tar.gz) = 2801 SHA256 (fatih-pool-cba550e_GH0.tar.gz) = fdcbcf67872333b16b74647bc4c8aa8100de81f58f0ea99ff83a519bf142e4cb SIZE (fatih-pool-cba550e_GH0.tar.gz) = 4854 -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 (gogo-protobuf-e492fd3_GH0.tar.gz) = 914aafa56baa6c24c24c8732b53c09b111a4324b7a50d3bb9af4ec3797d03c47 +SIZE (gogo-protobuf-e492fd3_GH0.tar.gz) = 1570750 +SHA256 (golang-protobuf-68415e7_GH0.tar.gz) = 5b54f372d62be2b0a13a2d757950d922b4ccdd12180178798bcd4927a26848a0 +SIZE (golang-protobuf-68415e7_GH0.tar.gz) = 178721 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-d136cd1_GH0.tar.gz) = 550bfaed021d46ffe6ae4873c43125c934d69d6210c2c422fa33ea0205a79516 +SIZE (hashicorp-raft-d136cd1_GH0.tar.gz) = 59284 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 SIZE (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 49496 +SHA256 (influxdb-enterprise-client-25665cb_GH0.tar.gz) = 867a109025936d030b1d43e35df4e88ed7a9f267c8bf33b5e110293f6c7ef694 +SIZE (influxdb-enterprise-client-25665cb_GH0.tar.gz) = 6531 +SHA256 (jwilder-encoding-07d88d4_GH0.tar.gz) = c061d88b954e13a5c1c74b964e9b56c9a670f3f3ec8c8f563827f5323b8e2ae7 +SIZE (jwilder-encoding-07d88d4_GH0.tar.gz) = 9462 SHA256 (kimor79-gollectd-61d0dee_GH0.tar.gz) = 217d827fb26d1cf7b1fa3bae7fa51fc5b25ff2141151ffa7d328d015cd4fb498 SIZE (kimor79-gollectd-61d0dee_GH0.tar.gz) = 9508 -SHA256 (peterh-liner-1bb0d1c_GH0.tar.gz) = 0ed1d975b6af46820eb55826527a9ab0263376da5a20e94b21695e21267f6f2e -SIZE (peterh-liner-1bb0d1c_GH0.tar.gz) = 16925 +SHA256 (peterh-liner-4d47685_GH0.tar.gz) = 49dbb396f03cdb4358955066db8411bc51eade6e294688a456c771f76e50d276 +SIZE (peterh-liner-4d47685_GH0.tar.gz) = 18603 SHA256 (rakyll-statik-274df12_GH0.tar.gz) = 47cb3d4bc95171baeac813c0373cdfc232c4339fb09f251a76df247615216d49 SIZE (rakyll-statik-274df12_GH0.tar.gz) = 77898 +SHA256 (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = e493c6c8d673ecda63e9c0bd4e63a5af11362878c0c95f0e46711ccad1462eba +SIZE (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = 2877 diff -urN influxdb.orig/files/patch-cluster_shard__writer.go influxdb/files/patch-cluster_shard__writer.go --- influxdb.orig/files/patch-cluster_shard__writer.go 2015-06-26 16:17:18.107144000 +0300 +++ influxdb/files/patch-cluster_shard__writer.go 2015-12-08 17:04:02.202420487 +0200 @@ -1,9 +1,9 @@ ---- cluster/shard_writer.go.orig 2015-06-23 14:38:36 UTC +--- cluster/shard_writer.go.orig 2015-12-08 15:03:30 UTC +++ cluster/shard_writer.go @@ -7,7 +7,7 @@ import ( "github.com/influxdb/influxdb/meta" - "github.com/influxdb/influxdb/tsdb" + "github.com/influxdb/influxdb/models" - "gopkg.in/fatih/pool.v2" + "github.com/fatih/pool" )