From owner-dev-commits-ports-all@freebsd.org Tue Aug 17 15:43:52 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C76C66626E; Tue, 17 Aug 2021 15:43:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GpwLJ1D3rz3FS7; Tue, 17 Aug 2021 15:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 128C62062F; Tue, 17 Aug 2021 15:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17HFhqcm031718; Tue, 17 Aug 2021 15:43:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17HFhq1B031717; Tue, 17 Aug 2021 15:43:52 GMT (envelope-from git) Date: Tue, 17 Aug 2021 15:43:52 GMT Message-Id: <202108171543.17HFhq1B031717@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 5bd41868dada - main - sysutils/graylog: update to 4.1.3 and provide a valid default .conf MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bd41868dadadd5b431c59649230ee0fafaf5c9e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2021 15:43:52 -0000 The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=5bd41868dadadd5b431c59649230ee0fafaf5c9e commit 5bd41868dadadd5b431c59649230ee0fafaf5c9e Author: Dave Cottlehuber AuthorDate: 2021-08-17 15:42:52 +0000 Commit: Dave Cottlehuber CommitDate: 2021-08-17 15:43:38 +0000 sysutils/graylog: update to 4.1.3 and provide a valid default .conf Summary: ChangeLog: https://docs.graylog.org/en/4.1/pages/changelog.html#graylog-4-1-3 Reported by: Daniel Morante Submitted by: Charles Gonçalves Sponsored by: FreeBSD Brasil Sponsored by: SkunkWerks, GmbH Differential Revision: https://reviews.freebsd.org/D31521 --- sysutils/graylog/Makefile | 15 ++++++++++++--- sysutils/graylog/distinfo | 10 +++++----- sysutils/graylog/pkg-plist | 3 ++- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/sysutils/graylog/Makefile b/sysutils/graylog/Makefile index ca7833fa92ae..84da0ce37d27 100644 --- a/sysutils/graylog/Makefile +++ b/sysutils/graylog/Makefile @@ -1,7 +1,7 @@ # Created by: Thomas Bartelmess PORTNAME= graylog -DISTVERSION= 4.1.2 +DISTVERSION= 4.1.3 CATEGORIES= sysutils java MASTER_SITES= https://downloads.graylog.org/releases/ DISTFILES= graylog/${DISTNAME}${EXTRACT_SUFX} \ @@ -48,10 +48,19 @@ PLIST_SUB= DISTVERSION=${DISTVERSION} \ GRAYLOGGROUP=${GRAYLOGGROUP} \ PORTNAME=${PORTNAME} +post-extract: + ${REINPLACE_CMD} -E \ + -e 's,^bin_dir .+,bin_dir = ${LOCALBASE}/share/graylog/bin,' \ + -e 's,^data_dir .+,data_dir = /var/db/graylog,' \ + -e 's,^message_journal_dir .+,message_journal_dir = ${GRAYLOG_DATA_DIR}/journal,' \ + -e 's,^node_id_file .+,node_id_file = ${ETCDIR}/server/node-id,' \ + -e 's,^plugin_dir .+,plugin_dir = ${LOCALBASE}/share/graylog/plugin,' \ + ${WRKSRC}/graylog.conf.example + do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/plugin - @${MKDIR} ${STAGEDIR}${ETCDIR} - @${MKDIR} ${STAGEDIR}${GRAYLOG_DATA_DIR} + @${MKDIR} ${STAGEDIR}${ETCDIR}/server + @${MKDIR} ${STAGEDIR}${GRAYLOG_DATA_DIR}/journal @${MKDIR} ${STAGEDIR}${GRAYLOG_LOGS_DIR} ${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/graylog.conf.example \ diff --git a/sysutils/graylog/distinfo b/sysutils/graylog/distinfo index 9597bf62fbff..6df339d3e773 100644 --- a/sysutils/graylog/distinfo +++ b/sysutils/graylog/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1627499684 -SHA256 (graylog/graylog-4.1.2.tgz) = befdebb2c759ab6b1a17f8c918e989dedc174af8c14befd549a6c05d797934dc -SIZE (graylog/graylog-4.1.2.tgz) = 197078255 -SHA256 (graylog-integrations/graylog-integrations-plugins-4.1.2.tgz) = 8ca7d63743ce4c6aaebb73522376d315556f44c0b05c326c2b5f53ae7a96734f -SIZE (graylog-integrations/graylog-integrations-plugins-4.1.2.tgz) = 29495666 +TIMESTAMP = 1628761882 +SHA256 (graylog/graylog-4.1.3.tgz) = 516b32cc3f6888bbbdedfa1c3d722a5413da658257de6be7eb9adf2fb404ac83 +SIZE (graylog/graylog-4.1.3.tgz) = 197149916 +SHA256 (graylog-integrations/graylog-integrations-plugins-4.1.3.tgz) = 5e603130abf8a9f8181504035653c98f4297c13041363850c82386b0fe33ee6c +SIZE (graylog-integrations/graylog-integrations-plugins-4.1.3.tgz) = 29497807 diff --git a/sysutils/graylog/pkg-plist b/sysutils/graylog/pkg-plist index bc732afc68cb..dca62c13b94f 100644 --- a/sysutils/graylog/pkg-plist +++ b/sysutils/graylog/pkg-plist @@ -5,8 +5,9 @@ %%DATADIR%%/plugin/%%PORTNAME%%-plugin-threatintel-%%DISTVERSION%%.jar %%DATADIR%%/plugin/%%PORTNAME%%-storage-elasticsearch6-%%DISTVERSION%%.jar %%DATADIR%%/plugin/%%PORTNAME%%-storage-elasticsearch7-%%DISTVERSION%%.jar -@dir %%ETCDIR%% +@dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%ETCDIR%%/server @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_DATA_DIR%% +@dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_DATA_DIR%%/journal @dir(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,750) %%GRAYLOG_LOGS_DIR%% @sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/graylog.conf.sample @sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/log4j2.xml.sample