Attachment 188222 Details for Bug 223827 – patch to update to 1.4.2

[patch] patch to update to 1.4.2

influxdb-1.4.2.patch (text/plain), 10.79 KB, created by cheffo on 2017-11-23 20:03:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cheffo

Created: 2017-11-23 20:03:04 UTC

Size: 10.79 KB

patch

obsolete

>diff -urN influxdb.orig/Makefile influxdb/Makefile
>--- influxdb.orig/Makefile	2017-11-17 12:27:17.539828000 +0200
>+++ influxdb/Makefile	2017-11-23 18:51:10.106846000 +0200
>@@ -1,9 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	influxdb
>-PORTVERSION=	1.3.3
>+PORTVERSION=	1.4.2
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
> CATEGORIES=	databases net-mgmt
> 
> MAINTAINER=	cheffo@freebsd-bg.org
>@@ -20,26 +19,35 @@
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	influxdata:DEFAULT
>-GH_TUPLE=	BurntSushi:toml:9906417:toml/src/github.com/BurntSushi/toml \
>+GH_TUPLE=	BurntSushi:toml:a368813:toml/src/github.com/BurntSushi/toml \
> 		bmizerany:pat:c068ca2:pat/src/github.com/bmizerany/pat \
> 		boltdb:bolt:4b1ebc1:bolt/src/github.com/boltdb/bolt \
>-		cespare:xxhash:4a94f89:xxhash/src/github.com/cespare/xxhash \
>+		cespare:xxhash:1b6d2e4:xxhash/src/github.com/cespare/xxhash \
> 		davecgh:go-spew:346938d:go_spew/src/github.com/davecgh/go-spew \
> 		dgrijalva:jwt-go:24c63f5:jwt_go/src/github.com/dgrijalva/jwt-go \
> 		dgryski:go-bits:2ad8d70:go_bits/src/github.com/dgryski/go-bits \
> 		dgryski:go-bitstream:7d46cd2:go_bitstream/src/github.com/dgryski/go-bitstream \
>-		gogo:protobuf:3043356:protobuf/src/github.com/gogo/protobuf \
>+		gogo:protobuf:1c2b16b:protobuf/src/github.com/gogo/protobuf \
> 		golang:snappy:d9eb7a3:snappy/src/github.com/golang/snappy \
>+		google:go-cmp:18107e6:go_cmp/src/google/go-cmp \
>+		influxdata:influxql:3921ab7:influxql/src/github.com/influxdata/influxql \
> 		influxdata:usage-client:6d38953:usage_client/src/github.com/influxdata/usage-client \
>+		influxdata:yamux:1f58ded:yamux/src/github.com/influxdata/yamux \
>+		influxdata:yarpc:036268c:yarpc/src/github.com/influxdata/yarpc \
> 		jwilder:encoding:278947:encoding/src/github.com/jwilder/encoding \
> 		paulbellamy:ratecounter:5a11f58:ratecounter/src/github.com/paulbellamy/ratecounter \
> 		peterh:liner:8860952:liner/src/github.com/peterh/liner \
>+		philhofer:fwd:1612a29:fwd/src/github.com/philhofer/fwd \
> 		retailnext:hllpp:38a7bb7:hllpp/src/github.com/retailnext/hllpp \
> 		spaolacci:murmur3:0d12bf8:murmur3/src/github.com/spaolacci/murmur3 \
>+		tinylib:msgp:ad0ff2e:msgp/src/github.com/tinylib/msgp \
> 		collectd:go-collectd:e84e8af:go_collectd/src/collectd.org \
> 		uber-go:atomic:74ca5ec:atomic/src/github.com/uber-go/atomic \
> 		uber-go:zap:fbae028:zap/src/github.com/uber-go/zap \
>-		golang:crypto:9477e0b:crypto/src/golang.org/x/crypto
>+		xlab:treeprint:06dfc6f:treeprint/src/github.com/xlab/treeprint \
>+		golang:crypto:9477e0b:crypto/src/golang.org/x/crypto \
>+		golang:sys:062cd7e:sys/src/golang.org/x/sys \
>+		golang:text:a71fd10:text/src/golang.org/x/text
> 
> SUB_FILES=	influxd
> SUB_LIST=	INFLUXD_USER=${INFLUXD_USER} \
>@@ -85,15 +93,16 @@
> post-patch:
> 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
> 	@cd ${WRKSRC} && \
>-		${MV} appveyor.yml build.py build.sh CHANGELOG.md \
>-		circle-test.sh circle.yml client cmd CODING_GUIDELINES.md \
>-		CONTRIBUTING.md coordinator \
>-		Dockerfile_build_ubuntu32 Dockerfile_build_ubuntu64 \
>-		Dockerfile_build_ubuntu64_git Dockerfile_test_ubuntu32 \
>-		errors.go etc gobuild.sh Godeps importer influxdb.go influxql \
>-		internal LICENSE_OF_DEPENDENCIES.md Makefile man models \
>-		monitor nightly.sh node.go pkg QUERIES.md README.md \
>-		scripts services stress tcp test.sh tests TODO.md toml tsdb uuid \
>+		${MV} CHANGELOG.md CODING_GUIDELINES.md CONTRIBUTING.md \
>+		Dockerfile Dockerfile_build_ubuntu32 Dockerfile_build_ubuntu64 \
>+		Dockerfile_build_ubuntu64_git Dockerfile_build_ubuntu64_go19 \
>+		Dockerfile_test_ubuntu32 Godeps \
>+		LICENSE_OF_DEPENDENCIES.md QUERIES.md README.md TODO.md \
>+		appveyor.yml build.py build.sh circle-test.sh circle.yml \
>+		client cmd coordinator docker errors.go etc gobuild.sh importer \
>+		influxdb.go internal man models monitor nightly.sh node.go pkg \
>+		prometheus query releng scripts services stress tcp test.sh \
>+		tests toml tsdb uuid \
> 		${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
> 
> do-build:
>@@ -111,6 +120,8 @@
> 		${INSTALL_PROGRAM} ${WRKSRC}/bin/influx ${STAGEDIR}${PREFIX}/bin/influx
> 		${INSTALL_PROGRAM} ${WRKSRC}/bin/influx_inspect ${STAGEDIR}${PREFIX}/bin/influx_inspect
> 		${INSTALL_PROGRAM} ${WRKSRC}/bin/influx_tsm ${STAGEDIR}${PREFIX}/bin/influx_tsm
>+		${INSTALL_PROGRAM} ${WRKSRC}/bin/influx_stress ${STAGEDIR}${PREFIX}/bin/influx_stress
>+		${INSTALL_PROGRAM} ${WRKSRC}/bin/store ${STAGEDIR}${PREFIX}/bin/influx_store
> 		@${SED} -i .bak -e \
> 			"s|/var/lib/influxdb|/var/db/influxdb|g" \
> 			${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT}/etc/config.sample.toml
>@@ -121,7 +132,8 @@
> do-install-MANPAGES-on:
> .for i in influx.1 influx_inspect.1 influx_stress.1 influx_tsm.1 \
> 	influxd-backup.1 influxd-config.1 influxd-restore.1 \
>-	influxd-run.1 influxd-version.1 influxd.1
>+	influxd-run.1 influxd-version.1 influxd.1 influx.1 influx_inspect.1 \
>+	influx_stress.1 influx_tsm.1
> 		${INSTALL_MAN} ${WRKSRC}/src/github.com/influxdata/influxdb/man/$i ${STAGEDIR}${MAN8PREFIX}/man/man1
> .endfor
> 
>diff -urN influxdb.orig/distinfo influxdb/distinfo
>--- influxdb.orig/distinfo	2017-11-17 12:27:17.540062000 +0200
>+++ influxdb/distinfo	2017-11-23 18:14:01.588689000 +0200
>@@ -1,14 +1,14 @@
>-TIMESTAMP = 1502885041
>-SHA256 (influxdata-influxdb-v1.3.3_GH0.tar.gz) = 4efe9e1fec6fc618d532107001743fbce14da29e87eb3446995a78d2a512dfb4
>-SIZE (influxdata-influxdb-v1.3.3_GH0.tar.gz) = 1075167
>-SHA256 (BurntSushi-toml-9906417_GH0.tar.gz) = a980407edcf8275d58651f9af3c74dc802f0aaf702936c78b36059289421de8c
>-SIZE (BurntSushi-toml-9906417_GH0.tar.gz) = 39914
>+TIMESTAMP = 1511453641
>+SHA256 (influxdata-influxdb-v1.4.2_GH0.tar.gz) = 7ff8d0464bbb96c3bbe9b07147d0e9153dfea9fc1590109d724eb80574209e6f
>+SIZE (influxdata-influxdb-v1.4.2_GH0.tar.gz) = 1126527
>+SHA256 (BurntSushi-toml-a368813_GH0.tar.gz) = 68dc067c4105cd20a642ddf1f4acaada7474c1b58e5b249d4bd9b0d7e8edebc2
>+SIZE (BurntSushi-toml-a368813_GH0.tar.gz) = 42252
> SHA256 (bmizerany-pat-c068ca2_GH0.tar.gz) = 1bff463e4313717c5561a97020e5b6ae8095560fa834aa565c488b85b5549433
> SIZE (bmizerany-pat-c068ca2_GH0.tar.gz) = 6246
> SHA256 (boltdb-bolt-4b1ebc1_GH0.tar.gz) = ee9abc065d95c96d3e519f28cbecefb69342504d41b285886294d26ace49c500
> SIZE (boltdb-bolt-4b1ebc1_GH0.tar.gz) = 83626
>-SHA256 (cespare-xxhash-4a94f89_GH0.tar.gz) = f9d7886234ce69fbd461bf0ea0afd860f2cc42525af7066b17b49d35be2e850a
>-SIZE (cespare-xxhash-4a94f89_GH0.tar.gz) = 7143
>+SHA256 (cespare-xxhash-1b6d2e4_GH0.tar.gz) = e68c3cc2d51c51a6ed2b096897478d36f6eb6d20b6b2e1f91cf6a6e5f2406a67
>+SIZE (cespare-xxhash-1b6d2e4_GH0.tar.gz) = 7832
> SHA256 (davecgh-go-spew-346938d_GH0.tar.gz) = 92e706ece5da01f2c61cf632e168d8c24d44866523b25f0e8eb9d1596c5d5f79
> SIZE (davecgh-go-spew-346938d_GH0.tar.gz) = 42343
> SHA256 (dgrijalva-jwt-go-24c63f5_GH0.tar.gz) = b8e7b4fd2911b6a7c91f0817da09f7fda65c0898a94122dfb30f76bf851029e3
>@@ -17,27 +17,45 @@
> SIZE (dgryski-go-bits-2ad8d70_GH0.tar.gz) = 2193
> SHA256 (dgryski-go-bitstream-7d46cd2_GH0.tar.gz) = ba7a2b22ea94d4541da4fce08e7c58fdbcde6feec1a652c3174a89907567667f
> SIZE (dgryski-go-bitstream-7d46cd2_GH0.tar.gz) = 3006
>-SHA256 (gogo-protobuf-3043356_GH0.tar.gz) = e6a0453c31ed94c4a96d6770fe056b4865a7ccbaf165b23321ce8f892876d9ea
>-SIZE (gogo-protobuf-3043356_GH0.tar.gz) = 2442219
>+SHA256 (gogo-protobuf-1c2b16b_GH0.tar.gz) = 90f582454d78ddd1a108fd34cd2c6d0e7ea9b207295ba96e33973b39d69be1fc
>+SIZE (gogo-protobuf-1c2b16b_GH0.tar.gz) = 2567473
> SHA256 (golang-snappy-d9eb7a3_GH0.tar.gz) = 857fd1a142bc62ed05610c9daec12c6f6e4ff68b6cd5594311496b96bd8cbc2d
> SIZE (golang-snappy-d9eb7a3_GH0.tar.gz) = 62041
>+SHA256 (google-go-cmp-18107e6_GH0.tar.gz) = 1eea9950ccff2279d9c04d8988210bb40f6b95863439cf2d48e463c0c1fa0491
>+SIZE (google-go-cmp-18107e6_GH0.tar.gz) = 54129
>+SHA256 (influxdata-influxql-3921ab7_GH0.tar.gz) = bcd51efc4bbd121577318bf1064803aeae9f9cfc8fd829e571c90afea5975de0
>+SIZE (influxdata-influxql-3921ab7_GH0.tar.gz) = 87427
> SHA256 (influxdata-usage-client-6d38953_GH0.tar.gz) = aa828fc1f3fb5fa7c68eee58b4b5a7886e664cbdcac853d6a32945c2f0dd9024
> SIZE (influxdata-usage-client-6d38953_GH0.tar.gz) = 6578
>+SHA256 (influxdata-yamux-1f58ded_GH0.tar.gz) = bfae5651c1b712a0b16d0becde0af61db1992d9fab659c157cfc183296602b98
>+SIZE (influxdata-yamux-1f58ded_GH0.tar.gz) = 22644
>+SHA256 (influxdata-yarpc-036268c_GH0.tar.gz) = fa9d522cb4610104afb1bd1145c6425ae10d1511f3a926941eb4de34163b6c12
>+SIZE (influxdata-yarpc-036268c_GH0.tar.gz) = 34681
> SHA256 (jwilder-encoding-278947_GH0.tar.gz) = fe47034e6b071ccc6a68c3f3bfbcf7247ffe3c05c70441e459cf92aafafe9569
> SIZE (jwilder-encoding-278947_GH0.tar.gz) = 9677
> SHA256 (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = e493c6c8d673ecda63e9c0bd4e63a5af11362878c0c95f0e46711ccad1462eba
> SIZE (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = 2877
> SHA256 (peterh-liner-8860952_GH0.tar.gz) = 653956f128fe495487cd2dbd44b9121b2776b7073e849f0fec40d998cdea750d
> SIZE (peterh-liner-8860952_GH0.tar.gz) = 20386
>+SHA256 (philhofer-fwd-1612a29_GH0.tar.gz) = 0432a75da81b1635ace9afe2c58cce24b09fbe861688654700ab4681d009c0b2
>+SIZE (philhofer-fwd-1612a29_GH0.tar.gz) = 9224
> SHA256 (retailnext-hllpp-38a7bb7_GH0.tar.gz) = 904156542b8cc404710f5689f7944e2d0c9a2fb8a6f53ae763bc922724f8c603
> SIZE (retailnext-hllpp-38a7bb7_GH0.tar.gz) = 43008
> SHA256 (spaolacci-murmur3-0d12bf8_GH0.tar.gz) = 8c0dcee38d517b7decd2aa6e982cebc7fecb36834d3d4289b043b870b8bba07c
> SIZE (spaolacci-murmur3-0d12bf8_GH0.tar.gz) = 6766
>+SHA256 (tinylib-msgp-ad0ff2e_GH0.tar.gz) = 2ee1b887819763f8b5ad90a14392446c12a83c4ea196d46837ded5d699d6a113
>+SIZE (tinylib-msgp-ad0ff2e_GH0.tar.gz) = 67426
> SHA256 (collectd-go-collectd-e84e8af_GH0.tar.gz) = 24fc759dbe743b1c070fad1c420cf3813581b0fa801d2445809a91440dd4c354
> SIZE (collectd-go-collectd-e84e8af_GH0.tar.gz) = 38938
> SHA256 (uber-go-atomic-74ca5ec_GH0.tar.gz) = a2ac91075dcd85013fe012b2596bc374edd81d7b2818722ea8d7ab97bdbd4949
> SIZE (uber-go-atomic-74ca5ec_GH0.tar.gz) = 6580
> SHA256 (uber-go-zap-fbae028_GH0.tar.gz) = 78db0dbf47496a26333172802867c3c930d156e3ddb92d53aecd74c92b9b76ab
> SIZE (uber-go-zap-fbae028_GH0.tar.gz) = 54647
>+SHA256 (xlab-treeprint-06dfc6f_GH0.tar.gz) = 32fcee2802c46711cc408c4fd7e967c0d7d0dd1557325f8e55af5dccf2dc29ff
>+SIZE (xlab-treeprint-06dfc6f_GH0.tar.gz) = 6362
> SHA256 (golang-crypto-9477e0b_GH0.tar.gz) = 133589653318a665b277bd5bce223955e4f1ca6ce80fce7a338fd24ad0ccdff0
> SIZE (golang-crypto-9477e0b_GH0.tar.gz) = 1297866
>+SHA256 (golang-sys-062cd7e_GH0.tar.gz) = 2e4f1daaa6ae968a868940381decb21d97867593e0779176b253d569287d99d0
>+SIZE (golang-sys-062cd7e_GH0.tar.gz) = 768071
>+SHA256 (golang-text-a71fd10_GH0.tar.gz) = 8b8bfda09d60729c50162b67f5f3451980e7ce5c6580769c99a423172a6a75ad
>+SIZE (golang-text-a71fd10_GH0.tar.gz) = 4030980
>diff -urN influxdb.orig/pkg-plist influxdb/pkg-plist
>--- influxdb.orig/pkg-plist	2017-11-17 12:27:17.540460000 +0200
>+++ influxdb/pkg-plist	2017-11-23 18:49:28.698432000 +0200
>@@ -2,6 +2,8 @@
> bin/influx_inspect
> bin/influx_tsm
> bin/influxd
>+bin/influx_store
>+bin/influx_stress
> %%MANPAGES%%man/man1/influx.1.gz
> %%MANPAGES%%man/man1/influx_inspect.1.gz
> %%MANPAGES%%man/man1/influx_stress.1.gz

Actions: View | Diff

Attachments on bug 223827: 188222