Attachment #206705 for bug #239972

Lines 2-8 Link Here

(-)Makefile (-5 / +40 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= elasticsearch	4	PORTNAME= elasticsearch
5	PORTVERSION= 6.5.4	5	PORTVERSION= 6.8.2
6	PORTREVISION= 0	6	PORTREVISION= 0
7	CATEGORIES= textproc java devel	7	CATEGORIES= textproc java devel
8	MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \	8	MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \
Lines 24-45 Link Here
24	NO_ARCH= yes	24	NO_ARCH= yes
25	USE_JAVA= yes	25	USE_JAVA= yes
26	NO_BUILD= yes	26	NO_BUILD= yes
27	JAVA_VERSION= 1.8+	27	JAVA_VERSION= 8+
28	USE_RC_SUBR= ${PORTNAME}	28	USE_RC_SUBR= ${PORTNAME}
29	SHEBANG_FILES= bin/elasticsearch \	29	SHEBANG_FILES= bin/elasticsearch \
		30	bin/elasticsearch-certgen \
		31	bin/elasticsearch-certutil \
30	bin/elasticsearch-cli \	32	bin/elasticsearch-cli \
		33	bin/elasticsearch-croneval \
31	bin/elasticsearch-env \	34	bin/elasticsearch-env \
32	bin/elasticsearch-plugin	35	bin/elasticsearch-keystore \
		36	bin/elasticsearch-migrate \
		37	bin/elasticsearch-plugin \
		38	bin/elasticsearch-saml-metadata \
		39	bin/elasticsearch-setup-passwords \
		40	bin/elasticsearch-shard \
		41	bin/elasticsearch-sql-cli \
		42	bin/elasticsearch-syskeygen \
		43	bin/elasticsearch-translog \
		44	bin/elasticsearch-users \
		45	bin/x-pack-env \
		46	bin/x-pack-security-env \
		47	bin/x-pack-watcher-env
33		48
34	OPTIONS_DEFINE= DOCS	49	OPTIONS_DEFINE= DOCS
35		50
36	.include <bsd.port.options.mk>	51	.include <bsd.port.options.mk>
37		52
38	CONFIG_FILES= elasticsearch.yml log4j2.properties jvm.options	53	CONFIG_FILES= elasticsearch.yml \
		54	log4j2.properties \
		55	jvm.options \
		56	role_mapping.yml \
		57	roles.yml
39	BINS= elasticsearch \	58	BINS= elasticsearch \
		59	elasticsearch-certgen \
		60	elasticsearch-certutil \
40	elasticsearch-cli \	61	elasticsearch-cli \
		62	elasticsearch-croneval \
41	elasticsearch-env \	63	elasticsearch-env \
42	elasticsearch-plugin	64	elasticsearch-keystore \
		65	elasticsearch-migrate \
		66	elasticsearch-plugin \
		67	elasticsearch-saml-metadata \
		68	elasticsearch-setup-passwords \
		69	elasticsearch-shard \
		70	elasticsearch-sql-cli \
		71	elasticsearch-sql-cli-${PORTVERSION}.jar \
		72	elasticsearch-syskeygen \
		73	elasticsearch-translog \
		74	elasticsearch-users \
		75	x-pack-env \
		76	x-pack-security-env \
		77	x-pack-watcher-env
43		78
44	PORTDOCS= LICENSE.txt \	79	PORTDOCS= LICENSE.txt \
45	NOTICE.txt \	80	NOTICE.txt \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1548195078	1	TIMESTAMP = 1565898113
2	SHA256 (elasticsearch-6.5.4.tar.gz) = 762e25c036fa2e882cb7e91d83868fa15a1cad8549d279a8c5826a005bb31877	2	SHA256 (elasticsearch-6.8.2.tar.gz) = 2dc3107475659dfd21afa74612a43d5ccbcf4942ab679e8e4e77167cafe27c94
3	SIZE (elasticsearch-6.5.4.tar.gz) = 113322649	3	SIZE (elasticsearch-6.8.2.tar.gz) = 148601605




--- config/jvm.options.orig	2019-07-24 08:21:42.000000000 -0700
+++ config/jvm.options	2019-08-16 13:41:33.818798000 -0700
@@ -107,13 +107,13 @@
 8:-XX:+PrintGCDateStamps
 8:-XX:+PrintTenuringDistribution
 8:-XX:+PrintGCApplicationStoppedTime

 8:-XX:+UseGCLogFileRotation
 8:-XX:NumberOfGCLogFiles=32
 8:-XX:GCLogFileSize=64m
 
 # JDK 9+ GC logging
-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
+9-:-Xlog:gc*,gc+age=trace,safepoint:file=${ES_TMPDIR}/gc.log:utctime,pid,tags:filecount=32,filesize=64m
 # due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
 # time/date parsing will break in an incompatible way for some date patterns and locals
 9-:-Djava.locale.providers=COMPAT

Lines 14-20 Link Here

(-)files/pkg-message.in (-1 / +1 lines)
14	ElasticSearch plugins should only be installed via the elasticsearch-plugin	14	ElasticSearch plugins should only be installed via the elasticsearch-plugin
15	included with this software. As we strive to provide a minimum semblance	15	included with this software. As we strive to provide a minimum semblance
16	of security, the files installed by the package are owned by root:wheel.	16	of security, the files installed by the package are owned by root:wheel.
17	This is different than upstream hich expects all of the files to be	17	This is different than upstream which expects all of the files to be
18	owned by the user and for you to execute the elasticsearch-plugin script	18	owned by the user and for you to execute the elasticsearch-plugin script
19	as said user.	19	as said user.
20		20

Return to bug 239972

Lines 1-6 Link Here

(-)files/patch-config_jvm.options (-3 / +10 lines)
1	--- config/jvm.options.orig 2018-03-01 23:04:45 UTC	1	--- config/jvm.options.orig 2019-07-24 08:21:42.000000000 -0700
2	+++ config/jvm.options	2	+++ config/jvm.options 2019-08-16 13:41:33.818798000 -0700
3	@@ -87,7 +87,7 @@	3	@@ -107,13 +107,13 @@
4	8:-XX:+PrintGCDateStamps	4	8:-XX:+PrintGCDateStamps
5	8:-XX:+PrintTenuringDistribution	5	8:-XX:+PrintTenuringDistribution
6	8:-XX:+PrintGCApplicationStoppedTime	6	8:-XX:+PrintGCApplicationStoppedTime
Lines 9-11 Link Here
9	8:-XX:+UseGCLogFileRotation	9	8:-XX:+UseGCLogFileRotation
10	8:-XX:NumberOfGCLogFiles=32	10	8:-XX:NumberOfGCLogFiles=32
11	8:-XX:GCLogFileSize=64m	11	8:-XX:GCLogFileSize=64m
		12
		13	# JDK 9+ GC logging
		14	-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
		15	+9-:-Xlog:gc*,gc+age=trace,safepoint:file=${ES_TMPDIR}/gc.log:utctime,pid,tags:filecount=32,filesize=64m
		16	# due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
		17	# time/date parsing will break in an incompatible way for some date patterns and locals
		18	9-:-Djava.locale.providers=COMPAT