Attachment 163666 Details for Bug 204902 – update to 2.1.0

[patch] update to 2.1.0

elasticsearch2-2.1.0.diff (text/plain), 8.30 KB, created by Olli Hauer on 2015-11-29 20:52:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2015-11-29 20:52:02 UTC

Size: 8.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 402595)
>+++ Makefile	(working copy)
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	elasticsearch
>-PORTVERSION=	2.0.0
>+PORTVERSION=	2.1.0
> CATEGORIES=	textproc java devel
>-MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
>-		http://mirrors.rit.edu/zi/
>+MASTER_SITES=	GHL
> PKGNAMESUFFIX=	2
> 
> MAINTAINER=	tj@FreeBSD.org
>@@ -15,6 +14,11 @@
> 
> CONFLICTS=	elasticsearch-[0-9]*
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	elastic
>+GH_PROJECT=	${PORTNAME}
>+GH_TAGNAME=	72cd1f1
>+
> USES=		cpe
> NO_ARCH=	yes
> USE_JAVA=	yes
>@@ -26,48 +30,10 @@
> 
> .include <bsd.port.options.mk>
> 
>-LUCENEVER=	5.2.1
>+LUCENEVER=	5.3.1
>+
> CONFIG_FILES=	elasticsearch.yml logging.yml
>-JARS=		elasticsearch-${PORTVERSION}.jar \
>-		HdrHistogram-2.1.6.jar \
>-		antlr-runtime-3.5.jar \
>-		apache-log4j-extras-1.2.17.jar \
>-		asm-4.1.jar \
>-		asm-commons-4.1.jar \
>-		commons-cli-1.3.1.jar \
>-		compiler-0.8.13.jar \
>-		compress-lzf-1.0.2.jar \
>-		groovy-all-2.4.4-indy.jar \
>-		guava-18.0.jar \
>-		hppc-0.7.1.jar \
>-		jackson-core-2.5.3.jar \
>-		jackson-dataformat-cbor-2.5.3.jar \
>-		jackson-dataformat-smile-2.5.3.jar \
>-		jackson-dataformat-yaml-2.5.3.jar \
>-		jna-4.1.0.jar \
>-		joda-convert-1.2.jar \
>-		joda-time-2.8.2.jar \
>-		jsr166e-1.1.0.jar \
>-		jts-1.13.jar \
>-		log4j-1.2.17.jar \
>-		lucene-analyzers-common-${LUCENEVER}.jar \
>-		lucene-backward-codecs-${LUCENEVER}.jar \
>-		lucene-core-${LUCENEVER}.jar \
>-		lucene-expressions-${LUCENEVER}.jar \
>-		lucene-grouping-${LUCENEVER}.jar \
>-		lucene-highlighter-${LUCENEVER}.jar \
>-		lucene-join-${LUCENEVER}.jar \
>-		lucene-memory-${LUCENEVER}.jar \
>-		lucene-misc-${LUCENEVER}.jar \
>-		lucene-queries-${LUCENEVER}.jar \
>-		lucene-queryparser-${LUCENEVER}.jar \
>-		lucene-sandbox-${LUCENEVER}.jar \
>-		lucene-spatial-${LUCENEVER}.jar \
>-		lucene-suggest-${LUCENEVER}.jar \
>-		netty-3.10.5.Final.jar \
>-		snakeyaml-1.12.jar \
>-		spatial4j-0.4.1.jar \
>-		t-digest-3.0.jar
>+
> BINS=		elasticsearch.in.sh \
> 		elasticsearch \
> 		plugin
>@@ -96,32 +62,28 @@
> 		ELASTIC_LOGDIR=${ELASTIC_LOGDIR}
> 
> post-patch:
>-	${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
>-	${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh
>+	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
>+	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh
> 
> do-install:
>-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
> .for f in ${CONFIG_FILES}
> 	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
> .endfor
>-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
>-.for f in ${BINS}
>-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
>-.endfor
>-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib
>-.for f in ${JARS}
>-	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib
>-.endfor
> 
>-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
>-	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
>+	${INSTALL_SCRIPT} ${BINS:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
> 
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib
>+	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar")
>+
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
>+	@${MKDIR} ${STAGEDIR}${ELASTIC_DBDIR} ${STAGEDIR}${ELASTIC_LOGDIR}
>+	${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin
>+
> do-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for f in ${DOCS}
>-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
>-.endfor
>+	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
> 
>-	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 402595)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (elasticsearch-2.0.0.tar.gz) = b25f13f615337c2072964fd9fc5c7250f8a2a983b22198daf93548285d5d16df
>-SIZE (elasticsearch-2.0.0.tar.gz) = 28576708
>+SHA256 (elastic-elasticsearch-2.1.0-72cd1f1_GH0.tar.gz) = 5705a4739f563fc7ba968c59ec3bbeefc89c7a930fb0e5ec0aa449e62de3fb37
>+SIZE (elastic-elasticsearch-2.1.0-72cd1f1_GH0.tar.gz) = 17319716
>Index: files/patch-bin-elasticsearch.in.sh
>===================================================================
>--- files/patch-bin-elasticsearch.in.sh	(revision 402595)
>+++ files/patch-bin-elasticsearch.in.sh	(working copy)
>@@ -1,5 +1,5 @@
>---- bin/elasticsearch.in.sh.orig	2015-11-19 16:02:28.386051810 -0500
>-+++ bin/elasticsearch.in.sh	2015-11-19 16:02:56.618049877 -0500
>+--- bin/elasticsearch.in.sh.orig	2015-10-21 08:41:12 UTC
>++++ bin/elasticsearch.in.sh
> @@ -1,5 +1,19 @@
>  #!/bin/sh
>  
>Index: files/patch-config-elasticsearch.yml
>===================================================================
>--- files/patch-config-elasticsearch.yml	(revision 402595)
>+++ 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	2015-11-18 12:27:49 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 402595)
>+++ pkg-plist	(working copy)
>@@ -1,8 +1,9 @@
>+bin/elasticsearch-plugin
> @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/antlr-runtime-3.5.jar
> lib/elasticsearch/lib/apache-log4j-extras-1.2.17.jar
>@@ -15,10 +16,10 @@
> lib/elasticsearch/lib/groovy-all-2.4.4-indy.jar
> lib/elasticsearch/lib/guava-18.0.jar
> lib/elasticsearch/lib/hppc-0.7.1.jar
>-lib/elasticsearch/lib/jackson-core-2.5.3.jar
>-lib/elasticsearch/lib/jackson-dataformat-cbor-2.5.3.jar
>-lib/elasticsearch/lib/jackson-dataformat-smile-2.5.3.jar
>-lib/elasticsearch/lib/jackson-dataformat-yaml-2.5.3.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/jna-4.1.0.jar
> lib/elasticsearch/lib/joda-convert-1.2.jar
> lib/elasticsearch/lib/joda-time-2.8.2.jar
>@@ -38,19 +39,18 @@
> 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-spatial3d-%%LUCENEVER%%.jar
> lib/elasticsearch/lib/lucene-suggest-%%LUCENEVER%%.jar
> lib/elasticsearch/lib/netty-3.10.5.Final.jar
>-lib/elasticsearch/lib/snakeyaml-1.12.jar
>-lib/elasticsearch/lib/spatial4j-0.4.1.jar
>+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
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
> %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
> %%PORTDOCS%%%%DOCSDIR%%/README.textile
>-@dir lib/elasticsearch/lib
>-@dir lib/elasticsearch/bin
> @dir lib/elasticsearch/plugins
>-@dir lib/elasticsearch
> @dir libexec/elasticsearch
>+@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
>+@postunexec if [ -d %%ELASTIC_DBDIR%% ]; then echo "You should remove %%ELASTIC_DBDIR%% if you don't need it any more."; fi

Actions: View | Diff

Attachments on bug 204902: 163666 | 163726