From aad4ab38870a46c8e4a71016dfb8cc9a87138c40 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Thu, 25 Jul 2024 04:57:08 +0100 Subject: [PATCH 1/2] JULY CPU - JDK8 & JDK11 Updates For Shipping Linux Packages (#961) * July_CPU_Updates * Fix gpg signing * Updates for JDK11 Installers. * Updates For JDK8 * Update JDK arm32 tags --- .../src/main/packaging/temurin/11/APKBUILD | 4 ++-- .../src/main/packaging/temurin/8/APKBUILD | 4 ++-- .../packaging/temurin/11/debian/changelog | 6 ++++++ .../main/packaging/temurin/11/debian/rules | 20 +++++++++---------- .../main/packaging/temurin/8/debian/changelog | 6 ++++++ .../src/main/packaging/temurin/8/debian/rules | 16 +++++++-------- linux/jdk/redhat/src/main/packaging/build.sh | 8 ++++++-- .../packaging/temurin/11/temurin-11-jdk.spec | 6 ++++-- .../packaging/temurin/8/temurin-8-jdk.spec | 8 +++++--- linux/jdk/suse/src/main/packaging/build.sh | 6 +++++- .../packaging/temurin/11/temurin-11-jdk.spec | 6 ++++-- .../packaging/temurin/8/temurin-8-jdk.spec | 8 +++++--- .../src/main/packaging/temurin/11/APKBUILD | 4 ++-- .../src/main/packaging/temurin/8/APKBUILD | 4 ++-- .../packaging/temurin/11/debian/changelog | 6 ++++++ .../main/packaging/temurin/11/debian/rules | 20 +++++++++---------- .../main/packaging/temurin/8/debian/changelog | 6 ++++++ .../src/main/packaging/temurin/8/debian/rules | 16 +++++++-------- linux/jre/redhat/src/main/packaging/build.sh | 6 +++++- .../packaging/temurin/11/temurin-11-jre.spec | 6 ++++-- .../packaging/temurin/8/temurin-8-jre.spec | 8 +++++--- linux/jre/suse/src/main/packaging/build.sh | 6 +++++- .../packaging/temurin/11/temurin-11-jre.spec | 6 ++++-- .../packaging/temurin/8/temurin-8-jre.spec | 8 +++++--- 24 files changed, 125 insertions(+), 69 deletions(-) diff --git a/linux/jdk/alpine/src/main/packaging/temurin/11/APKBUILD b/linux/jdk/alpine/src/main/packaging/temurin/11/APKBUILD index 4ae7c5e25..a91991057 100644 --- a/linux/jdk/alpine/src/main/packaging/temurin/11/APKBUILD +++ b/linux/jdk/alpine/src/main/packaging/temurin/11/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Eclipse Adoptium Package Maintainers pkgname=temurin-11 -pkgver=11.0.23_p9 +pkgver=11.0.24_p8 # replace _p1 with _1 _pkgver=${pkgver/_p/_} _pkgverplus=${pkgver/_p/+} @@ -95,7 +95,7 @@ _jdk() { } sha256sums=" -b45c467be52fe11ffd9bf69b3a035068134b305053874de4f3b3c5e5e1419659 OpenJDK11U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz +ae988c72eeb2d78bb729a3387601ce0ea84305734ebdbe95d276f39952a8e019 OpenJDK11U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz e9185736dde99a4dc570a645a20407bdb41c1f48dfc34d9c3eb246cf0435a378 HelloWorld.java 22d2ff9757549ebc64e09afd3423f84b5690dcf972cd6535211c07c66d38fab0 TestCryptoLevel.java 9fb00c7b0220de8f3ee2aa398459a37d119f43fd63321530a00b3bb9217dd933 TestECDSA.java diff --git a/linux/jdk/alpine/src/main/packaging/temurin/8/APKBUILD b/linux/jdk/alpine/src/main/packaging/temurin/8/APKBUILD index 04bc60be0..b440d3046 100644 --- a/linux/jdk/alpine/src/main/packaging/temurin/8/APKBUILD +++ b/linux/jdk/alpine/src/main/packaging/temurin/8/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Eclipse Adoptium Package Maintainers pkgname=temurin-8-jdk -pkgver=8.412.08 +pkgver=8.422.05 # replace 8. with 8u and .01 with b-01 _pkgver=${pkgver/8./8u} _pkgver=${_pkgver%.*}b${_pkgver#*.} @@ -67,6 +67,6 @@ package() { } sha256sums=" -409091665e5f8cf678938bbbc0d377122ef8bad7b1c97a0f809da054db956e51 OpenJDK8U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz +525a7731331cad502b9293ccb4ac2b13e85516736e98a57cb27c2767005188e1 OpenJDK8U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz e9185736dde99a4dc570a645a20407bdb41c1f48dfc34d9c3eb246cf0435a378 HelloWorld.java " diff --git a/linux/jdk/debian/src/main/packaging/temurin/11/debian/changelog b/linux/jdk/debian/src/main/packaging/temurin/11/debian/changelog index 8fd3fb443..30e7a08c2 100644 --- a/linux/jdk/debian/src/main/packaging/temurin/11/debian/changelog +++ b/linux/jdk/debian/src/main/packaging/temurin/11/debian/changelog @@ -1,3 +1,9 @@ +temurin-11-jdk (11.0.24.0.0+8) STABLE; urgency=medium + + * Eclipse Temurin 11.0.24.0.0+8 release. + + -- Eclipse Adoptium Package Maintainers Wed, 17 Jul 2024 00:00:00 +0000 + temurin-11-jdk (11.0.23.0.0+9) STABLE; urgency=medium * Eclipse Temurin 11.0.23.0.0+9 release. diff --git a/linux/jdk/debian/src/main/packaging/temurin/11/debian/rules b/linux/jdk/debian/src/main/packaging/temurin/11/debian/rules index 799a53507..38cdff156 100755 --- a/linux/jdk/debian/src/main/packaging/temurin/11/debian/rules +++ b/linux/jdk/debian/src/main/packaging/temurin/11/debian/rules @@ -3,16 +3,16 @@ pkg_name = temurin-11-jdk priority = 1111 jvm_tools = jaotc jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jjs jlink jmap jmod jps jrunscript jshell jstack jstat jstatd keytool pack200 rmic rmid rmiregistry serialver unpack200 jexec jspawnhelper -amd64_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz -amd64_checksum = 23e47ea7a3015be3240f21185fd902adebdcf76530757c9b482c7eb5bd3417c2 -arm64_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.23_9.tar.gz -arm64_checksum = e00476a7be3c4adfa9b3d55d30768967fd246a8352e518894e183fa444d4d3ce -armhf_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.23_9.tar.gz -armhf_checksum = 8077edc07a57d846c3d11286a7caf05ed6ca6d6c1234bf0e03611f18e187f075 -ppc64el_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.23_9.tar.gz -ppc64el_checksum = f56068bb64c6bf858894f75c2bc261f54db32932422eb07527f36ae40046e9a0 -s390x_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.23_9.tar.gz -s390x_checksum = cf06c3e41acfaeda77112ac04f5a711cafe9fa9ac04dff758696fe7e8d66a0ea +amd64_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz +amd64_checksum = 0e71a01563a5c7b9988a168b0c4ce720a6dff966b3c27bb29d1ded461ff71d0e +arm64_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz +arm64_checksum = 04e21301fedc76841fb03929ac6cacfbbda30b5693acfd515a8f34d4a0cdeb28 +armhf_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz +armhf_checksum = 9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00 +ppc64el_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz +ppc64el_checksum = 4dfdc498938a159c592a2f094576f09c94999e17327c1f5ff81794694992054d +s390x_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.24_8.tar.gz +s390x_checksum = 7f049af5d3ff8794d07da1c31752e18e204653930f1d422e2d42905c90c1c408 d = debian/$(pkg_name) jvm_home = usr/lib/jvm diff --git a/linux/jdk/debian/src/main/packaging/temurin/8/debian/changelog b/linux/jdk/debian/src/main/packaging/temurin/8/debian/changelog index 35600f5e9..69eba2528 100644 --- a/linux/jdk/debian/src/main/packaging/temurin/8/debian/changelog +++ b/linux/jdk/debian/src/main/packaging/temurin/8/debian/changelog @@ -1,3 +1,9 @@ +temurin-8-jdk (8.0.422.0.0+5) STABLE; urgency=medium + + * Eclipse Temurin 8.0.422.0.0+5 release. + +-- Eclipse Adoptium Package Maintainers Wed, Jul 17 2024 00:00:00 +0000 + temurin-8-jdk (8.0.412.0.0+8) STABLE; urgency=medium * Eclipse Temurin 8.0.412.0.0+8 release. diff --git a/linux/jdk/debian/src/main/packaging/temurin/8/debian/rules b/linux/jdk/debian/src/main/packaging/temurin/8/debian/rules index 19dd69080..f11f16ddd 100755 --- a/linux/jdk/debian/src/main/packaging/temurin/8/debian/rules +++ b/linux/jdk/debian/src/main/packaging/temurin/8/debian/rules @@ -4,14 +4,14 @@ pkg_name = temurin-8-jdk priority = 1081 # The list below must be kept in sync with the jinfo.in file jvm_tools = appletviewer clhsdb extcheck hsdb idlj jar jarsigner java javac javadoc javah javap jcmd jconsole jdb jdeps jfr jhat jinfo jjs jmap jps jrunscript jsadebugd jstack jstat jstatd keytool native2ascii orbd pack200 policytool rmic rmid rmiregistry schemagen serialver servertool tnameserv unpack200 wsgen wsimport xjc jexec -amd64_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u412b08.tar.gz -amd64_checksum = b9884a96f78543276a6399c3eb8c2fd8a80e6b432ea50e87d3d12d495d1d2808 -arm64_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u412b08.tar.gz -arm64_checksum = 3504d748a93f23cac8c060bd33231bd51e90dcb620f38dadc6239b6cd2a5011c -armhf_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_arm_linux_hotspot_8u412b08.tar.gz -armhf_checksum = be4aff6fa7bf6515f16f93dcaf9fdc61853fe1ef0d25b08a1bb1cf6e3d047391 -ppc64el_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u412b08.tar.gz -ppc64el_checksum = 6b7ed7996788075e182dd33349288346240fbce540e50fd77aecfc309a5ada19 +amd64_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz +amd64_checksum = 4c6056f6167fae73ace7c3080b78940be5c87d54f5b08894b3517eed1cbb2c06 +arm64_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz +arm64_checksum = af98a839ec238106078bd360af9e405dc6665c05ee837178ed13b92193681923 +armhf_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz +armhf_checksum = 5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1 +ppc64el_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz +ppc64el_checksum = 78fbd7b01204cdf90bcb3f9fe6a8e9432bdaa75776fa333aa9cbcb5a79de34cd d = debian/$(pkg_name) jvm_home = usr/lib/jvm diff --git a/linux/jdk/redhat/src/main/packaging/build.sh b/linux/jdk/redhat/src/main/packaging/build.sh index e18d7e007..519152a97 100644 --- a/linux/jdk/redhat/src/main/packaging/build.sh +++ b/linux/jdk/redhat/src/main/packaging/build.sh @@ -63,5 +63,9 @@ done; find /home/builder/rpmbuild/SRPMS /home/builder/rpmbuild/RPMS -type f -name "*.rpm" -print0 | xargs -0 -I {} cp {} /home/builder/out # Sign generated RPMs with rpmsign. if grep -q %_gpg_name /home/builder/.rpmmacros; then - rpmsign --addsign /home/builder/out/*.rpm -fi + rm -f ~/.gnupg/public-keys.d/pubring.db.lock + for file in `ls /home/builder/out/*.rpm`; do + echo Signing: $file + rpmsign --addsign $file + done +fi; diff --git a/linux/jdk/redhat/src/main/packaging/temurin/11/temurin-11-jdk.spec b/linux/jdk/redhat/src/main/packaging/temurin/11/temurin-11-jdk.spec index ecfdd3a68..bf7115911 100644 --- a/linux/jdk/redhat/src/main/packaging/temurin/11/temurin-11-jdk.spec +++ b/linux/jdk/redhat/src/main/packaging/temurin/11/temurin-11-jdk.spec @@ -1,10 +1,10 @@ -%global upstream_version 11.0.23+9 +%global upstream_version 11.0.24+8 # Only [A-Za-z0-9.] allowed in version: # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version # also not very intuitive: # $ rpmdev-vercmp 11.0.13.0.1___7 11.0.13.0.0+8 # 11.0.13.0.0___8 == 11.0.13.0.0+8 -%global spec_version 11.0.23.0.0.9 +%global spec_version 11.0.24.0.0.8 %global spec_release 1 %global priority 1111 @@ -264,6 +264,8 @@ fi /usr/lib/tmpfiles.d/%{name}.conf %changelog +* Wed Jul 17 2024 Eclipse Adoptium Package Maintainers 11.0.24.0.0.8-1 +- Eclipse Temurin 11.0.24.0+8 release. * Wed Apr 17 2024 Eclipse Adoptium Package Maintainers 11.0.23.0.0.9-1 - Eclipse Temurin 11.0.23.0+9 release. * Tue Jan 23 2024 Eclipse Adoptium Package Maintainers 11.0.22.0.0.7-1 diff --git a/linux/jdk/redhat/src/main/packaging/temurin/8/temurin-8-jdk.spec b/linux/jdk/redhat/src/main/packaging/temurin/8/temurin-8-jdk.spec index 93d26d0e3..0418ada8d 100644 --- a/linux/jdk/redhat/src/main/packaging/temurin/8/temurin-8-jdk.spec +++ b/linux/jdk/redhat/src/main/packaging/temurin/8/temurin-8-jdk.spec @@ -1,10 +1,10 @@ -%global upstream_version 8u412-b08 +%global upstream_version 8u422-b05 # Only [A-Za-z0-9.] allowed in version: # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version # also not very intuitive: # $ rpmdev-vercmp 8.0.312.0.1___8 8.0.312.0.0+7 # 8.0.312.0.0___7 == 8.0.312.0.0+7 -%global spec_version 8.0.412.0.0.8 +%global spec_version 8.0.422.0.0.5 %global spec_release 1 %global priority 1081 @@ -47,7 +47,7 @@ %global src_num 6 %global sha_src_num 7 # jdk8 arm32 has different top directory name https://github.com/adoptium/temurin-build/issues/2795 -%global upstream_version 8u412-b08-aarch32-20240419 +%global upstream_version 8u422-b05-aarch32-20240718 %endif # Allow for noarch SRPM build %ifarch noarch @@ -278,6 +278,8 @@ fi /usr/lib/tmpfiles.d/%{name}.conf %changelog +* Wed Jul 17 2024 Eclipse Adoptium Package Maintainers 8.0.422.0.0.5-1 +- Eclipse Temurin 8.0.422-b05 release. * Wed Apr 17 2024 Eclipse Adoptium Package Maintainers 8.0.412.0.0.8-1 - Eclipse Temurin 8.0.412-b08 release. * Wed Jan 24 2024 Eclipse Adoptium Package Maintainers 8.0.402.0.0.6-1 diff --git a/linux/jdk/suse/src/main/packaging/build.sh b/linux/jdk/suse/src/main/packaging/build.sh index b17e29aa7..06319b87d 100644 --- a/linux/jdk/suse/src/main/packaging/build.sh +++ b/linux/jdk/suse/src/main/packaging/build.sh @@ -34,5 +34,9 @@ done; find /home/builder/rpmbuild/SRPMS /home/builder/rpmbuild/RPMS -type f -name "*.rpm" -print0 | xargs -0 -I {} cp {} /home/builder/out # Sign generated RPMs with rpmsign if grep -q %_gpg_name /home/builder/.rpmmacros; then - rpmsign --addsign /home/builder/out/*.rpm + rm -f ~/.gnupg/public-keys.d/pubring.db.lock + for file in `ls /home/builder/out/*.rpm`; do + echo Signing: $file + rpmsign --addsign $file + done fi; diff --git a/linux/jdk/suse/src/main/packaging/temurin/11/temurin-11-jdk.spec b/linux/jdk/suse/src/main/packaging/temurin/11/temurin-11-jdk.spec index b0e084659..2a22c496a 100644 --- a/linux/jdk/suse/src/main/packaging/temurin/11/temurin-11-jdk.spec +++ b/linux/jdk/suse/src/main/packaging/temurin/11/temurin-11-jdk.spec @@ -1,10 +1,10 @@ -%global upstream_version 11.0.23+9 +%global upstream_version 11.0.24+8 # Only [A-Za-z0-9.] allowed in version: # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version # also not very intuitive: # $ rpmdev-vercmp 11.0.13.0.1___7 11.0.13.0.0+8 # 11.0.13.0.0___8 == 11.0.13.0.0+8 -%global spec_version 11.0.23.0.0.9 +%global spec_version 11.0.24.0.0.8 %global spec_release 1 %global priority 1111 @@ -255,6 +255,8 @@ fi %{prefix} %changelog +* Wed Jul 17 2024 Eclipse Adoptium Package Maintainers 11.0.24.0.0.8-1 +- Eclipse Temurin 11.0.24.0+8 release. * Wed Apr 17 2024 Eclipse Adoptium Package Maintainers 11.0.23.0.0.9-1 - Eclipse Temurin 11.0.23.0+9 release. * Mon Jan 23 2024 Eclipse Adoptium Package Maintainers 11.0.22.0.0.7-1 diff --git a/linux/jdk/suse/src/main/packaging/temurin/8/temurin-8-jdk.spec b/linux/jdk/suse/src/main/packaging/temurin/8/temurin-8-jdk.spec index 8bcb3f7cc..0105a26c0 100644 --- a/linux/jdk/suse/src/main/packaging/temurin/8/temurin-8-jdk.spec +++ b/linux/jdk/suse/src/main/packaging/temurin/8/temurin-8-jdk.spec @@ -1,10 +1,10 @@ -%global upstream_version 8u412-b08 +%global upstream_version 8u422-b05 # Only [A-Za-z0-9.] allowed in version: # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version # also not very intuitive: # $ rpmdev-vercmp 8.0.312.0.1___8 8.0.312.0.0+7 # 8.0.312.0.0___7 == 8.0.312.0.0+7 -%global spec_version 8.0.412.0.0.8 +%global spec_version 8.0.422.0.0.5 %global spec_release 1 %global priority 1081 @@ -47,7 +47,7 @@ %global src_num 6 %global sha_src_num 7 # jdk8 arm32 has different top directory name https://github.com/adoptium/temurin-build/issues/2795 -%global upstream_version 8u412-b08-aarch32-20240419 +%global upstream_version 8u422-b05-aarch32-20240718 %endif # Allow for noarch SRPM build %ifarch noarch @@ -268,6 +268,8 @@ fi %{prefix} %changelog +* Wed Jul 17 2024 Eclipse Adoptium Package Maintainers 8.0.422.0.0.5-1 +- Eclipse Temurin 8.0.422-b05 release. * Wed Apr 17 2024 Eclipse Adoptium Package Maintainers 8.0.412.0.0.8-1 - Eclipse Temurin 8.0.412-b08 release. * Wed Jan 24 2024 Eclipse Adoptium Package Maintainers 8.0.402.0.0.6-1 diff --git a/linux/jre/alpine/src/main/packaging/temurin/11/APKBUILD b/linux/jre/alpine/src/main/packaging/temurin/11/APKBUILD index e50d987d2..50a775879 100644 --- a/linux/jre/alpine/src/main/packaging/temurin/11/APKBUILD +++ b/linux/jre/alpine/src/main/packaging/temurin/11/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Eclipse Adoptium Package Maintainers pkgname=temurin-11 -pkgver=11.0.23_p9 +pkgver=11.0.24_p8 # replace _p1 with _1 _pkgver=${pkgver/_p/_} _pkgverplus=${pkgver/_p/+} @@ -72,5 +72,5 @@ _jre() { } sha256sums=" -6972a6251bc88d6fbb64a188557cf165f1c415ded550d2a280bbcbc4272caff1 OpenJDK11U-jre_x64_alpine-linux_hotspot_$_pkgver.tar.gz +0ac795729cc11f47323a71713eac2a5b22d4615fd9b66c8766f964c03fb6e160 OpenJDK11U-jre_x64_alpine-linux_hotspot_$_pkgver.tar.gz " diff --git a/linux/jre/alpine/src/main/packaging/temurin/8/APKBUILD b/linux/jre/alpine/src/main/packaging/temurin/8/APKBUILD index 63906bc3c..22fbcca9e 100644 --- a/linux/jre/alpine/src/main/packaging/temurin/8/APKBUILD +++ b/linux/jre/alpine/src/main/packaging/temurin/8/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Eclipse Adoptium Package Maintainers pkgname=temurin-8-jre -pkgver=8.412.08 +pkgver=8.422.05 # replace 8. with 8u and .01 with b-01 _pkgver=${pkgver/8./8u} _pkgver=${_pkgver%.*}b${_pkgver#*.} @@ -60,5 +60,5 @@ ls ${srcdir} } sha256sums=" -c82962d7378d1fd415db594fce6ec047939e9fab5301fa4407cd7faea9ea7e31 OpenJDK8U-jre_x64_alpine-linux_hotspot_$_pkgver.tar.gz +9a7a939638b9cdaa8e1a119b8f21bfdd4cb2390b8a47cc27ccf9effc90f4b437 OpenJDK8U-jre_x64_alpine-linux_hotspot_$_pkgver.tar.gz " diff --git a/linux/jre/debian/src/main/packaging/temurin/11/debian/changelog b/linux/jre/debian/src/main/packaging/temurin/11/debian/changelog index 2ad1fc84d..eefce5e22 100644 --- a/linux/jre/debian/src/main/packaging/temurin/11/debian/changelog +++ b/linux/jre/debian/src/main/packaging/temurin/11/debian/changelog @@ -1,3 +1,9 @@ +temurin-11-jre (11.0.24.0.0+8) STABLE; urgency=medium + + * Eclipse Temurin 11.0.24.0.0+8 release. + + -- Eclipse Adoptium Package Maintainers Wed, 17 Jul 2024 00:00:00 +0000 + temurin-11-jre (11.0.23.0.0+9) STABLE; urgency=medium * Eclipse Temurin 11.0.23.0.0+9 release. diff --git a/linux/jre/debian/src/main/packaging/temurin/11/debian/rules b/linux/jre/debian/src/main/packaging/temurin/11/debian/rules index 94657bf26..aa6d8078d 100755 --- a/linux/jre/debian/src/main/packaging/temurin/11/debian/rules +++ b/linux/jre/debian/src/main/packaging/temurin/11/debian/rules @@ -3,16 +3,16 @@ pkg_name = temurin-11-jre priority = 1112 jvm_tools = jaotc java jfr jjs jrunscript keytool pack200 rmid rmiregistry unpack200 -amd64_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.23_9.tar.gz -amd64_checksum = 786a72296189ba8e43999532aa73730d87ec1fce558eb3c4e98b611b423375e3 -arm64_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.23_9.tar.gz -arm64_checksum = 7290ace47a030d89ea023c28e7aa555c9da72b4194f73b39ec9d058011bf06dd -armhf_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.23_9.tar.gz -armhf_checksum = 025f994549708f7291ce3b0fa7c41f7e78ec3af3eae3f85fffe9c5fa4a54889f -ppc64el_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.23_9.tar.gz -ppc64el_checksum = 3b3fbd324620fd914bd8462e292124493fcf846fd69195c4b9a231131dc68d5f -s390x_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.23_9.tar.gz -s390x_checksum = 25abb7f74f55847b0d509402111084bd7a244d904744f3bfffa89528bc3b8a69 +amd64_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.24_8.tar.gz +amd64_checksum = e0c1938093da3780e4494d366a4e6b75584dde8d46a19acea6691ae11df4cda5 +arm64_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.24_8.tar.gz +arm64_checksum = 1fe97cdaad47d7d108f329c6e4560b46748ef7f2948a1027812ade0bbc2a3597 +armhf_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz +armhf_checksum = bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a +ppc64el_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.24_8.tar.gz +ppc64el_checksum = 8ee351314182df93fbad96139bb74b97814944d66197896e388404a1ecfa06b3 +s390x_tarball_url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_s390x_linux_hotspot_11.0.24_8.tar.gz +s390x_checksum = 5b331f093bb03126334bbbc24f05f60681baeda461d860e4e2cdb693ee54e0ed d = debian/$(pkg_name) jvm_home = usr/lib/jvm diff --git a/linux/jre/debian/src/main/packaging/temurin/8/debian/changelog b/linux/jre/debian/src/main/packaging/temurin/8/debian/changelog index 8c457c91b..773b2e2fa 100644 --- a/linux/jre/debian/src/main/packaging/temurin/8/debian/changelog +++ b/linux/jre/debian/src/main/packaging/temurin/8/debian/changelog @@ -1,3 +1,9 @@ +temurin-8-jre (8.0.422.0.0+5) STABLE; urgency=medium + + * Eclipse Temurin 8.0.422.0.0+5 release. + +-- Eclipse Adoptium Package Maintainers Wed, Jul 17 2024 00:00:00 +0000 + temurin-8-jre (8.0.412.0.0+8) STABLE; urgency=medium * Eclipse Temurin 8.0.412.0.0+8 release. diff --git a/linux/jre/debian/src/main/packaging/temurin/8/debian/rules b/linux/jre/debian/src/main/packaging/temurin/8/debian/rules index 09fd4e5d5..b4581ca68 100755 --- a/linux/jre/debian/src/main/packaging/temurin/8/debian/rules +++ b/linux/jre/debian/src/main/packaging/temurin/8/debian/rules @@ -4,14 +4,14 @@ pkg_name = temurin-8-jre priority = 1082 # The list below must be kept in sync with the jinfo.in file jvm_tools = java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200 -amd64_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_x64_linux_hotspot_8u412b08.tar.gz -amd64_checksum = a8d994332a2ff15d48bf04405c3b2f6bd331a928dd96639b15e62891f7172363 -arm64_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u412b08.tar.gz -arm64_checksum = 17550a6a4ddf71ac81ba8f276467bc58f036c123c0f1bafcafd69f70e3e49cf5 -armhf_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_arm_linux_hotspot_8u412b08.tar.gz -armhf_checksum = 1a6b470ac83b241223447a1e6cb55c4a8f78af0146b9387e9842625041226654 -ppc64el_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u412-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u412b08.tar.gz -ppc64el_checksum = d3157230c01b320e47ad6df650e83b15f8f76294d0df9f1c03867d07fe2883c9 +amd64_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_linux_hotspot_8u422b05.tar.gz +amd64_checksum = 0ac516cc1eadffb4cd3cfc9736a33d58ea6a396bf85729036c973482f7c063d9 +arm64_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_aarch64_linux_hotspot_8u422b05.tar.gz +arm64_checksum = 8fbefff2c578f73d95118d830347589ddc9aa84510200a5a5001901c2dea4810 +armhf_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz +armhf_checksum = 13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff +ppc64el_tarball_url = https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_ppc64le_linux_hotspot_8u422b05.tar.gz +ppc64el_checksum = 2991edbedee448c0f1edf131beca84b415dac64ea97365b9bfd85bc2f39893bb d = debian/$(pkg_name) jvm_home = usr/lib/jvm diff --git a/linux/jre/redhat/src/main/packaging/build.sh b/linux/jre/redhat/src/main/packaging/build.sh index e3e1818b8..f994fc9a7 100644 --- a/linux/jre/redhat/src/main/packaging/build.sh +++ b/linux/jre/redhat/src/main/packaging/build.sh @@ -61,5 +61,9 @@ done; find /home/builder/rpmbuild/SRPMS /home/builder/rpmbuild/RPMS -type f -name "*.rpm" -print0 | xargs -0 -I {} cp {} /home/builder/out # Sign generated RPMs with rpmsign. if grep -q %_gpg_name /home/builder/.rpmmacros; then - rpmsign --addsign /home/builder/out/*.rpm + rm -f ~/.gnupg/public-keys.d/pubring.db.lock + for file in `ls /home/builder/out/*.rpm`; do + echo Signing: $file + rpmsign --addsign $file + done fi; diff --git a/linux/jre/redhat/src/main/packaging/temurin/11/temurin-11-jre.spec b/linux/jre/redhat/src/main/packaging/temurin/11/temurin-11-jre.spec index e49c0df72..fba02964b 100644 --- a/linux/jre/redhat/src/main/packaging/temurin/11/temurin-11-jre.spec +++ b/linux/jre/redhat/src/main/packaging/temurin/11/temurin-11-jre.spec @@ -1,10 +1,10 @@ -%global upstream_version 11.0.23+9 +%global upstream_version 11.0.24+8 # Only [A-Za-z0-9.] allowed in version: # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version # also not very intuitive: # $ rpmdev-vercmp 11.0.13.0.1___7 11.0.13.0.0+8 # 11.0.13.0.0___8 == 11.0.13.0.0+8 -%global spec_version 11.0.23.0.0.9 +%global spec_version 11.0.24.0.0.8 %global spec_release 1 %global priority 1112 @@ -199,6 +199,8 @@ fi /usr/lib/tmpfiles.d/%{name}.conf %changelog +* Wed Jul 17 2024 Eclipse Adoptium Package Maintainers 11.0.24.0.0.8-1 +- Eclipse Temurin 11.0.24.0+8 release. * Wed Apr 17 2024 Eclipse Adoptium Package Maintainers 11.0.23.0.0.9-1 - Eclipse Temurin 11.0.23.0+9 release. * Tue Jan 23 2024 Eclipse Adoptium Package Maintainers 11.0.22.0.0.7-1 diff --git a/linux/jre/redhat/src/main/packaging/temurin/8/temurin-8-jre.spec b/linux/jre/redhat/src/main/packaging/temurin/8/temurin-8-jre.spec index 8b892fe91..beb5f80c7 100644 --- a/linux/jre/redhat/src/main/packaging/temurin/8/temurin-8-jre.spec +++ b/linux/jre/redhat/src/main/packaging/temurin/8/temurin-8-jre.spec @@ -1,10 +1,10 @@ -%global upstream_version 8u412-b08 +%global upstream_version 8u422-b05 # Only [A-Za-z0-9.] allowed in version: # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version # also not very intuitive: # $ rpmdev-vercmp 8.0.312.0.1___8 8.0.312.0.0+7 # 8.0.312.0.0___7 == 8.0.312.0.0+7 -%global spec_version 8.0.412.0.0.8 +%global spec_version 8.0.422.0.0.5 %global spec_release 1 %global priority 1082 @@ -47,7 +47,7 @@ %global src_num 6 %global sha_src_num 7 # jre8 arm32 has different top directory name https://github.com/adoptium/temurin-build/issues/2795 -%global upstream_version 8u412-b08-aarch32-20240419 +%global upstream_version 8u422-b05-aarch32-20240718 %endif # Allow for noarch SRPM build %ifarch noarch @@ -192,6 +192,8 @@ fi /usr/lib/tmpfiles.d/%{name}.conf %changelog +* Wed Jul 17 2024 Eclipse Adoptium Package Maintainers 8.0.422.0.0.5-1 +- Eclipse Temurin 8.0.422-b05 release. * Wed Apr 17 2024 Eclipse Adoptium Package Maintainers 8.0.412.0.0.8-1 - Eclipse Temurin 8.0.412-b08 release. * Wed Jan 24 2024 Eclipse Adoptium Package Maintainers 8.0.402.0.0.6-1 diff --git a/linux/jre/suse/src/main/packaging/build.sh b/linux/jre/suse/src/main/packaging/build.sh index 1894852a0..288034b84 100644 --- a/linux/jre/suse/src/main/packaging/build.sh +++ b/linux/jre/suse/src/main/packaging/build.sh @@ -34,5 +34,9 @@ done; find /home/builder/rpmbuild/SRPMS /home/builder/rpmbuild/RPMS -type f -name "*.rpm" -print0 | xargs -0 -I {} cp {} /home/builder/out # Sign generated RPMs with rpmsign if grep -q %_gpg_name /home/builder/.rpmmacros; then - rpmsign --addsign /home/builder/out/*.rpm + rm -f ~/.gnupg/public-keys.d/pubring.db.lock + for file in `ls /home/builder/out/*.rpm`; do + echo Signing: $file + rpmsign --addsign $file + done fi; diff --git a/linux/jre/suse/src/main/packaging/temurin/11/temurin-11-jre.spec b/linux/jre/suse/src/main/packaging/temurin/11/temurin-11-jre.spec index 56b0204d7..25bdf3860 100644 --- a/linux/jre/suse/src/main/packaging/temurin/11/temurin-11-jre.spec +++ b/linux/jre/suse/src/main/packaging/temurin/11/temurin-11-jre.spec @@ -1,10 +1,10 @@ -%global upstream_version 11.0.23+9 +%global upstream_version 11.0.24+8 # Only [A-Za-z0-9.] allowed in version: # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version # also not very intuitive: # $ rpmdev-vercmp 11.0.13.0.1___7 11.0.13.0.0+8 # 11.0.13.0.0___8 == 11.0.13.0.0+8 -%global spec_version 11.0.23.0.0.9 +%global spec_version 11.0.24.0.0.8 %global spec_release 1 %global priority 1112 @@ -190,6 +190,8 @@ fi %{prefix} %changelog +* Wed Jul 17 2024 Eclipse Adoptium Package Maintainers 11.0.24.0.0.8-1 +- Eclipse Temurin 11.0.24.0+8 release. * Wed Apr 17 2024 Eclipse Adoptium Package Maintainers 11.0.23.0.0.9-1 - Eclipse Temurin 11.0.23.0+9 release. * Tue Jan 23 2024 Eclipse Adoptium Package Maintainers 11.0.22.0.0.7-1 diff --git a/linux/jre/suse/src/main/packaging/temurin/8/temurin-8-jre.spec b/linux/jre/suse/src/main/packaging/temurin/8/temurin-8-jre.spec index 2bed48378..943d8459b 100644 --- a/linux/jre/suse/src/main/packaging/temurin/8/temurin-8-jre.spec +++ b/linux/jre/suse/src/main/packaging/temurin/8/temurin-8-jre.spec @@ -1,10 +1,10 @@ -%global upstream_version 8u412-b08 +%global upstream_version 8u422-b05 # Only [A-Za-z0-9.] allowed in version: # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version # also not very intuitive: # $ rpmdev-vercmp 8.0.312.0.1___8 8.0.312.0.0+7 # 8.0.312.0.0___7 == 8.0.312.0.0+7 -%global spec_version 8.0.412.0.0.8 +%global spec_version 8.0.422.0.0.5 %global spec_release 1 %global priority 1082 @@ -47,7 +47,7 @@ %global src_num 6 %global sha_src_num 7 # jre8 arm32 has different top directory name https://github.com/adoptium/temurin-build/issues/2795 -%global upstream_version 8u412-b08-aarch32-20240419 +%global upstream_version 8u422-b05-aarch32-20240718 %endif # Allow for noarch SRPM build %ifarch noarch @@ -182,6 +182,8 @@ fi %{prefix} %changelog +* Wed Jul 17 2024 Eclipse Adoptium Package Maintainers 8.0.422.0.0.5-1 +- Eclipse Temurin 8.0.422-b05 release. * Wed Apr 17 2024 Eclipse Adoptium Package Maintainers 8.0.412.0.0.8-1 - Eclipse Temurin 8.0.412-b08 release. * Wed Jan 24 2024 Eclipse Adoptium Package Maintainers 8.0.402.0.0.6-1 From 803b3b9d6a5da05d06d325b43c846f2fc9702c76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 22:27:29 +1200 Subject: [PATCH 2/2] Bump github/codeql-action from 3.25.13 to 3.25.14 (#963) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.13 to 3.25.14. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2d790406f505036ef40ecba973cc774a50395aac...5cf07d8b700b67e235fbb65cbc84f69c0cf10464) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 3a1113ed6..ea972cf6d 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -66,6 +66,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13 + uses: github/codeql-action/upload-sarif@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14 with: sarif_file: results.sarif