git: c8b1ef07c984 - main - sysutils/graylog: Update 7.0.6 => 7.0.8

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Thu, 18 Jun 2026 20:58:43 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c8b1ef07c984bd66074c91fe34008f3af00b5b31

commit c8b1ef07c984bd66074c91fe34008f3af00b5b31
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-06-18 20:55:57 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-06-18 20:55:57 +0000

    sysutils/graylog: Update 7.0.6 => 7.0.8
    
    Changelog:
    https://go2docs.graylog.org/current/changelogs/changelog.html#Graylog708
    
    - Add LOCAL to MASTER_SITES for those who also can't download from the
      official website: "403 Forbidden".
    - Parametrize graylog with ${PORTNAME}.
    - Fix warnings from portclippy.
    - Fix build with USER/GROUP not in UIDs/GIDs.
    - Rename post-extract to post-patch - patches must be after "patch".
    - Merge MKDIRs.
    - Fix comments in rc script.
    
    Security:       GHSA-gqr6-r77p-c2pj
    Security:       GHSA-j769-9gv9-65gr
    Sponsored by:   UNIS Labs
    MFH:            2026Q2
---
 sysutils/graylog/Makefile         | 45 ++++++++++++++++++++-------------------
 sysutils/graylog/distinfo         |  6 +++---
 sysutils/graylog/files/graylog.in |  6 +++---
 sysutils/graylog/pkg-plist        |  1 -
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/sysutils/graylog/Makefile b/sysutils/graylog/Makefile
index 48b04fb2e4e1..bf789c506d09 100644
--- a/sysutils/graylog/Makefile
+++ b/sysutils/graylog/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	graylog
-DISTVERSION=	7.0.6
+DISTVERSION=	7.0.8
 CATEGORIES=	sysutils java
