Date: Thu, 23 Aug 2018 16:27:12 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477876 - in head: sysutils/beats sysutils/beats/files sysutils/logstash6 sysutils/logstash6/files textproc/elasticsearch6 textproc/elasticsearch6/files textproc/kibana6 Message-ID: <201808231627.w7NGRCEK010902@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Thu Aug 23 16:27:11 2018 New Revision: 477876 URL: https://svnweb.freebsd.org/changeset/ports/477876 Log: ElasticSearch: Update to 6.3.2 Differential Revision: https://reviews.freebsd.org/D16597 Added: head/sysutils/beats/files/patch-vendor_github.com_elastic_gosigar_sigar__freebsd.go (contents, props changed) Modified: head/sysutils/beats/Makefile head/sysutils/beats/distinfo head/sysutils/logstash6/Makefile head/sysutils/logstash6/distinfo head/sysutils/logstash6/files/logstash.in head/textproc/elasticsearch6/Makefile head/textproc/elasticsearch6/distinfo head/textproc/elasticsearch6/files/pkg-message.in head/textproc/kibana6/Makefile head/textproc/kibana6/distinfo Modified: head/sysutils/beats/Makefile ============================================================================== --- head/sysutils/beats/Makefile Thu Aug 23 14:43:41 2018 (r477875) +++ head/sysutils/beats/Makefile Thu Aug 23 16:27:11 2018 (r477876) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= beats -PORTVERSION= 6.2.4 -PORTREVISION= 1 +PORTVERSION= 6.3.2 +PORTREVISION= 0 DISTVERSIONPREFIX=v CATEGORIES= sysutils Modified: head/sysutils/beats/distinfo ============================================================================== --- head/sysutils/beats/distinfo Thu Aug 23 14:43:41 2018 (r477875) +++ head/sysutils/beats/distinfo Thu Aug 23 16:27:11 2018 (r477876) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525976251 -SHA256 (elastic-beats-v6.2.4_GH0.tar.gz) = 87d863cf55863329ca80e76c3d813af2960492f4834d4fea919f1d4b49aaf699 -SIZE (elastic-beats-v6.2.4_GH0.tar.gz) = 19466271 +TIMESTAMP = 1533488588 +SHA256 (elastic-beats-v6.3.2_GH0.tar.gz) = 2eb116df314ab780f75da928ac41f379c677b5251a584b04e99817190f95d1ed +SIZE (elastic-beats-v6.3.2_GH0.tar.gz) = 20923316 Added: head/sysutils/beats/files/patch-vendor_github.com_elastic_gosigar_sigar__freebsd.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/files/patch-vendor_github.com_elastic_gosigar_sigar__freebsd.go Thu Aug 23 16:27:11 2018 (r477876) @@ -0,0 +1,10 @@ +--- vendor/github.com/elastic/gosigar/sigar_freebsd.go.orig 2018-08-05 17:40:01 UTC ++++ vendor/github.com/elastic/gosigar/sigar_freebsd.go +@@ -4,6 +4,7 @@ package gosigar + + import ( + "io/ioutil" ++ "runtime" + "strconv" + "strings" + "unsafe" Modified: head/sysutils/logstash6/Makefile ============================================================================== --- head/sysutils/logstash6/Makefile Thu Aug 23 14:43:41 2018 (r477875) +++ head/sysutils/logstash6/Makefile Thu Aug 23 16:27:11 2018 (r477876) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= logstash -PORTVERSION= 6.2.4 +PORTVERSION= 6.3.2 PORTREVISION= 0 CATEGORIES= sysutils java MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/ @@ -73,7 +73,7 @@ post-install: ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/cache" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/doc" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/extensions" >> ${TMPPLIST} - ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/gems/manticore-0.6.1-java/spec/ssl" >> ${TMPPLIST} + ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/gems/manticore-0.6.4-java/spec/ssl" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/gems/redis-3.3.5/test/db" >> ${TMPPLIST} .include <bsd.port.mk> Modified: head/sysutils/logstash6/distinfo ============================================================================== --- head/sysutils/logstash6/distinfo Thu Aug 23 14:43:41 2018 (r477875) +++ head/sysutils/logstash6/distinfo Thu Aug 23 16:27:11 2018 (r477876) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525976336 -SHA256 (logstash-6.2.4.tar.gz) = 4040c2b6a1e9c6908b12885659021a35dca415c6b884cef6938fcc589e94431e -SIZE (logstash-6.2.4.tar.gz) = 147224408 +TIMESTAMP = 1533488339 +SHA256 (logstash-6.3.2.tar.gz) = b9498b7e9475883539f87523df2b4d1adb19412c50745156f8a591ade285a97b +SIZE (logstash-6.3.2.tar.gz) = 144211416 Modified: head/sysutils/logstash6/files/logstash.in ============================================================================== --- head/sysutils/logstash6/files/logstash.in Thu Aug 23 14:43:41 2018 (r477875) +++ head/sysutils/logstash6/files/logstash.in Thu Aug 23 16:27:11 2018 (r477876) @@ -102,6 +102,10 @@ logstash_precmd() /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 ${logstash_log_dir} /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 /var/db/logstash /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 /var/run/logstash + + if [ -d ${logstash_home}/data/queue ]; then + chown ${logstash_user}:${logstash_group} ${logstash_home}/data/queue + fi } configtest() Modified: head/textproc/elasticsearch6/Makefile ============================================================================== --- head/textproc/elasticsearch6/Makefile Thu Aug 23 14:43:41 2018 (r477875) +++ head/textproc/elasticsearch6/Makefile Thu Aug 23 16:27:11 2018 (r477876) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elasticsearch -PORTVERSION= 6.2.4 +PORTVERSION= 6.3.2 PORTREVISION= 0 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ @@ -56,6 +56,8 @@ post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch ${RM} ${WRKSRC}/lib/jna-*.jar + # ML plugin not supported on FreeBSD + ${RM} -rf ${WRKSRC}/modules/x-pack/x-pack-ml do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch @@ -90,5 +92,6 @@ post-install: ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir lib/elasticsearch/plugins" >> ${TMPPLIST} ${ECHO} "@dir libexec/elasticsearch" >> ${TMPPLIST} + ${ECHO} "@dir(elasticsearch,elasticsearch,0755) ${ETCDIR}" >> ${TMPPLIST} .include <bsd.port.mk> Modified: head/textproc/elasticsearch6/distinfo ============================================================================== --- head/textproc/elasticsearch6/distinfo Thu Aug 23 14:43:41 2018 (r477875) +++ head/textproc/elasticsearch6/distinfo Thu Aug 23 16:27:11 2018 (r477876) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525976955 -SHA256 (elasticsearch-6.2.4.tar.gz) = 91e6f1ea1e1dd39011e7a703d2751ca46ee374665b08b0bfe17e0c0c27000e8e -SIZE (elasticsearch-6.2.4.tar.gz) = 29056810 +TIMESTAMP = 1533481811 +SHA256 (elasticsearch-6.3.2.tar.gz) = d05608c6b125df4fb6c809f9c1dd457e369e6b582c2958c52da95e01cc54c024 +SIZE (elasticsearch-6.3.2.tar.gz) = 91452574 Modified: head/textproc/elasticsearch6/files/pkg-message.in ============================================================================== --- head/textproc/elasticsearch6/files/pkg-message.in Thu Aug 23 14:43:41 2018 (r477875) +++ head/textproc/elasticsearch6/files/pkg-message.in Thu Aug 23 16:27:11 2018 (r477876) @@ -10,12 +10,12 @@ sysctl security.bsd.unprivileged_mlock=1 !!! PLUGINS NOTICE !!! -ElasticSearch plugins such as X-Pack should only be installed via the -elasticsearch-plugin script included with this software. As we strive -to provide a minimum semblance of security, the files installed by -the package are owned by root:wheel. This is different than upstream -which expects all of the files to be owned by the user and for you to -execute the elasticsearch-plugin script as said user. +ElasticSearch plugins should only be installed via the elasticsearch-plugin +included with this software. As we strive to provide a minimum semblance +of security, the files installed by the package are owned by root:wheel. +This is different than upstream hich expects all of the files to be +owned by the user and for you to execute the elasticsearch-plugin script +as said user. You will encounter permissions errors with configuration files and directories created by plugins which you will have to manually correct. @@ -24,11 +24,8 @@ a poorly designed security model. e.g., after installing X-Pack you will have to correct: -%%ETCDIR%%/elasticsearch.keystore file to be owned by root:elasticsearch -%%ETCDIR%%/x-pack directory/files to be owned by root:elasticsearch - -Also you need to add "xpack.ml.enabled: false" to your elasticsearch.yml -configuration as this plugin does not support FreeBSD. +%%ETCDIR%%/elasticsearch.keystore file to be owned by elasticsearch:elasticsearch +%%ETCDIR%%/x-pack directory/files to be owned by elasticsearch:elasticsearch !!! PLUGINS NOTICE !!! Modified: head/textproc/kibana6/Makefile ============================================================================== --- head/textproc/kibana6/Makefile Thu Aug 23 14:43:41 2018 (r477875) +++ head/textproc/kibana6/Makefile Thu Aug 23 16:27:11 2018 (r477876) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= kibana -PORTVERSION= 6.2.4 +PORTVERSION= 6.3.2 DISTVERSIONSUFFIX= -linux-x86_64 PORTREVISION= 0 CATEGORIES= textproc www @@ -15,7 +15,7 @@ COMMENT= Browser based analytics and search interface LICENSE= APACHE20 -RUN_DEPENDS= node6>=6.12.2:www/node6 +RUN_DEPENDS= node8>=8.11.3:www/node8 CONFLICTS= kibana[3-5]* Modified: head/textproc/kibana6/distinfo ============================================================================== --- head/textproc/kibana6/distinfo Thu Aug 23 14:43:41 2018 (r477875) +++ head/textproc/kibana6/distinfo Thu Aug 23 16:27:11 2018 (r477876) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525977011 -SHA256 (kibana-6.2.4-linux-x86_64.tar.gz) = 53fb5ddcb3055209f8e3dffcad62d24bdbdedbe8e2f66c1773bac4a1f8b629af -SIZE (kibana-6.2.4-linux-x86_64.tar.gz) = 85348919 +TIMESTAMP = 1533489803 +SHA256 (kibana-6.3.2-linux-x86_64.tar.gz) = 605bf5e991d206b5b2799ef5210644c50192cad6a239662a8674d57fdf3b69ce +SIZE (kibana-6.3.2-linux-x86_64.tar.gz) = 205331616
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808231627.w7NGRCEK010902>