From nobody Thu Mar 12 22:47:24 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 4fX2n86bkzz6W6tX for ; Thu, 12 Mar 2026 22:47:24 +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 4fX2n85hMdz42Jd for ; Thu, 12 Mar 2026 22:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773355644; 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=4BtVL1b/AqMCrX6dPin3e7bD5W2UsLHRG3NFDIW2JFE=; b=aJpXuOmBpZY9n6X3zGB8T/BG06bM00CKQc1+6eSUhlOwGA91MXewoAWBmER8CU0QIdQTXq i02hc26AAm1tJ/XGZRLxGrbPrU3b7+iSmPotREhmRJGWKUvOJvBFb9tG9kvSJ7+ScDZDFp ewbQfCp3lay1Kl7k+P084XUFVB6KewIBBrMCymQjorB5YXjIu/2eATptOIwSTIOfbxf+iT ChnF0P7j9JrySPiuV9webltmQDG+6JbSltYtDvtxB33w8yTj2zVt7Nyp13q2LuDNOwZnsp GV6n+U2FJHK/5IekrsZlfdHSaLJtfd+6ZYAVk+1lnDyb4G6zHZjggLt//lLeYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773355644; a=rsa-sha256; cv=none; b=VSfRj8J2n/xX90ktkjEGOQMncG+Ty1W1S4FiszYix/MfJO1qMwFqyVU5H6HV6rWIFVza+z +Fn2kuiLbkwkWQG2qI60uqnkqXIzSoMlveKKQCDOOqvGCjHL4Qw16ybzyevR9ScdfT2oCs eftwFiJLmNeFNaLfxQr8XNQiwtDSlt1NEcp3p/r5aktzmz59OkI5TeNipG+0uH8QKZytdV renhd34uB0Yppt10Aaw+QwG8RBdcZ2bHbtjFO3wUsIwYJj78XjBXSzW8/Rl/OovIoLncnm PdmzI7+LRdWGlfAL5ROOGKaQqdpm/SvqcqAnd3t9HT0s9kVxO6DlREPdJYtn5g== 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=1773355644; 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=4BtVL1b/AqMCrX6dPin3e7bD5W2UsLHRG3NFDIW2JFE=; b=VFU3RUZ3lCf3XsAbpnj5VW2lEGPFUHu5Cs35QWG3fzDrIl3rc2lRpHpPXDKc2wa6y+xGs/ R5anXtnqguJCZrKAW2ZUgZilBPQPDRfyPjT9obGiKD6J6zA2/j2obfCT0O5w1dO3Aoll0n fdMC/tOKJD9GBJkDd6lSeWKn9dsW4UZqEDLHbeIHRS9BiBozg0SI5SBMWKvQaDaeRqwFYz A9zVZAjdNTXvYottEJ3VzgMRfKXVfR1xCRksE/w2AvdNMatAnT9UoS1xSVWipweG00ki6o JXHOWWxbj2zS9P8orXLPyMQY0Hck7MyqKSl++I+d1lT6rbjNalYRL782Wqre2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fX2n84wvdz153D for ; Thu, 12 Mar 2026 22:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18cf0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 22:47:24 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: f9a361fbda06 - main - sysutils/logstash7: Update 7.17.11 => 7.17.29, deprecate 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: f9a361fbda06dbe5ba5c009e79a446039899725f Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 22:47:24 +0000 Message-Id: <69b3427c.18cf0.22607f3@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9a361fbda06dbe5ba5c009e79a446039899725f commit f9a361fbda06dbe5ba5c009e79a446039899725f Author: Vladimir Druzenko AuthorDate: 2026-03-12 21:53:12 +0000 Commit: Vladimir Druzenko CommitDate: 2026-03-12 22:47:01 +0000 sysutils/logstash7: Update 7.17.11 => 7.17.29, deprecate Release Notes: https://www.elastic.co/guide/en/logstash/7.17/releasenotes.html 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". - Deprecate with date 2026-06-30 due to 7.x reached EoL on 15 Jan 2026. - Limit JAVA_VERSION to supported 17, 11 and 8. - Parametrize "logstash" with "${PORTNAME}". - Adjust CONFLICTS. - Add possibility to use custom user/group. - Merge CHMODs. - Fix white characters and remove unnecessary empty lines. - Remove unnecessary MKDIR. PR: 293746 Approved by: elastic (maintainer, implicit - inactive for more than 6 months) MFH: 2026Q1 --- sysutils/logstash7/Makefile | 38 +++++++++++++++++++++----------------- sysutils/logstash7/distinfo | 6 +++--- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/sysutils/logstash7/Makefile b/sysutils/logstash7/Makefile index 5834422f3eb5..0ee87a5e8c5c 100644 --- a/sysutils/logstash7/Makefile +++ b/sysutils/logstash7/Makefile @@ -1,9 +1,9 @@ PORTNAME= logstash -PORTVERSION= 7.17.11 -PORTREVISION= 1 +DISTVERSION= 7.17.29 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= 7 MAINTAINER= elastic@FreeBSD.org @@ -12,30 +12,37 @@ WWW= https://www.elastic.co/products/logstash LICENSE= APACHE20 -ONLY_FOR_ARCHS= aarch64 amd64 +DEPRECATED= 7.x reached EoL on 15 Jan 2026 - use sysutils/logstash8 or sysutils/logstash9* +EXPIRATION_DATE= 2026-06-30 + +ONLY_FOR_ARCHS= aarch64 amd64 RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash USES= cpe java shebangfix CPE_VENDOR= elastic -JAVA_VERSION= 11+ -USE_RC_SUBR= logstash +JAVA_VERSION= 17 11 8 +USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= bin/* -CONFLICTS= logstash6 +CONFLICTS= ${PORTNAME}8 ${PORTNAME}9* NO_BUILD= yes - PORTSCOUT= limit:^7 - SUB_LIST= JAVA_HOME=${JAVA_HOME} \ LOGSTASH_HOME=${LOGSTASH_HOME} 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 @@ -60,16 +67,13 @@ 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/2.5.0/gems \ - ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/ruby/gems/shared/gems \ + ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/ruby/gems/shared/gems \ -type d -empty -delete ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${LOGSTASH_HOME}/config ${RM} -rf ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/jni - ${MKDIR} ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/jni (cd ${WRKSRC}/vendor/jruby/lib/jni && \ ${COPYTREE_SHARE} ${ARCH:S/amd64/x86_64/}-FreeBSD \ ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/jni) diff --git a/sysutils/logstash7/distinfo b/sysutils/logstash7/distinfo index 73b52f14b48d..09b9513e11d3 100644 --- a/sysutils/logstash7/distinfo +++ b/sysutils/logstash7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688931081 -SHA256 (logstash-7.17.11-darwin-x86_64.tar.gz) = 32325d8bd59d5930f1240c9ff58cd0030f5443c0bd50d82df2bc304537431c55 -SIZE (logstash-7.17.11-darwin-x86_64.tar.gz) = 358486631 +TIMESTAMP = 1773333333 +SHA256 (logstash-7.17.29-darwin-x86_64.tar.gz) = 30d3624f6e42dc0e9a5c7e5385ec13ddb2ad6bd97e52ad9af0217478c30bb803 +SIZE (logstash-7.17.29-darwin-x86_64.tar.gz) = 366408007