Attachment 167133 Details for Bug 207292 – update opentsdb to 2.2.0

[patch] update opentsdb to 2.2.0

opentsdb_2.2.0.diff (text/plain), 5.65 KB, created by Johannes Jost Meixner on 2016-02-18 01:50:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Jost Meixner

Created: 2016-02-18 01:50:06 UTC

Size: 5.65 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 408136)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	opentsdb
>-PORTVERSION=	2.1.3
>-PORTREVISION=	1
>+PORTVERSION=	2.2.0
> CATEGORIES=	databases java
> MASTER_SITES=	https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 408136)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (opentsdb-2.1.3.tar.gz) = 771a846baf47f987e0ac78a009f558f246896acb1a468ed0a4a8f57f3cf03a16
>-SIZE (opentsdb-2.1.3.tar.gz) = 74601205
>+SHA256 (opentsdb-2.2.0.tar.gz) = 5689d4d83ee21f1ce5892d064d6738bfa9fdef99f106f45d5c38eefb9476dfb5
>+SIZE (opentsdb-2.2.0.tar.gz) = 76793860
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 408136)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,19 +1,6 @@
>---- Makefile.in.orig	2015-11-11 20:54:56 UTC
>+--- Makefile.in.orig	2016-02-17 17:48:38 UTC
> +++ Makefile.in
>-@@ -1313,9 +1313,11 @@ printdeps:
>- # This is kind of a hack, but I couldn't find a better way to adjust the paths
>- # in the script before it gets installed...
>- install-exec-hook:
>--	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfigdir)/etc/opentsdb'; \
>-+	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfdir)/opentsdb'; \
>-           abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script)
>-+	chmod u+w "$(DESTDIR)$(bindir)/tsdb"
>- 	cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb"
>-+	chmod u-w "$(DESTDIR)$(bindir)/tsdb"
>- 	rm -f tsdb.tmp
>- 
>- $(builddata_SRC): .git/HEAD $(tsdb_SRC) $(top_srcdir)/build-aux/gen_build_data.sh
>-@@ -1366,7 +1368,7 @@ gwttsd: staticroot
>+@@ -1562,7 +1562,7 @@ gwttsd: staticroot
>  # how to tell it to install a bunch of files recursively for which I don't
>  # know ahead of time what the file names are.
>  install-data-local: staticroot install-data-lib install-data-tools \
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 408136)
>+++ files/patch-configure	(working copy)
>@@ -1,4 +1,4 @@
>---- configure.orig	2015-09-12 19:49:18 UTC
>+--- configure.orig	2016-02-15 22:38:55 UTC
> +++ configure
> @@ -1714,7 +1714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>  
>Index: files/patch-src_utils_Config.java
>===================================================================
>--- files/patch-src_utils_Config.java	(revision 408136)
>+++ files/patch-src_utils_Config.java	(working copy)
>@@ -1,10 +1,10 @@
>---- src/utils/Config.java.orig	2015-11-04 10:25:48 UTC
>+--- src/utils/Config.java.orig	2016-02-15 22:56:56 UTC
> +++ src/utils/Config.java
>-@@ -509,6 +509,7 @@ public class Config {
>+@@ -562,6 +562,7 @@ public class Config {
>      } else {
>        file_locations.add("/etc/opentsdb.conf");
>        file_locations.add("/etc/opentsdb/opentsdb.conf");
>-+      file_locations.add("%%PREFIX%%/etc/opentsdb/opentsdb.conf");
>++      file_locations.add("/usr/local/etc/opentsdb/opentsdb.conf");
>        file_locations.add("/opt/opentsdb/opentsdb.conf");
>      }
>  
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 408136)
>+++ pkg-plist	(working copy)
>@@ -3,7 +3,8 @@
> %%DATADIR%%/bin/mygnuplot.sh
> %%DATADIR%%/bin/tsdb
> %%DATADIR%%/lib/async-1.4.0.jar
>-%%DATADIR%%/lib/asynchbase-1.6.0.jar
>+%%DATADIR%%/lib/asynchbase-1.7.1.jar
>+%%DATADIR%%/lib/commons-math3-3.4.1.jar
> %%DATADIR%%/lib/guava-18.0.jar
> %%DATADIR%%/lib/jackson-annotations-2.4.3.jar
> %%DATADIR%%/lib/jackson-core-2.4.3.jar
>@@ -14,25 +15,23 @@
> %%DATADIR%%/lib/netty-3.9.4.Final.jar
> %%DATADIR%%/lib/protobuf-java-2.5.0.jar
> %%DATADIR%%/lib/slf4j-api-1.7.7.jar
>-%%DATADIR%%/lib/tsdb-2.1.3.jar
>-%%DATADIR%%/lib/zookeeper-3.3.6.jar
>+%%DATADIR%%/lib/tsdb-2.2.0.jar
>+%%DATADIR%%/lib/zookeeper-3.4.5.jar
> %%DATADIR%%/static/clear.cache.gif
>+%%DATADIR%%/static/opentsdb_header.jpg
> %%DATADIR%%/static/favicon.ico
>-%%DATADIR%%/static/gwt/standard/images/corner.png
>-%%DATADIR%%/static/gwt/standard/images/corner_ie6.png
>-%%DATADIR%%/static/gwt/standard/images/hborder.png
>-%%DATADIR%%/static/gwt/standard/images/hborder_ie6.png
>-%%DATADIR%%/static/gwt/standard/images/ie6/corner_dialog_topleft.png
>-%%DATADIR%%/static/gwt/standard/images/ie6/corner_dialog_topright.png
>-%%DATADIR%%/static/gwt/standard/images/ie6/hborder_blue_shadow.png
>-%%DATADIR%%/static/gwt/standard/images/ie6/hborder_gray_shadow.png
>-%%DATADIR%%/static/gwt/standard/images/ie6/vborder_blue_shadow.png
>-%%DATADIR%%/static/gwt/standard/images/ie6/vborder_gray_shadow.png
>-%%DATADIR%%/static/gwt/standard/images/splitPanelThumb.png
>-%%DATADIR%%/static/gwt/standard/images/vborder.png
>-%%DATADIR%%/static/gwt/standard/images/vborder_ie6.png
>-%%DATADIR%%/static/gwt/standard/standard.css
>-%%DATADIR%%/static/gwt/standard/standard_rtl.css
>+%%DATADIR%%/static/gwt/opentsdb/images/corner.png
>+%%DATADIR%%/static/gwt/opentsdb/images/hborder.png
>+%%DATADIR%%/static/gwt/opentsdb/images/ie6/corner_dialog_topleft.png
>+%%DATADIR%%/static/gwt/opentsdb/images/ie6/corner_dialog_topright.png
>+%%DATADIR%%/static/gwt/opentsdb/images/ie6/hborder_blue_shadow.png
>+%%DATADIR%%/static/gwt/opentsdb/images/ie6/hborder_gray_shadow.png
>+%%DATADIR%%/static/gwt/opentsdb/images/ie6/vborder_blue_shadow.png
>+%%DATADIR%%/static/gwt/opentsdb/images/ie6/vborder_gray_shadow.png
>+%%DATADIR%%/static/gwt/opentsdb/images/splitPanelThumb.png
>+%%DATADIR%%/static/gwt/opentsdb/images/vborder.png
>+%%DATADIR%%/static/gwt/opentsdb/opentsdb.css
>+%%DATADIR%%/static/gwt/opentsdb/opentsdb_rtl.css
> %%DATADIR%%/static/hosted.html
> %%DATADIR%%/static/queryui.nocache.js
> %%DATADIR%%/tools/check_tsd

Flags:

xmj: maintainer-approval+

Actions: View | Diff

Attachments on bug 207292: 167133