diff --git a/textproc/elasticsearch8/Makefile b/textproc/elasticsearch8/Makefile index 1adc4736af2f..fa00020b5734 100644 --- a/textproc/elasticsearch8/Makefile +++ b/textproc/elasticsearch8/Makefile @@ -1,133 +1,133 @@ PORTNAME= elasticsearch -PORTVERSION= 8.6.2 +PORTVERSION= 8.7.0 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ PKGNAMESUFFIX= 8 DISTNAME= ${PORTNAME}-${PORTVERSION}-darwin-x86_64 MAINTAINER= elastic@FreeBSD.org COMMENT= Distributed, RESTful search and analytics engine WWW= https://www.elastic.co/ LICENSE= APACHE20 BUILD_DEPENDS= jna>0:devel/jna RUN_DEPENDS= bash:shells/bash \ jna>0:devel/jna USES= cpe shebangfix USE_JAVA= yes JAVA_VERSION= 17+ USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= bin/elasticsearch bin/elasticsearch-certgen \ bin/elasticsearch-certutil bin/elasticsearch-cli \ bin/elasticsearch-create-enrollment-token \ bin/elasticsearch-croneval bin/elasticsearch-env \ bin/elasticsearch-env-from-file bin/elasticsearch-geoip \ bin/elasticsearch-keystore bin/elasticsearch-node \ bin/elasticsearch-plugin bin/elasticsearch-reconfigure-node \ bin/elasticsearch-reset-password \ bin/elasticsearch-saml-metadata \ bin/elasticsearch-service-tokens \ bin/elasticsearch-setup-passwords bin/elasticsearch-shard \ bin/elasticsearch-sql-cli bin/elasticsearch-syskeygen \ bin/elasticsearch-users CONFLICTS= elasticsearch6 elasticsearch7 NO_ARCH= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= DOCS .include CONFIG_FILES= elasticsearch.yml jvm.options log4j2.properties \ role_mapping.yml roles.yml BINS= elasticsearch elasticsearch-certgen elasticsearch-certutil \ elasticsearch-cli elasticsearch-create-enrollment-token \ elasticsearch-croneval elasticsearch-env \ elasticsearch-env-from-file elasticsearch-geoip \ elasticsearch-keystore elasticsearch-node elasticsearch-plugin \ elasticsearch-reconfigure-node elasticsearch-reset-password \ elasticsearch-saml-metadata elasticsearch-service-tokens \ elasticsearch-setup-passwords elasticsearch-shard \ elasticsearch-sql-cli elasticsearch-sql-cli-${PORTVERSION}.jar \ elasticsearch-syskeygen elasticsearch-users PORTDOCS= LICENSE.txt NOTICE.txt README.asciidoc SIGAR_ARCH= ${ARCH:S|i386|x86|} SEARCHUSER?= elasticsearch SEARCHGROUP?= ${SEARCHUSER} USERS= ${SEARCHUSER} GROUPS= ${SEARCHGROUP} PORTSCOUT= limit:^8 SUB_FILES= pkg-message SUB_LIST= ETCDIR=${ETCDIR} \ JAVA_HOME=${JAVA_HOME} \ BINDIR=${PREFIX}/bin post-extract: ${RM} -rf ${WRKSRC}/jdk.app post-patch: ${RM} ${WRKSRC}/lib/jna-*.jar # ML plugin not supported on FreeBSD ${RM} -rf ${WRKSRC}/modules/x-pack/x-pack-ml ${RM} -rf ${WRKSRC}/jdk.app ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/bin/elasticsearch-env do-install: ${INSTALL} -d -m 0750 ${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 ${RLN} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f} ${ECHO_CMD} "bin/${f}" >> ${TMPPLIST} .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-0.0.0.jar ${TOUCH} ${STAGEDIR}${ETCDIR}/users.sample ${STAGEDIR}${ETCDIR}/users_roles.sample 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}/jvm.options.sample" >> ${TMPPLIST} ${ECHO} "@sample ${ETCDIR}/log4j2.properties.sample" >> ${TMPPLIST} ${ECHO} "@sample ${ETCDIR}/role_mapping.yml.sample" >> ${TMPPLIST} ${ECHO} "@sample ${ETCDIR}/roles.yml.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(${SEARCHUSER},${SEARCHGROUP},0755) ${ETCDIR}" >> ${TMPPLIST} ${ECHO} "@owner ${SEARCHUSER}" >> ${TMPPLIST} ${ECHO} "@group ${SEARCHGROUP}" >> ${TMPPLIST} ${ECHO} "@mode 0640" >> ${TMPPLIST} ${ECHO} "@sample ${ETCDIR}/users.sample" >> ${TMPPLIST} ${ECHO} "@sample ${ETCDIR}/users_roles.sample" >> ${TMPPLIST} ${ECHO} "@mode" >> ${TMPPLIST} ${ECHO} "@owner" >> ${TMPPLIST} ${ECHO} "@group" >> ${TMPPLIST} .include diff --git a/textproc/elasticsearch8/distinfo b/textproc/elasticsearch8/distinfo index 216db6e067b4..d070c17e513a 100644 --- a/textproc/elasticsearch8/distinfo +++ b/textproc/elasticsearch8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677239595 -SHA256 (elasticsearch-8.6.2-darwin-x86_64.tar.gz) = c058f115fd66fc74bada41d1a721db52cdc421c80e218854d4f33c486eb8558a -SIZE (elasticsearch-8.6.2-darwin-x86_64.tar.gz) = 394616903 +TIMESTAMP = 1682975761 +SHA256 (elasticsearch-8.7.0-darwin-x86_64.tar.gz) = 547583578747a83c1198bcd0fbb81e4c05c53fbbe29019e58d6f91426740cbff +SIZE (elasticsearch-8.7.0-darwin-x86_64.tar.gz) = 406549735 diff --git a/textproc/elasticsearch8/files/patch-config_elasticsearch.yml b/textproc/elasticsearch8/files/patch-config_elasticsearch.yml index e0bff4afd738..7a6253412e30 100644 --- a/textproc/elasticsearch8/files/patch-config_elasticsearch.yml +++ b/textproc/elasticsearch8/files/patch-config_elasticsearch.yml @@ -1,25 +1,23 @@ ---- config/elasticsearch.yml.orig 2022-11-17 18:55:38 UTC +--- config/elasticsearch.yml.orig 2023-05-01 21:34:56 UTC +++ config/elasticsearch.yml -@@ -31,10 +31,12 @@ +@@ -30,11 +30,11 @@ + # # Path to directory where to store the data (separate multiple locations by comma): # - #path.data: /path/to/data +-#path.data: /path/to/data +path.data: /var/db/elasticsearch # # Path to log files: # - #path.logs: /path/to/logs -+path.logs: /var/log/elasticsearch +-#path.logs: /path/to/logs ++path.logs: /var/run/elasticsearch # # ----------------------------------- Memory ----------------------------------- # -@@ -80,6 +82,9 @@ - # Enable an unauthenticated TCP readiness endpoint on localhost +@@ -80,3 +80,6 @@ + # Allow wildcard deletion of indices: # - #readiness.port: 9399 -+ + #action.destructive_requires_name: false ++# +# ml is not supported on FreeBSD +xpack.ml.enabled: false - # - # ---------------------------------- Various ----------------------------------- - #