Update logstash 7.5.2 -> 7.6.0

Relase notes: https://www.elastic.co/guide/en/logstash/7.6/logstash-7-6-0.html

sysutils/logstash/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.30 2020/01/23 13:49:36 pvk Exp $
+# $OpenBSD: Makefile,v 1.31 2020/02/18 09:29:16 pvk Exp $
 
 ONLY_FOR_ARCHS =	amd64
 COMMENT =		tool for managing events and logs
 
-V =			7.5.2
+V =			7.6.0
 DISTNAME =		logstash-oss-$V
 PKGNAME =		logstash-$V
 EPOCH =			0
@@ -21,8 +21,7 @@ MASTER_SITES =		https://artifacts.elastic.co/downloads/logstash/
 
 MASTER_SITES0 =		https://distfiles.tristero.se/
 DISTFILES =		logstash-oss-$V.tar.gz \
-			netty-tcnative-boringssl-static-2.0.27.Final.jar:0 \
-			netty-tcnative-boringssl-static-2.0.28.Final.jar:0
+			netty-tcnative-boringssl-static-2.0.12.Final.jar:0
 EXTRACT_ONLY =		logstash-oss-$V.tar.gz
 
 MODULES =		java
@@ -54,7 +53,7 @@ do-build:
 	rm ${WRKSRC}/vendor/jruby/bin/*.{bash,bat,dll,exe,sh}
 	rm -r ${WRKSRC}/vendor/jruby/lib/jni
 	cd ${WRKSRC}/vendor/jruby/lib/ruby/stdlib/ffi/platform/ && \
-		rm -r *-{aix,cygwin,darwin,freebsd,gnu,linux,netbsd,solaris,windows}
+		rm -r *-{aix,cygwin,darwin,freebsd,gnu,linux,netbsd,solaris,windows}*
 	@# apply hammer to fixup weird modes
 	find ${WRKSRC}/vendor/ -type f -exec chmod 0644 {} \;
 	chmod 755 ${WRKSRC}/vendor/jruby/bin/*
@@ -68,10 +67,10 @@ do-install:
 		 ${PREFIX}/share/doc/logstash/
 	${INSTALL_DATA} ${WRKSRC}/config/* ${PREFIX}/share/examples/logstash/
 	cp -R ${WRKSRC}/{lib,logstash-*,modules,tools,vendor} ${LOGSTASH_HOME}
-	cp ${FULLDISTDIR}/netty-tcnative-boringssl-static-2.0.28.Final.jar \
-		${LOGSTASH_HOME}vendor/bundle/jruby/2.5.0/gems/logstash-input-beats-6.0.5-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.28.Final/
-	cp ${FULLDISTDIR}/netty-tcnative-boringssl-static-2.0.27.Final.jar \
-		${LOGSTASH_HOME}vendor/bundle/jruby/2.5.0/gems/logstash-input-http-3.3.2-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.27.Final/
+	cp ${FULLDISTDIR}/netty-tcnative-boringssl-static-2.0.12.Final.jar \
+		${LOGSTASH_HOME}vendor/bundle/jruby/2.5.0/gems/logstash-input-beats-6.0.4-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/
+	cp ${FULLDISTDIR}/netty-tcnative-boringssl-static-2.0.12.Final.jar \
+		${LOGSTASH_HOME}vendor/bundle/jruby/2.5.0/gems/logstash-input-http-3.3.3-java/vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/
 	${INSTALL_DATA} ${FILESDIR}/filebeat.yml \
 		${PREFIX}/share/examples/logstash/filebeat.yml
 	cd ${PREFIX}/logstash && \

sysutils/logstash/distinfo

@@ -1,6 +1,4 @@
-SHA256 (logstash-oss-7.5.2.tar.gz) = qP/UQKJmmtHPa2B4w4gFvbo4NynKYN7tLQeYU7mnLvs=
-SHA256 (netty-tcnative-boringssl-static-2.0.27.Final.jar) = PXOWoOsg+cq5pVh3bjYp6F9vMgAZgbPDUbh8eciP5o4=
-SHA256 (netty-tcnative-boringssl-static-2.0.28.Final.jar) = ma8PTxYaPZvCHZT6T0VV0smeC0XiLJ8DW6Hz9pKyN3o=
-SIZE (logstash-oss-7.5.2.tar.gz) = 166077841
-SIZE (netty-tcnative-boringssl-static-2.0.27.Final.jar) = 1173543
-SIZE (netty-tcnative-boringssl-static-2.0.28.Final.jar) = 1175299
+SHA256 (logstash-oss-7.6.0.tar.gz) = vUNzIcTAaa5pfErSBMvVBzFUJZCRAH+56ePhXd1Aemw=
+SHA256 (netty-tcnative-boringssl-static-2.0.12.Final.jar) = mRxDzTZmeAmxpLn6G8apMySkRqOMb7cXFpiS09RZCwk=
+SIZE (logstash-oss-7.6.0.tar.gz) = 165747338
+SIZE (netty-tcnative-boringssl-static-2.0.12.Final.jar) = 1156667

sysutils/logstash/patches/patch-bin_logstash-plugin

@@ -1,4 +1,4 @@
-$OpenBSD: patch-bin_logstash-plugin,v 1.1 2018/05/17 10:50:12 pvk Exp $
+$OpenBSD: patch-bin_logstash-plugin,v 1.2 2020/02/18 09:29:16 pvk Exp $
 
 Index: bin/logstash-plugin
 --- bin/logstash-plugin.orig
@@ -12,4 +12,4 @@ Index: bin/logstash-plugin
 +
  # bin/logstash-plugin is a short lived ruby script thus we can use aggressive "faster starting JRuby options"
  # see https://github.com/jruby/jruby/wiki/Improving-startup-time
- export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -X-C -Xcompile.invokedynamic=false"
+ export JRUBY_OPTS="${JRUBY_OPTS---dev}"

sysutils/logstash/patches/patch-config_logstash_yml

@@ -1,4 +1,4 @@
-$OpenBSD: patch-config_logstash_yml,v 1.5 2019/12/07 00:06:22 pvk Exp $
+$OpenBSD: patch-config_logstash_yml,v 1.6 2020/02/18 09:29:16 pvk Exp $
 
 Index: config/logstash.yml
 --- config/logstash.yml.orig
@@ -21,7 +21,7 @@ Index: config/logstash.yml
  #
  # ------------ Other Settings --------------
  #
-@@ -215,37 +215,3 @@
+@@ -215,43 +215,3 @@
  # Flag to output log lines of each pipeline in its separate log file. Each log filename contains the pipeline.name
  # Default is false
  # pipeline.separate_logs: false
@@ -34,6 +34,9 @@ Index: config/logstash.yml
 -#xpack.monitoring.elasticsearch.username: logstash_system
 -#xpack.monitoring.elasticsearch.password: password
 -#xpack.monitoring.elasticsearch.hosts: ["https://es1:9200", "https://es2:9200"]
+-# an alternative to hosts + username/password settings is to use cloud_id/cloud_auth
+-#xpack.monitoring.elasticsearch.cloud_id: monitoring_cluster_id:xxxxxxxxxx
+-#xpack.monitoring.elasticsearch.cloud_auth: logstash_system:password
 -#xpack.monitoring.elasticsearch.ssl.certificate_authority: [ "/path/to/ca.crt" ]
 -#xpack.monitoring.elasticsearch.ssl.truststore.path: path/to/file
 -#xpack.monitoring.elasticsearch.ssl.truststore.password: password
@@ -51,6 +54,9 @@ Index: config/logstash.yml
 -#xpack.management.elasticsearch.username: logstash_admin_user
 -#xpack.management.elasticsearch.password: password
 -#xpack.management.elasticsearch.hosts: ["https://es1:9200", "https://es2:9200"]
+-# an alternative to hosts + username/password settings is to use cloud_id/cloud_auth
+-#xpack.management.elasticsearch.cloud_id: management_cluster_id:xxxxxxxxxx
+-#xpack.management.elasticsearch.cloud_auth: logstash_admin_user:password
 -#xpack.management.elasticsearch.ssl.certificate_authority: [ "/path/to/ca.crt" ]
 -#xpack.management.elasticsearch.ssl.truststore.path: /path/to/file
 -#xpack.management.elasticsearch.ssl.truststore.password: password