Update to 22.3.0

2 files changed, 10 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2db46037f0f..bbbbab107e16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = graal-visualvm-jdk11-bin
 	pkgdesc = GraalVM VisualVM distribution, Java 11 version
-	pkgver = 22.2.0
+	pkgver = 22.3.0
 	pkgrel = 1
 	url = https://www.graalvm.org/
 	arch = x86_64
 	arch = aarch64
 	license = GPL2
 	depends = jdk11-graalvm-bin
-	source = LICENSE::https://raw.githubusercontent.com/oracle/graal/09883274a37a97f69a143604249db904901b6a72/tools/VISUALVM_LICENSE
-	sha256sums = 29c5bc82ed188162958c6a681bc63b5d7444630e5c907a9285141368bae650f2
-	source_x86_64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/visualvm-installable-ce-java11-linux-amd64-22.2.0.jar
-	sha256sums_x86_64 = 5087caf533c94ca2012f1c1ff2b502652fb8a3e56fb77263101bc523b72adf0d
-	source_aarch64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/visualvm-installable-ce-java11-linux-aarch64-22.2.0.jar
-	sha256sums_aarch64 = 2bad5b1ac70d4d62bbbb3cbc130702c74dba2e9f49b597f527b5f789aed7cdc0
+	source_x86_64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/visualvm-installable-ce-java11-linux-amd64-22.3.0.jar
+	sha256sums_x86_64 = 86115ec26b895b998434b7b17475d27782701f5d302ca8ede7faba5a62db8b95
+	source_aarch64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/visualvm-installable-ce-java11-linux-aarch64-22.3.0.jar
+	sha256sums_aarch64 = aaf80ee727af4d37b16cd3ff9e3d5b18d8801fb61a9cbfa2ba9f691d17016e81
 
 pkgname = graal-visualvm-jdk11-bin
diff --git a/PKGBUILD b/PKGBUILD
index 013f799c8dce..c75bb8b136ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 java_=11
 pkgname_=graal-visualvm
 pkgname="${pkgname_}-jdk${java_}-bin"
-pkgver=22.2.0
+pkgver=22.3.0
 pkgrel=1
 pkgdesc="GraalVM VisualVM distribution, Java ${java_} version"
 arch=('x86_64'
@@ -11,18 +11,16 @@ arch=('x86_64'
 url='https://www.graalvm.org/'
 license=('GPL2')
 depends=("jdk${java_}-graalvm-bin")
-source=('LICENSE::https://raw.githubusercontent.com/oracle/graal/09883274a37a97f69a143604249db904901b6a72/tools/VISUALVM_LICENSE') # TODO use vm-${pkgver} instead of hard-coded commit next time (vm-22.2.0 tag does not include tools/VISUALVM_LICENSE)
-sha256sums=('29c5bc82ed188162958c6a681bc63b5d7444630e5c907a9285141368bae650f2')
 source_x86_64=("https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${pkgver}/visualvm-installable-ce-java${java_}-linux-amd64-${pkgver}.jar")
 source_aarch64=("https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${pkgver}/visualvm-installable-ce-java${java_}-linux-aarch64-${pkgver}.jar")
-sha256sums_x86_64=('5087caf533c94ca2012f1c1ff2b502652fb8a3e56fb77263101bc523b72adf0d')
-sha256sums_aarch64=('2bad5b1ac70d4d62bbbb3cbc130702c74dba2e9f49b597f527b5f789aed7cdc0')
+sha256sums_x86_64=('86115ec26b895b998434b7b17475d27782701f5d302ca8ede7faba5a62db8b95')
+sha256sums_aarch64=('aaf80ee727af4d37b16cd3ff9e3d5b18d8801fb61a9cbfa2ba9f691d17016e81')
 
 package() {
     local file eq permissions mode name target
 
     mkdir -p "$pkgdir/usr/lib/jvm/java-${java_}-graalvm/"
-    cp -a -t "$pkgdir/usr/lib/jvm/java-${java_}-graalvm/" bin/ lib/ # TODO some LICENSE* once upstream includes it (oracle/graal#4762)
+    cp -a -t "$pkgdir/usr/lib/jvm/java-${java_}-graalvm/" bin/ lib/ LICENSE_VISUALVM.txt
 
     printf '\n' >> META-INF/permissions
     while read -r file eq permissions; do
@@ -42,14 +40,6 @@ package() {
                 return 1
                 ;;
         esac
-        case "$file" in
-            'lib/visualvm/platform/modules/lib/i386'|'lib/visualvm/platform/modules/lib/amd64'|'lib/visualvm/platform/modules/lib/x86')
-                if ! [[ -e "$pkgdir/usr/lib/jvm/java-${java_}-graalvm/$file" ]]; then
-                    # missing directories, reported as oracle/graal#4763
-                    continue;
-                fi
-                ;;
-        esac
         chmod "$mode" -- "$pkgdir/usr/lib/jvm/java-${java_}-graalvm/$file"
     done < META-INF/permissions
 
@@ -70,6 +60,5 @@ package() {
     # already in jdk${java_}-graalvm-bin package
     unlink "$pkgdir/usr/lib/jvm/java-${java_}-graalvm/lib/installer/components/org.graalvm.component"
 
-    # for now, copy the separately downloaded LICENSE into /usr/share/licenses/
-    install -DTm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -DTm644 LICENSE_VISUALVM.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }