Date: Thu, 12 Mar 2026 22:47:25 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d14dde28e8db - main - textproc/elasticsearch7: Update 7.17.11 => 7.17.29, deprecate Message-ID: <69b3427d.1a1c3.14cca2d8@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d14dde28e8db9bf65aba5a067df1c466e93bc870 commit d14dde28e8db9bf65aba5a067df1c466e93bc870 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2026-03-12 22:44:44 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-03-12 22:47:01 +0000 textproc/elasticsearch7: Update 7.17.11 => 7.17.29, deprecate Release Notes: https://www.elastic.co/guide/en/elasticsearch/reference/7.17/es-release-notes.html - Replace PORTVERSION with DISTVERSION. - Add LOCAL/vvd/elastic to MASTER_SITES for those who can't download due to the HTTP error "Forbidden 403". - Deprecate with date 2026-06-30 due to 7.x reached EoL on 15 Jan 2026. - Limit JAVA_VERSION to supported 21, 17, 11 and 8. - Parametrize "logstash" with "${PORTNAME}". - Adjust CONFLICTS. - Fix warnings from portclippy. - Fix possibility to use custom user/group. - Remove unnecessary ".include <bsd.port.options.mk>" and variable SIGAR_ARCH. - Merge MKDIRs, INSTALL_SCRIPTs, INSTALL_DATAs. PR: 293746 Approved by: elastic (maintainer, implicit - inactive for more than 6 months) MFH: 2026Q1 --- textproc/elasticsearch7/Makefile | 66 +++++++++++++++++++--------------------- textproc/elasticsearch7/distinfo | 6 ++-- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/textproc/elasticsearch7/Makefile b/textproc/elasticsearch7/Makefile index f0dae5d03174..0128d84994b4 100644 --- a/textproc/elasticsearch7/Makefile +++ b/textproc/elasticsearch7/Makefile @@ -1,10 +1,10 @@ PORTNAME= elasticsearch -PORTVERSION= 7.17.11 -PORTREVISION= 1 +DISTVERSION= 7.17.29 CATEGORIES= textproc java devel -MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ +MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ + LOCAL/vvd/elastic PKGNAMESUFFIX= 7 -DISTNAME= ${PORTNAME}-${PORTVERSION}-darwin-x86_64 +DISTNAME= ${PORTNAME}-${DISTVERSION}-darwin-x86_64 MAINTAINER= elastic@FreeBSD.org COMMENT= Full-text search engine for Java @@ -12,12 +12,15 @@ WWW= https://www.elastic.co/ LICENSE= APACHE20 +DEPRECATED= 7.x reached EoL on 15 Jan 2026 - use textproc/elasticsearch8 or textproc/elasticsearch9* +EXPIRATION_DATE= 2026-06-30 + BUILD_DEPENDS= jna>0:devel/jna RUN_DEPENDS= bash>0:shells/bash \ jna>0:devel/jna USES= cpe java shebangfix -JAVA_VERSION= 11+ +JAVA_VERSION= 21 17 11 8 USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= bin/elasticsearch bin/elasticsearch-certgen \ @@ -31,17 +34,29 @@ SHEBANG_FILES= bin/elasticsearch bin/elasticsearch-certgen \ bin/elasticsearch-users bin/x-pack-env bin/x-pack-security-env \ bin/x-pack-watcher-env -CONFLICTS= elasticsearch6 +CONFLICTS= ${PORTNAME}8 ${PORTNAME}9* NO_ARCH= yes NO_BUILD= yes PORTSCOUT= limit:^7 +SUB_FILES= pkg-message +SUB_LIST= ETCDIR=${ETCDIR} \ + JAVA_HOME=${JAVA_HOME} -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -OPTIONS_DEFINE= DOCS +SEARCHUSER?= ${PORTNAME} +SEARCHGROUP?= ${SEARCHUSER} +.if ${SEARCHUSER} == ${PORTNAME} +USERS= ${SEARCHUSER} +.endif +.if ${SEARCHGROUP} == ${PORTNAME} +GROUPS= ${SEARCHGROUP} +.endif + +PORTDOCS= LICENSE.txt NOTICE.txt README.asciidoc -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS CONFIG_FILES= elasticsearch.yml jvm.options log4j2.properties \ role_mapping.yml roles.yml @@ -51,22 +66,10 @@ BINS= elasticsearch elasticsearch-certgen elasticsearch-certutil \ elasticsearch-migrate elasticsearch-node elasticsearch-plugin \ elasticsearch-saml-metadata elasticsearch-setup-passwords \ elasticsearch-shard elasticsearch-sql-cli \ - elasticsearch-sql-cli-${PORTVERSION}.jar \ + elasticsearch-sql-cli-${DISTVERSION}.jar \ elasticsearch-syskeygen elasticsearch-users x-pack-env \ x-pack-security-env x-pack-watcher-env -PORTDOCS= LICENSE.txt NOTICE.txt README.asciidoc - -SIGAR_ARCH= ${ARCH:S|i386|x86|} -SEARCHUSER?= elasticsearch -SEARCHGROUP?= ${SEARCHUSER} -USERS= ${SEARCHUSER} -GROUPS= ${SEARCHGROUP} - -SUB_FILES= pkg-message -SUB_LIST= ETCDIR=${ETCDIR} \ - JAVA_HOME=${JAVA_HOME} - post-patch: ${RM} ${WRKSRC}/lib/jna-*.jar # ML plugin not supported on FreeBSD @@ -74,29 +77,22 @@ post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/bin/elasticsearch-env do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch \ + ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin \ + ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins \ + ${STAGEDIR}${PREFIX}/libexec/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 + ${INSTALL_SCRIPT} ${BINS:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin (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 do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} -.endfor + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install: ${ECHO} "@sample ${ETCDIR}/elasticsearch.yml.sample" >> ${TMPPLIST} diff --git a/textproc/elasticsearch7/distinfo b/textproc/elasticsearch7/distinfo index da38fa1b9d9d..0ef43e2f51b3 100644 --- a/textproc/elasticsearch7/distinfo +++ b/textproc/elasticsearch7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688929601 -SHA256 (elasticsearch-7.17.11-darwin-x86_64.tar.gz) = 1b28b9a314a99cc46ae90fc883245be8309abc9b4e9b8188570d374a9a9fd4ac -SIZE (elasticsearch-7.17.11-darwin-x86_64.tar.gz) = 311351017 +TIMESTAMP = 1773333333 +SHA256 (elasticsearch-7.17.29-darwin-x86_64.tar.gz) = bda312f74f0f691d5e4090fed7283c5a2f8609316bdcb9ebdc2671ecc7663ae2 +SIZE (elasticsearch-7.17.29-darwin-x86_64.tar.gz) = 317608172home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b3427d.1a1c3.14cca2d8>