Attachment 172787 Details for Bug 211197 – Update patch

[patch] Update patch

elasticsearch2-2.3.4.patch (text/plain), 6.19 KB, created by Jimmy Olgeni on 2016-07-21 14:54:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jimmy Olgeni

Created: 2016-07-21 14:54:31 UTC

Size: 6.19 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 418875)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	elasticsearch
>-PORTVERSION=	2.3.0
>-PORTREVISION=	1
>+PORTVERSION=	2.3.4
> CATEGORIES=	textproc java devel
> MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
> 		http://mirrors.rit.edu/zi/
>@@ -70,13 +69,14 @@
> 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
> .endfor
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib
>-	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar")
>+	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar"
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules
>+	cd ${WRKSRC}/modules && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules
> 
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
> 	@${MKDIR} ${STAGEDIR}${ELASTIC_DBDIR} ${STAGEDIR}${ELASTIC_LOGDIR}
>-	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin
>+	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ../lib/elasticsearch/bin/plugin elasticsearch-plugin
> 
> do-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>@@ -84,5 +84,4 @@
> 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
> .endfor
> 
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 418875)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (elasticsearch-2.3.0.tar.gz) = d68482c7633f2986263bc5f11f93b8a58c54c6cf5e337b615446d0a7c6fdcd8b
>-SIZE (elasticsearch-2.3.0.tar.gz) = 27556947
>+TIMESTAMP = 1468841279
>+SHA256 (elasticsearch-2.3.4.tar.gz) = 371e0c5f4ded0a8548f1cce55faff3efebcfd5f895c2c816f220146521f6f06e
>+SIZE (elasticsearch-2.3.4.tar.gz) = 27547169
>Index: files/patch-bin-elasticsearch.in.sh
>===================================================================
>--- files/patch-bin-elasticsearch.in.sh	(revision 418875)
>+++ files/patch-bin-elasticsearch.in.sh	(working copy)
>@@ -1,5 +1,5 @@
>---- bin/elasticsearch.in.sh.orig	2015-10-21 04:41:12.000000000 -0400
>-+++ bin/elasticsearch.in.sh	2015-12-15 12:00:37.323441838 -0500
>+--- bin/elasticsearch.in.sh.orig	2016-01-27 12:53:39 UTC
>++++ bin/elasticsearch.in.sh
> @@ -1,5 +1,20 @@
>  #!/bin/sh
>  
>Index: files/patch-config-elasticsearch.yml
>===================================================================
>--- files/patch-config-elasticsearch.yml	(revision 418875)
>+++ files/patch-config-elasticsearch.yml	(working copy)
>@@ -1,5 +1,5 @@
>---- config/elasticsearch.yml.orig	2015-10-21 04:41:12.000000000 -0400
>-+++ config/elasticsearch.yml	2015-11-19 12:34:39.766910803 -0500
>+--- config/elasticsearch.yml.orig	2016-01-27 13:29:25 UTC
>++++ config/elasticsearch.yml
> @@ -31,10 +31,12 @@
>  # Path to directory where to store the data (separate multiple locations by comma):
>  #
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 418875)
>+++ pkg-plist	(working copy)
>@@ -1,8 +1,9 @@
> @sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/elasticsearch.yml.sample
> @sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/logging.yml.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/bin/elasticsearch
>+lib/elasticsearch/bin/elasticsearch.in.sh
>+lib/elasticsearch/bin/plugin
> lib/elasticsearch/lib/HdrHistogram-2.1.6.jar
> lib/elasticsearch/lib/apache-log4j-extras-1.2.17.jar
> lib/elasticsearch/lib/commons-cli-1.3.1.jar
>@@ -11,13 +12,13 @@
> lib/elasticsearch/lib/elasticsearch-%%PORTVERSION%%.jar
> lib/elasticsearch/lib/guava-18.0.jar
> lib/elasticsearch/lib/hppc-0.7.1.jar
>-lib/elasticsearch/lib/jackson-core-2.6.2.jar
>-lib/elasticsearch/lib/jackson-dataformat-cbor-2.6.2.jar
>-lib/elasticsearch/lib/jackson-dataformat-smile-2.6.2.jar
>-lib/elasticsearch/lib/jackson-dataformat-yaml-2.6.2.jar
>+lib/elasticsearch/lib/jackson-core-2.6.6.jar
>+lib/elasticsearch/lib/jackson-dataformat-cbor-2.6.6.jar
>+lib/elasticsearch/lib/jackson-dataformat-smile-2.6.6.jar
>+lib/elasticsearch/lib/jackson-dataformat-yaml-2.6.6.jar
> lib/elasticsearch/lib/jna-4.1.0.jar
> lib/elasticsearch/lib/joda-convert-1.2.jar
>-lib/elasticsearch/lib/joda-time-2.8.2.jar
>+lib/elasticsearch/lib/joda-time-2.9.4.jar
> lib/elasticsearch/lib/jsr166e-1.1.0.jar
> lib/elasticsearch/lib/jts-1.13.jar
> lib/elasticsearch/lib/log4j-1.2.17.jar
>@@ -40,16 +41,26 @@
> lib/elasticsearch/lib/snakeyaml-1.15.jar
> lib/elasticsearch/lib/spatial4j-0.5.jar
> lib/elasticsearch/lib/t-digest-3.0.jar
>-lib/elasticsearch/bin/elasticsearch.in.sh
>-lib/elasticsearch/bin/elasticsearch
>-lib/elasticsearch/bin/plugin
>+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/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/reindex/plugin-descriptor.properties
>+lib/elasticsearch/modules/reindex/reindex-%%PORTVERSION%%.jar
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
> %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
> %%PORTDOCS%%%%DOCSDIR%%/README.textile
>+@dir lib/elasticsearch/plugins
>+@dir lib/elasticsearch/modules
> @dir lib/elasticsearch/lib
> @dir lib/elasticsearch/bin
>-@dir lib/elasticsearch/modules
>-@dir lib/elasticsearch/plugins
> @dir lib/elasticsearch
> @dir libexec/elasticsearch
> @dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_LOGDIR%%

Actions: View | Diff

Attachments on bug 211197: 172648 | 172654 | 172787 | 173288