From nobody Fri Mar 13 16:12:28 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXTz062qqz6VM81 for ; Fri, 13 Mar 2026 16:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXTz052jRz46ZC for ; Fri, 13 Mar 2026 16:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773418348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBEot+6q+hGzxFH1lz9zCmG6EI5ZBq06iyKeXFFqFUg=; b=y09lrwxAG+rwWJAOXPo+ELU3ysPivgSDBIFpDLxHM+T48kxGXffMeBQeaMr9m91nCtPzNC sQrG6jtVolu4UrLR6bnu0sJZW1aEBRn5hd0VHQY3HEFefHwTu0YjzJz+wKoWPNBX6CwtnO aNR4NOBM+bSyNzOyBWtuB6J58Y9UhhCZc1lP5dvqNqDI2mQhor+gzv0BoAn1Z2TdZiRoMO s2cJENhD4GKgI+NMiTDTpalgj4srvhfavj2swhD+XP5Pv/pTZU7dhVpans/J5+MX2HuY96 W6nR67b2edjp6fgF43pOW88PquDLRGgG9zW9w4/PxWpyJTKWRdcgJql/sodL7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773418348; a=rsa-sha256; cv=none; b=yAAiJOEluRty/Rc3G+T3lKv9ImlTASJn90GHF+H9ZTIRl0WiTpH7qUeAQEVjzV9hxfXOYL HmfyIUNM8p2KLAiaib2KNXegW9e7lW8zgTwjn9JttoNTlRxofHx0euCCFaElTqOSkjPVv+ MDMwGPNTlc8dudqiMqt7+QJhIqW/LCGtOuHGyJD9+IFpb6ZY28KBrGYz1sSN04kKxxSwKW hcD432J1P+WVXI4HLStm5QnwJSW8BCe//VXQUhodEQNKGt/XZ+gdu1ourNfIobEnSLOf4+ +hrEkwRoiYW2ytuZn11f+Y1UskY20woql2tpIlTUrN+hBZXvp2YnLfu/EtMx8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773418348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBEot+6q+hGzxFH1lz9zCmG6EI5ZBq06iyKeXFFqFUg=; b=YaJFx92sLMLuk9iEYWGYpVe1yjC1tM7EN/u+b1FA9JbOdwjOOQ0xAfYEYWx0xVM4db5F0j FvFQY9yGotsUKWH26lo/oWTFClYp+7vzLLJ6GY7GyX44By6jPFNgB4DChvQ5X8PsxQSx2l 72wbXOhbq1RPhA86VrpapWLr3XwFIsWg3TsZ7O079hlar5+LcvLKHt5NOI0mY5IDK85Wjw GNcvEF/yVrxENGhWQ6nMMgTmqToQ5xfAd1wQAHLN6W0gB2tm/cxpUAsBDpanxGAvHw3vqX S6PDoSDjz/sxxBNChyw2toDHYUNNFk0Q1+xRk+MZHoE8usLk/qtyU8fVQBrghQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXTz03krqzft4 for ; Fri, 13 Mar 2026 16:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bb24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 16:12:28 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: f5c624428d6d - main - sysutils/logstash7: Fix runtime with non-default USERS/GROUPS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5c624428d6d4ab4738395d0cbabd6bbb246c526 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 16:12:28 +0000 Message-Id: <69b4376c.1bb24.3def2b36@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5c624428d6d4ab4738395d0cbabd6bbb246c526 commit f5c624428d6d4ab4738395d0cbabd6bbb246c526 Author: Vladimir Druzenko AuthorDate: 2026-03-13 15:44:36 +0000 Commit: Vladimir Druzenko 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"}