Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Mar 2026 22:47:24 +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: f9a361fbda06 - main - sysutils/logstash7: Update 7.17.11 => 7.17.29, deprecate
Message-ID:  <69b3427c.18cf0.22607f3@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=f9a361fbda06dbe5ba5c009e79a446039899725f

commit f9a361fbda06dbe5ba5c009e79a446039899725f
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-03-12 21:53:12 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
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


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b3427c.18cf0.22607f3>