Use el8 portable packages

This commit is contained in:
Eduard Abdullin 2026-08-19 17:30:26 +00:00 committed by root
commit ad5582fc9c
5 changed files with 95 additions and 13 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
openjdk-21.0.12+8.tar.xz
openjdk-21.0.12.1+1.tar.xz
tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz

26
NEWS
View File

@ -3,12 +3,38 @@ Key:
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
New in release OpenJDK 21.0.12.1 (2026-08-18):
==============================================
Live versions of these release notes can be found at:
* https://bit.ly/openjdk210121
* CVEs
- CVE-2026-60589
- CVE-2026-61308
- CVE-2026-70907
* Changes
- JDK-8333743: Change .jcheck/conf branches property to match valid branches
- JDK-8382471: Improve Resource Resolving
- JDK-8384708: Enhance HTTP Connections
- JDK-8386205: Enhance TLS server
- JDK-8388789: Bump update version for OpenJDK: jdk-21.0.12.1
- JDK-8389946: [21u] Remove designator DEFAULT_PROMOTED_VERSION_PRE=ea for release 21.0.12.1
New in release OpenJDK 21.0.12 (2026-07-21):
===========================================
Live versions of these release notes can be found at:
* https://bit.ly/openjdk2112
* CVEs
- CVE-2026-46968
- CVE-2026-46917
- CVE-2026-47010
- CVE-2026-47021
- CVE-2026-47027
- CVE-2026-60147
- CVE-2026-47059
- CVE-2026-47063
- CVE-2026-41254
* Changes
- JDK-7184899: Test sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh fail
- JDK-8015444: java/awt/Focus/KeyStrokeTest.java sometimes fails

View File

@ -2,8 +2,8 @@
%global featurever 21
%global interimver 0
%global updatever 12
%global patchver 0
%global buildver 8
%global patchver 1
%global buildver 1
%global portablerelease 1
%global rpmrelease 0
@ -25,8 +25,16 @@
%global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup
# Define an optional suffix for the OS this package is built on
%if 0%{?rhel} == 7
%global pkgos rhel7
# The portable package is intended to be built on either RHEL 8
# or CentOS Stream 9; any other OS will automatically get an
# appropriate suffix
%global rhel_buildos 8
%global centos_buildos 9
%if 0%{?centos} == 0 && 0%{?rhel} != 0%{rhel_buildos}
%global pkgos rhel%{?rhel}
%endif
%if 0%{?centos} != 0 && 0%{?centos} != 0%{centos_buildos}
%global pkgos rhel%{?centos}
%endif
# Define milestone (EA for pre-releases, GA for releases)
@ -235,7 +243,7 @@ URL: http://openjdk.java.net/
# Set of architectures for which we have a devkit
# Only used on RHEL
%if 0%{?centos} == 0
%global devkit_arches %{aarch64} %{ppc64le} riscv64 s390x x86_64
%global devkit_arches %{aarch64} %{ppc64le} s390x x86_64
%endif
# By default, we build a slowdebug build during main build on JIT architectures
@ -526,8 +534,14 @@ URL: http://openjdk.java.net/
# Define the architectures on which we build
# On RHEL, this should be the architectures with a devkit
# The exception is riscv64, which was introduced too recently
# for a devkit to exist. In that case, we build without devkit
%if 0%{?centos} == 0
%if 0%{?rhel} >= 10
ExclusiveArch: %{devkit_arches} riscv64
%else
ExclusiveArch: %{devkit_arches}
%endif
%else
ExclusiveArch: %{aarch64} %{ppc64le} riscv64 s390x x86_64
%endif
@ -538,7 +552,7 @@ Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_
# Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x).
# Systemtap tapsets. Zipped up to keep it small.
Source8: tapsets-icedtea-%%{icedteaver}.tar.xz
Source8: tapsets-icedtea-%{icedteaver}.tar.xz
# Desktop files. Adapted from IcedTea
# Disabled in portables
@ -683,7 +697,7 @@ BuildRequires: zip
BuildRequires: tar
BuildRequires: unzip
BuildRequires: javapackages-filesystem
BuildRequires: java-%{buildjdkver}-%{origin}%{?pkgos:-%{pkgos}}-devel
BuildRequires: java-%{buildjdkver}-%{origin}-devel
# Zero-assembler build requirement
%ifarch %{zero_arches}
BuildRequires: libffi-devel
@ -873,6 +887,7 @@ The %{origin_nice} %{featurever} miscellany.
echo "Preparing %{oj_vendor_version}"
echo "System is RHEL=%{?rhel}%{!?rhel:0}, CentOS=%{?centos}%{!?centos:0}, EPEL=%{?epel}%{!?epel:0}, Fedora=%{?fedora}%{!?fedora:0}"
echo "Portable suffix is %{?pkgos}%{!?pkgos:unset}"
# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-(
%if 0%{?stapinstall:1}
@ -1885,6 +1900,30 @@ done
%endif
%changelog
* Mon Aug 10 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.1.1-1.0
- Update to jdk-21.0.12.1+1 (GA)
- Update release notes to 21.0.12.1+1
- Fix double '%' in specification of IcedTea sources
- ** This tarball is embargoed until 2026-08-18 @ 1pm PT. **
- Resolves: OPENJDK-5042
* Mon Aug 10 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.0.8-3.0
- Make rhel usage in pkgos optional as it may be undefined
- Simplify pkgos conditional to work on RHEL 8
- Related: OPENJDK-5045
* Fri Aug 07 2026 Andrea Bolognani <abologna@redhat.com> - 1:21.0.12.0.8-3.0
- Automatically set pkgos when necessary
- Remove now redundant pkgos usage in JDK build dependency
- Don't attempt to use devkit on riscv64
- Resolves: OPENJDK-5045
- Resolves: OPENJDK-5046
* Wed Jul 29 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.0.8-2.0
- Add CVEs to NEWS file
- Update to tarball with final changeset ID
- Related: OPENJDK-4865
* Wed Jul 15 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.0.8-1.0
- Update to jdk-21.0.12+8 (GA)
- Update release notes to 21.0.12+8

