Date: Fri, 13 Mar 2026 16:12:28 +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: f5c624428d6d - main - sysutils/logstash7: Fix runtime with non-default USERS/GROUPS Message-ID: <69b4376c.1bb24.3def2b36@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=f5c624428d6d4ab4738395d0cbabd6bbb246c526 commit f5c624428d6d4ab4738395d0cbabd6bbb246c526 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2026-03-13 15:44:36 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-03-13 16:10:48 +0000 sysutils/logstash7: Fix runtime with non-default USERS/GROUPS Also: - Respect LOGSTASH_HOME and ETCDIR substitutions in rc.d script. - Replace RM of bundled JDK and *.bat files with EXTRACT_AFTER_ARGS=--exclude. Approved by: blanket (fix runtime) MFH: 2026Q1 --- sysutils/logstash7/Makefile | 13 ++++++++----- sysutils/logstash7/files/logstash.in | 10 +++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sysutils/logstash7/Makefile b/sysutils/logstash7/Makefile index 0ee87a5e8c5c..4ce1b7bf8acc 100644 --- a/sysutils/logstash7/Makefile +++ b/sysutils/logstash7/Makefile @@ -1,6 +1,7 @@ PORTNAME= logstash DISTVERSION= 7.17.29 DISTVERSIONSUFFIX= -darwin-x86_64 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://artifacts.elastic.co/downloads/logstash/ \ LOCAL/vvd/elastic @@ -28,10 +29,16 @@ SHEBANG_FILES= bin/* CONFLICTS= ${PORTNAME}8 ${PORTNAME}9* +EXTRACT_AFTER_ARGS= --exclude jdk.app \ + --exclude *.bat \ + --no-same-owner --no-same-permissions + NO_BUILD= yes PORTSCOUT= limit:^7 SUB_LIST= JAVA_HOME=${JAVA_HOME} \ - LOGSTASH_HOME=${LOGSTASH_HOME} + LOGSTASH_HOME=${LOGSTASH_HOME} \ + LOGUSER=${LOGUSER} \ + LOGGROUP=${LOGGROUP} WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} @@ -51,15 +58,11 @@ LOGSTASH_JRUBY_BIN_FILES= ast gem irb jgem jirb jirb_swing jruby \ jruby.bash jruby.sh jrubyc rake rdoc ri testrb 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} diff --git a/sysutils/logstash7/files/logstash.in b/sysutils/logstash7/files/logstash.in index a68ee4062264..b8c35a08b5cd 100644 --- a/sysutils/logstash7/files/logstash.in +++ b/sysutils/logstash7/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): @@ -29,7 +29,7 @@ # Log file path. # # logstash_java_home (string): -# Default value: "/usr/local/openjdk8" +# Default value: "%%JAVA_HOME%%" # Root directory of the desired Java SDK. # The JAVA_HOME environment variable is set with the contents of this # variable. @@ -55,8 +55,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"}home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b4376c.1bb24.3def2b36>