From nobody Wed Jan 11 22:11:32 2023 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 4NshjK20R9z2sKfD; Wed, 11 Jan 2023 22:11:33 +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 4NshjK0RtXz3sNQ; Wed, 11 Jan 2023 22:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673475093; 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=HO9QhXL3DVkjfqPwfB3p90a/Ag5GcHrYFMHE0qCjOOQ=; b=pl634DSJXg71C1PBrjXadvatpIcX63bsPOpcFoCvpcjrqM6oz/xZZkOHY4SOS2HflBSNxT D9OEX1tVBo2NFqqjB0oeUXqqengdFJQABG3FRvRlV3CkIVmdpg5IiOCSKR0pVcNJLo844W YsFHA5iJuUVwD1P22FF//obK5EeEcRSE0gnUMnuX9iCQNfeKEWd5A7TLxUpVIkioNJ+D1r z01n4nnj/ZDoZFmJ6Ci5Yhg8f99d0Yza1M5ytPGCs9yOh+J/ZNeyd6Lc+roeDhl6LndydN moVSPwGf7TgmJ+fs49LKJsiit8oVmqdOh/fwbfhzLGakZeUura8+5Oa5vqoA6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673475093; 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=HO9QhXL3DVkjfqPwfB3p90a/Ag5GcHrYFMHE0qCjOOQ=; b=B7sfeFbI+1vaYsHNVMcLr7npcy+XqvlkDK02o4PaJAb7h/tC754UlvLvE2KAjGjyxQZ1mK 6M7Q+5MJCJpW1Z2P83GMdgszzXjrzQ4ePoNmvaZTpnEg9kZidS5yY8njb4cDxyOZtIKZpA wXVgHIuOGpb9ztXxgcQbZyzfrpHwqLRJzL9OaDAl39/FzqzIxOIB0cwNP5gkRhh+WJR7Mv TmTIt08PvLDPri69iff6AUePhKSdwZchllubZXe3XD3f2zvdNE/mikF/kzsTJisv0sg6Db 8JdYSKJ61vHxyXggr7+sBmP54QMt25gFjygy6f+PYd6vpNBoffX8PlvYOe45Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673475093; a=rsa-sha256; cv=none; b=ABrz/mvKlQdb1aI7v0eUmSRtys+J/PURFRcjpyGZLNhOaYAoixJQ7JhWNCVSzhK4K5gF+e K1kslwAAeOMeVFSqPoiQrIrDv2Tdh7iEufzXp44ZYHR46gkpScJf/vsKtMSTU08fwoTAAk zuEJUIMhwZzADVNpemczt1+OTq1G3ojpGib+1mxwskf5S1ESQF6ePju7fJ3sY+jGYdn3q8 1RnBm68X/jIuA5ZZaknE35SmBSTS5FrkotSJ4lsyIwQgl7gFI0RbCkU/yfJ+6j448HyB2o y3Ir5SoA9f6J1WcUsC5yCEEm/mkqkZpShPd5E8JUR0WjHMVfw7fmZ9oilRnJRQ== 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 4NshjJ65RLz144h; Wed, 11 Jan 2023 22:11:32 +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 30BMBWJn087402; Wed, 11 Jan 2023 22:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30BMBWeI087401; Wed, 11 Jan 2023 22:11:32 GMT (envelope-from git) Date: Wed, 11 Jan 2023 22:11:32 GMT Message-Id: <202301112211.30BMBWeI087401@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: e8723f0a8cc8 - main - sysutils/graylog: update to 5.0.2 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: e8723f0a8cc8cb102a21be5ddb2b430ec61fcc2b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8723f0a8cc8cb102a21be5ddb2b430ec61fcc2b commit e8723f0a8cc8cb102a21be5ddb2b430ec61fcc2b Author: Dave Cottlehuber AuthorDate: 2023-01-11 22:01:22 +0000 Commit: Dave Cottlehuber CommitDate: 2023-01-11 22:08:28 +0000 sysutils/graylog: update to 5.0.2 - support JAVA_HOME - accept additional java parameters in rc.conf - OpenJDK17 is now required - remove unsupported JVM tunables Reported by: Einar Bjarni Halldórsson Differential Revision: https://reviews.freebsd.org/D37979 --- UPDATING | 8 +++++++ sysutils/graylog/Makefile | 13 +++++------ sysutils/graylog/distinfo | 8 +++---- sysutils/graylog/files/graylog.in | 41 +++++++++++++++++------------------ sysutils/graylog/files/pkg-message.in | 23 ++++++++++---------- sysutils/graylog/pkg-plist | 3 ++- 6 files changed, 50 insertions(+), 46 deletions(-) diff --git a/UPDATING b/UPDATING index b8fc689d5a0d..3fcbb66292c2 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20230111: + AFFECTS: users of sysutils/graylog + AUTHOR: dch@freebsd.org + + Graylog 5.x and higher effectively constrains ElasticSearch + dependencies, and in most cases will force a migration to + OpenSearch 2.x, now available in ports. Plan accordingly. + 20230104: AFFECTS: users of mail/spamassassin AUTHOR: cy@freebsd.org diff --git a/sysutils/graylog/Makefile b/sysutils/graylog/Makefile index da6582b23829..1b2566036643 100644 --- a/sysutils/graylog/Makefile +++ b/sysutils/graylog/Makefile @@ -1,9 +1,8 @@ PORTNAME= graylog -DISTVERSION= 4.3.9 +DISTVERSION= 5.0.2 CATEGORIES= sysutils java MASTER_SITES= https://downloads.graylog.org/releases/ -DISTFILES= graylog/${DISTNAME}${EXTRACT_SUFX} \ - graylog-integrations/graylog-integrations-plugins-${DISTVERSION}${EXTRACT_SUFX} +DISTFILES= graylog/${DISTNAME}${EXTRACT_SUFX} MAINTAINER= dch@FreeBSD.org COMMENT= Tool for centralized log collection @@ -18,7 +17,7 @@ LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cpe tar:tgz USE_JAVA= yes -JAVA_VERSION= 1.8+ +JAVA_VERSION= 17+ JAVA_EXTRACT= yes JAVA_RUN= yes @@ -38,7 +37,8 @@ GRAYLOG_LOGS_DIR= /var/log/graylog SUB_LIST= GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \ GRAYLOG_LOGS_DIR=${GRAYLOG_LOGS_DIR} \ GRAYLOGGROUP=${GRAYLOGGROUP} \ - GRAYLOGUSER=${GRAYLOGUSER} + GRAYLOGUSER=${GRAYLOGUSER} \ + JAVA_HOME=${JAVA_HOME} PLIST_SUB= DISTVERSION=${DISTVERSION} \ GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \ @@ -53,7 +53,6 @@ post-extract: -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: @@ -66,8 +65,6 @@ do-install: ${STAGEDIR}${ETCDIR}/graylog.conf.sample ${INSTALL_DATA} ${WRKDIR}/log4j2.xml \ ${STAGEDIR}${ETCDIR}/log4j2.xml.sample - cd ${WRKDIR}/graylog-integrations-plugins-${DISTVERSION}/plugin && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin/ cd ${WRKSRC}/plugin && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/plugin/ diff --git a/sysutils/graylog/distinfo b/sysutils/graylog/distinfo index b49adb71a630..05394c263ae6 100644 --- a/sysutils/graylog/distinfo +++ b/sysutils/graylog/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1668610419 -SHA256 (graylog/graylog-4.3.9.tgz) = 04cc3a538ecb41014554cdf8ae069d31eb69613b63e91dc4fae53476d4dc1fae -SIZE (graylog/graylog-4.3.9.tgz) = 205517890 -SHA256 (graylog-integrations/graylog-integrations-plugins-4.3.9.tgz) = 21035ef2dfad2c2dc7c7913527b44232727d9d9291cb3f922585b2dae0154610 -SIZE (graylog-integrations/graylog-integrations-plugins-4.3.9.tgz) = 29305007 +TIMESTAMP = 1673040775 +SHA256 (graylog/graylog-5.0.2.tgz) = 183e7f87bb037dec51d4b3d146d1684e4d8095ce7bf0dfb5ef5faf9b06734792 +SIZE (graylog/graylog-5.0.2.tgz) = 252827584 diff --git a/sysutils/graylog/files/graylog.in b/sysutils/graylog/files/graylog.in index 3530a2a57120..aff849de8e10 100644 --- a/sysutils/graylog/files/graylog.in +++ b/sysutils/graylog/files/graylog.in @@ -19,7 +19,7 @@ # Name of the graylog group # # graylog_config (string) -# Default value %%ETCDIR%%/server/server.conf +# Default value %%ETCDIR%%/graylog.conf # Path to the graylog configuration file # # graylog_min_mem (string): @@ -45,6 +45,10 @@ # graylog_log_config (string): # Default value: %%ETCDIR%%/server/log4j2.xml # Path to the Graylog Server logfile +# +# graylog_java_home (path): +# Default value: %%JAVA_HOME%% +# Set it to the root of the JDK to use. . /etc/rc.subr @@ -53,38 +57,31 @@ rcvar=graylog_enable load_rc_config $name : ${graylog_enable:="NO"} -: ${graylog_user:="%%GRAYLOGUSER%%"} -: ${graylog_group:="%%GRAYLOGGROUP%%"} : ${graylog_config:="%%ETCDIR%%/graylog.conf"} -: ${graylog_min_mem:="256m"} -: ${graylog_max_mem:="1g"} -: ${graylog_dir:="%%DATADIR%%"} : ${graylog_data_dir:="%%GRAYLOG_DATA_DIR%%"} +: ${graylog_dir:="%%DATADIR%%"} +: ${graylog_group:="%%GRAYLOGGROUP%%"} +: ${graylog_java_home:="%%JAVA_HOME%%"} +: ${graylog_java_opts:=""} +: ${graylog_log_config:="%%ETCDIR%%/log4j2.xml"} : ${graylog_logs_dir:="%%GRAYLOG_LOGS_DIR%%"} +: ${graylog_max_mem:="1g"} +: ${graylog_min_mem:="256m"} : ${graylog_run_dir:="/var/run/graylog"} -: ${graylog_log_config:="%%ETCDIR%%/log4j2.xml"} +: ${graylog_user:="%%GRAYLOGUSER%%"} java_options=" \ - -Djava.awt.headless=true \ -Dapp=${name} \ + -Djava.awt.headless=true \ -Dlog4j.configurationFile=${graylog_log_config} \ - -Xms${graylog_min_mem} \ - -Xmx${graylog_max_mem} \ - -XX:-OmitStackTraceInFastThrow \ - -XX:+AggressiveOpts \ - -XX:+CMSClassUnloadingEnabled \ - -XX:+CMSConcurrentMTEnabled \ - -XX:+CMSParallelRemarkEnabled \ - -XX:+DisableExplicitGC \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:+ResizeTLAB \ - -XX:+UseCMSInitiatingOccupancyOnly \ -XX:+UseCompressedOops \ - -XX:+UseConcMarkSweepGC \ - -XX:+UseFastAccessorMethods \ - -XX:+UseParNewGC \ - -XX:CMSInitiatingOccupancyFraction=75 \ + -XX:-OmitStackTraceInFastThrow \ -XX:NewRatio=1 \ + -Xms${graylog_min_mem} \ + -Xmx${graylog_max_mem} \ + ${graylog_java_opts} \ " app_pidfile="${graylog_run_dir}/${name}.pid" @@ -103,6 +100,8 @@ command_args=" \ --no-pid-file \ --configfile ${graylog_config}" +export JAVA_HOME=${graylog_java_home} + required_files="%%LOCALBASE%%/bin/java ${graylog_config}" graylog_precmd() { diff --git a/sysutils/graylog/files/pkg-message.in b/sysutils/graylog/files/pkg-message.in index 0c2d6783ab52..04fdeb212817 100644 --- a/sysutils/graylog/files/pkg-message.in +++ b/sysutils/graylog/files/pkg-message.in @@ -11,28 +11,29 @@ When running graylog in a jail, you need to set enforce_statfs for the jail. For a single-node installation, install: -- databases/mongodb40 or higher -- textproc/elasticsearch6 or higher +- databases/mongodb50 or higher +- textproc/opensearch 1.3, 2.0 or higher And ensure that the elasticsearch cluster name matches that used by graylog. +See https://go2docs.graylog.org/5-0/downloading_and_installing_graylog/installing_graylog.html + EOM } { type: upgrade message: <