git: 3803e8815226 - main - sysutils/logstash92: Update 9.2.3 => 9.2.6

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Fri, 13 Mar 2026 20:22:14 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3803e88152265d9ced6d52afeb27db404cbf15ee

commit 3803e88152265d9ced6d52afeb27db404cbf15ee
Author:     Saro <web@saromedia.com>
AuthorDate: 2026-03-13 18:59:12 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-03-13 20:10:28 +0000

    sysutils/logstash92: Update 9.2.3 => 9.2.6
    
    Release Notes:
    https://www.elastic.co/docs/release-notes/logstash#logstash-9.2.6-release-notes
    
    Improve port:
    - Replace PORTVERSION with DISTVERSION.
    - Add LOCAL/vvd/elastic to MASTER_SITES for those who can't download due
      to the HTTP error "Forbidden 403".
    - Sort USES.
    - Adjust JAVA_VERSION to supported LTS 25, 21 and 17.
    - Parametrize "logstash" with "${PORTNAME}".
    - Adjust CONFLICTS.
    - Fix warnings from portclippy.
    - Add possibility to use custom user/group.
    - Replace RM of bundled JDK and *.bat files with
      EXTRACT_AFTER_ARGS=--exclude.
    - Merge CHMODs.
    - Replace %%PREFIX%% with %%LOCALBASE%% in rc.d script - bash installed
      in LOCALBASE.
    
    PR:             293788
    Approved by:    elastic (maintainer, implicit - inactive for more than 6 months)
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
---
 sysutils/logstash92/Makefile          | 52 ++++++++++++++++++-----------------
 sysutils/logstash92/distinfo          |  6 ++--
 sysutils/logstash92/files/logstash.in | 12 ++++----
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/sysutils/logstash92/Makefile b/sysutils/logstash92/Makefile
index 8b9107aa7c64..532e2771948e 100644
--- a/sysutils/logstash92/Makefile
+++ b/sysutils/logstash92/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	logstash
-PORTVERSION=	9.2.3
-PORTREVISION=	1
+DISTVERSION=	9.2.6
 DISTVERSIONSUFFIX=	-darwin-x86_64
 CATEGORIES=	sysutils java
-MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/
+MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/ \
+		LOCAL/vvd/elastic
 PKGNAMESUFFIX=	92
 
 MAINTAINER=	elastic@FreeBSD.org
@@ -14,31 +14,39 @@ LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
-
-USES=		cpe shebangfix java:run
+RUN_DEPENDS=	bash:shells/bash
 
+USES=		cpe java:run shebangfix
 CPE_VENDOR=	elastic
