Index: head/sysutils/beats/Makefile =================================================================== --- head/sysutils/beats/Makefile (revision 477875) +++ head/sysutils/beats/Makefile (revision 477876) @@ -1,57 +1,57 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= beats -PORTVERSION= 6.2.4 -PORTREVISION= 1 +PORTVERSION= 6.3.2 +PORTREVISION= 0 DISTVERSIONPREFIX=v CATEGORIES= sysutils MAINTAINER= elastic@FreeBSD.org COMMENT= Collect logs locally and send to remote logstash LICENSE= APACHE20 USE_GITHUB= yes GH_ACCOUNT= elastic USES= gmake go GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} USE_RC_SUBR= ${GO_TARGETS} OPTIONS_DEFAULT=FILEBEAT PACKETBEAT METRICBEAT HEARTBEAT OPTIONS_SUB= yes OPTIONS_MULTI= BEATS OPTIONS_MULTI_BEATS=${OPTIONS_DEFAULT} FILEBEAT_DESC= Filebeat FILEBEAT_VARS= GO_TARGETS+=filebeat PACKETBEAT_DESC=Packetbeat PACKETBEAT_VARS=GO_TARGETS+=packetbeat METRICBEAT_DESC=Metricbeat METRICBEAT_VARS=GO_TARGETS+=metricbeat HEARTBEAT_DESC= Heartbeat HEARTBEAT_VARS=GO_TARGETS+=heartbeat MAKE_ENV+= GOBUILD_FLAGS="" do-build: @for GO_TARGET in ${GO_TARGETS}; do \ cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C $${GO_TARGET} ;\ done do-install: for GO_TARGET in ${GO_TARGETS}; do \ ${INSTALL_PROGRAM} ${GO_WRKSRC}/$${GO_TARGET}/$${GO_TARGET} \ ${STAGEDIR}${PREFIX}/sbin ;\ ${INSTALL_DATA} ${WRKSRC}/$${GO_TARGET}/$${GO_TARGET}.yml \ ${STAGEDIR}${PREFIX}/etc/$${GO_TARGET}.yml.sample ;\ ${MKDIR} ${STAGEDIR}/var/db/beats/$${GO_TARGET} ;\ done .include Index: head/sysutils/beats/distinfo =================================================================== --- head/sysutils/beats/distinfo (revision 477875) +++ head/sysutils/beats/distinfo (revision 477876) @@ -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 Index: head/sysutils/beats/files/patch-vendor_github.com_elastic_gosigar_sigar__freebsd.go =================================================================== --- head/sysutils/beats/files/patch-vendor_github.com_elastic_gosigar_sigar__freebsd.go (nonexistent) +++ head/sysutils/beats/files/patch-vendor_github.com_elastic_gosigar_sigar__freebsd.go (revision 477876) @@ -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" Property changes on: head/sysutils/beats/files/patch-vendor_github.com_elastic_gosigar_sigar__freebsd.go ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/logstash6/Makefile =================================================================== --- head/sysutils/logstash6/Makefile (revision 477875) +++ head/sysutils/logstash6/Makefile (revision 477876) @@ -1,79 +1,79 @@ # Created by: Daniel Solsona , Guido Falsi # $FreeBSD$ PORTNAME= logstash -PORTVERSION= 6.2.4 +PORTVERSION= 6.3.2 PORTREVISION= 0 CATEGORIES= sysutils java MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/ PKGNAMESUFFIX= 6 MAINTAINER= elastic@FreeBSD.org COMMENT= Server-side data ingest and transfomation tool LICENSE= APACHE20 RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash CONFLICTS= logstash-[0-9]* logstash5-[0-9]* USES= cpe shebangfix SHEBANG_FILES= bin/* CPE_VENDOR= elasticsearch USE_JAVA= yes JAVA_VERSION= 1.8+ JAVA_RUN= yes NO_BUILD= yes USERS= logstash GROUPS= logstash LOGSTASH_DIR= ${PREFIX}/${PORTNAME} USE_RC_SUBR= logstash LOGSTASH_HOME?= ${PREFIX}/${PORTNAME} SUB_LIST= JAVA_HOME=${JAVA_HOME} \ LOGSTASH_HOME=${LOGSTASH_HOME} LOGSTASH_CONF_FILES= jvm.options log4j2.properties logstash.yml pipelines.yml LOGSTASH_JRUBY_SUBDIR= vendor/jruby/bin LOGSTASH_JRUBY_BIN_FILES= ast irb jirb jruby jruby.sh rdoc testrb gem \ jgem jirb_swing jruby.bash jrubyc rake ri post-patch: ${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml ${FIND} ${WRKSRC} -name '*.orig' -delete do-install: ${FIND} ${WRKSRC} -name '*.bat' -delete ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${STAGEDIR}${ETCDIR} .for x in ${LOGSTASH_CONF_FILES} ${INSTALL_DATA} ${WRKSRC}/config/${x} ${STAGEDIR}${ETCDIR}/${x}.sample .endfor ${RM} -rf ${WRKSRC}/config (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOGSTASH_DIR}) ${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/bin/* .for x in ${LOGSTASH_JRUBY_BIN_FILES} ${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/${LOGSTASH_JRUBY_SUBDIR}/${x} .endfor ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${LOGSTASH_DIR}/config post-install: ${ECHO} "@sample ${ETCDIR}/logstash.conf.sample" >> ${TMPPLIST} .for x in ${LOGSTASH_CONF_FILES} ${ECHO} "@sample ${ETCDIR}/${x}.sample" >> ${TMPPLIST} .endfor ${FIND} -s ${STAGEDIR}${PREFIX}/logstash -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST} ${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/build_info" >> ${TMPPLIST} ${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 Index: head/sysutils/logstash6/distinfo =================================================================== --- head/sysutils/logstash6/distinfo (revision 477875) +++ head/sysutils/logstash6/distinfo (revision 477876) @@ -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 Index: head/sysutils/logstash6/files/logstash.in =================================================================== --- head/sysutils/logstash6/files/logstash.in (revision 477875) +++ head/sysutils/logstash6/files/logstash.in (revision 477876) @@ -1,117 +1,121 @@ #!/bin/sh # Configuration settings for logstash in /etc/rc.conf: # # PROVIDE: logstash # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown # # logstash_enable (bool): # Default value: "NO" # Flag that determines whether Logstash is enabled. # # logstash_home (string): # Default value: "/usr/local/logstash" # Logstash installation directory. # # logstash_config (string): # Default value: /usr/local/etc/${name} # Logstash configuration path. # # logstash_log (bool): # Set to "NO" by default. # Set it to "YES" to enable logstash logging to file # Default output to /var/log/logstash.log # # logstash_log_file (string): # Default value: "${logdir}/${name}.log" # Log file path. # # logstash_java_home (string): # Default value: "/usr/local/openjdk8" # Root directory of the desired Java SDK. # The JAVA_HOME environment variable is set with the contents of this # variable. # # logstash_java_opts (string): # Default value: "" # Options to pass to the Java Virtual Machine. # The JAVA_OPTS environment variable is set with the contents of this # variable. # # logstash_opts (string): # Default value: "" # Additional command line flags for logstash, eg. "-r" # . /etc/rc.subr name=logstash rcvar=logstash_enable load_rc_config ${name} logdir="/var/log" : ${logstash_enable="NO"} : ${logstash_user="logstash"} : ${logstash_group="logstash"} : ${logstash_home="%%LOGSTASH_HOME%%"} : ${logstash_config="%%ETCDIR%%"} : ${logstash_log="YES"} : ${logstash_log_dir="${logdir}/${name}"} : ${logstash_java_home="%%JAVA_HOME%%"} : ${logstash_java_opts=""} : ${logstash_opts=""} pidfile=/var/run/${name}/${name}.pid extra_commands="configtest reload" start_precmd="logstash_precmd" configtest_cmd=configtest logstash_cmd="${logstash_home}/bin/logstash" procname="${logstash_java_home}/bin/java" logstash_chdir=${logstash_home} logstash_log_options="" if checkyesno logstash_log; then logstash_log_options=" -l ${logstash_log_dir}" fi logstash_args="--path.settings ${logstash_config} ${logstash_log_options} ${logstash_opts}" JAVA_OPTS="${logstash_java_opts}" JAVA_HOME="${logstash_java_home}" export JAVA_OPTS export JAVA_HOME command="/usr/sbin/daemon" command_args="-f -p ${pidfile} ${logstash_cmd} ${logstash_args}" required_files="${logstash_home} ${logstash_java_home} ${logstash_cmd} ${logstash_config}" # Include /usr/local/bin in path because Logstash startup scripts # assume bash is in path. PATH=/usr/local/bin:$PATH logstash_precmd() { /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 ${pidfile%/*} /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() { echo "${name} configtest:" echo "WARNING: this does not check validity of Grok patterns!" echo "WARNING: this does not check validity of Grok patterns!" echo "WARNING: this does not check validity of Grok patterns!" ${logstash_cmd} --path.settings ${logstash_config} --config.test_and_exit } run_rc_command "$1" Index: head/textproc/elasticsearch6/Makefile =================================================================== --- head/textproc/elasticsearch6/Makefile (revision 477875) +++ head/textproc/elasticsearch6/Makefile (revision 477876) @@ -1,94 +1,97 @@ # Created by: Tom Judge # $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}/ \ http://mirrors.rit.edu/zi/ PKGNAMESUFFIX= 6 MAINTAINER= feld@FreeBSD.org COMMENT= Full-text search engine for Java LICENSE= APACHE20 BUILD_DEPENDS= jna>0:devel/jna RUN_DEPENDS= bash>0:shells/bash \ jna>0:devel/jna CONFLICTS= elasticsearch-[0-9]* elasticsearch2-[0-9]* elasticsearch5-[0-9]* USES= cpe shebangfix NO_ARCH= yes USE_JAVA= yes NO_BUILD= yes JAVA_VERSION= 1.8+ USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= bin/elasticsearch \ bin/elasticsearch-env \ bin/elasticsearch-plugin OPTIONS_DEFINE= DOCS .include CONFIG_FILES= elasticsearch.yml log4j2.properties jvm.options BINS= elasticsearch \ elasticsearch-env \ elasticsearch-plugin PORTDOCS= LICENSE.txt \ NOTICE.txt \ README.textile SIGAR_ARCH= ${ARCH:S|i386|x86|} SEARCHUSER?= elasticsearch SEARCHGROUP?= ${SEARCHUSER} USERS= ${SEARCHUSER} GROUPS= ${SEARCHGROUP} SUB_LIST= ETCDIR=${ETCDIR} JAVA=${JAVA} SUB_FILES= pkg-message 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 .for f in ${CONFIG_FILES} ${INSTALL} ${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 (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar") ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules (cd ${WRKSRC}/modules && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules/) ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/config ${LN} -s ${JAVASHAREDIR}/classes/jna.jar ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/jna.jar do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor post-install: ${ECHO} "@sample ${ETCDIR}/elasticsearch.yml.sample" >> ${TMPPLIST} ${ECHO} "@sample ${ETCDIR}/log4j2.properties.sample" >> ${TMPPLIST} ${ECHO} "@sample ${ETCDIR}/jvm.options.sample" >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${PREFIX}/lib/elasticsearch -not -type d | ${SORT} | \ ${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 Index: head/textproc/elasticsearch6/distinfo =================================================================== --- head/textproc/elasticsearch6/distinfo (revision 477875) +++ head/textproc/elasticsearch6/distinfo (revision 477876) @@ -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 Index: head/textproc/elasticsearch6/files/pkg-message.in =================================================================== --- head/textproc/elasticsearch6/files/pkg-message.in (revision 477875) +++ head/textproc/elasticsearch6/files/pkg-message.in (revision 477876) @@ -1,35 +1,32 @@ ====================================================================== Please see %%ETCDIR%% for sample versions of elasticsearch.yml and logging.yml. ElasticSearch requires memory locking of large amounts of RAM. You may need to set: 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. This is the price we have to pay to protect ourselves in the face of 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 !!! ====================================================================== Index: head/textproc/kibana6/Makefile =================================================================== --- head/textproc/kibana6/Makefile (revision 477875) +++ head/textproc/kibana6/Makefile (revision 477876) @@ -1,46 +1,46 @@ # Created by: Tom Judge # $FreeBSD$ PORTNAME= kibana -PORTVERSION= 6.2.4 +PORTVERSION= 6.3.2 DISTVERSIONSUFFIX= -linux-x86_64 PORTREVISION= 0 CATEGORIES= textproc www MASTER_SITES= https://artifacts.elastic.co/downloads/kibana/ \ http://artifacts.elastic.co/downloads/kibana/ PKGNAMESUFFIX?= 6 MAINTAINER= elastic@FreeBSD.org COMMENT= Browser based analytics and search interface to ElasticSearch LICENSE= APACHE20 -RUN_DEPENDS= node6>=6.12.2:www/node6 +RUN_DEPENDS= node8>=8.11.3:www/node8 CONFLICTS= kibana[3-5]* NO_BUILD= yes WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-deinstall do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample (cd ${WRKSRC} && \ ${RM} -r config node optimize && \ ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config ${CHMOD} +x ${STAGEDIR}${WWWDIR}/bin/* post-install: ${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST} ${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} .include Index: head/textproc/kibana6/distinfo =================================================================== --- head/textproc/kibana6/distinfo (revision 477875) +++ head/textproc/kibana6/distinfo (revision 477876) @@ -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