From nobody Wed Jan 11 21:09:07 2023 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 4NsgKH6XZPz2r9Yb; Wed, 11 Jan 2023 21:09:07 +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 4NsgKH5zgfz3lHy; Wed, 11 Jan 2023 21:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673471347; 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=tLKitXuIksdmlvK8ObEF9joTqgpLdiRwnrq5Yr7fDZg=; b=tBNN5CIpFa4dbvrEbHX5u5t4M+KWJflDgkRbJsoUNw8Y8VGcZkBfFjRPUNZNk+G1zSdCnZ ATZuZ8mf7zQAmDHp3QMkGAbgwMWo9flnR0fojhnbXYrc+L3feUB+x1Xwj8e32l/x1c8ba/ Q3uoBQA5GLynSiQvTeaZ2t8BRWLOyaA52vWMUxvIh4c4NvqJAgTVXl9FvvpxDeuRkBqzKr XwntPk35Z4xpGUs4N0EUAGX8FJy5u9tQd56sFjxsA/I5ussTHRXaVOMFGYGSC+zpTQKSaB Fvl0djDGNW7gv8vvqsVgO9MQdtO0vA0ARorNqgiMouU/YzamjMSxBlg7ZrO5yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673471347; 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=tLKitXuIksdmlvK8ObEF9joTqgpLdiRwnrq5Yr7fDZg=; b=fvx2DNA4e+j4P+UK/N/R40SvKtUCeb5bGKDIeU8jZNvUm1VHso9Q+0SO167HLgDRmeAhrI QarRx3gTuu37MIWlAlH1DN2Ci+3Y9PcoXNRA3M0h12Rs7zSCrYNOup2Lm5lZ4ZW6ciR9Dk 91W0ztrbaXKBPSNZ4Oliz1PwbyIgLhqUMZYaw9KJnq2SB9sQcdNha8SZl0ELIehcvnG0fg Zk9F2P0GH9/o8sGakgzgY+JJ5iq4ZvecaHLXk/QlYAA0z5abV5O+0oH4/vplIgD5DqJ44s SAa3lj2EfmGaKWWeTqShdo7iQiyb39Q4zhI2FkyjuJcBViVGzRSeMFK40fV9Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673471347; a=rsa-sha256; cv=none; b=bcJCqXhpKPYdAbBQs6olfhoyQ8XOhRVgmNq2U/UzVr6YsvLD0RxyqtHWbi+HQ+yanoBnQC 1Hr2PQ/PiactbdxfrwIkBkCjzVZOMyj298+JJnWGjBGnE53qJI2IiPSjxLtKQhnxX3Dotx d3aFrVA2TYKAY4hAvk3ZfP7TYDD0RkWCzEELiPAGJ8DMW5tHs1CKNGwnUyLyOH/Wqk6m// 3TDE0d1wdBSAvBSxUawfqSWES/pUoEnFBW8n69GnMsDLerGmbEXGHgIDI+FJFKHYQZftow WD82EmSuW4uevu9gbRX1bFNpIHoaFgIu173omFzKxqkRpZF6u+owwspEXRAXTA== 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 4NsgKH52H3z12N2; Wed, 11 Jan 2023 21:09:07 +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 30BL97Ta091936; Wed, 11 Jan 2023 21:09:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30BL97UE091935; Wed, 11 Jan 2023 21:09:07 GMT (envelope-from git) Date: Wed, 11 Jan 2023 21:09:07 GMT Message-Id: <202301112109.30BL97UE091935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: 09dc4af0af41 - 2023Q1 - sysutils/graylog: enable using alternate JVM versions 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q1 X-Git-Reftype: branch X-Git-Commit: 09dc4af0af41c83e913d91ecb8593e4cbcf8892d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=09dc4af0af41c83e913d91ecb8593e4cbcf8892d commit 09dc4af0af41c83e913d91ecb8593e4cbcf8892d Author: Einar Bjarni Halldórsson AuthorDate: 2023-01-11 20:53:39 +0000 Commit: Dave Cottlehuber CommitDate: 2023-01-11 21:06:21 +0000 sysutils/graylog: enable using alternate JVM versions Future graylog versions in the 5.x series require both newer java versions, and migration from ElasticSearch to OpenSearch. This patch helps smooth the migration path. Reported by: Einar Bjarni Halldórsson --- sysutils/graylog/Makefile | 6 ++++-- sysutils/graylog/files/graylog.in | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sysutils/graylog/Makefile b/sysutils/graylog/Makefile index da6582b23829..19049f6d91d8 100644 --- a/sysutils/graylog/Makefile +++ b/sysutils/graylog/Makefile @@ -1,5 +1,6 @@ PORTNAME= graylog DISTVERSION= 4.3.9 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.graylog.org/releases/ DISTFILES= graylog/${DISTNAME}${EXTRACT_SUFX} \ @@ -18,7 +19,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= 8+ JAVA_EXTRACT= yes JAVA_RUN= yes @@ -38,7 +39,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} \ diff --git a/sysutils/graylog/files/graylog.in b/sysutils/graylog/files/graylog.in index 3530a2a57120..24d9b77c225a 100644 --- a/sysutils/graylog/files/graylog.in +++ b/sysutils/graylog/files/graylog.in @@ -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 @@ -63,6 +67,7 @@ load_rc_config $name : ${graylog_logs_dir:="%%GRAYLOG_LOGS_DIR%%"} : ${graylog_run_dir:="/var/run/graylog"} : ${graylog_log_config:="%%ETCDIR%%/log4j2.xml"} +: ${graylog_java_home:="%%JAVA_HOME%%"} java_options=" \ -Djava.awt.headless=true \ @@ -103,6 +108,8 @@ command_args=" \ --no-pid-file \ --configfile ${graylog_config}" +export JAVA_HOME=${graylog_java_home} + required_files="%%LOCALBASE%%/bin/java ${graylog_config}" graylog_precmd() {