From nobody Thu Mar 12 22:50:37 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 4fX2rt2m8sz6W6q9 for ; Thu, 12 Mar 2026 22:50:38 +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 4fX2rt03zWz42YL for ; Thu, 12 Mar 2026 22:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773355838; 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=03JbYaR+8DAqZeCcX+NTMDb75r/tPmzM/nJ6r4FfjSw=; b=LyT7QqUXpPOolQ6INZg1FpOMv0mYV/LS8SnZ4JqnqPVpqqcp+AohK99rzaCXSa1SjnBMwq QAsCmhPW1gMY9XbdezL2WDvrCJlug3+0pFLFUtjjyKS4SV0dzWSs+H+ukIJ4fkOqTmUQLC KcO8QA26VfmhlITDxE0bl1oxH8aG1Snu9R5m82u7dfNbQGtGKBPplF2ZruUE1wWChjfmTw MvJu/nZyWL3NGYdxu5aBTD3RLwRKdiez772dGSmCpy6rD+CQ3ew4Ix6A3UXMWlTYPtudpS FpE77R6T4HsfFIszhIe9HqmLAzIWPb0BETCoIKM1ZHpjwFIRSZJ5PewUrX+LMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773355838; a=rsa-sha256; cv=none; b=ZcZBBEt5j91C0NQllsHLzrt+3NMWCPF2COu5uPtdJY2Cca3Lect0p/ESWmvNavFkhCfWeN ZaElvhs0/jQefxseFuITnaszuzn0qtxlEocwDlP91ubBEZMWqbBmHI+xFmA9jGdkN6Z4h8 iTymsjtGb/0mEld9MJKmT7qVTsufRItX3nnOToQosNsJ3XsPd9MDNmfC0nFPW9wj1RN03F wb2yJJHlYgqyPRQc0LwG08PIgmCP6Z3mfe8ngM8wwCGpbPCLgWtLgBDfRP49gPmH6W/LeL mrJ5phGDClMTAGqeyyWXwTeYqm6SsZsthoIaysQKlt2RVEtfYAiJbxqWCJOeAg== 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=1773355838; 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=03JbYaR+8DAqZeCcX+NTMDb75r/tPmzM/nJ6r4FfjSw=; b=aiY12DkhuAFORBiNKqNSeKzvJ3oLoS74vsbF4R1ZNOLTFaVIwYe9d2y6Ro6oPcfv8T51oi EkuEgOHCw/y8WBa9vhjJPlxaCd/boVtYkr+a4qbuQVeej2ggypeDfT2mB4dX2nJ060Wamp JTwpk2ax3wnnWRyg21/p4PYwHE0sURTPlMGuJnsJ2EilIKsSMryCVRlnBW9zte0QFLgDyJ ORLHeeJ7xKaewJhNO3EjREvKrtGjhPc+JaEoN1uCvYxyL2Zf39rhwcuklOIhwbNjuX2bc2 +L6TxywBY3PucF9myht2nWV2lCYZ+zvEMFZ0jS1qCQEYZuibbFKtME/3aki8ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fX2rs6L3Xz14cX for ; Thu, 12 Mar 2026 22:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a1f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 22:50:37 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: a741f0462812 - 2026Q1 - sysutils/logstash7: Update 7.17.11 => 7.17.29, deprecate 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: a741f04628122c013f5044519f9360663bbef97c Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 22:50:37 +0000 Message-Id: <69b3433d.1a1f7.5b5dca2@gitrepo.freebsd.org> The branch 2026Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a741f04628122c013f5044519f9360663bbef97c commit a741f04628122c013f5044519f9360663bbef97c Author: Vladimir Druzenko AuthorDate: 2026-03-12 21:53:12 +0000 Commit: Vladimir Druzenko CommitDate: 2026-03-12 22:50:05 +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 (cherry picked from commit f9a361fbda06dbe5ba5c009e79a446039899725f) --- sysutils/logstash7/Makefile | 37 +++++++++++++++++++++---------------- sysutils/logstash7/distinfo | 6 +++--- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/sysutils/logstash7/Makefile b/sysutils/logstash7/Makefile index 3e99ac4873d6..0ee87a5e8c5c 100644 --- a/sysutils/logstash7/Makefile +++ b/sysutils/logstash7/Makefile @@ -1,8 +1,9 @@ PORTNAME= logstash -PORTVERSION= 7.17.11 +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 @@ -11,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 @@ -59,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