From nobody Fri Mar 13 16:16:03 2026 X-Original-To: dev-commits-ports-all@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 4fXV375xWTz6VMqd for ; Fri, 13 Mar 2026 16:16:03 +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 4fXV37349Dz46ny for ; Fri, 13 Mar 2026 16:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773418563; 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=BqJavhGK2/3jRXW8zpOF9NhzS2picVYPr/lalaToWbI=; b=efBSopL2SaNDMiuLfmh7LM0faLg3AXQNPf9Pxb1fLm6CiczEjm5iOg3841qLWcBQNFzkru 7OGDDS/uJ6N70gTKTkVlMYRf6nVr1Mjv3GUoOSXayfBQIVhR29yY6hxpGV8gyGFd0kP8Hf zvyhwcyIE+ns53WybZdlxbsx0rABArmxIjZNpVQoGvQW5AUZp9Ko1cY1uK0hwmWI7QwJRB 3dE1RgwmEGM2DeQ+SfODEBWw6uz4Xv6iMr50Lr+fv48DiMfwdAJKfCIbMyZpTIJsSYjbjE omFheaz3IEGoJryoyZMTzV7tPjWZlNcTnM6B8GNbSdVYgfysstyZlu/IHk2x+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773418563; a=rsa-sha256; cv=none; b=desgy+ba9DRXlrGiqlk2JcNzTdGy3y/MGbCCRpW/5GeAaqrZRuSz4S86p9Gx9cIEdEf+wo COFwTidv6+NCqVrAPIhaRiEACBM7zYm0QOUL1SorAXFYt89aPILVs/Bd2GRCE2SIFqZmYS uwd+bXu2yy1xAZZpsYyKH5tqR1H8K4dfqRK8PR/zBWAULaMXkterdKLDi4ecAxHcNmF6hV A1Wqoo7OcwtTAgoyP8R9JiPZSwbFbMmT5yZSfTaAGBgJje1EoD20p+fs5XPVyVDtl3i6QX KxmOyIuGUr4Exeyo0MeCkrDcrVtX7d+mQ4h0UaBD4IFRspesX44Z2UYe4xtVKw== 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=1773418563; 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=BqJavhGK2/3jRXW8zpOF9NhzS2picVYPr/lalaToWbI=; b=pDWdCX54sRBh+fG2TLk6oNzTDHtoiQMgoQpDpVzUpKmFivj1YGEHA7tN0/2neBIvrbu9yN Gr4TN0pNKVUgHQ5LlyL8XMcXJ+X7EK+j+X4IPn08zryVY7wk64j7jz70wefyCS5aKYp2z0 mOBPtQ5yz5nmExD6PjPNJNPOwvjkvg2nJ65jsyre+jTdicFRLD2uDeD1F3yWNZAX25VbL6 3tlJuZUX5ERmMdQju/YC+I8vjC91b4rNzkSr+QaMDggjpqaxyeHOLERk0z/aMFVK/oXqEr sI0BVVMJW+b24DtFZ2+07yTlkEzMncxeuglF+LUoShG0j/+CB3D9vAUNXrH5WA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXV371tKkzgHm for ; Fri, 13 Mar 2026 16:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a104 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 16:16:03 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: fac13430ec1e - 2026Q1 - sysutils/logstash7: Fix runtime with non-default USERS/GROUPS List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2026Q1 X-Git-Reftype: branch X-Git-Commit: fac13430ec1e9e22e9e094f17d932b733541fe91 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 16:16:03 +0000 Message-Id: <69b43843.1a104.e56d1f5@gitrepo.freebsd.org> The branch 2026Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fac13430ec1e9e22e9e094f17d932b733541fe91 commit fac13430ec1e9e22e9e094f17d932b733541fe91 Author: Vladimir Druzenko AuthorDate: 2026-03-13 15:44:36 +0000 Commit: Vladimir Druzenko CommitDate: 2026-03-13 16:15:49 +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 (cherry picked from commit f5c624428d6d4ab4738395d0cbabd6bbb246c526) --- 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"}