From nobody Tue Feb 20 17:37:11 2024 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 4TfRRq2rbVz543fl; Tue, 20 Feb 2024 17:37:11 +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 4TfRRq29HTz4Jxk; Tue, 20 Feb 2024 17:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708450631; 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=jPu3yvOV+sXnc6MGgqHgO+ss4/k7E+YHXCYh6vgRjCA=; b=S9aV2+qfWm7lZsb2FKcy6sjxT13h/N3LQd3noSGOGIpQ3C3xgzHUjZvd9t7gRPmAWzBFcp UpsiciAkQ0QvD5+BHYRqaKr7WivuR8JOkph0rwDPN1JTRbOO0EMRFkYai1aOWqYpeQdB2w xC+Jgj9y+ouwNxSUCShR/MxmC32g+qnQdPQV2EZ/F7HUwYl7WcDglws8R7fHCcP1QuME8f jUuWeRtlv0KXddNVULxuAjfmmnUZRlEKr57yM4lqEv7SawTb8QHXQFJ+3x9d18N3LItxxY 3V75N/23BDxWA/64hnfgNvxQBQ8SMAaho4R9SqYhIZhy6ekixhOUDALtW9vwOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708450631; 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=jPu3yvOV+sXnc6MGgqHgO+ss4/k7E+YHXCYh6vgRjCA=; b=NFTeh8+Fzg1HiF1NbabZ+P/lC1X8PfXZg057CN9qV9tGKlCgRzfg7kJfN7XN8WI/xttw/P /DBHmJ2QNng0CBvAPoaMuB46JOPvOPQl8GIp2xeq2m8eVKQIezwv+sKGRr2bbPLI/O4cve cMMXbK/CWBatb8zTWhG6gnAG3Wju+hWWE6dQkUVDdUvxt/7ipu9gejZ/BxB3z7l1mQIjd9 Sol7E52k5nyL3fFVvOVDYnLdrdKASlLp3JYnSsqXSjaV2h5J44jHBCNlSc+IpEO10Q8D/A wPbCNTuj3aukgtJJWTWMEMQQ0tpnRss0pbPAHrtR/233AKAqpsSv9LXtX2Japg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708450631; a=rsa-sha256; cv=none; b=x63AX1f18q5t+TZT/oIGs9PaiqylpmZmtUM928NcW1Tt6xBAyXyiEoMzEiUTdOQbO/GJ1g ajfUSlz4VokSI2alejLvZlcHAt7/Y762oUu8nOJi+5r47f9caRtjxNbMqgBcroDQ4jcy8v g32/bqiLi6nJkzOa+wmHRYMcnKkyRFg6PcozToGnjtjAXDOhta0Vsgv6R/gobdZ9WjgrmU SF1zFThdf7nqjb5RbV0EqZUd/0+XXTajPzH7pHK8pnL1EzeVnBZd7nT6cY5/3yEV53z7O5 qg15yxjJtYjCoU3c71nKApBP4jGSBFfvRG98cBfcvQMw8CJPATPj2xNrzhGX9w== 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 4TfRRq17lKzS20; Tue, 20 Feb 2024 17:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KHbBVr007244; Tue, 20 Feb 2024 17:37:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KHbBVU007241; Tue, 20 Feb 2024 17:37:11 GMT (envelope-from git) Date: Tue, 20 Feb 2024 17:37:11 GMT Message-Id: <202402201737.41KHbBVU007241@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 17afe60229c0 - main - net/keycloak: update to 23.0.6 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: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17afe60229c0d18c7f0d38fc7412d17abcffbc39 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=17afe60229c0d18c7f0d38fc7412d17abcffbc39 commit 17afe60229c0d18c7f0d38fc7412d17abcffbc39 Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-02-20 17:33:39 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-02-20 17:36:48 +0000 net/keycloak: update to 23.0.6 - Update to 23.0.6 - Add keycloak user and group - Add pkg-message - Add support for development(start-dev) and production (start) mode at rc script - Export JAVA_HOME from rc script - Add keycloak build function into rc script PR: 275658 276859 Approved by: maintainer timeout (2 weeks) --- GIDs | 2 +- UIDs | 2 +- net/keycloak/Makefile | 19 +++++++++---- net/keycloak/distinfo | 6 ++-- net/keycloak/files/keycloak.in | 15 ++++++++-- net/keycloak/files/pkg-message.in | 58 +++++++++++++++++++++++++++++++++++++++ net/keycloak/pkg-plist | 6 ++-- 7 files changed, 93 insertions(+), 15 deletions(-) diff --git a/GIDs b/GIDs index 862dc28445c0..ea2114a098aa 100644 --- a/GIDs +++ b/GIDs @@ -272,7 +272,7 @@ galene:*:328: certspotter:*:329: orthanc:*:330: svxlink:*:331: -# free: 332 +keycloak:*:332: # free: 333 honeytrap:*:333: # free: 335 diff --git a/UIDs b/UIDs index e8a4a025a983..707e29c7be1c 100644 --- a/UIDs +++ b/UIDs @@ -277,7 +277,7 @@ galene:*:328:328::0:0:Galene Visioconference server:/nonexistent:/usr/sbin/nolog certspotter:*:329:329::0:0:Cert Spotter user:/nonexistent:/usr/sbin/nologin orthanc:*:330:330::0:0:Orthanc Daemon:/nonexistent:/usr/sbin/nologin svxlink:*:331:331::0:0:svxlink server:/nonexistent:/usr/sbin/nologin -# free: 332 +keycloak:*:332:332::0:0:keycloak server:/nonexistent:/usr/sbin/nologin honeytrap:*:333:333::0:0:HoneyTrap Daemon:/nonexistent:/usr/sbin/nologin # free: 334 # free: 335 diff --git a/net/keycloak/Makefile b/net/keycloak/Makefile index 4a27c5ecdd12..b1062b807e1a 100644 --- a/net/keycloak/Makefile +++ b/net/keycloak/Makefile @@ -1,5 +1,5 @@ PORTNAME= keycloak -PORTVERSION= 23.0.5 +DISTVERSION= 23.0.6 CATEGORIES= net java MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ @@ -28,8 +28,10 @@ JAVA_RUN= yes USE_RC_SUBR= keycloak -USER= www -GROUP= www +KEYCLOAK_USER= ${PORTNAME} +KEYCLOAK_GROUP= ${PORTNAME} +USERS= ${KEYCLOAK_USER} +GROUPS= ${USERS} VAR_DIR?= /var LOG_DIR?= ${VAR_DIR}/log/${PORTNAME} @@ -38,13 +40,18 @@ RUN_DIR?= ${VAR_DIR}/run/${PORTNAME} NO_ARCH= yes NO_BUILD= yes -SUB_LIST+= GROUP=${GROUP} \ +SUB_FILES+= pkg-message +SUB_LIST+= GROUP=${KEYCLOAK_GROUP} \ JAVA=${JAVA} \ + JAVA_HOME=${JAVA_HOME} \ LOG_DIR=${LOG_DIR} \ PORTNAME=${PORTNAME} \ RUN_DIR=${RUN_DIR} \ - USER=${USER} -PLIST_SUB= VERSION=${DISTVERSION} + USER=${KEYCLOAK_USER} \ + GROUP=${KEYCLOAK_GROUP} +PLIST_SUB= VERSION=${DISTVERSION} \ + USER=${KEYCLOAK_USER} \ + GROUP=${KEYCLOAK_GROUP} OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/net/keycloak/distinfo b/net/keycloak/distinfo index b549281cbfb4..c6492d16eaf0 100644 --- a/net/keycloak/distinfo +++ b/net/keycloak/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706519411 -SHA256 (keycloak-23.0.5.tar.gz) = 576990e486f1a3f0d4bce8f3c7c22fee5699d17e03794c8653cc5d36287adac1 -SIZE (keycloak-23.0.5.tar.gz) = 177864638 +TIMESTAMP = 1706915975 +SHA256 (keycloak-23.0.6.tar.gz) = 0a335248f44ba4c9aa2460082b3d00237900e3f0f4f910daab79d3fd401d0cb6 +SIZE (keycloak-23.0.6.tar.gz) = 177876996 diff --git a/net/keycloak/files/keycloak.in b/net/keycloak/files/keycloak.in index ad88f6699df3..f90d2304243a 100644 --- a/net/keycloak/files/keycloak.in +++ b/net/keycloak/files/keycloak.in @@ -14,6 +14,7 @@ # %%PORTNAME%%_user (string): User account to run with. # Default: www # %%PORTNAME%%_flags (string): Additional flags for the startup script. +# Default: start # . /etc/rc.subr @@ -27,7 +28,8 @@ load_rc_config $name : ${%%PORTNAME%%_enable:=NO} : ${%%PORTNAME%%_user:=%%USER%%} : ${%%PORTNAME%%_group:=%%GROUP%%} -: ${%%PORTNAME%%_flags:=""} +: ${%%PORTNAME%%_flags="start"} +: ${%%PORTNAME%%_java_home="%%JAVA_HOME%%"} pidfile=%%RUN_DIR%%/%%PORTNAME%%.pid command=/usr/sbin/daemon @@ -35,6 +37,9 @@ command_args="-u ${%%PORTNAME%%_user} -o %%LOG_DIR%%/%%PORTNAME%%.out -t %%PORTN start_cmd="%%PORTNAME%%_start" stop_cmd="%%PORTNAME%%_stop" +build_cmd="%%PORTNAME%%_build" + +export JAVA_HOME=${%%PORTNAME%%_java_home} %%PORTNAME%%_start() { @@ -49,7 +54,7 @@ stop_cmd="%%PORTNAME%%_stop" echo "Starting %%PORTNAME%%." ${command} ${command_args} \ - %%JAVASHAREDIR%%/%%PORTNAME%%/bin/kc.sh start \ + %%JAVASHAREDIR%%/%%PORTNAME%%/bin/kc.sh \ ${%%PORTNAME%%_flags} } @@ -73,4 +78,10 @@ stop_cmd="%%PORTNAME%%_stop" wait_for_pids ${pid_daemon} ${pid_child} } +%%PORTNAME%%_build() +{ + su -m keycloak -c "%%JAVASHAREDIR%%/%%PORTNAME%%/bin/kc.sh build" +} + +extra_commands="build" run_rc_command "$1" diff --git a/net/keycloak/files/pkg-message.in b/net/keycloak/files/pkg-message.in new file mode 100644 index 000000000000..85b23d9347fa --- /dev/null +++ b/net/keycloak/files/pkg-message.in @@ -0,0 +1,58 @@ +[ +{ type: install + message: <