-JAVA_VERSION=	21+
-
-USE_RC_SUBR=	logstash
+JAVA_VERSION=	25 21 17
+USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	bin/*
 
-CONFLICTS=	logstash6 logstash7 logstash8 logstash91
-
-NO_BUILD=	yes
+CONFLICTS=	${PORTNAME}7 ${PORTNAME}8 ${PORTNAME}91 ${PORTNAME}93
 
-PORTSCOUT=	limit:^9\.2\.\d{1}
+EXTRACT_AFTER_ARGS=	--exclude jdk.app \
+			--exclude *.bat \
+			--no-same-owner --no-same-permissions
 
+NO_BUILD=	yes
+PORTSCOUT=	limit:^9\.2\.
 SUB_FILES=	pkg-message
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
-		LOGSTASH_HOME=${LOGSTASH_HOME}
+		LOGSTASH_HOME=${LOGSTASH_HOME} \
+		LOGUSER=${LOGUSER} \
+		LOGGROUP=${LOGGROUP}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-USERS=		logstash
-GROUPS=		logstash
+LOGUSER?=	${PORTNAME}
+LOGGROUP?=	${LOGUSER}
+.if ${LOGUSER} == ${PORTNAME}
+USERS=		${LOGUSER}
+.endif
+.if ${LOGGROUP} == ${PORTNAME}
+GROUPS=		${LOGGROUP}
+.endif
 
 LOGSTASH_CONF_FILES=		jvm.options log4j2.properties logstash.yml \
 				pipelines.yml startup.options
@@ -47,15 +55,11 @@ LOGSTASH_JRUBY_BIN_FILES=	ast gem irb jgem jirb jirb_swing jruby \
 				jruby.sh jrubyc rake rdoc ri
 LOGSTASH_JRUBY_SUBDIR=		vendor/jruby/bin
 
-post-extract:
-	${RM} -rf ${WRKSRC}/jdk.app
-
 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}
@@ -63,10 +67,8 @@ do-install:
 .endfor
 	${RM} -rf ${WRKSRC}/config
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOGSTASH_HOME})
-	${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_HOME}/bin/*
-.for x in ${LOGSTASH_JRUBY_BIN_FILES}
-	${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_HOME}/${LOGSTASH_JRUBY_SUBDIR}/${x}
-.endfor
+	${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_HOME}/bin/* \
+		${LOGSTASH_JRUBY_BIN_FILES:S|^|${STAGEDIR}${LOGSTASH_HOME}/${LOGSTASH_JRUBY_SUBDIR}/|}
 	${FIND} ${STAGEDIR}${LOGSTASH_HOME}/vendor/bundle/jruby/3.1.0/gems \
 	        ${STAGEDIR}${LOGSTASH_HOME}/vendor/bundle/jruby/3.1.0/plugins \
 		${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/ruby/gems/shared/gems \
@@ -85,6 +87,6 @@ post-install:
 	${ECHO} "@dir logstash/vendor/jruby/lib/ruby/gems/shared/cache" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${LOGSTASH_HOME} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
-	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
+	${ECHO} "@dir(${LOGUSER},${LOGGROUP},) logstash/data" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/sysutils/logstash92/distinfo b/sysutils/logstash92/distinfo
index 019e9a4f6f28..401bf2ebe40b 100644
--- a/sysutils/logstash92/distinfo
+++ b/sysutils/logstash92/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1767131393
-SHA256 (logstash-9.2.3-darwin-x86_64.tar.gz) = 2782600895c8200dbebf1e415b5c13045e6121e80643d13970e0aec702b55fde
-SIZE (logstash-9.2.3-darwin-x86_64.tar.gz) = 425330726
+TIMESTAMP = 1773064008
+SHA256 (logstash-9.2.6-darwin-x86_64.tar.gz) = dc0eed7ee53318e1c73c963e1ed45da0b5893cc70a210e10a0a6b7fc81b49bd4
+SIZE (logstash-9.2.6-darwin-x86_64.tar.gz) = 435342490
diff --git a/sysutils/logstash92/files/logstash.in b/sysutils/logstash92/files/logstash.in
index 2346410b0cc3..ba42ae85f5b3 100644
--- a/sysutils/logstash92/files/logstash.in
+++ b/sysutils/logstash92/files/logstash.in
@@ -12,11 +12,11 @@
 #   Flag that determines whether Logstash is enabled.
 #
 # logstash_home (string):
-#   Default value: "/usr/local/logstash"
+#   Default value: "%%LOGSTASH_HOME%%"
 #   Logstash installation directory.
 #
 # logstash_config (string):
-#   Default value: /usr/local/etc/${name}
+#   Default value: "%%ETCDIR%%"
 #   Logstash configuration path.
 #
 # logstash_log (bool):
@@ -54,8 +54,8 @@ load_rc_config ${name}
 logdir="/var/log"
 
 : ${logstash_enable="NO"}
-: ${logstash_user="logstash"}
-: ${logstash_group="logstash"}
+: ${logstash_user="%%LOGUSER%%"}
+: ${logstash_group="%%LOGGROUP%%"}
 : ${logstash_home="%%LOGSTASH_HOME%%"}
 : ${logstash_config="%%ETCDIR%%"}
 : ${logstash_log="YES"}
@@ -91,9 +91,9 @@ 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 %%PREFIX%%/bin in path because Logstash startup scripts
+# Include %%LOCALBASE%%/bin in path because Logstash startup scripts
 # assume bash is in path.
-PATH=%%PREFIX%%/bin:$PATH
+PATH=%%LOCALBASE%%/bin:$PATH
 
 logstash_precmd()
 {