View File

@ -7,8 +7,8 @@
%global featurever 21
%global interimver 0
%global updatever 12
%global patchver 0
%global buildver 8
%global patchver 1
%global buildver 1
%global portablerelease 1
%global rpmrelease 2
@ -53,7 +53,7 @@
Name: %{compatiblename}
Version: %{newjavaver}.%{buildver}
Release: %{?eaprefix}%{portablerelease}.%{rpmrelease}%{?extraver}%{?dist}.alma.2
Release: %{?eaprefix}%{portablerelease}.%{rpmrelease}%{?extraver}%{?dist}.alma.1
%global fullversion %{compatiblename}-%{version}-%{release}
@ -2478,9 +2478,26 @@ exit 0
%endif
%changelog
* Thu Jul 23 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1:21.0.12.0.8-1.2.alma.2
* Wed Aug 19 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1:21.0.12.1.1-1.2.alma.1
- Use el8 portable packages
* Wed Aug 12 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.1.1-1.2
- Bump release for PQC build
- Related: RHEL-235622
* Mon Aug 10 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.1.1-1.1
- Update to jdk-21.0.12.1+1 (GA)
- Update release notes to 21.0.12.1+1
- Sync the copy of the portable specfile with the latest update
- ** This tarball is embargoed until 2026-08-18 @ 1pm PT. **
- Resolves: RHEL-235622
* Wed Jul 29 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.0.8-2.1
- Add CVEs to NEWS file
- Update to tarball with final changeset ID
- Sync the copy of the portable specfile with the latest update
- Related: RHEL-188872
* Sat Jul 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.12.0.8-1.2
- Bump release for PQC build
- Related: RHEL-212302

View File

@ -1,2 +1,2 @@
SHA512 (openjdk-21.0.12+8.tar.xz) = 514c28f1819b12fb6f5a04c3ebc4358d8694135dc9566314dfe7368485e947f0f03e1835f069d0e989768537e953e4b3cd16f294289f6d4e2fbf74fffe9886d8
SHA512 (openjdk-21.0.12.1+1.tar.xz) = 96cf4f861d7c21ab9a4cd1e761797815c0c7b9b7891157febce980f0b77fff23c84fc5af51e51a8321f200ac447bf2d22230989c415c7e883a65d1d3221fb452
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30