Attachment 187971 Details for Bug 222261 – elasticsearch5 5.3.0 to 5.6.4 patch

[patch] elasticsearch5 5.3.0 to 5.6.4 patch

elasticsearch5.6.4.patch (text/plain), 14.95 KB, created by Patrice on 2017-11-13 16:28:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice

Created: 2017-11-13 16:28:38 UTC

Size: 14.95 KB

patch

obsolete

>diff -pur elasticsearch5.orig/Makefile elasticsearch5/Makefile
>--- elasticsearch5.orig/Makefile	2017-11-09 06:07:25.032535000 +0100
>+++ elasticsearch5/Makefile	2017-11-13 17:23:55.643961000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/textproc/elasticsearch5/Makefile 451762 2017-10-11 17:08:37Z feld $
> 
> PORTNAME=	elasticsearch
>-PORTVERSION=	5.3.0
>+PORTVERSION=	5.6.4
> PORTREVISION=	1
> CATEGORIES=	textproc java devel
> MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/ \
>@@ -15,6 +15,7 @@ COMMENT=	Full-text search engine for Jav
> LICENSE=	APACHE20
> 
> RUN_DEPENDS=	bash>0:shells/bash
>+BUILD_DEPENDS=	jna>0:devel/jna
> 
> CONFLICTS=	elasticsearch-[0-9]* elasticsearch2-[0-9]*
> 
>@@ -31,7 +32,7 @@ OPTIONS_DEFINE=	DOCS
> 
> .include <bsd.port.options.mk>
> 
>-LUCENEVER=	6.4.1
>+LUCENEVER=	6.6.1
> CONFIG_FILES=	elasticsearch.yml log4j2.properties jvm.options
> BINS=		elasticsearch.in.sh \
> 		elasticsearch \
>@@ -64,6 +65,7 @@ post-patch:
> 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
> 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh
> 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch
>+	${CP} /usr/local/share/java/classes/jna.jar ${WRKSRC}/lib/
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
>diff -pur elasticsearch5.orig/distinfo elasticsearch5/distinfo
>--- elasticsearch5.orig/distinfo	2017-11-09 06:07:25.032607000 +0100
>+++ elasticsearch5/distinfo	2017-11-13 17:23:55.694810000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1491415113
>-SHA256 (elasticsearch-5.3.0.tar.gz) = effd922973e9f4fe25565e0a194a4b534c08b22849f03cb9fea13c311401e21b
>-SIZE (elasticsearch-5.3.0.tar.gz) = 33696963
>+TIMESTAMP = 1510400839
>+SHA256 (elasticsearch-5.6.4.tar.gz) = 1098fc776fae8c74e65f8e17cf2ea244c1d07c4e6711340c9bb9f6df56aa45b0
>+SIZE (elasticsearch-5.6.4.tar.gz) = 33776770
>diff -pur elasticsearch5.orig/files/elasticsearch.in elasticsearch5/files/elasticsearch.in
>--- elasticsearch5.orig/files/elasticsearch.in	2017-11-09 06:07:25.033234000 +0100
>+++ elasticsearch5/files/elasticsearch.in	2017-11-13 17:23:55.314184000 +0100
>@@ -51,7 +51,7 @@ elasticsearch_precmd()
>     chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile}
>     /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp}
>     /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/db/elasticsearch
>-    /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/log/elasticsearch
>+    /usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 755 /var/log/elasticsearch
> }
> 
> elasticsearch_console()
>diff -pur elasticsearch5.orig/pkg-plist elasticsearch5/pkg-plist
>--- elasticsearch5.orig/pkg-plist	2017-11-09 06:07:25.036258000 +0100
>+++ elasticsearch5/pkg-plist	2017-11-13 17:23:55.539937000 +0100
>@@ -3,105 +3,113 @@
> @sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/jvm.options.sample
> @unexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi
> @unexec if [ -d %%ELASTIC_DBDIR%% ]; then echo "You should remove %%ELASTIC_DBDIR%% if you don't need it any more."; fi
>-bin/elasticsearch-plugin
>-lib/elasticsearch/lib/HdrHistogram-2.1.6.jar
>-lib/elasticsearch/lib/elasticsearch-%%PORTVERSION%%.jar
>-lib/elasticsearch/lib/hppc-0.7.1.jar
>-lib/elasticsearch/lib/jackson-core-2.8.6.jar
>-lib/elasticsearch/lib/jackson-dataformat-cbor-2.8.6.jar
>-lib/elasticsearch/lib/jackson-dataformat-smile-2.8.6.jar
>-lib/elasticsearch/lib/jackson-dataformat-yaml-2.8.6.jar
>-lib/elasticsearch/lib/java-version-checker-%%PORTVERSION%%.jar
>-lib/elasticsearch/lib/jna-4.2.2.jar
>-lib/elasticsearch/lib/joda-time-2.9.5.jar
>-lib/elasticsearch/lib/jopt-simple-5.0.2.jar
>-lib/elasticsearch/lib/jts-1.13.jar
>-lib/elasticsearch/lib/log4j-1.2-api-2.7.jar
>-lib/elasticsearch/lib/log4j-api-2.7.jar
>-lib/elasticsearch/lib/log4j-core-2.7.jar
>-lib/elasticsearch/lib/lucene-analyzers-common-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-backward-codecs-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-core-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-grouping-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-highlighter-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-join-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-memory-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-misc-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-queries-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-queryparser-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-sandbox-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-spatial-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-spatial-extras-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-spatial3d-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/lucene-suggest-%%LUCENEVER%%.jar
>-lib/elasticsearch/lib/securesm-1.1.jar
>-lib/elasticsearch/lib/snakeyaml-1.15.jar
>-lib/elasticsearch/lib/spatial4j-0.6.jar
>-lib/elasticsearch/lib/t-digest-3.0.jar
>-lib/elasticsearch/bin/elasticsearch.in.sh
>-lib/elasticsearch/bin/elasticsearch
>-lib/elasticsearch/bin/elasticsearch-plugin
>-lib/elasticsearch/modules/aggs-matrix-stats/aggs-matrix-stats-%%PORTVERSION%%.jar
>-lib/elasticsearch/modules/aggs-matrix-stats/plugin-descriptor.properties
>-lib/elasticsearch/modules/ingest-common/ingest-common-%%PORTVERSION%%.jar
>-lib/elasticsearch/modules/ingest-common/jcodings-1.0.12.jar
>-lib/elasticsearch/modules/ingest-common/joni-2.1.6.jar
>-lib/elasticsearch/modules/ingest-common/plugin-descriptor.properties
>-lib/elasticsearch/modules/lang-expression/antlr4-runtime-4.5.1-1.jar
>-lib/elasticsearch/modules/lang-expression/asm-5.0.4.jar
>-lib/elasticsearch/modules/lang-expression/asm-commons-5.0.4.jar
>-lib/elasticsearch/modules/lang-expression/asm-tree-5.0.4.jar
>-lib/elasticsearch/modules/lang-expression/lang-expression-%%PORTVERSION%%.jar
>-lib/elasticsearch/modules/lang-expression/lucene-expressions-%%LUCENEVER%%.jar
>-lib/elasticsearch/modules/lang-expression/plugin-descriptor.properties
>-lib/elasticsearch/modules/lang-expression/plugin-security.policy
>-lib/elasticsearch/modules/lang-groovy/groovy-2.4.6-indy.jar
>-lib/elasticsearch/modules/lang-groovy/lang-groovy-%%PORTVERSION%%.jar
>-lib/elasticsearch/modules/lang-groovy/plugin-descriptor.properties
>-lib/elasticsearch/modules/lang-groovy/plugin-security.policy
>-lib/elasticsearch/modules/lang-mustache/compiler-0.9.3.jar
>-lib/elasticsearch/modules/lang-mustache/lang-mustache-%%PORTVERSION%%.jar
>-lib/elasticsearch/modules/lang-mustache/plugin-descriptor.properties
>-lib/elasticsearch/modules/lang-mustache/plugin-security.policy
>-lib/elasticsearch/modules/lang-painless/antlr4-runtime-4.5.1-1.jar
>-lib/elasticsearch/modules/lang-painless/asm-debug-all-5.1.jar
>-lib/elasticsearch/modules/lang-painless/lang-painless-%%PORTVERSION%%.jar
>-lib/elasticsearch/modules/lang-painless/plugin-descriptor.properties
>-lib/elasticsearch/modules/lang-painless/plugin-security.policy
>-lib/elasticsearch/modules/percolator/percolator-%%PORTVERSION%%.jar
>-lib/elasticsearch/modules/percolator/plugin-descriptor.properties
>-lib/elasticsearch/modules/reindex/commons-codec-1.10.jar
>-lib/elasticsearch/modules/reindex/commons-logging-1.1.3.jar
>-lib/elasticsearch/modules/reindex/httpasyncclient-4.1.2.jar
>-lib/elasticsearch/modules/reindex/httpclient-4.5.2.jar
>-lib/elasticsearch/modules/reindex/httpcore-4.4.5.jar
>-lib/elasticsearch/modules/reindex/httpcore-nio-4.4.5.jar
>-lib/elasticsearch/modules/reindex/plugin-descriptor.properties
>-lib/elasticsearch/modules/reindex/reindex-%%PORTVERSION%%.jar
>-lib/elasticsearch/modules/reindex/rest-%%PORTVERSION%%.jar
>-lib/elasticsearch/modules/transport-netty3/netty-3.10.6.Final.jar
>-lib/elasticsearch/modules/transport-netty3/plugin-descriptor.properties
>-lib/elasticsearch/modules/transport-netty3/plugin-security.policy
>-lib/elasticsearch/modules/transport-netty3/transport-netty3-%%PORTVERSION%%.jar
>-lib/elasticsearch/modules/transport-netty4/netty-buffer-4.1.7.Final.jar
>-lib/elasticsearch/modules/transport-netty4/netty-codec-4.1.7.Final.jar
>-lib/elasticsearch/modules/transport-netty4/netty-codec-http-4.1.7.Final.jar
>-lib/elasticsearch/modules/transport-netty4/netty-common-4.1.7.Final.jar
>-lib/elasticsearch/modules/transport-netty4/netty-handler-4.1.7.Final.jar
>-lib/elasticsearch/modules/transport-netty4/netty-resolver-4.1.7.Final.jar
>-lib/elasticsearch/modules/transport-netty4/netty-transport-4.1.7.Final.jar
>-lib/elasticsearch/modules/transport-netty4/plugin-descriptor.properties
>-lib/elasticsearch/modules/transport-netty4/plugin-security.policy
>-lib/elasticsearch/modules/transport-netty4/transport-netty4-%%PORTVERSION%%.jar
>+bin/%%SEARCHUSER%%-plugin
>+%%ETCDIR%%/%%SEARCHUSER%%.yml.sample
>+%%ETCDIR%%/jvm.options.sample
>+%%ETCDIR%%/log4j2.properties.sample
>+etc/rc.d/%%SEARCHUSER%%
>+lib/%%SEARCHUSER%%/bin/%%SEARCHUSER%%
>+lib/%%SEARCHUSER%%/bin/%%SEARCHUSER%%-plugin
>+lib/%%SEARCHUSER%%/bin/%%SEARCHUSER%%.in.sh
>+lib/%%SEARCHUSER%%/lib/HdrHistogram-2.1.9.jar
>+lib/%%SEARCHUSER%%/lib/%%SEARCHUSER%%-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/lib/hppc-0.7.1.jar
>+lib/%%SEARCHUSER%%/lib/jackson-core-2.8.6.jar
>+lib/%%SEARCHUSER%%/lib/jackson-dataformat-cbor-2.8.6.jar
>+lib/%%SEARCHUSER%%/lib/jackson-dataformat-smile-2.8.6.jar
>+lib/%%SEARCHUSER%%/lib/jackson-dataformat-yaml-2.8.6.jar
>+lib/%%SEARCHUSER%%/lib/java-version-checker-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/lib/jna.jar
>+lib/%%SEARCHUSER%%/lib/joda-time-2.9.5.jar
>+lib/%%SEARCHUSER%%/lib/jopt-simple-5.0.2.jar
>+lib/%%SEARCHUSER%%/lib/jts-1.13.jar
>+lib/%%SEARCHUSER%%/lib/log4j-1.2-api-2.9.1.jar
>+lib/%%SEARCHUSER%%/lib/log4j-api-2.9.1.jar
>+lib/%%SEARCHUSER%%/lib/log4j-core-2.9.1.jar
>+lib/%%SEARCHUSER%%/lib/lucene-analyzers-common-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-backward-codecs-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-core-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-grouping-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-highlighter-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-join-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-memory-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-misc-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-queries-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-queryparser-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-sandbox-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-spatial-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-spatial-extras-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-spatial3d-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/lucene-suggest-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/lib/plugin-cli-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/lib/securesm-1.1.jar
>+lib/%%SEARCHUSER%%/lib/snakeyaml-1.15.jar
>+lib/%%SEARCHUSER%%/lib/spatial4j-0.6.jar
>+lib/%%SEARCHUSER%%/lib/t-digest-3.0.jar
>+lib/%%SEARCHUSER%%/modules/aggs-matrix-stats/aggs-matrix-stats-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/aggs-matrix-stats/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/ingest-common/ingest-common-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/ingest-common/jcodings-1.0.12.jar
>+lib/%%SEARCHUSER%%/modules/ingest-common/joni-2.1.6.jar
>+lib/%%SEARCHUSER%%/modules/ingest-common/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/lang-expression/antlr4-runtime-4.5.1-1.jar
>+lib/%%SEARCHUSER%%/modules/lang-expression/asm-5.0.4.jar
>+lib/%%SEARCHUSER%%/modules/lang-expression/asm-commons-5.0.4.jar
>+lib/%%SEARCHUSER%%/modules/lang-expression/asm-tree-5.0.4.jar
>+lib/%%SEARCHUSER%%/modules/lang-expression/lang-expression-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/lang-expression/lucene-expressions-%%LUCENEVER%%.jar
>+lib/%%SEARCHUSER%%/modules/lang-expression/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/lang-expression/plugin-security.policy
>+lib/%%SEARCHUSER%%/modules/lang-groovy/groovy-2.4.6-indy.jar
>+lib/%%SEARCHUSER%%/modules/lang-groovy/lang-groovy-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/lang-groovy/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/lang-groovy/plugin-security.policy
>+lib/%%SEARCHUSER%%/modules/lang-mustache/compiler-0.9.3.jar
>+lib/%%SEARCHUSER%%/modules/lang-mustache/lang-mustache-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/lang-mustache/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/lang-mustache/plugin-security.policy
>+lib/%%SEARCHUSER%%/modules/lang-painless/antlr4-runtime-4.5.1-1.jar
>+lib/%%SEARCHUSER%%/modules/lang-painless/asm-debug-all-5.1.jar
>+lib/%%SEARCHUSER%%/modules/lang-painless/lang-painless-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/lang-painless/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/lang-painless/plugin-security.policy
>+lib/%%SEARCHUSER%%/modules/parent-join/parent-join-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/parent-join/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/percolator/percolator-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/percolator/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/reindex/commons-codec-1.10.jar
>+lib/%%SEARCHUSER%%/modules/reindex/commons-logging-1.1.3.jar
>+lib/%%SEARCHUSER%%/modules/reindex/%%SEARCHUSER%%-rest-client-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/reindex/httpasyncclient-4.1.2.jar
>+lib/%%SEARCHUSER%%/modules/reindex/httpclient-4.5.2.jar
>+lib/%%SEARCHUSER%%/modules/reindex/httpcore-4.4.5.jar
>+lib/%%SEARCHUSER%%/modules/reindex/httpcore-nio-4.4.5.jar
>+lib/%%SEARCHUSER%%/modules/reindex/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/reindex/plugin-security.policy
>+lib/%%SEARCHUSER%%/modules/reindex/reindex-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/transport-netty3/netty-3.10.6.Final.jar
>+lib/%%SEARCHUSER%%/modules/transport-netty3/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/transport-netty3/plugin-security.policy
>+lib/%%SEARCHUSER%%/modules/transport-netty3/transport-netty3-%%PORTVERSION%%.jar
>+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-buffer-4.1.13.Final.jar
>+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-codec-4.1.13.Final.jar
>+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-codec-http-4.1.13.Final.jar
>+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-common-4.1.13.Final.jar
>+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-handler-4.1.13.Final.jar
>+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-resolver-4.1.13.Final.jar
>+lib/%%SEARCHUSER%%/modules/transport-netty4/netty-transport-4.1.13.Final.jar
>+lib/%%SEARCHUSER%%/modules/transport-netty4/plugin-descriptor.properties
>+lib/%%SEARCHUSER%%/modules/transport-netty4/plugin-security.policy
>+lib/%%SEARCHUSER%%/modules/transport-netty4/transport-netty4-%%PORTVERSION%%.jar
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
> %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
> %%PORTDOCS%%%%DOCSDIR%%/README.textile
>-@dir lib/elasticsearch/lib
>-@dir lib/elasticsearch/bin
>-@dir lib/elasticsearch/modules
>-@dir lib/elasticsearch/plugins
>-@dir lib/elasticsearch
>-@dir libexec/elasticsearch
>+@dir lib/%%SEARCHUSER%%/lib
>+@dir lib/%%SEARCHUSER%%/bin
>+@dir lib/%%SEARCHUSER%%/modules
>+@dir lib/%%SEARCHUSER%%/plugins
>+@dir lib/%%SEARCHUSER%%
>+@dir libexec/%%SEARCHUSER%%
> @dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_LOGDIR%%
> @dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_DBDIR%%
> @postunexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi

Actions: View | Diff

Attachments on bug 222261: 186301 | 187971