Frederik Schwan pushed to branch main at Arch Linux / Packaging / Packages / keycloak
Commits: 444864f6 by Frederik Schwan at 2024-03-21T20:28:08+01:00 fix java version patch breaking kcreg.sh - - - - - 3 changed files: - .SRCINFO - PKGBUILD - pin-java-version.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = keycloak pkgdesc = Open Source Identity and Access Management For Modern Applications and Services pkgver = 24.0.1 - pkgrel = 1 + pkgrel = 2 url = https://www.keycloak.org/ install = keycloak.install arch = any @@ -26,6 +26,6 @@ pkgbase = keycloak sha512sums = 2e2ba147007ad74e38579a8838d79de47beac509b4bd1a14d7f80905953d79a7396d781f141b461ec688f5ceef9a1081a825a4ca8afc1ea12c178d8ae7f5a7dd sha512sums = 155db40105c08d0aaa810ca5533dc16fc9f82060280541ede6fafd754d30b4844f6d10ace1417a5ad68d89fc54e1b9e6d906ce7ccf973f4ac964422211ed9a72 sha512sums = 27c2b0d8ef2f64a515410e5316524eed879d67c42a695642c23653f59bbdc37ff7aaff3414fa6779e97ae477c51014aadb2f0256effdf7abf65f1778fe8885bd - sha512sums = a10f377d2e19f72f77000a474563b6fc83c740d6040551c6ff034d22a32cde8c77ea3a413e9f03e52a773f778049ffc7174fb966fa328288c5cd049d3d68a19b + sha512sums = 4b69d59657bd9bc7583860ea5f8c103965330e37293235e63a012d222fdc26b8f88ee7e7eb9208ea81367271e7a8c2b10e2f86a115453dd374160a0e23abe64c pkgname = keycloak ===================================== PKGBUILD ===================================== @@ -4,7 +4,7 @@ pkgname=keycloak pkgver=24.0.1 _java=17 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Identity and Access Management For Modern Applications and Services" arch=('any') url="https://www.keycloak.org/" @@ -28,7 +28,7 @@ sha512sums=('b46252c6b50e951cb99a91a4fdd0d99a7c8cce1879b20aab2c1be5c8860ac3db4eb '2e2ba147007ad74e38579a8838d79de47beac509b4bd1a14d7f80905953d79a7396d781f141b461ec688f5ceef9a1081a825a4ca8afc1ea12c178d8ae7f5a7dd' '155db40105c08d0aaa810ca5533dc16fc9f82060280541ede6fafd754d30b4844f6d10ace1417a5ad68d89fc54e1b9e6d906ce7ccf973f4ac964422211ed9a72' '27c2b0d8ef2f64a515410e5316524eed879d67c42a695642c23653f59bbdc37ff7aaff3414fa6779e97ae477c51014aadb2f0256effdf7abf65f1778fe8885bd' - 'a10f377d2e19f72f77000a474563b6fc83c740d6040551c6ff034d22a32cde8c77ea3a413e9f03e52a773f778049ffc7174fb966fa328288c5cd049d3d68a19b') + '4b69d59657bd9bc7583860ea5f8c103965330e37293235e63a012d222fdc26b8f88ee7e7eb9208ea81367271e7a8c2b10e2f86a115453dd374160a0e23abe64c') prepare() { cd $pkgname-$pkgver ===================================== pin-java-version.patch ===================================== @@ -1,22 +1,22 @@ -From 24fd4d17d97bfa28971ce980c76ebbf420fb9439 Mon Sep 17 00:00:00 2001 +From e2072b1611e4fee730c9d8f7c3f68fd0410c5700 Mon Sep 17 00:00:00 2001 From: Frederik Schwan <frederik.sch...@linux.com> -Date: Tue, 1 Nov 2022 18:14:03 +0100 -Subject: [PATCH] Pin Java version +Date: Thu, 21 Mar 2024 20:11:59 +0100 +Subject: [PATCH] Pin Java Version Inject JAVA_HOME and JAVA variables into scripts that end up in /usr/bin to also pin the java version for the cli tools that otherwise would use the default system JAVA_HOME and JAVA var. --- - integration/client-cli/admin-cli/src/main/bin/kcadm.sh | 1 + - .../client-cli/client-registration-cli/src/main/bin/kcreg.sh | 1 + - quarkus/dist/src/main/content/bin/kc.sh | 1 + - 3 files changed, 3 insertions(+) + integration/client-cli/admin-cli/src/main/bin/kcadm.sh | 1 + + .../client-cli/client-registration-cli/src/main/bin/kcreg.sh | 3 ++- + quarkus/dist/src/main/content/bin/kc.sh | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/integration/client-cli/admin-cli/src/main/bin/kcadm.sh b/integration/client-cli/admin-cli/src/main/bin/kcadm.sh -index 60a9e05f5c..0cdd597cd6 100755 +index fa0e7f86a5..a08299e498 100755 --- a/integration/client-cli/admin-cli/src/main/bin/kcadm.sh +++ b/integration/client-cli/admin-cli/src/main/bin/kcadm.sh -@@ -19,6 +19,7 @@ +@@ -19,6 +19,7 @@ esac RESOLVED_NAME="${RESOLVED_NAME:-"$0"}" DIRNAME="$(dirname "$RESOLVED_NAME")" @@ -25,22 +25,31 @@ index 60a9e05f5c..0cdd597cd6 100755 if [ -z "$JAVA" ]; then if [ -n "$JAVA_HOME" ]; then diff --git a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh -index ce85fb5710..bab287e9b7 100755 +index 6a188c20b3..87e923189b 100755 --- a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh +++ b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh -@@ -19,6 +19,7 @@ +@@ -17,8 +17,10 @@ case "$(uname)" in + esac + RESOLVED_NAME="${RESOLVED_NAME:-"$0"}" ++DIRNAME="$(dirname "$RESOLVED_NAME")" if [ -z "$JAVA" ]; then + . "$DIRNAME/common.sh" if [ -n "$JAVA_HOME" ]; then JAVA="$JAVA_HOME/bin/java" else +@@ -26,5 +28,4 @@ if [ -z "$JAVA" ]; then + fi + fi + +-DIRNAME="$(dirname "$RESOLVED_NAME")" + exec "$JAVA" $KC_OPTS -cp $DIRNAME/client/keycloak-client-registration-cli-${project.version}.jar --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir=$DIRNAME/client/lib org.keycloak.client.registration.cli.KcRegMain "$@" diff --git a/quarkus/dist/src/main/content/bin/kc.sh b/quarkus/dist/src/main/content/bin/kc.sh -index d7be862cde..fdef64d707 100644 +index 7e40aade59..395e5d9a5a 100644 --- a/quarkus/dist/src/main/content/bin/kc.sh +++ b/quarkus/dist/src/main/content/bin/kc.sh -@@ -23,6 +23,7 @@ fi +@@ -25,6 +25,7 @@ RESOLVED_NAME="${RESOLVED_NAME:-"$0"}" GREP="grep" DIRNAME="$(dirname "$RESOLVED_NAME")" @@ -49,5 +58,5 @@ index d7be862cde..fdef64d707 100644 abs_path () { if [ -z $IS_CYGWIN ] ; then -- -2.38.1 +2.44.0 View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/keycloak/-/commit/444864f63fd25648c215426e61dbd5096d9d54c5 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/keycloak/-/commit/444864f63fd25648c215426e61dbd5096d9d54c5 You're receiving this email because of your account on gitlab.archlinux.org.