From owner-svn-ports-all@freebsd.org Sun Nov 4 16:58:34 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6F9010DCC2E; Sun, 4 Nov 2018 16:58:34 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1F45A79E06; Sun, 4 Nov 2018 16:58:34 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 004F7388D; Sun, 4 Nov 2018 16:58:34 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA4GwXwI031219; Sun, 4 Nov 2018 16:58:33 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4GwVFk031207; Sun, 4 Nov 2018 16:58:31 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201811041658.wA4GwVFk031207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 4 Nov 2018 16:58:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484109 - in head: sysutils/beats sysutils/logstash6 textproc/elasticsearch6 textproc/elasticsearch6/files textproc/kibana6 textproc/kibana6/files X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head: sysutils/beats sysutils/logstash6 textproc/elasticsearch6 textproc/elasticsearch6/files textproc/kibana6 textproc/kibana6/files X-SVN-Commit-Revision: 484109 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1F45A79E06 X-Spamd-Result: default: False [-0.22 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.11)[-0.108,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2018 16:58:34 -0000 Author: feld Date: Sun Nov 4 16:58:30 2018 New Revision: 484109 URL: https://svnweb.freebsd.org/changeset/ports/484109 Log: ElasticSearch6: Update to 6.4.2 Added: head/textproc/kibana6/files/patch-config_kibana.yml (contents, props changed) head/textproc/kibana6/files/patch-src_setup__node__env_index.js (contents, props changed) Modified: head/sysutils/beats/Makefile head/sysutils/beats/distinfo head/sysutils/logstash6/Makefile head/sysutils/logstash6/distinfo head/textproc/elasticsearch6/Makefile head/textproc/elasticsearch6/distinfo head/textproc/elasticsearch6/files/patch-config_elasticsearch.yml head/textproc/kibana6/Makefile head/textproc/kibana6/distinfo head/textproc/kibana6/files/kibana.in Modified: head/sysutils/beats/Makefile ============================================================================== --- head/sysutils/beats/Makefile Sun Nov 4 16:24:08 2018 (r484108) +++ head/sysutils/beats/Makefile Sun Nov 4 16:58:30 2018 (r484109) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= beats -PORTVERSION= 6.3.2 +PORTVERSION= 6.4.2 PORTREVISION= 0 DISTVERSIONPREFIX=v CATEGORIES= sysutils Modified: head/sysutils/beats/distinfo ============================================================================== --- head/sysutils/beats/distinfo Sun Nov 4 16:24:08 2018 (r484108) +++ head/sysutils/beats/distinfo Sun Nov 4 16:58:30 2018 (r484109) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533488588 -SHA256 (elastic-beats-v6.3.2_GH0.tar.gz) = 2eb116df314ab780f75da928ac41f379c677b5251a584b04e99817190f95d1ed -SIZE (elastic-beats-v6.3.2_GH0.tar.gz) = 20923316 +TIMESTAMP = 1541266718 +SHA256 (elastic-beats-v6.4.2_GH0.tar.gz) = 815e7f03de1cae3cffe8893ecf9b90b46e073641e93319bab3ca863cba75fbda +SIZE (elastic-beats-v6.4.2_GH0.tar.gz) = 21993305 Modified: head/sysutils/logstash6/Makefile ============================================================================== --- head/sysutils/logstash6/Makefile Sun Nov 4 16:24:08 2018 (r484108) +++ head/sysutils/logstash6/Makefile Sun Nov 4 16:58:30 2018 (r484109) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= logstash -PORTVERSION= 6.3.2 +PORTVERSION= 6.4.2 PORTREVISION= 0 CATEGORIES= sysutils java MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/ Modified: head/sysutils/logstash6/distinfo ============================================================================== --- head/sysutils/logstash6/distinfo Sun Nov 4 16:24:08 2018 (r484108) +++ head/sysutils/logstash6/distinfo Sun Nov 4 16:58:30 2018 (r484109) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533488339 -SHA256 (logstash-6.3.2.tar.gz) = b9498b7e9475883539f87523df2b4d1adb19412c50745156f8a591ade285a97b -SIZE (logstash-6.3.2.tar.gz) = 144211416 +TIMESTAMP = 1541266705 +SHA256 (logstash-6.4.2.tar.gz) = 8c0a0d45df6485c71eebde5272ac53136fdde772bac7fab65a273d76a54ddc35 +SIZE (logstash-6.4.2.tar.gz) = 153924169 Modified: head/textproc/elasticsearch6/Makefile ============================================================================== --- head/textproc/elasticsearch6/Makefile Sun Nov 4 16:24:08 2018 (r484108) +++ head/textproc/elasticsearch6/Makefile Sun Nov 4 16:58:30 2018 (r484109) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch -PORTVERSION= 6.3.2 +PORTVERSION= 6.4.2 PORTREVISION= 0 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ Modified: head/textproc/elasticsearch6/distinfo ============================================================================== --- head/textproc/elasticsearch6/distinfo Sun Nov 4 16:24:08 2018 (r484108) +++ head/textproc/elasticsearch6/distinfo Sun Nov 4 16:58:30 2018 (r484109) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533481811 -SHA256 (elasticsearch-6.3.2.tar.gz) = d05608c6b125df4fb6c809f9c1dd457e369e6b582c2958c52da95e01cc54c024 -SIZE (elasticsearch-6.3.2.tar.gz) = 91452574 +TIMESTAMP = 1541260799 +SHA256 (elasticsearch-6.4.2.tar.gz) = 32a9c0305faed1cbd4e22c85a8c333ca2b6704f1d0006e92709fada10cec3f45 +SIZE (elasticsearch-6.4.2.tar.gz) = 97914519 Modified: head/textproc/elasticsearch6/files/patch-config_elasticsearch.yml ============================================================================== --- head/textproc/elasticsearch6/files/patch-config_elasticsearch.yml Sun Nov 4 16:24:08 2018 (r484108) +++ head/textproc/elasticsearch6/files/patch-config_elasticsearch.yml Sun Nov 4 16:58:30 2018 (r484109) @@ -1,4 +1,4 @@ ---- config/elasticsearch.yml.orig 2018-02-16 18:57:55 UTC +--- config/elasticsearch.yml.orig 2018-09-26 13:30:23 UTC +++ config/elasticsearch.yml @@ -31,10 +31,12 @@ # Path to directory where to store the data (separate multiple locations by comma): @@ -13,3 +13,10 @@ # # ----------------------------------- Memory ----------------------------------- # +@@ -86,3 +88,6 @@ + # Require explicit names when deleting indices: + # + #action.destructive_requires_name: true ++ ++# ml is not supported on FreeBSD ++xpack.ml.enabled: false Modified: head/textproc/kibana6/Makefile ============================================================================== --- head/textproc/kibana6/Makefile Sun Nov 4 16:24:08 2018 (r484108) +++ head/textproc/kibana6/Makefile Sun Nov 4 16:58:30 2018 (r484109) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= kibana -PORTVERSION= 6.3.2 +PORTVERSION= 6.4.2 DISTVERSIONSUFFIX= -linux-x86_64 PORTREVISION= 0 CATEGORIES= textproc www @@ -25,6 +25,9 @@ USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-deinstall +post-patch: + ${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete + do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample @@ -39,7 +42,6 @@ post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST} - ${ECHO} "@dir ${WWWDIR}/node_modules/@elastic/numeral/src" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/src/ui/public/factories" >> ${TMPPLIST} Modified: head/textproc/kibana6/distinfo ============================================================================== --- head/textproc/kibana6/distinfo Sun Nov 4 16:24:08 2018 (r484108) +++ head/textproc/kibana6/distinfo Sun Nov 4 16:58:30 2018 (r484109) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533489803 -SHA256 (kibana-6.3.2-linux-x86_64.tar.gz) = 605bf5e991d206b5b2799ef5210644c50192cad6a239662a8674d57fdf3b69ce -SIZE (kibana-6.3.2-linux-x86_64.tar.gz) = 205331616 +TIMESTAMP = 1541260848 +SHA256 (kibana-6.4.2-linux-x86_64.tar.gz) = f3a69709171ea8e28da754578ec519f33c423d3e3cbed6e81381f14cb8517383 +SIZE (kibana-6.4.2-linux-x86_64.tar.gz) = 188077286 Modified: head/textproc/kibana6/files/kibana.in ============================================================================== --- head/textproc/kibana6/files/kibana.in Sun Nov 4 16:24:08 2018 (r484108) +++ head/textproc/kibana6/files/kibana.in Sun Nov 4 16:58:30 2018 (r484109) @@ -22,6 +22,9 @@ load_rc_config $name export BABEL_DISABLE_CACHE=1 export NODE_ENV=production +# ml and reporting modules not supported on FreeBSD +export XPACK_ML_ENABLED=false +export XPACK_REPORTING_ENABLED=false required_files="${kibana_config}" pidfile="/var/run/${name}/${name}.pid" Added: head/textproc/kibana6/files/patch-config_kibana.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/kibana6/files/patch-config_kibana.yml Sun Nov 4 16:58:30 2018 (r484109) @@ -0,0 +1,10 @@ +--- config/kibana.yml.orig 2018-11-04 16:33:12 UTC ++++ config/kibana.yml +@@ -112,3 +112,7 @@ + # The default locale. This locale can be used in certain circumstances to substitute any missing + # translations. + #i18n.defaultLocale: "en" ++ ++# ml and reporting are not supported on FreeBSD ++xpack.ml.enabled: false ++xpack.reporting.enabled: false Added: head/textproc/kibana6/files/patch-src_setup__node__env_index.js ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/kibana6/files/patch-src_setup__node__env_index.js Sun Nov 4 16:58:30 2018 (r484109) @@ -0,0 +1,11 @@ +--- src/setup_node_env/index.js.orig 2018-11-04 14:48:57 UTC ++++ src/setup_node_env/index.js +@@ -19,5 +19,5 @@ + * under the License. + */ + +-require('./node_version_validator'); +-require('./babel_register'); +\ No newline at end of file ++//require('./node_version_validator'); ++require('./babel_register');