From b518dd9c7e5632c37b17cdd64a2d0a9966a38f68 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 11 Oct 2023 20:32:39 +0100 Subject: [PATCH] add shasums --- .../alpine/src/main/packaging/temurin/21/APKBUILD | 12 ++++++------ .../src/main/packaging/temurin/21/debian/rules | 8 ++++---- .../main/packaging/temurin/21/temurin-21-jdk.spec | 12 ++++++------ .../main/packaging/temurin/21/temurin-21-jdk.spec | 12 ++++++------ .../alpine/src/main/packaging/temurin/21/APKBUILD | 12 ++++++------ .../src/main/packaging/temurin/21/debian/rules | 8 ++++---- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD b/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD index 7c68573d4..a4e8f971d 100644 --- a/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD +++ b/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD @@ -11,7 +11,7 @@ pkgrel=0 pkgdesc="Eclipse Temurin 21" provider_priority=21 url="https://adoptium.net" -arch="noarch" +arch="aarch64 x86_64" license="GPL-2.0-with-classpath-exception" makedepends=" alsa-lib-dev @@ -27,9 +27,9 @@ makedepends=" " depends="" subpackages="$pkgname-src:_src:noarch - $pkgname-jdk:_jdk:${CARCH/x86_64/x64}" + $pkgname-jdk:_jdk" source=" - https://github.com/adoptium/temurin21-binaries/releases/download/jdk-$_pkgvername/OpenJDK21-jdk_${CARCH/x86_64/x64}_alpine-linux_hotspot_$_pkgver.tar.gz + https://github.com/adoptium/temurin21-binaries/releases/download/jdk-$_pkgvername/OpenJDK21u-jdk_${CARCH/x86_64/x64}_alpine-linux_hotspot_$_pkgver.tar.gz HelloWorld.java TestECDSA.java @@ -99,15 +99,15 @@ _jdk() { case "$CARCH" in x86_64) - _arch_sum="b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306" + _arch_sum="4fd74f93f0b1a94d8471e0ed801fe9d938f7471f6efe8791880c85e7716c943f" ;; aarch64) - _arch_sum="b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306" + _arch_sum="3f8e5b0447d2dd711f12edda611ed1cf9aab4ca53c8fe32fca8fb1e6fee41c12" ;; esac sha256sums=" -$_arch_sum OpenJDK21-jdk_${CARCH/x86_64/x64}_alpine-linux_hotspot_$_pkgver.tar.gz +$_arch_sum OpenJDK21u-jdk_${CARCH/x86_64/x64}_alpine-linux_hotspot_$_pkgver.tar.gz e9185736dde99a4dc570a645a20407bdb41c1f48dfc34d9c3eb246cf0435a378 HelloWorld.java 22d2ff9757549ebc64e09afd3423f84b5690dcf972cd6535211c07c66d38fab0 TestCryptoLevel.java 9fb00c7b0220de8f3ee2aa398459a37d119f43fd63321530a00b3bb9217dd933 TestECDSA.java diff --git a/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules b/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules index dd0526695..760c4b2d4 100644 --- a/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules +++ b/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules @@ -3,10 +3,10 @@ pkg_name = temurin-21-jdk priority = 2111 jvm_tools = jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jlink jmap jmod jpackage jps jrunscript jshell jstack jstat jstatd jwebserver keytool rmiregistry serialver jexec jspawnhelper -amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.0%2B35/OpenJDK21-jdk_x64_linux_hotspot_21.0.0_35.tar.gz -amd64_checksum = 3d91842e9c172967ac397076523249d05a82ead51b0006838f5f0315ad52222c -arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.0%2B35/OpenJDK21-jdk_aarch64_linux_hotspot_21.0.0_35.tar.gz -arm64_checksum = b475bcc23db0bd618c815bb8f11d8e084dc58288ea3bcdf4e7f389ed41c89f56 +amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jdk_x64_linux_hotspot_21_35.tar.gz +amd64_checksum = 82f64c53acaa045370d6762ebd7441b74e6fda14b464d54d1ff8ca941ec069e6 +arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jdk_aarch64_linux_hotspot_21_35.tar.gz +arm64_checksum = 33e440c237438aa2e3866d84ead8d4e00dc0992d98d9fd0ee2fe48192f2dbc4b d = debian/$(pkg_name) jvm_home = usr/lib/jvm diff --git a/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec index 31d93fe4b..22f76477e 100644 --- a/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec +++ b/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec @@ -96,14 +96,14 @@ Provides: java-sdk-21-%{java_provides} Provides: java-sdk-%{java_provides} # First architecture (x86_64) -Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz -Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt +Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz +Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt # Second architecture (ppc64le) -Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz -Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt +Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz +Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt # Third architecture (aarch64) -Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz -Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt +Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz +Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt # Set the compression format to xz to be compatible with more Red Hat flavours. Newer versions of Fedora use zstd which # is not available on CentOS 7, for example. https://github.com/rpm-software-management/rpm/blob/master/macros.in#L353 diff --git a/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec index b04f2077d..653c674e0 100644 --- a/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec +++ b/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec @@ -96,14 +96,14 @@ Provides: java-sdk-21-%{java_provides} Provides: java-sdk-%{java_provides} # First architecture (x86_64) -Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz -Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt +Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz +Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt # Second architecture (ppc64le) -#Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz -#Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt +#Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz +#Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt # Third architecture (aarch64) -Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz -Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt +Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz +Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21u-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt # Avoid build failures on some distros due to missing build-id in binaries. %global debug_package %{nil} diff --git a/linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD b/linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD index 2c99836da..02c51e364 100644 --- a/linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD +++ b/linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD @@ -11,7 +11,7 @@ pkgrel=0 pkgdesc="Eclipse Temurin 21" provider_priority=21 url="https://adoptium.net" -arch="noarch" +arch="aarch64 x86_64" license="GPL-2.0-with-classpath-exception" makedepends=" alsa-lib-dev @@ -26,8 +26,8 @@ makedepends=" libxtst-dev " depends="" -subpackages="$pkgname-jre:_jre:${CARCH/x86_64/x64}" -source="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-$_pkgvername/OpenJDK21-jre_${CARCH/x86_64/x64}_alpine-linux_hotspot_$_pkgver.tar.gz" +subpackages="$pkgname-jre:_jre" +source="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-$_pkgvername/OpenJDK21u-jre_${CARCH/x86_64/x64}_alpine-linux_hotspot_$_pkgver.tar.gz" _java_home="/usr/lib/jvm/java-21-temurin-jre" @@ -73,13 +73,13 @@ _jre() { case "$CARCH" in x86_64) - _arch_sum="b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306" + _arch_sum="9e7aa5ca9d8819e8fb3ae9f3c146905bee81808b70b875de0984ec55b1bd8559" ;; aarch64) - _arch_sum="b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306" + _arch_sum="ff4102e2aa0b35f337d579f0d19aff1aa4a10bee9ab0951137affdb50dd8f3e2" ;; esac sha256sums=" -$_arch_sum OpenJDK21-jre_${CARCH/x86_64/x64}_alpine-linux_hotspot_$_pkgver.tar.gz +$_arch_sum OpenJDK21u-jre_${CARCH/x86_64/x64}_alpine-linux_hotspot_$_pkgver.tar.gz " diff --git a/linux/jre/debian/src/main/packaging/temurin/21/debian/rules b/linux/jre/debian/src/main/packaging/temurin/21/debian/rules index 16682e316..a8d84373d 100644 --- a/linux/jre/debian/src/main/packaging/temurin/21/debian/rules +++ b/linux/jre/debian/src/main/packaging/temurin/21/debian/rules @@ -3,10 +3,10 @@ pkg_name = temurin-21-jre priority = 2112 jvm_tools = java jfr jrunscript jwebserver keytool rmiregistry -amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B35/OpenJDK21-jre_x64_linux_hotspot_21.0.0_35.tar.gz -amd64_checksum = e3592e86290c192804d9c6b5035d42cc32cf04141d1c0b9d1ecb67739826c8c5 -arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.0%2B35/OpenJDK21-jre_aarch64_linux_hotspot_21.0.0_35.tar.gz -arm64_checksum = 63a730d5a3b6d21d31f7cba15dc44b019a8a4d8652e13acec45040f98584112c +amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jre_x64_linux_hotspot_21_35.tar.gz +amd64_checksum = 080a53a3f75b94450779199f09c8d91b53637d315f128c58a4f160fb6272502d +arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jre_aarch64_linux_hotspot_21_35.tar.gz +arm64_checksum = 5a36cde2956749aaad502e1df6729072e5483265fce142230516261da9a391db d = debian/$(pkg_name) jvm_home = usr/lib/jvm