-MASTER_SITES=	https://downloads.graylog.org/releases/
-DISTFILES=	graylog/${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	https://downloads.graylog.org/releases/${PORTNAME}/ \
+		LOCAL/vvd
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for centralized log collection
@@ -16,26 +16,29 @@ LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cpe java:extract,run tar:tgz
 JAVA_VERSION=	21+
+USE_RC_SUBR=	${PORTNAME}
 
-NO_BUILD=	yes
 NO_ARCH=	yes
+NO_BUILD=	yes
 
-USE_RC_SUBR=	graylog
+GRAYLOG_DATA_DIR=	/var/db/${PORTNAME}
+GRAYLOG_LOGS_DIR=	/var/log/${PORTNAME}
 SUB_FILES=	log4j2.xml pkg-message
-
-GRAYLOGUSER?=		graylog
-GRAYLOGGROUP?=		${GRAYLOGUSER}
-USERS=			${GRAYLOGUSER}
-GROUPS=			${GRAYLOGGROUP}
-GRAYLOG_DATA_DIR=	/var/db/graylog
-GRAYLOG_LOGS_DIR=	/var/log/graylog
-
 SUB_LIST=	GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \
 		GRAYLOG_LOGS_DIR=${GRAYLOG_LOGS_DIR} \
 		GRAYLOGGROUP=${GRAYLOGGROUP} \
 		GRAYLOGUSER=${GRAYLOGUSER} \
 		JAVA_HOME=${JAVA_HOME}
 
+GRAYLOGUSER?=	${PORTNAME}
+GRAYLOGGROUP?=	${GRAYLOGUSER}
+.if ${GRAYLOGUSER} == ${PORTNAME}
+USERS=		${GRAYLOGUSER}
+.endif
+.if ${GRAYLOGGROUP} == ${PORTNAME}
+GROUPS=		${GRAYLOGGROUP}
+.endif
+
 PLIST_SUB=	DISTVERSION=${DISTVERSION} \
 		GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \
 		GRAYLOG_LOGS_DIR=${GRAYLOG_LOGS_DIR} \
@@ -43,25 +46,23 @@ PLIST_SUB=	DISTVERSION=${DISTVERSION} \
 		GRAYLOGUSER=${GRAYLOGUSER} \
 		PORTNAME=${PORTNAME}
 
-post-extract:
+post-patch:
 	${REINPLACE_CMD} -E \
-		-e 's,^bin_dir .+,bin_dir = ${LOCALBASE}/share/graylog/bin,' \
-		-e 's,^data_dir .+,data_dir = /var/db/graylog,' \
+		-e 's,^bin_dir .+,bin_dir = ${PREFIX}/share/graylog/bin,' \
+		-e 's,^data_dir .+,data_dir = ${GRAYLOG_DATA_DIR},' \
 		-e 's,^message_journal_dir .+,message_journal_dir = ${GRAYLOG_DATA_DIR}/journal,' \
 		-e 's,^node_id_file .+,node_id_file = ${ETCDIR}/server/node-id,' \
 	${WRKSRC}/graylog.conf.example
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/plugin
-	@${MKDIR} ${STAGEDIR}${ETCDIR}/server
-	@${MKDIR} ${STAGEDIR}${GRAYLOG_DATA_DIR}/journal
-	@${MKDIR} ${STAGEDIR}${GRAYLOG_LOGS_DIR}
+	${MKDIR} ${STAGEDIR}${ETCDIR}/server \
+		 ${STAGEDIR}${GRAYLOG_DATA_DIR}/journal \
+		 ${STAGEDIR}${GRAYLOG_LOGS_DIR}
+	(cd ${WRKSRC}/plugin && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin)
 	${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/graylog.conf.example \
 		${STAGEDIR}${ETCDIR}/graylog.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/log4j2.xml \
 		${STAGEDIR}${ETCDIR}/log4j2.xml.sample
-	cd ${WRKSRC}/plugin && \
-	    ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin/
 
 .include <bsd.port.mk>
diff --git a/sysutils/graylog/distinfo b/sysutils/graylog/distinfo
index 3a8757d8da4b..a4ce66825ed9 100644
--- a/sysutils/graylog/distinfo
+++ b/sysutils/graylog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1777880877
-SHA256 (graylog/graylog-7.0.6.tgz) = c7857905fc36425b962f452b45ad273d9d97d076d7b19f00cdb6d13f9671577a
-SIZE (graylog/graylog-7.0.6.tgz) = 324845848
+TIMESTAMP = 1781818181
+SHA256 (graylog-7.0.8.tgz) = 50ac5ec9d66b11c1ff0fa741c1920d87a23df5d7699fd024968ca86fff457703
+SIZE (graylog-7.0.8.tgz) = 324847952
diff --git a/sysutils/graylog/files/graylog.in b/sysutils/graylog/files/graylog.in
index aff849de8e10..e3bd40165af9 100644
--- a/sysutils/graylog/files/graylog.in
+++ b/sysutils/graylog/files/graylog.in
@@ -11,11 +11,11 @@
 #   Flag that determines whether graylog is enabled
 #
 # graylog_user (username):
-#   Default value: "graylog"
+#   Default value: "%%GRAYLOGUSER%%"
 #   Name of the graylog user account
 #
 # graylog_group (group):
-#   Default value: "graylog"
+#   Default value: "%%GRAYLOGGROUP%%"
 #   Name of the graylog group
 #
 # graylog_config (string)
@@ -39,7 +39,7 @@
 #   Storage location for the graylog journal
 #
 # graylog_run_dir (string):
-#   Default value: /var/graylog
+#   Default value: /var/run/graylog
 #   Path to the graylog run folder.
 #
 # graylog_log_config (string):
diff --git a/sysutils/graylog/pkg-plist b/sysutils/graylog/pkg-plist
index 99e24b121899..bc0dfe107782 100644
--- a/sysutils/graylog/pkg-plist
+++ b/sysutils/graylog/pkg-plist
@@ -7,4 +7,3 @@
 @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_LOGS_DIR%%
 @sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/graylog.conf.sample
 @sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/log4j2.xml.sample
-