diff --git a/.gitignore b/.gitignore index 51f40ad..9db45fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz -SOURCES/openjdk-jdk11u-jdk-11.0.22+7.tar.xz +SOURCES/openjdk-jdk11u-jdk-11.0.23+9.tar.xz diff --git a/.java-11-openjdk-portable.metadata b/.java-11-openjdk-portable.metadata index 162e9d3..1479d99 100644 --- a/.java-11-openjdk-portable.metadata +++ b/.java-11-openjdk-portable.metadata @@ -1,2 +1,2 @@ c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz -7694237019564cbd5568e24ffae9754308d13b29 SOURCES/openjdk-jdk11u-jdk-11.0.22+7.tar.xz +db99bc0a0912f824db1043d18b199c154d57bb5b SOURCES/openjdk-jdk11u-jdk-11.0.23+9.tar.xz diff --git a/SOURCES/README.md b/SOURCES/README.md deleted file mode 100644 index 2fa9c3a..0000000 --- a/SOURCES/README.md +++ /dev/null @@ -1,39 +0,0 @@ -OpenJDK 11 is a Long-Term Support (LTS) release of the Java platform. - -For a list of major changes from OpenJDK 8 (java-1.8.0-openjdk), see -the upstream release page for OpenJDK 11 and the preceding interim -releases: - -* 9: https://openjdk.org/projects/jdk9/ -* 10: https://openjdk.java.net/projects/jdk/10/ -* 11: https://openjdk.java.net/projects/jdk/11/ - -# Rebuilding the OpenJDK package - -The OpenJDK packages are now created from a single build which is then -packaged for different major versions of Red Hat Enterprise Linux -(RHEL). This allows the OpenJDK team to focus their efforts on the -development and testing of this single build, rather than having -multiple builds which only differ by the platform they were built on. - -This does make rebuilding the package slightly more complicated than a -normal package. Modifications should be made to the -`java-11-openjdk-portable.specfile` file, which can be found with this -README file in the source RPM or installed in the documentation tree -by the `java-11-openjdk-headless` RPM. - -Once the modified `java-11-openjdk-portable` RPMs are built, they -should be installed and will produce a number of tarballs in the -`/usr/lib/jvm` directory. The `java-11-openjdk` RPMs can then be -built, which will use these tarballs to create the usual RPMs found in -RHEL. The `java-11-openjdk-portable` RPMs can be uninstalled once the -desired final RPMs are produced. - -Note that the `java-11-openjdk.spec` file has a hard requirement on -the exact version of java-11-openjdk-portable to use, so this will -need to be modified if the version or rpmrelease values are changed in -`java-11-openjdk-portable.specfile`. - -To reduce the number of RPMs involved, the `fastdebug` and `slowdebug` -builds may be disabled using `--without fastdebug` and `--without -slowdebug`. diff --git a/SOURCES/java-11-openjdk-portable.specfile b/SOURCES/java-11-openjdk-portable.specfile deleted file mode 100644 index 30f7454..0000000 --- a/SOURCES/java-11-openjdk-portable.specfile +++ /dev/null @@ -1,2555 +0,0 @@ -# debug_package %%{nil} is portable-jdks specific -%define debug_package %{nil} - -# RPM conditionals so as to be able to dynamically produce -# slowdebug/release builds. See: -# http://rpm.org/user_doc/conditional_builds.html -# -# Examples: -# -# Produce release, fastdebug *and* slowdebug builds on x86_64 (default): -# $ rpmbuild -ba java-11-openjdk.spec -# -# Produce only release builds (no slowdebug builds) on x86_64: -# $ rpmbuild -ba java-11-openjdk.spec --without slowdebug --without fastdebug -# -# Only produce a release build on x86_64: -# $ rhpkg mockbuild --without slowdebug --without fastdebug - -# Enable fastdebug builds by default on relevant arches. -%bcond_without fastdebug -# Enable slowdebug builds by default on relevant arches. -%bcond_without slowdebug -# Enable release builds by default on relevant arches. -%bcond_without release -# Enable static library builds by default. -%bcond_without staticlibs -# Remove build artifacts by default -%bcond_with artifacts -# Build a fresh libjvm.so for use in a copy of the bootstrap JDK -%bcond_without fresh_libjvm -# Build with system libraries -%bcond_with system_libs - -# Workaround for stripping of debug symbols from static libraries -%if %{with staticlibs} -%define __brp_strip_static_archive %{nil} -%global include_staticlibs 1 -%else -%global include_staticlibs 0 -%endif - -# Define whether to use the bootstrap JDK directly or with a fresh libjvm.so -%if %{with fresh_libjvm} -%global build_hotspot_first 1 -%else -%global build_hotspot_first 0 -%endif - -%if %{with system_libs} -%global system_libs 1 -%global link_type system -%global freetype_lib %{nil} -%else -%global system_libs 0 -%global link_type bundled -%global freetype_lib |libfreetype[.]so.* -%endif - -# The -g flag says to use strip -g instead of full strip on DSOs or EXEs. -# This fixes detailed NMT and other tools which need minimal debug info. -# See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879 -%global _find_debuginfo_opts -g - -# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros -# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch -# see the difference between global and define: -# See https://github.com/rpm-software-management/rpm/issues/127 to comments at "pmatilai commented on Aug 18, 2017" -# (initiated in https://bugzilla.redhat.com/show_bug.cgi?id=1482192) -%global debug_suffix_unquoted -slowdebug -%global fastdebug_suffix_unquoted -fastdebug -%global main_suffix_unquoted -main -%global staticlibs_suffix_unquoted -staticlibs -# quoted one for shell operations -%global debug_suffix "%{debug_suffix_unquoted}" -%global fastdebug_suffix "%{fastdebug_suffix_unquoted}" -%global normal_suffix "" -%global main_suffix "%{main_suffix_unquoted}" -%global staticlibs_suffix "%{staticlibs_suffix_unquoted}" - -%global debug_warning This package is unoptimised with full debugging. Install only as needed and remove ASAP. -%global fastdebug_warning This package is optimised with full debugging. Install only as needed and remove ASAP. -%global debug_on unoptimised with full debugging on -%global fastdebug_on optimised with full debugging on -%global for_fastdebug for packages with debugging on and optimisation -%global for_debug for packages with debugging on and no optimisation - -%if %{with release} -%global include_normal_build 1 -%else -%global include_normal_build 0 -%endif - -%if %{include_normal_build} -%global normal_build %{normal_suffix} -%else -%global normal_build %{nil} -%endif - -# We have hardcoded list of files, which is appearing in alternatives, and in files -# in alternatives those are slaves and master, very often triplicated by man pages -# in files all masters and slaves are ghosted -# the ghosts are here to allow installation via query like `dnf install /usr/bin/java` -# you can list those files, with appropriate sections: cat *.spec | grep -e --install -e --slave -e post_ -# TODO - fix those hardcoded lists via single list -# Those files must *NOT* be ghosted for *slowdebug* packages -# FIXME - if you are moving jshell or jlink or similar, always modify all three sections -# you can check via headless and devels: -# rpm -ql --noghost java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin -# == rpm -ql java-11-openjdk-headless-slowdebug-11.0.1.13-8.fc29.x86_64.rpm | grep bin -# != rpm -ql java-11-openjdk-headless-11.0.1.13-8.fc29.x86_64.rpm | grep bin -# similarly for other %%{_jvmdir}/{jre,java} and %%{_javadocdir}/{java,java-zip} -%define is_release_build() %( if [ "%{?1}" == "%{debug_suffix_unquoted}" -o "%{?1}" == "%{fastdebug_suffix_unquoted}" ]; then echo "0" ; else echo "1"; fi ) - -# while JDK is a techpreview(is_system_jdk=0), some provides are turned off. Once jdk stops to be an techpreview, move it to 1 -# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...) -%global is_system_jdk 0 - -%global aarch64 aarch64 arm64 armv8 -# we need to distinguish between big and little endian PPC64 -%global ppc64le ppc64le -%global ppc64be ppc64 ppc64p7 -# Set of architectures which support multiple ABIs -%global multilib_arches %{power64} sparc64 x86_64 -# Set of architectures for which we build slowdebug builds -%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x -# Set of architectures for which we build fastdebug builds -%global fastdebug_arches x86_64 ppc64le aarch64 -# Set of architectures with a Just-In-Time (JIT) compiler -%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 -# Set of architectures which use the Zero assembler port (!jit_arches) -%global zero_arches ppc s390 -# Set of architectures which run a full bootstrap cycle -%global bootstrap_arches %{jit_arches} -# Set of architectures which support SystemTap tapsets -%global systemtap_arches %{jit_arches} -# Set of architectures with a Ahead-Of-Time (AOT) compiler -%global aot_arches x86_64 %{aarch64} -# Set of architectures which support the serviceability agent -%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} -# Set of architectures which support class data sharing -# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific -# However, it does segfault on the Zero assembler port, so currently JIT only -%global share_arches %{jit_arches} -# Set of architectures for which we build the Shenandoah garbage collector -%global shenandoah_arches x86_64 %{aarch64} -# Set of architectures for which we build the Z garbage collector -%global zgc_arches x86_64 -# Set of architectures for which alt-java has SSB mitigation -%global ssbd_arches x86_64 -# Set of architectures where we verify backtraces with gdb -# s390x fails on RHEL 7 so we exclude it there -%if (0%{?rhel} > 0 && 0%{?rhel} < 8) -%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches} -%else -%global gdb_arches %{jit_arches} %{zero_arches} -%endif - -# By default, we build a slowdebug build during main build on JIT architectures -%if %{with slowdebug} -%ifarch %{debug_arches} -%global include_debug_build 1 -%else -%global include_debug_build 0 -%endif -%else -%global include_debug_build 0 -%endif - -# On certain architectures, we compile the Shenandoah GC -%ifarch %{shenandoah_arches} -%global use_shenandoah_hotspot 1 -%global shenandoah_feature shenandoahgc -%else -%global use_shenandoah_hotspot 0 -%global shenandoah_feature -shenandoahgc -%endif - -# On certain architectures, we compile the ZGC -%ifarch %{zgc_arches} -%global use_zgc_hotspot 1 -%global zgc_feature zgc -%else -%global use_zgc_hotspot 0 -%global zgc_feature -zgc -%endif - -# By default, we build a fastdebug build during main build only on fastdebug architectures -%if %{with fastdebug} -%ifarch %{fastdebug_arches} -%global include_fastdebug_build 1 -%else -%global include_fastdebug_build 0 -%endif -%else -%global include_fastdebug_build 0 -%endif - -%if %{include_debug_build} -%global slowdebug_build %{debug_suffix} -%else -%global slowdebug_build %{nil} -%endif - -%if %{include_fastdebug_build} -%global fastdebug_build %{fastdebug_suffix} -%else -%global fastdebug_build %{nil} -%endif - -# If you disable all builds, then the build fails -# Build and test slowdebug first as it provides the best diagnostics -%global build_loop %{slowdebug_build} %{fastdebug_build} %{normal_build} - -%if %{include_staticlibs} -%global staticlibs_loop %{staticlibs_suffix} -%else -%global staticlibs_loop %{nil} -%endif - -%if 0%{?flatpak} -%global bootstrap_build false -%else -%ifarch %{bootstrap_arches} -%global bootstrap_build true -%else -%global bootstrap_build false -%endif -%endif - -%if %{include_staticlibs} -# Extra target for producing the static-libraries. Separate from -# other targets since this target is configured to use in-tree -# AWT dependencies: lcms, libjpeg, libpng, libharfbuzz, giflib -# and possibly others -%global static_libs_target static-libs-image -%else -%global static_libs_target %{nil} -%endif - -# The static libraries are produced under the same configuration as the main -# build for portables, as we expect in-tree libraries to be used throughout. -# If system libraries are enabled, the static libraries will also use them -# which may cause issues. -%global bootstrap_targets images %{static_libs_target} legacy-jre-image -%global release_targets images docs-zip %{static_libs_target} legacy-jre-image -# No docs nor bootcycle for debug builds -%global debug_targets images %{static_libs_target} legacy-jre-image -# Target to use to just build HotSpot -%global hotspot_target hotspot - -# JDK to use for bootstrapping -%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk - -# Disable LTO as this causes build failures at the moment. -# See RHBZ#1861401 -%define _lto_cflags %{nil} - -# Filter out flags from the optflags macro that cause problems with the OpenJDK build -# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2 -# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs) -# We replace it with -Wformat (required by -Werror=format-security) and -Wno-cpp to avoid FORTIFY_SOURCE warnings -# We filter out -fexceptions as the HotSpot build explicitly does -fno-exceptions and it's otherwise the default for C++ -%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat -Wno-cpp|' | sed -r -e 's|-O[0-9]*||') -%global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||') -%global ourldflags %{__global_ldflags} - -# With disabled nss is NSS deactivated, so NSS_LIBDIR can contain the wrong path -# the initialization must be here. Later the pkg-config have buggy behavior -# looks like openjdk RPM specific bug -# Always set this so the nss.cfg file is not broken -%global NSS_LIBDIR %(pkg-config --variable=libdir nss) - -# In some cases, the arch used by the JDK does -# not match _arch. -# Also, in some cases, the machine name used by SystemTap -# does not match that given by _target_cpu -%ifarch x86_64 -%global archinstall amd64 -%global stapinstall x86_64 -%endif -%ifarch ppc -%global archinstall ppc -%global stapinstall powerpc -%endif -%ifarch %{ppc64be} -%global archinstall ppc64 -%global stapinstall powerpc -%endif -%ifarch %{ppc64le} -%global archinstall ppc64le -%global stapinstall powerpc -%endif -%ifarch %{ix86} -%global archinstall i686 -%global stapinstall i386 -%endif -%ifarch ia64 -%global archinstall ia64 -%global stapinstall ia64 -%endif -%ifarch s390 -%global archinstall s390 -%global stapinstall s390 -%endif -%ifarch s390x -%global archinstall s390x -%global stapinstall s390 -%endif -%ifarch %{arm} -%global archinstall arm -%global stapinstall arm -%endif -%ifarch %{aarch64} -%global archinstall aarch64 -%global stapinstall arm64 -%endif -# 32 bit sparc, optimized for v9 -%ifarch sparcv9 -%global archinstall sparc -%global stapinstall %{_target_cpu} -%endif -# 64 bit sparc -%ifarch sparc64 -%global archinstall sparcv9 -%global stapinstall %{_target_cpu} -%endif -# Need to support noarch for srpm build -%ifarch noarch -%global archinstall %{nil} -%global stapinstall %{nil} -%endif - -%ifarch %{systemtap_arches} -%global with_systemtap 1 -%else -%global with_systemtap 0 -%endif - -# New Version-String scheme-style defines -%global featurever 11 -%global interimver 0 -%global updatever 21 -%global patchver 0 -# buildjdkver is usually same as %%{featurever}, -# but in time of bootstrap of next jdk, it is featurever-1, -# and this it is better to change it here, on single place -%global buildjdkver %{featurever} -# Add LTS designator for RHEL builds -%if 0%{?rhel} - %global lts_designator "LTS" - %global lts_designator_zip -%{lts_designator} -%else - %global lts_designator "" - %global lts_designator_zip "" -%endif - -# Define vendor information used by OpenJDK -%global oj_vendor Red Hat, Inc. -%global oj_vendor_url https://www.redhat.com/ -# Define what url should JVM offer in case of a crash report -# order may be important, epel may have rhel declared -%if 0%{?epel} -%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{component}&version=epel%{epel} -%else -%if 0%{?fedora} -# Does not work for rawhide, keeps the version field empty -%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{component}&version=%{fedora} -%else -%if 0%{?rhel} -%global oj_vendor_bug_url https://access.redhat.com/support/cases/ -%else -%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi -%endif -%endif -%endif -%global oj_vendor_version (Red_Hat-%{version}-%{rpmrelease}) - -# Define IcedTea version used for SystemTap tapsets and desktop file -%global icedteaver 6.0.0pre00-c848b93a8598 -# Define current Git revision for the FIPS support patches -%global fipsver f93a863b56 -# Define JDK versions -%global javaver %{featurever} -%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} -# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames -%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn}) -# The tag used to create the OpenJDK tarball -%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}} - -# Standard JPackage naming and versioning defines -%global origin openjdk -%global origin_nice OpenJDK -%global top_level_dir_name %{vcstag} -%global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 9 -%global rpmrelease 1 -#%%global tagsuffix %%{nil} -# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit -%if %is_system_jdk -# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions -# It is very unlikely we will ever have a patch version > 4 or a build version > 20, so we combine as (patch * 20) + build. -# This means 11.0.9.0+11 would have had a priority of 11000911 as before -# A 11.0.9.1+1 would have had a priority of 11000921 (20 * 1 + 1), thus ensuring it is bigger than 11.0.9.0+11 -%global combiver $( expr 20 '*' %{patchver} + %{buildver} ) -%global priority %( printf '%02d%02d%02d%02d' %{featurever} %{interimver} %{updatever} %{combiver} ) -%else -# for techpreview, using 1, so slowdebugs can have 0 -%global priority %( printf '%08d' 1 ) -%endif - -# Define milestone (EA for pre-releases, GA for releases) -# Release will be (where N is usually a number starting at 1): -# - 0.N%%{?extraver}%%{?dist} for EA releases, -# - N%%{?extraver}{?dist} for GA releases -%global is_ga 1 -%if %{is_ga} -%global ea_designator "" -%global ea_designator_zip "" -%global extraver %{nil} -%global eaprefix %{nil} -%else -%global ea_designator ea -%global ea_designator_zip -%{ea_designator} -%global extraver .%{ea_designator} -%global eaprefix 0. -%endif - -# parametrized macros are order-sensitive -%global compatiblename java-%{featurever}-%{origin} -%global fullversion %{compatiblename}-%{version}-%{release} -# images directories from upstream build -%global jdkimage jdk -%global static_libs_image static-libs -# output dir stub -%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}} -%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}} -%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}} -# we can copy the javadoc to not arched dir, or make it not noarch -%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}} -# main id and dir of this jdk -%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}} -# portable only declarations -%global jreimage jre -%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.jre;g") -%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.jdk;g") -%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.static-libs;g") -%define jreportablearchive() %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz} -%define jdkportablearchive() %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz} -%define staticlibsportablearchive() %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz} -%define jreportablename() %{expand:%{jreportablenameimpl -- %%{1}}} -%define jdkportablename() %{expand:%{jdkportablenameimpl -- %%{1}}} -# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on -# top of the JDK archive -%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}} -%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.docs;g") -%define docportablearchive() %{docportablename}.tar.xz -%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g") -%define miscportablearchive() %{miscportablename}.tar.xz - -################################################################# -# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349 -# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14 -# https://bugzilla.redhat.com/show_bug.cgi?id=1655938 -%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libsystemconf[.]so.*|libunpack[.]so.*|libzip[.]so.*%{freetype_lib} -%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.* -%if %is_system_jdk -%global __provides_exclude ^(%{_privatelibs})$ -%global __requires_exclude ^(%{_privatelibs})$ -# Never generate lib-style provides/requires for any debug packages -%global __provides_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$ -%global __requires_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$ -%global __provides_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$ -%global __requires_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$ -%else -# Don't generate provides/requires for JDK provided shared libraries at all. -%global __provides_exclude ^(%{_privatelibs}|%{_publiclibs})$ -%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$ -%endif - - -%global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin} -%define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}} -# Standard JPackage directories and symbolic links. -%define sdkdir() %{expand:%{uniquesuffix -- %{?1}}} -%define jrelnk() %{expand:jre-%{javaver}-%{origin}-%{version}-%{release}.%{_arch}%{?1}} - -%define sdkbindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin} -%define jrebindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin} - -%global alt_java_name alt-java - -%global rpm_state_dir %{_localstatedir}/lib/rpm-state/ - -# For flatpack builds hard-code /usr/sbin/alternatives, -# otherwise use %%{_sbindir} relative path. -%if 0%{?flatpak} -%global alternatives_requires /usr/sbin/alternatives -%else -%global alternatives_requires %{_sbindir}/alternatives -%endif - -# Portables have no repo (requires/provides), but these are awesome for orientation in spec -# Also scriptlets are happily missing and files are handled old fashion -# not-duplicated requires/provides/obsoletes for normal/debug packages -%define java_rpo() %{expand: -} - -%define java_devel_rpo() %{expand: -} - -%define java_static_libs_rpo() %{expand: -} - -%define java_unstripped_rpo() %{expand: -} - -%define java_docs_rpo() %{expand: -} - -%define java_misc_rpo() %{expand: -} - -# Prevent brp-java-repack-jars from being run -%global __jar_repack 0 - -# portables have grown out of its component, moving back to java-x-vendor -# this expression, when declared as global, filled component with java-x-vendor portable -%define component %(echo %{name} | sed "s;-portable;;g") - -Name: java-%{javaver}-%{origin}-portable -Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} -# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons -# and this change was brought into RHEL-4. java-1.5.0-ibm packages -# also included the epoch in their virtual provides. This created a -# situation where in-the-wild java-1.5.0-ibm packages provided "java = -# 1:1.5.0". In RPM terms, "1.6.0 < 1:1.5.0" since 1.6.0 is -# interpreted as 0:1.6.0. So the "java >= 1.6.0" requirement would be -# satisfied by the 1:1.5.0 packages. Thus we need to set the epoch in -# JDK package >= 1.6.0 to 1, and packages referring to JDK virtual -# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0". - -Epoch: 1 -Summary: %{origin_nice} %{featurever} Runtime Environment portable edition -%if 0%{?rhel} <= 8 -Group: Development/Languages -%endif - -# HotSpot code is licensed under GPLv2 -# JDK library code is licensed under GPLv2 with the Classpath exception -# The Apache license is used in code taken from Apache projects (primarily xalan & xerces) -# DOM levels 2 & 3 and the XML digital signature schemas are licensed under the W3C Software License -# The JSR166 concurrency code is in the public domain -# The BSD and MIT licenses are used for a number of third-party libraries (see ADDITIONAL_LICENSE_INFO) -# The OpenJDK source tree includes: -# - JPEG library (IJG), zlib & libpng (zlib), giflib (MIT), harfbuzz (ISC), -# - freetype (FTL), jline (BSD) and LCMS (MIT) -# - jquery (MIT), jdk.crypto.cryptoki PKCS 11 wrapper (RSA) -# - public_suffix_list.dat from publicsuffix.org (MPLv2.0) -# The test code includes copies of NSS under the Mozilla Public License v2.0 -# The PCSClite headers are under a BSD with advertising license -# The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version -License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA -URL: http://openjdk.java.net/ - - -# to regenerate source0 (jdk) run update_package.sh -# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives -Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz - -# 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 - -# Desktop files. Adapted from IcedTea -# Disabled in portables -#Source9: jconsole.desktop.in - -# Release notes -Source10: NEWS - -# nss configuration file -Source11: nss.cfg.in - -# Removed libraries that we link instead -Source12: remove-intree-libraries.sh - -# Ensure we aren't using the limited crypto policy -Source13: TestCryptoLevel.java - -# Ensure ECDSA is working -Source14: TestECDSA.java - -# Verify system crypto (policy) can be disabled via a property -Source15: TestSecurityProperties.java - -# Ensure vendor settings are correct -Source16: CheckVendor.java - -# nss fips configuration file -Source17: nss.fips.cfg.in - -# Ensure translations are available for new timezones -Source18: TestTranslations.java - -############################################ -# -# RPM/distribution specific patches -# -############################################ - -# Ignore AWTError when assistive technologies are loaded -Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch -# NSS via SunPKCS11 Provider (disabled due to memory leak). -Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch -# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639) -Patch600: rh1750419-redhat_alt_java.patch -# RH1582504: Use RSA as default for keytool, as DSA is disabled in all crypto policies except LEGACY -Patch1003: rh1842572-rsa_default_for_keytool.patch - -# Crypto policy and FIPS support patches -# Patch is generated from the fips tree at https://github.com/rh-openjdk/jdk11u/tree/fips -# as follows: git diff %%{vcstag} src make test > fips-11u-$(git show -s --format=%h HEAD).patch -# Diff is limited to src and make subdirectories to exclude .github changes -# Fixes currently included: -# PR3694, RH1340845: Add security.useSystemPropertiesFile option to java.security to use system crypto policy -# PR3695: Allow use of system crypto policy to be disabled by the user -# RH1655466: Support RHEL FIPS mode using SunPKCS11 provider -# RH1818909: No ciphersuites availale for SSLSocket in FIPS mode -# RH1860986: Disable TLSv1.3 with the NSS-FIPS provider until PKCS#11 v3.0 support is available -# RH1915071: Always initialise JavaSecuritySystemConfiguratorAccess -# RH1929465: Improve system FIPS detection -# RH1996182: Login to the NSS software token in FIPS mode -# RH1991003: Allow plain key import unless com.redhat.fips.plainKeySupport is set to false -# RH2021263: Make sure java.security.Security is initialised when retrieving JavaSecuritySystemConfiguratorAccess instance -# RH2021263: Return in C code after having generated Java exception -# RH2052819: Improve Security initialisation, now FIPS support no longer relies on crypto policy support -# RH2051605: Detect NSS at Runtime for FIPS detection -# RH2052819: Fix FIPS reliance on crypto policies -# RH2036462: sun.security.pkcs11.wrapper.PKCS11.getInstance breakage -# RH2090378: Revert to disabling system security properties and FIPS mode support together -Patch1001: fips-11u-%{fipsver}.patch - -############################################# -# -# Shenandoah specific patches -# -############################################# - -# Currently empty - -############################################# -# -# Upstreamable patches -# -# This section includes patches which need to -# be reviewed & pushed to the current development -# tree of OpenJDK. -############################################# -Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch - -############################################# -# -# Backportable patches -# -# This section includes patches which are -# present in the current development tree, but -# need to be reviewed & pushed to the appropriate -# updates tree of OpenJDK. -############################################# -Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch - -############################################# -# -# Patches appearing in 11.0.21 -# -# This section includes patches which are present -# in the listed OpenJDK 11u release and should be -# able to be removed once that release is out -# and used by this RPM. -############################################# - -############################################# -# -# Patches appearing in 11.0.22 -# -# This section includes patches which are present -# in the listed OpenJDK 8u release and should be -# able to be removed once that release is out -# and used by this RPM. -############################################# -# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar -Patch2000: jdk8312489-max_sig_default_increase.patch - -############################################# -# -# Portable build specific patches -# -############################################# - -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: alsa-lib-devel -BuildRequires: binutils -BuildRequires: cups-devel -BuildRequires: desktop-file-utils -# elfutils only are OK for build without AOT -BuildRequires: elfutils-devel -BuildRequires: file -BuildRequires: fontconfig-devel -BuildRequires: gcc-c++ -BuildRequires: gdb -BuildRequires: libxslt -BuildRequires: libX11-devel -BuildRequires: libXi-devel -BuildRequires: libXinerama-devel -BuildRequires: libXrandr-devel -BuildRequires: libXrender-devel -BuildRequires: libXt-devel -BuildRequires: libXtst-devel -# Requirement for setting up nss.cfg and nss.fips.cfg -BuildRequires: nss-devel -# Requirement for system security property test -# N/A for portable. RHEL7 doesn't provide them -# and policy support is turned off -#BuildRequires: crypto-policies -BuildRequires: pkgconfig -BuildRequires: xorg-x11-proto-devel -BuildRequires: zip -# to pack portable tarballs -BuildRequires: tar -BuildRequires: unzip -# No javapackages-filesystem on el7,nor is needed for portables -# BuildRequires: javapackages-filesystem -BuildRequires: java-%{buildjdkver}-openjdk-devel -# Zero-assembler build requirement -%ifarch %{zero_arches} -BuildRequires: libffi-devel -%endif -# 2023c required as of JDK-8305113 -BuildRequires: tzdata-java >= 2023c -# cacerts build requirement in portable mode -BuildRequires: ca-certificates -# Earlier versions have a bug in tree vectorization on PPC -BuildRequires: gcc >= 4.8.3-8 - -%if %{with_systemtap} -BuildRequires: systemtap-sdt-devel -%endif -BuildRequires: make - -%if %{system_libs} -BuildRequires: freetype-devel -BuildRequires: giflib-devel -BuildRequires: harfbuzz-devel -BuildRequires: lcms2-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -%else -# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h -Provides: bundled(freetype) = 2.13.0 -# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h -Provides: bundled(giflib) = 5.2.1 -# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 7.2.0 -# Version in src/java.desktop/share/native/liblcms/lcms2.h -Provides: bundled(lcms2) = 2.15.0 -# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h -Provides: bundled(libjpeg) = 6b -# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h -Provides: bundled(libpng) = 1.6.39 -# We link statically against libstdc++ to increase portability -BuildRequires: libstdc++-static -%endif - -# this is always built, also during debug-only build -# when it is built in debug-only this package is just placeholder -%{java_rpo %{nil}} - -%description -The %{origin_nice} %{featurever} runtime environment - portable edition. - -%if %{include_debug_build} -%package slowdebug -Summary: %{origin_nice} %{featurever} Runtime Environment portable edition %{debug_on} -%if 0%{?rhel} <= 8 -Group: Development/Languages -%endif - -%{java_rpo -- %{debug_suffix_unquoted}} -%description slowdebug -The %{origin_nice} %{featurever} runtime environment - portable edition. -%{debug_warning} -%endif - -%if %{include_fastdebug_build} -%package fastdebug -Summary: %{origin_nice} %{featurever} Runtime Environment portable edition %{fastdebug_on} -%if 0%{?rhel} <= 8 -Group: Development/Languages -%endif - -%{java_rpo -- %{fastdebug_suffix_unquoted}} -%description fastdebug -The %{origin_nice} %{featurever} runtime environment - portable edition. -%{fastdebug_warning} -%endif - -%if %{include_normal_build} -%package devel -Summary: %{origin_nice} %{featurever} Development Environment portable edition -%if 0%{?rhel} <= 8 -Group: Development/Languages -%endif - -%{java_devel_rpo %{nil}} - -%description devel -The %{origin_nice} %{featurever} development tools - portable edition. -%endif - -%if %{include_debug_build} -%package devel-slowdebug -Summary: %{origin_nice} %{featurever} Runtime and Development Environment portable edition %{debug_on} -%if 0%{?rhel} <= 8 -Group: Development/Languages -%endif - -%{java_devel_rpo -- %{debug_suffix_unquoted}} - -%description devel-slowdebug -The %{origin_nice} %{featurever} development tools - portable edition. -%{debug_warning} -%endif - -%if %{include_fastdebug_build} -%package devel-fastdebug -Summary: %{origin_nice} %{featurever} Runtime and Development Environment portable edition %{fastdebug_on} -Group: Development/Tools - -%{java_devel_rpo -- %{fastdebug_suffix_unquoted}} - -%description devel-fastdebug -The %{origin_nice} %{featurever} runtime environment and development tools - portable edition -%{fastdebug_warning} -%endif - -%if %{include_staticlibs} - -%if %{include_normal_build} -%package static-libs -Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition - -%{java_static_libs_rpo %{nil}} - -%description static-libs -The %{origin_nice} %{featurever} libraries for static linking - portable edition. -%endif - -%if %{include_debug_build} -%package static-libs-slowdebug -Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition %{debug_on} - -%{java_static_libs_rpo -- %{debug_suffix_unquoted}} - -%description static-libs-slowdebug -The %{origin_nice} %{featurever} libraries for static linking - portable edition -%{debug_warning} -%endif - -%if %{include_fastdebug_build} -%package static-libs-fastdebug -Summary: %{origin_nice} %{featurever} libraries for static linking - portable edition %{fastdebug_on} - -%{java_static_libs_rpo -- %{fastdebug_suffix_unquoted}} - -%description static-libs-fastdebug -The %{origin_nice} %{featurever} libraries for static linking - portable edition -%{fastdebug_warning} -%endif - -# staticlibs -%endif - -%if %{include_normal_build} -%package unstripped -Summary: The %{origin_nice} %{featurever} runtime environment. - -%{java_unstripped_rpo %{nil}} - -%description unstripped -The %{origin_nice} %{featurever} runtime environment. - -%endif - -%package docs -Summary: %{origin_nice} %{featurever} API documentation - -%{java_docs_rpo %{nil}} - -%description docs -The %{origin_nice} %{featurever} API documentation. - -%package misc -Summary: %{origin_nice} %{featurever} miscellany - -%{java_misc_rpo %{nil}} - -%description misc -The %{origin_nice} %{featurever} miscellany. - -%prep - -echo "Preparing %{oj_vendor_version}" - -# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-( -%if 0%{?stapinstall:1} - echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{stapinstall}" -%else - %{error:Unrecognised architecture %{_target_cpu}} -%endif - -if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then - echo "include_normal_build is %{include_normal_build}" -else - echo "include_normal_build is %{include_normal_build}, that is invalid. Use 1 for yes or 0 for no" - exit 11 -fi -if [ %{include_debug_build} -eq 0 -o %{include_debug_build} -eq 1 ] ; then - echo "include_debug_build is %{include_debug_build}" -else - echo "include_debug_build is %{include_debug_build}, that is invalid. Use 1 for yes or 0 for no" - exit 12 -fi -if [ %{include_fastdebug_build} -eq 0 -o %{include_fastdebug_build} -eq 1 ] ; then - echo "include_fastdebug_build is %{include_fastdebug_build}" -else - echo "include_fastdebug_build is %{include_fastdebug_build}, that is invalid. Use 1 for yes or 0 for no" - exit 13 -fi -if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{include_fastdebug_build} -eq 0 ] ; then - echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go." - exit 14 -fi -%setup -q -c -n %{uniquesuffix ""} -T -a 0 -# https://bugzilla.redhat.com/show_bug.cgi?id=1189084 -prioritylength=`expr length %{priority}` -if [ $prioritylength -ne 8 ] ; then - echo "priority must be 8 digits in total, violated" - exit 14 -fi - -# OpenJDK patches -%if %{system_libs} -# Remove libraries that are linked by both static and dynamic builds -sh %{SOURCE12} %{top_level_dir_name} -%endif - -# Patch the JDK -pushd %{top_level_dir_name} -%patch1 -p1 -%patch3 -p1 -# Add crypto policy and FIPS support -%patch1001 -p1 -# nss.cfg PKCS11 support; must come last as it also alters java.security -%patch1000 -p1 -# JDK-8312489 backport, coming in 11.0.22 -%patch2000 -p1 -# PKCS11 SHA3 backport -%patch2002 -p1 -# alt-java -%patch600 -p1 -# RSA default -%patch1003 -p1 -popd # openjdk - - -# Extract systemtap tapsets -%if %{with_systemtap} -tar --strip-components=1 -x -I xz -f %{SOURCE8} -%if %{include_debug_build} -cp -r tapset tapset%{debug_suffix} -%endif -%if %{include_fastdebug_build} -cp -r tapset tapset%{fastdebug_suffix} -%endif - -for suffix in %{build_loop} ; do - for file in "tapset"$suffix/*.in; do - sed -i -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file - sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $file - done -done -# systemtap tapsets ends -%endif - -# Prepare desktop files -# Portables do not have desktop integration - -# Setup nss.cfg -sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg - -# Setup nss.fips.cfg -sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg - -%build -# How many CPU's do we have? -export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :) -export NUM_PROC=${NUM_PROC:-1} -%if 0%{?_smp_ncpus_max} -# Honor %%_smp_ncpus_max -[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max} -%endif - -%ifarch s390x sparc64 alpha %{power64} %{aarch64} -export ARCH_DATA_MODEL=64 -%endif -%ifarch alpha -export CFLAGS="$CFLAGS -mieee" -%endif - -# We use ourcppflags because the OpenJDK build seems to -# pass EXTRA_CFLAGS to the HotSpot C++ compiler... -EXTRA_CFLAGS="%ourcppflags -Wno-error" -EXTRA_CPP_FLAGS="%ourcppflags" - -%ifarch %{power64} ppc -# fix rpmlint warnings -EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing" -%endif -%ifarch %{ix86} -# Align stack boundary on x86_32 -EXTRA_CFLAGS="$(echo ${EXTRA_CFLAGS} | sed -e 's|-mstackrealign|-mincoming-stack-boundary=2 -mpreferred-stack-boundary=4|')" -EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming-stack-boundary=2 -mpreferred-stack-boundary=4|')" -%endif -# Fixes annocheck warnings in assembler files due to missing build notes -EXTRA_ASFLAGS="${EXTRA_CFLAGS} -Wa,--generate-missing-build-notes=yes" -export EXTRA_CFLAGS EXTRA_CPP_FLAGS EXTRA_ASFLAGS - -function buildjdk() { - local outputdir=${1} - local buildjdk=${2} - local maketargets="${3}" - local debuglevel=${4} - local link_opt=${5} - local debug_symbols=${6} - - local top_dir_abs_src_path=$(pwd)/%{top_level_dir_name} - local top_dir_abs_build_path=$(pwd)/${outputdir} - - # This must be set using the global, so that the - # static libraries still use a dynamic stdc++lib - if [ "x%{link_type}" = "xbundled" ] ; then - libc_link_opt="static"; - else - libc_link_opt="dynamic"; - fi - - echo "Using output directory: ${outputdir}"; - echo "Checking build JDK ${buildjdk} is operational..." - ${buildjdk}/bin/java -version - echo "Using make targets: ${maketargets}" - echo "Using debuglevel: ${debuglevel}" - echo "Using link_opt: ${link_opt}" - echo "Using debug_symbols: ${debug_symbols}" - echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}" - - mkdir -p ${outputdir} - pushd ${outputdir} - - # Note: zlib and freetype use %{link_type} - # rather than ${link_opt} as the system versions - # are always used in a system_libs build, even - # for the static library build - bash ${top_dir_abs_src_path}/configure \ -%ifarch %{zero_arches} - --with-jvm-variants=zero \ -%endif -%ifarch %{ppc64le} - --with-jobs=1 \ -%endif - --with-cacerts-file=`readlink -f %{_sysconfdir}/pki/java/cacerts` \ - --with-version-build=%{buildver} \ - --with-version-pre="%{ea_designator}" \ - --with-version-opt="%{lts_designator}" \ - --with-vendor-version-string="%{oj_vendor_version}" \ - --with-vendor-name="%{oj_vendor}" \ - --with-vendor-url="%{oj_vendor_url}" \ - --with-vendor-bug-url="%{oj_vendor_bug_url}" \ - --with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \ - --with-boot-jdk=${buildjdk} \ - --with-debug-level=${debuglevel} \ - --with-native-debug-symbols="${debug_symbols}" \ - --disable-sysconf-nss \ - --enable-unlimited-crypto \ - --with-zlib=%{link_type} \ - --with-freetype=%{link_type} \ - --with-libjpeg=${link_opt} \ - --with-giflib=${link_opt} \ - --with-libpng=${link_opt} \ - --with-lcms=${link_opt} \ - --with-harfbuzz=${link_opt} \ - --with-stdc++lib=${libc_link_opt} \ - --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ - --with-extra-cflags="$EXTRA_CFLAGS" \ - --with-extra-asflags="$EXTRA_ASFLAGS" \ - --with-extra-ldflags="%{ourldflags}" \ - --with-num-cores="$NUM_PROC" \ - --disable-javac-server \ - --with-jvm-features="%{shenandoah_feature},%{zgc_feature}" \ - --disable-warnings-as-errors - - cat spec.gmk - - make JAVAC_FLAGS=-g LOG=trace $maketargets || \ - ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false ) - - popd -} - -function stripjdk() { - local outputdir=${1} - local jdkimagepath=${outputdir}/images/%{jdkimage} - local jreimagepath=${outputdir}/images/%{jreimage} - local jmodimagepath=${outputdir}/images/jmods - local supportdir=${outputdir}/support - - if [ "x$suffix" = "x" ] ; then - # Keep the unstripped version for consumption by RHEL RPMs - cp -a ${jdkimagepath}{,.unstripped} - - # Strip the files - for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do - if file ${file} | grep -q 'ELF'; then - noextfile=${file/.so/}; - objcopy --only-keep-debug ${file} ${noextfile}.debuginfo; - objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}; - strip -g ${file}; - fi - done - - # Rebuild jmod files against the stripped binaries - if [ ! -d ${supportdir} ] ; then - echo "Support directory missing."; - exit 15 - fi - for cmd in $(find ${supportdir} -name '*.jmod.cmdline') ; do - jmod=$(cat ${cmd} | sed -r 's|.*support/(.*$)|\1|'); - echo "Rebuilding ${jmod} against stripped binaries..."; - echo "Removing old jmod ${jmod}..."; - rm -vf ${jmod} - rm -vf ${jdkimagepath}/jmods/$(basename ${jmod}); - echo "Executing $(cat ${cmd})..."; - cat ${cmd} | sh -s ; - echo "Moving jmod to image..."; - mv -v ${supportdir}/${jmod} ${jdkimagepath}/jmods; - done - fi -} - -function installjdk() { - local outputdir=${1} - local installdir=${2} - local jdkimagepath=${installdir}/images/%{jdkimage} - local jreimagepath=${installdir}/images/%{jreimage} - local unstripped=${jdkimagepath}.unstripped - - echo "Installing build from ${outputdir} to ${installdir}..." - mkdir -p ${installdir} - echo "Installing images..." - mv ${outputdir}/images ${installdir} - if [ -d ${outputdir}/bundles ] ; then - echo "Installing bundles..."; - mv ${outputdir}/bundles ${installdir} ; - fi - -%if !%{with artifacts} - echo "Removing output directory..."; - rm -rf ${outputdir} -%endif - - for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do - - if [ -d ${imagepath} ] ; then - # the build (erroneously) removes read permissions from some jars - # this is a regression in OpenJDK 7 (our compiler): - # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437 - find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \; - - # Build screws up permissions on binaries - # https://bugs.openjdk.java.net/browse/JDK-8173610 - find ${imagepath} -iname '*.so' -exec chmod +x {} \; - find ${imagepath}/bin/ -exec chmod +x {} \; - - # Install local files which are distributed with the JDK - install -m 644 %{SOURCE10} ${imagepath} - install -m 644 nss.cfg ${imagepath}/conf/security/ - install -m 644 nss.fips.cfg ${imagepath}/conf/security/ - - # Create fake alt-java as a placeholder for future alt-java - pushd ${imagepath} - # add alt-java man page - echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1 - cat man/man1/java.1 >> man/man1/%{alt_java_name}.1 - popd - - # Print release information - cat ${imagepath}/release - fi - done -} - -function genchecksum() { - local checkedfile=${1} - - checkdir=$(dirname ${1}) - checkfile=$(basename ${1}) - - echo "Generating checksum for ${checkfile} in ${checkdir}..." - pushd ${checkdir} - sha256sum ${checkfile} > ${checkfile}.sha256sum - sha256sum --check ${checkfile}.sha256sum - popd -} - -function packagejdk() { - local imagesdir=$(pwd)/${1}/images - local docdir=$(pwd)/${1}/images/docs - local bundledir=$(pwd)/${1}/bundles - local packagesdir=$(pwd)/${2} - local srcdir=$(pwd)/%{top_level_dir_name} - local tapsetdir=$(pwd)/tapset - - echo "Packaging build from ${imagesdir} to ${packagesdir}..." - mkdir -p ${packagesdir} - pushd ${imagesdir} - - if [ "x$suffix" = "x" ] ; then - nameSuffix="" - else - nameSuffix=`echo "$suffix"| sed s/-/./` - fi - - jdkname=%{jdkportablename -- "$nameSuffix"} - jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"} - jrename=%{jreportablename -- "$nameSuffix"} - jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"} - staticname=%{staticlibsportablename -- "$nameSuffix"} - staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"} - debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"} - unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"} - # We only use docs for the release build - docname=%{docportablename} - docarchive=${packagesdir}/%{docportablearchive} - built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip - # These are from the source tree so no debug variants - miscname=%{miscportablename} - miscarchive=${packagesdir}/%{miscportablearchive} - - if [ "x$suffix" = "x" ] ; then - # Keep the unstripped version for consumption by RHEL RPMs - mv %{jdkimage}.unstripped ${jdkname} - tar -cJf ${unstrippedarchive} ${jdkname} - genchecksum ${unstrippedarchive} - mv ${jdkname} %{jdkimage}.unstripped - fi - - # Rename directories for packaging - cp -r %{jdkimage} ${jdkname} - cp -r %{jreimage} ${jrename} - - # Release images have external debug symbols - if [ "x$suffix" = "x" ] ; then - tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo) - genchecksum ${debugarchive} - - mkdir ${docname} - mv ${docdir} ${docname} - mv ${bundledir}/${built_doc_archive} ${docname} - tar -cJf ${docarchive} ${docname} - genchecksum ${docarchive} - - mkdir ${miscname} - for s in 16 24 32 48 ; do - cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname} - done - cp -a ${srcdir}/src/sample ${miscname} -%if %{with_systemtap} - cp -a ${tapsetdir}* ${miscname} -%endif - tar -cJf ${miscarchive} ${miscname} - genchecksum ${miscarchive} - fi - - tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname} - genchecksum ${jdkarchive} - - tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename} - genchecksum ${jrearchive} - -%if %{include_staticlibs} - # Static libraries (needed for building graal vm with native image) - # Tar as overlay. Transform to the JDK name, since we just want to "add" - # static libraries to that folder - tar -cJf ${staticarchive} \ - --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib" - genchecksum ${staticarchive} -%endif - - # Revert directory renaming so testing will run - # TODO: testing should run on the packaged JDK - rm -rf ${jdkname} %{jdkimage} - rm -rf ${jrename} %{jreimage} - - popd #images - -} - -%if %{build_hotspot_first} - # Build a fresh libjvm.so first and use it to bootstrap - cp -LR --preserve=mode,timestamps %{bootjdk} newboot - systemjdk=$(pwd)/newboot - buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled" "internal" - mv build/newboot/jdk/lib/server/libjvm.so newboot/lib/server -%else - systemjdk=%{bootjdk} -%endif - -for suffix in %{build_loop} ; do - - if [ "x$suffix" = "x" ] ; then - debugbuild=release - else - # change --something to something - debugbuild=`echo $suffix | sed "s/-//g"` - fi - # We build with internal debug symbols and do - # our own stripping for one version of the - # release build - debug_symbols=internal - - builddir=%{buildoutputdir -- ${suffix}} - bootbuilddir=boot${builddir} - installdir=%{installoutputdir -- ${suffix}} - bootinstalldir=boot${installdir} - packagesdir=%{packageoutputdir -- ${suffix}} - - link_opt="%{link_type}" -%if %{system_libs} - # Copy the source tree so we can remove all in-tree libraries - cp -a %{top_level_dir_name} %{top_level_dir_name_backup} - # Remove all libraries that are linked - sh %{SOURCE12} %{top_level_dir_name} full -%endif - # Debug builds don't need same targets as release for - # build speed-up. We also avoid bootstrapping these - # slower builds. - if echo $debugbuild | grep -q "debug" ; then - maketargets="%{debug_targets}" - run_bootstrap=false - else - maketargets="%{release_targets}" - run_bootstrap=%{bootstrap_build} - fi - if ${run_bootstrap} ; then - buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols} - installjdk ${bootbuilddir} ${bootinstalldir} - buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols} - stripjdk ${builddir} - installjdk ${builddir} ${installdir} - %{!?with_artifacts:rm -rf ${bootinstalldir}} - else - buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols} - stripjdk ${builddir} - installjdk ${builddir} ${installdir} - fi - packagejdk ${installdir} ${packagesdir} - -%if %{system_libs} - # Restore original source tree we modified by removing full in-tree sources - rm -rf %{top_level_dir_name} - mv %{top_level_dir_name_backup} %{top_level_dir_name} -%endif - -# build cycles -done # end of release / debug cycle loop - -%check - -# We test debug first as it will give better diagnostics on a crash -for suffix in %{build_loop} ; do - -# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path -top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}} -%if %{include_staticlibs} -top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path} -%endif - -export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage} - -#check Shenandoah is enabled -%if %{use_shenandoah_hotspot} -$JAVA_HOME//bin/java -XX:+UseShenandoahGC -version -%endif - -# Check unlimited policy has been used -$JAVA_HOME/bin/javac -d . %{SOURCE13} -$JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLevel - -# Check ECC is working -$JAVA_HOME/bin/javac -d . %{SOURCE14} -$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||") - -# Check system crypto (policy) is active and can be disabled -# Test takes a single argument - true or false - to state whether system -# security properties are enabled or not. -$JAVA_HOME/bin/javac -d . %{SOURCE15} -export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||") -export SEC_DEBUG="-Djava.security.debug=properties" -#Portable specific: set false whereas its true for upstream -$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false -$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false - -# Check correct vendor values have been set -$JAVA_HOME/bin/javac -d . %{SOURCE16} -$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}" - -# Check java launcher has no SSB mitigation -if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi - -# Check alt-java launcher has SSB mitigation on supported architectures -%ifarch %{ssbd_arches} -nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation -%else -if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi -%endif - -# Check translations are available for new timezones -$JAVA_HOME/bin/javac -d . %{SOURCE18} -$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE -$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR - -%if %{include_staticlibs} -# Check debug symbols in static libraries (smoke test) -export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image} -readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c -readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c -%endif - -# Release builds strip the debug symbols into external .debuginfo files -if [ "x$suffix" = "x" ] ; then - so_suffix="debuginfo" -else - so_suffix="so" -fi -# Check debug symbols are present and can identify code -find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib -do - if [ -f "$lib" ] ; then - echo "Testing $lib for debug symbols" - # All these tests rely on RPM failing the build if the exit code of any set - # of piped commands is non-zero. - - # Test for .debug_* sections in the shared object. This is the main test - # Stripped objects will not contain these - eu-readelf -S "$lib" | grep "] .debug_" - test $(eu-readelf -S "$lib" | grep -E "\]\ .debug_(info|abbrev)" | wc --lines) == 2 - - # Test FILE symbols. These will most likely be removed by anything that - # manipulates symbol tables because it's generally useless. So a nice test - # that nothing has messed with symbols - old_IFS="$IFS" - IFS=$'\n' - for line in $(eu-readelf -s "$lib" | grep "00000000 0 FILE LOCAL DEFAULT") - do - # We expect to see .cpp files, except for architectures like aarch64 and - # s390 where we expect .o and .oS files - echo "$line" | grep -E "ABS ((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx|o|oS))?$" - done - IFS="$old_IFS" - - # If this is the JVM, look for javaCalls.(cpp|o) in FILEs, for extra sanity checking - if [ "`basename $lib`" = "libjvm.so" ]; then - eu-readelf -s "$lib" | \ - grep -E "00000000 0 FILE LOCAL DEFAULT ABS javaCalls.(cpp|o)$" - fi - - # Test that there are no .gnu_debuglink sections pointing to another - # debuginfo file. There shouldn't be any debuginfo files, so the link makes - # no sense either - eu-readelf -S "$lib" | grep 'gnu' - if eu-readelf -S "$lib" | grep '] .gnu_debuglink' | grep PROGBITS; then - echo "bad .gnu_debuglink section." - eu-readelf -x .gnu_debuglink "$lib" - false - fi - fi -done - -# Make sure gdb can do a backtrace based on line numbers on libjvm.so -# javaCalls.cpp:58 should map to: -# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58 -# Using line number 1 might cause build problems. See: -# https://bugzilla.redhat.com/show_bug.cgi?id=1539664 -# https://bugzilla.redhat.com/show_bug.cgi?id=1538767 -gdb -q "$JAVA_HOME/bin/java" < - 1:11.0.21.0.9-1 -- Update to jdk-11.0.21+9 (GA) -- Update release notes to 11.0.21+9 -- Switch to GA mode for release -- Drop local backport of JDK-8243210 which is upstream from 11.0.21+2 -- Bump freetype version to 2.13.0 following JDK-8306881 -- ** This tarball is embargoed until 2023-10-17 @ 1pm PT. ** - -* Thu Oct 05 2023 Andrew Hughes - 1:11.0.21.0.1-0.1.ea -- Update to jdk-11.0.21+1 (EA) -- Update release notes to 11.0.21+1 -- Switch to EA mode -- Re-generate FIPS patch against 11.0.21+1 following backport of JDK-8155246 -- Re-generate SHA3 patch following backport of JDK-8242151 -- Bump libpng version to 1.6.39 following JDK-8305815 -- Bump HarfBuzz version to 7.2.0 following JDK-8307301 -- Update generate_tarball.sh to be closer to upstream vanilla script inc. no more ECC removal -- Update bug URL for RHEL to point to the Red Hat customer portal -- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball -- Apply all patches using -p1 - -* Tue Sep 05 2023 Andrew Hughes - 1:11.0.20.1.1-1 -- Update to jdk-11.0.20.1+1 (GA) -- Update release notes to 11.0.20.1+1 -- Add backport of JDK-8312489 already upstream in 11.0.22 (see OPENJDK-2095) -- Add backport of JDK-8243210 already upstream in 11.0.21 (see RH2229269) -- Update openjdk_news script to specify subdirectory last -- Add missing discover_trees script required by openjdk_news -- Update README.md to match the version in later RHEL releases -- Resolves: rhbz#2236589 - -* Fri Jul 14 2023 Andrew Hughes - 1:11.0.20.0.8-1 -- Update to jdk-11.0.20.0+8 (GA) -- Update release notes to 11.0.20.0+8 -- Switch to GA mode for release -- Bump bundled HarfBuzz version to 7.0.1 as in jdk-11.0.20+7 -- ** This tarball is embargoed until 2023-07-18 @ 1pm PT. ** - -* Fri Jul 14 2023 Andrew Hughes - 1:11.0.20.0.1-0.3.ea -- Determine path of output jmod path from command rather than guessing - -* Fri Jul 14 2023 Andrew Hughes - 1:11.0.20.0.1-0.3.ea -- Rebuild jmods using the stripped binaries in release builds -- Fix trailing '.' in tarball name -- Make sure the unstripped JDK is customised by the installjdk function -- Resolves: OPENJDK-1975 - -* Fri Jul 14 2023 Andrew Hughes - 1:11.0.20.0.1-0.2.ea -- Re-enable SystemTap support and perform only substitutions possible without final NVR available -- Include tapsets in the miscellaneous tarball -- Drop unused globals for tapset installation - -* Fri Jun 30 2023 Andrew Hughes - 1:11.0.20.0.1-0.2.ea -- Bump bundled LCMS version to 2.15 as in jdk-11.0.20+1. - -* Fri Jun 30 2023 Andrew Hughes - 1:11.0.20.0.1-0.1.ea -- Update to jdk-11.0.20+1 (EA) -- Update release notes to 11.0.20+1 -- Switch to EA mode -- Drop local inclusion of JDK-8274864 & JDK-8305113 as they are included in 11.0.20+1 -- Bump tzdata requirement to 2023c now it is available in the buildroot - -* Mon Apr 24 2023 Andrew Hughes - 1:11.0.19.0.7-2 -- Sync with existing RHEL 8 build, in order to start building portables on RHEL 8 -- Remove use of devtoolset (RHEL 8 native compilers should be sufficient) -- Lower tzdata requirement as build root does not yet contain the 0day tzdata update - -* Tue Apr 18 2023 Andrew Hughes - 1:11.0.19.0.7-2 -- Add missing Swing release note - -* Fri Apr 14 2023 Andrew Hughes - 1:11.0.19.0.7-1 -- Update to jdk-11.0.19.0+7 -- Update release notes to 11.0.19.0+7 -- Require tzdata 2023c due to local inclusion of JDK-8274864 & JDK-8305113 -- Reintroduce generate_source_tarball.sh from RHEL 9 -- Update generate_tarball.sh to add support for passing a boot JDK to the configure run -- Add POSIX-friendly error codes to generate_tarball.sh and fix whitespace -- Remove .jcheck and GitHub support when generating tarballs, as done in upstream release tarballs -- Rebase FIPS support against 11.0.19+6 -- Rebase RH1750419 alt-java patch against 11.0.19+6 -- ** This tarball is embargoed until 2023-04-18 @ 1pm PT. ** -- Resolves: rhbz#2185182 - -* Mon Feb 27 2023 Andrew Hughes - 1:11.0.18.0.10-6 -- Backport SHA-3 support for PKCS11 provider -- Resolves: rhbz#2108712 - -* Sun Feb 26 2023 Andrew Hughes - 1:11.0.18.0.10-5 -- Add docs, icons and samples to the portable output -- Make sure generated checksums work and don't include full path -- The docs directory is a subdirectory of images, so remove confusing separate copying - -* Sun Feb 26 2023 Andrew Hughes - 1:11.0.18.0.10-4 -- Build with internal debuginfo as in RHEL and then create a stripped variant ourselves for the portable release build -- Restore compiler flags to those used in RHEL -- Drop no longer needed static library patch, as we always have internal debuginfo now - -* Sun Feb 26 2023 Andrew Hughes - 1:11.0.18.0.10-3 -- Separate JDK packaging into a separate function -- Use variables to make it clearer what is going on -- Use a package output directory as we do for building and installing - -* Sat Feb 25 2023 Andrew Hughes - 1:11.0.18.0.10-2 -- Adapt the portable build to use the same system library handling as RHEL builds - -* Fri Jan 13 2023 Andrew Hughes - 1:11.0.18.0.10-2 -- Add missing release note for JDK-8295687 -- Resolves: rhbz#2160111 - -* Wed Jan 11 2023 Andrew Hughes - 1:11.0.18.0.10-1 -- Update to jdk-11.0.18+10 (GA) -- Update release notes to 11.0.18+10 -- Drop local copies of JDK-8294357 & JDK-8295173 now upstream contains tzdata 2022e -- Drop local copy of JDK-8275535 which is finally upstream -- Drop local copy of JDK-8293834 now this is upstream -- Require tzdata 2022g due to inclusion of JDK-8296108, JDK-8296715 & JDK-8297804 -- Update TestTranslations.java to test the new America/Ciudad_Juarez zone -- ** This tarball is embargoed until 2023-01-17 @ 1pm PT. ** -- Resolves: rhbz#2160111 - -* Sat Oct 15 2022 Andrew Hughes - 1:11.0.17.0.8-2 -- Update in-tree tzdata to 2022e with JDK-8294357 & JDK-8295173 -- Update CLDR data with Europe/Kyiv (JDK-8293834) -- Drop JDK-8292223 patch which we found to be unnecessary -- Update TestTranslations.java to use public API based on TimeZoneNamesTest upstream -- Related: rhbz#2133695 - -* Wed Oct 12 2022 Andrew Hughes - 1:11.0.17.0.8-1 -- Update to jdk-11.0.17+8 (GA) -- Update release notes to 11.0.17+8 -- Bump HarfBuzz bundled version to 4.4.1 following JDK-8289853 -- Bump FreeType bundled version to 2.12.1 following JDK-8290334 -- Resolves: rhbz#2133695 - -* Fri Oct 07 2022 Andrew Hughes - 1:11.0.16.1.1-3 -- Switch to using devtoolset-8 (as java-17-openjdk portable build does) as prep for building newer HarfBuzz -- Escape quotes in configure and make arguments so they can be passed to scl -- General cleanup of redundant build dependencies, comments and whitespace - -* Tue Aug 30 2022 Andrew Hughes - 1:11.0.16.1.1-2 -- Switch to static builds, reducing system dependencies and making build more portable -- Resolves: rhbz#2121275 - -* Wed Aug 24 2022 Andrew Hughes - 1:11.0.16.1.1-1 -- Update to jdk-11.0.16.1+1 -- Update release notes to 11.0.16.1+1 -- Add patch to provide translations for Europe/Kyiv added in tzdata2022b -- Add test to ensure timezones can be translated -- Resolves: rhbz#2119528 - -* Sun Jul 17 2022 Andrew Hughes - 1:11.0.16.0.8-1 -- Update to shenandoah-jdk-11.0.16+8 (GA) -- Switch to GA mode for final release. -- Update release notes -- This tarball is embargoed until 2022-07-19 @ 1pm PT. - -* Sat Jul 16 2022 Jayashree Huttanagoudar - 1:11.0.16.0.7-0.1.ea -- Commented out crypto-policies BR as it was failing for portable -- Tweaked line to print release information for portable - -* Sat Jul 16 2022 Andrew Hughes - 1:11.0.16.0.7-0.1.ea -- Update to jdk-11.0.16+7 -- Update release notes to 11.0.16+7 -- Switch to EA mode for 11.0.16 pre-release builds. -- Use same tarball naming style as java-17-openjdk and java-latest-openjdk -- Drop JDK-8257794 patch now upstreamed -- Print release file during build, which should now include a correct SOURCE value from .src-rev -- Update tarball script with IcedTea GitHub URL and .src-rev generation -- Use "git apply" with patches in the tarball script to allow binary diffs -- Include script to generate bug list for release notes -- Update tzdata requirement to 2022a to match JDK-8283350 -- Make use of the vendor version string to store our version & release rather than an upstream release date -- Explicitly require crypto-policies during build and runtime for system security properties -- Resolves: rhbz#2083325 - -* Fri Jul 08 2022 Andrew Hughes - 1:11.0.15.0.10-6 -- System security properties are disabled by default on portable. -- Commented out lines which are not applicable for portable. - -* Fri Jul 08 2022 Andrew Hughes - 1:11.0.15.0.10-6 -- Rebase FIPS patches from fips branch and simplify by using a single patch from that repository -- * RH2036462: sun.security.pkcs11.wrapper.PKCS11.getInstance breakage -- * RH2090378: Revert to disabling system security properties and FIPS mode support together -- Rebase RH1648249 nss.cfg patch so it applies after the FIPS patch -- Enable system security properties in the RPM (now disabled by default in the FIPS repo) -- Improve security properties test to check both enabled and disabled behaviour -- Run security properties test with property debugging on -- Resolves: rhbz#2099839 -- Resolves: rhbz#2100676 - -* Thu Jun 30 2022 Francisco Ferrari Bihurriet - 1:11.0.15.0.10-5 -- RH2007331: SecretKey generate/import operations don't add the CKA_SIGN attribute in FIPS mode -- Resolves: rhbz#2102434 - -* Thu Jun 30 2022 Stephan Bergmann - 1:11.0.15.0.10-4 -- Fix flatpak builds by exempting them from bootstrap -- Resolves: rhbz#2067189 - -* Wed May 25 2022 Andrew Hughes - 1:11.0.15.0.10-3 -- Exclude s390x from the gdb test on RHEL 7 where we see failures with the portable build - -* Thu May 19 2022 Jiri Vanek - 1:11.0.15.0.10-2 -- to pass aqa: -- removed copy system tzdb in favour of in-tree -- removed Patch2: rh1648644-java_access_bridge_privileged_security.patch -- This is not intended to release untill we decide proper steps - -* Thu May 19 2022 Jayashree Huttanagoudar - 1:11.0.15.0.10-2 -- Added cosmetic changes to bypass a failure for s390x - -* Wed May 11 2022 Jayashree Huttanagoudar - 1:11.0.15.0.10-1 -- Update tzdata from 2021a to 2021e as in upstream rhel spec - -* Sun Apr 24 2022 Andrew Hughes - 1:11.0.15.0.10-1 -- Update to jdk-11.0.15.0+10 -- Update release notes to 11.0.15.0+10 -- Remove JDK-8284920 fix for XPath regression now it's upstreamed -- Related: rhbz#2073422 -- Resolves: rhbz#2073595 - -* Sat Apr 16 2022 Andrew Hughes - 1:11.0.15.0.9-3 -- Add JDK-8284920 fix for XPath regression -- Related: rhbz#2073422 - -* Fri Apr 15 2022 Andrew Hughes - 1:11.0.15.0.9-2 -- Remove security items from release notes that were only in 17u and N/A for 11u -- Related: rhbz#2073422 - -* Wed Apr 13 2022 Andrew Hughes - 1:11.0.15.0.9-1 -- Update to jdk-11.0.15.0+9 -- Update release notes to 11.0.15.0+9 -- Rebase RH1996182 FIPS patch after JDK-8254410 -- ** This tarball is embargoed until 2022-04-19 @ 1pm PT. ** -- Related: rhbz#2073422 -- Resolves: rhbz#2073422 - -* Tue Apr 12 2022 Andrew Hughes - 1:11.0.15.0.1-0.1.ea -- Update to jdk-11.0.15.0+1 -- Update release notes to 11.0.15.0+1 -- Switch to EA mode for 11.0.15 pre-release builds. -- Related: rhbz#2050458 - -* Mon Feb 28 2022 Andrew Hughes - 1:11.0.14.1.1-6 -- Introduce tests/tests.yml, based on the one in RHEL 8 -- Correction to the previous changelog entry -- Resolves: rhbz#2058489 - -* Mon Feb 28 2022 Andrew Hughes - 1:11.0.14.1.1-5 -- Detect NSS at runtime for FIPS detection -- Resolves: rhbz#2052827 - -* Wed Feb 23 2022 Andrew Hughes - 1:11.0.14.1.1-4 -- Add JDK-8275535 patch to fix LDAP authentication issue. -- Resolves: rhbz#2053523 - -* Thu Feb 17 2022 Andrew Hughes - 1:11.0.14.1.1-3 -- Refactor build functions so we can build just HotSpot without any attempt at installation. -- Sync gdb test with java-1.8.0-openjdk. -- Improve architecture restrictions for the gdb test. -- Replace -mstackrealign with -mincoming-stack-boundary=2 -mpreferred-stack-boundary=4 on x86_32 for stack alignment -- Explicitly list JIT architectures rather than relying on those with slowdebug builds -- Disable the serviceability agent on Zero architectures even when the architecture itself is supported -- Add backport of JDK-8257794 to fix bogus assert on slowdebug x86-32 Zero builds -- Related: rhbz#2052834 - -* Wed Feb 16 2022 Andrew Hughes - 1:11.0.14.1.1-2 -- Fix buildjdk function to use local debuglevel and debug_symbols -- Pass debug_symbols into buildjdk function as they need to differ between builds on portable -- Move legacy-jre-image to join other targets and avoid building it for bootstrap - -* Fri Feb 11 2022 Andrew Hughes - 1:11.0.14.1.1-1 -- Update to jdk-11.0.14.1+1 -- Update release notes to 11.0.14.1+1 -- Resolves: rhbz#2052809 - -* Mon Jan 31 2022 Andrew Hughes - 1:11.0.14.0.8-6 -- Turn off bootstrapping for slow debug builds, which are particularly slow on ppc64le. -- Related: rhbz#2022821 - -* Fri Jan 28 2022 Andrew Hughes - 1:11.0.14.0.9-5 -- Reduce disk footprint by removing build artifacts by default. -- Related: rhbz#1999938 - -* Thu Jan 27 2022 Andrew Hughes - 1:11.0.14.0.9-4 -- Restructure the build so a minimal initial build is then used for the final build (with docs) -- This reduces pressure on the system JDK and ensures the JDK being built can do a full build -- Related: rhbz#1999938 - -* Tue Jan 18 2022 Andrew Hughes - 1:11.0.14.0.9-3 -- Separate crypto policy initialisation from FIPS initialisation, now they are no longer interdependent - -* Tue Jan 18 2022 Andrew Hughes - 1:11.0.14.0.9-2 -- Fix FIPS issues in native code and with initialisation of java.security.Security -- Minor correction to an old changelog entry -- Related: rhbz#2039366 - -* Mon Jan 17 2022 Andrew Hughes - 1:11.0.14.0.9-1 -- Update to jdk-11.0.14.0+9 -- Update release notes to 11.0.14.0+9 -- Switch to GA mode for final release. -- This tarball is embargoed until 2022-01-18 @ 1pm PT. -- Resolves: rhbz#2039366 - -* Fri Jan 14 2022 Andrew Hughes - 1:11.0.14.0.8-0.1.ea -- Update to jdk-11.0.14.0+8 -- Update release notes to 11.0.14.0+8 -- Resolves: rhbz#2022821 - -* Fri Jan 14 2022 Andrew Hughes - 1:11.0.14.0.1-0.1.ea -- Update to jdk-11.0.14.0+1 -- Update release notes to 11.0.14.0+1 -- Switch to EA mode for 11.0.14 pre-release builds. -- Rename blacklisted.certs to blocked.certs following JDK-8253866 -- Rebase RH1996182 login patch and drop redundant security policy extension after JDK-8269034 -- Related: rhbz#2022821 - -* Fri Jan 14 2022 Andrew Hughes - 1:11.0.13.0.8-7 -- Remove explicit compiler flags which should be handled by the upstream build - (-std=gnu++98, -fno-delete-null-pointer-checks, -fno-lifetime-dse) -- Resolves: rhbz#1966234 - -* Thu Dec 23 2021 Severin Gehwolf - 1:11.0.13.0.8-6 -- Use 'sql:' prefix in nss.fips.cfg as F35+ no longer ship the legacy - secmod.db file as part of NSS -- Resolves: rhbz#2023535 - -* Thu Dec 23 2021 Jiri Vanek - 1:11.0.13.0.8-5 -- Replaced hardcoded 11 by featurever where appropriate -- Fixed comment of `for slowdebug` to correct `any debug` -- Related: rhbz#2022821 - -* Fri Dec 17 2021 Jayashree Huttanagoudar - 1:11.0.13.0.8-4 -- Added rh1991003-enable_fips_keys_import.patch - -* Mon Nov 22 2021 Jayashree Huttanagoudar - 1:11.0.13.0.8-3 -- Fixed bogus date warnings. - -* Mon Oct 25 2021 Jiri Vanek - 1:11.0.13.0.8-2 -- cacerts symlink is resolved before passed to configure -- https://issues.redhat.com/browse/OPENJDK-487 - -* Wed Oct 13 2021 Andrew Hughes - 1:11.0.13.0.8-1 -- Update to jdk-11.0.13.0+8 -- Update release notes to 11.0.13.0+8 -- Switch to GA mode for final release. -- This tarball is embargoed until 2021-10-19 @ 1pm PT. -- Update release notes to 11.0.13.0+7 -- Remove non-Free test from source tarball. -- Drop JDK-8269668 patch which is now applied upstream. -- Related: rhbz#2011826 -- Resolves: rhbz#2012334 - -* Mon Oct 11 2021 Jiri Vanek - 1:11.0.12.0.7-14 -- Disable FIPS mode detection using NSS in favour of using /proc/sys/crypto/fips_enabled for now, so we don't link against NSS -- effectively disabled Patch1008: rh1929465-improve_system_FIPS_detection.patch by settng --enable-sysconf-nss to --disable-sysconf-nss -- the enable-sysconf-nss was bringing in hard depndence on nss. Without nss, even in non fips, jvm had not even started - -* Mon Oct 04 2021 Jiri Vanek - 1:11.0.12.0.7-13 -- fixed bugzilla component. It was pointing to java-x-vendor-portable due to recent rename - -* Thu Sep 30 2021 Jiri Vanek - 1:11.0.12.0.7-12 -- added and enabled fips patches and nss.fips.cfg -- source17: nss.fips.cfg.in,patch1001: rh1655466-global_crypto_and_fips.patch - patch1002: rh1818909-fips_default_keystore_type.patch patch1004: rh1860986-disable_tlsv1.3_in_fips_mode.patch - patch1007: rh1915071-always_initialise_configurator_access.patch patch1008: rh1929465-improve_system_FIPS_detection.patch - patch1009: rh1996182-login_to_nss_software_token.patch patch1010: rh1996182-extend_security_policy.patch - -* Mon Sep 20 2021 Jiri Vanek - 1:11.0.12.0.7-11 -- enable long time commented out patch1,patch2,patch4,patch7,patch1000 - -* Wed Sep 08 2021 Jiri Vanek - 1:11.0.12.0.7-9 -- add and used patch8 jdk8269668-rh1977671-aarch64_lib_path_fix.patch -- change STATIC_LIBS_HOME variable to expand correctly to fix build issues - -* Wed Sep 08 2021 Jiri Vanek - 1:11.0.12.0.7-8 -- Added and used source15 TestSecurityProperties.java - -* Wed Sep 08 2021 Jiri Vanek - 1:11.0.12.0.7-7 -- added dummy palceholder empty (with comment) files to keep track with rpms -- added define _lto_cflags %%{nil} - -* Wed Sep 08 2021 Jiri Vanek - 1:11.0.12.0.7-6 -- cosmetic changes whcih may have small effect to code -- added include_staticlibs switch -- reversed build loop to debug first -- reordered subpackages -- used the dummy requires/provides - -* Wed Sep 08 2021 Jiri Vanek - 1:11.0.12.0.7-5 -- cosmetic changes without efect on code - -* Mon Aug 16 2021 Jiri Vanek - 1:11.0.12.0.7-4 -- renamed to java-11-openjdk-portable -- adapted pacakges to not contain double portbale in name - -* Mon Aug 02 2021 Severin Gehwolf - 1:11.0.12.0.7-3 -- Update static-libs packaging to new layout - -* Wed Jul 21 2021 Severin Gehwolf - 1:11.0.12.0.7-2 -- Disable stripping of debug symbols for static libraries part of - the -static-libs sub-package. - -* Tue Jul 20 2021 Severin Gehwolf - 1:11.0.12.0.7-1 -- Build static-libs-image and package resulting files via -static-libs - sub-package. - -* Tue Jul 13 2021 Andrew Hughes - 1:11.0.12.0.7-0 -- Update to jdk-11.0.12.0+7 -- Update release notes to 11.0.12.0+7 -- Switch to GA mode for final release. -- This tarball is embargoed until 2021-07-20 @ 1pm PT. -- Resolves: rhbz#1972395 - -* Mon Jun 28 2021 Andrew Hughes - 1:11.0.12.0.1-0.0.ea -- Update to jdk-11.0.12.0+1 -- Update release notes to 11.0.12.0+1 -- Switch to EA mode for 11.0.12 pre-release builds. -- Resolves: rhbz#1967374 - -* Mon Apr 12 2021 Andrew Hughes - 1:11.0.11.0.9-0 -- Update to jdk-11.0.11.0+9 -- Update release notes to 11.0.11.0+9 -- Switch to GA mode for final release. -- This tarball is embargoed until 2021-04-20 @ 1pm PT. -- Resolves: rhbz#1940228 - -* Sun Apr 11 2021 Andrew Hughes - 1:11.0.11.0.7-0.0.ea -- Update to jdk-11.0.11.0+7 -- Update release notes to 11.0.11.0+7 -- Resolves: rhbz#1938082 - -* Fri Apr 09 2021 Andrew Hughes - 1:11.0.11.0.6-0.0.ea -- Update to jdk-11.0.11.0+6 -- Update release notes to 11.0.11.0+6 -- Resolves: rhbz#1938082 - -* Tue Apr 06 2021 Andrew Hughes - 1:11.0.11.0.5-0.0.ea -- Update to jdk-11.0.11.0+5 -- Update release notes to 11.0.11.0+5 -- Resolves: rhbz#1938082 - -* Mon Mar 29 2021 Andrew Hughes - 1:11.0.11.0.4-0.0.ea -- Update to jdk-11.0.11.0+4 -- Update release notes to 11.0.11.0+4 -- Resolves: rhbz#1938082 - -* Fri Mar 19 2021 Jayashree Huttanagoudar - 1:11.0.11.0.3-0.2.ea -- Fix issue where CheckVendor.java test erroneously passes when it should fail. -- Add proper quoting so '&' is not treated as a special character by the shell. - -* Tue Mar 16 2021 Jayashree Huttanagoudar - 1:11.0.11.0.3-0.1.ea -- Fix for debug symbols check. - -* Mon Mar 08 2021 Andrew Hughes - 1:11.0.11.0.3-0.0.ea -- Update to jdk-11.0.11.0+3 -- Update release notes to 11.0.11.0+3 - -* Tue Mar 02 2021 Andrew Hughes - 1:11.0.11.0.2-0.0.ea -- Update to jdk-11.0.11.0+2 -- Update release notes to 11.0.11.0+2 - -* Sun Feb 21 2021 Jayashree Huttanagoudar - 1:11.0.11.0.1-0.0.ea -- Add comment for tzdata-java - -* Sun Feb 21 2021 Andrew Hughes - 1:11.0.11.0.1-0.0.ea -- Update to jdk-11.0.11.0+1 -- Update release notes to 11.0.11.0+1 -- Switch to EA mode for 11.0.11 pre-release builds - -* Thu Feb 18 2021 Jayashree Huttanagoudar - 1:11.0.10.0.9-3 -- Changes to replace boot-jdk from embeded-java to java-unsafe -- update tzdata-java from 2020b to 2021a - -* Fri Feb 05 2021 Jayashree Huttanagoudar - 1:11.0.10.0.9-2 -- Changes to generate sha256sum for each linux-portable build artifacts inside RPM - -* Mon Jan 25 2021 Andrew Hughes - 1:11.0.10.0.9-1 -- Fix debug and fastdebug descriptions to emphasise the difference is optimisation or no optimisation. -- Cleanup package descriptions and version number placement. -- Resolves: rhbz#1908972 - -* Mon Jan 25 2021 Jiri Vanek - 1:11.0.10.0.9-1 -- Removed lib-style provides for fastdebug_suffix_unquoted -- Fixed missing condition for fastdebug packages being counted as debug ones -- Fix typo in variable -- Resolves: rhbz#1908972 - -* Fri Jan 15 2021 Andrew Hughes - 1:11.0.10.0.9-0 -- Update to jdk-11.0.10.0+9 -- Update release notes to 11.0.10.0+9 -- Switch to GA mode for final release. -- This tarball is embargoed until 2021-01-19 @ 1pm PT. -- Resolves: rhbz#1908970 - -* Fri Jan 15 2021 Jayashree Huttanagoudar - 1:11.0.10.0.8-0.0.ea -- Drop JDK-8222527 as applied upstream at the time of jdk-11.0.10.0+5 - -* Fri Jan 15 2021 Andrew Hughes - 1:11.0.10.0.8-0.0.ea -- Update to jdk-11.0.10.0+8 -- Update release notes to 11.0.10.0+8. -- Update tarball generation script to use PR3818 which handles JDK-8171279 changes -- Drop JDK-8250861 as applied upstream. -- Resolves: rhbz#1903908 - -* Fri Jan 15 2021 Andrew Hughes - 1:11.0.10.0.1-0.1.ea -- Update release notes for 11.0.9.1 release. -- Resolves: rhbz#1895274 - -* Thu Jan 14 2021 Andrew Hughes - 1:11.0.10.0.1-0.0.ea -- Completely revert hacks from previous release, using buildver in configure and tzdata 2020b -- Resolves: rhbz#1903907 - -* Thu Jan 14 2021 Andrew Hughes - 1:11.0.10.0.1-0.0.ea -- Add new Harfbuzz library to package listing and _privatelibs -- Resolves: rhbz#1903907 - -* Thu Jan 14 2021 Andrew John Hughes - 1:11.0.10.0.1-0.0.ea -- Update to jdk-11.0.10.0+1 -- Update release notes to 11.0.10.0+1 -- Use JEP-322 Time-Based Versioning so we can handle a future 11.0.9.1-like release correctly. -- Still use 11.0.x rather than 11.0.x.0 for file naming, as the trailing zero is omitted from tags. -- Switch to EA mode for 11.0.10 pre-release builds. -- Drop JDK-8222286 & JDK-8254177 as applied upstream -- Explicitly request bundled Harfbuzz (too risky to change this so late in the RHEL 7 lifecycle) -- Resolves: rhbz#1903907 - -* Wed Jan 13 2021 Andrew Hughes - 1:11.0.9.11-7 -- Introduced ssbd_arches to denote architectures with SSBD mitigation (currently only x86_64) -- Introduced nm-based check to verify alt-java on ssbd_arches is patched, and no other alt-java or java binaries are patched -- RH1750419 patch amended to emit a warning on architectures where alt-java is the same as java -- Resolves: rhbz#1901695 - -* Wed Jan 13 2021 Jiri Vanek - 1:11.0.9.11-7 -- Redefined linux -> __linux__ and __x86_64 -> __x86_64__ in RH1750419 patch -- Resolves: rhbz#1901695 - -* Mon Jan 11 2021 Jiri Vanek - 1:11.0.9.11-6 -- Removed patch6: rh1566890-CVE_2018_3639-speculative_store_bypass.patch, surpassed by new patch -- Added patch600: rh1750419-redhat_alt_java.patch, surpassing removed patch -- No longer copy java->alt-java as it is created by patch600 -- Resolves: rhbz#1901695 - -* Mon Jan 11 2021 Andrew Hughes - 1:11.0.9.11-5 -- Add backport of JDK-8222537 so the Host header is sent when using proxies. -- Resolves: rhbz#1869530 - -* Mon Dec 21 2020 Jayashree Huttanagoudar - 1:11.0.9.11-4 -- Align fastdebug/slowdebug changes with upstream rhel-8.4.0 spec -- Included patch to handle '--without fastdebug' option to mockbuild - -* Tue Dec 01 2020 Jiri Vanek - 1:11.0.9.11-3 -- added br of listdc++-static -- removed patch1001 rhel6-build.patch -- removed patch1002 zgc_jdk11_compiler_fixes.patch -- initial on-el7 build (more tuning expected) - -* Wed Nov 04 2020 Severin Gehwolf - 1:11.0.9.11-2 -- Update to jdk-11.0.9.1+1 -- RPM version stays at 11.0.9.11 so as to not break upgrade path. -- Adds a single patch for JDK-8250861. -- Resolves: rhbz#1895274 - -* Tue Oct 20 2020 Jayashree Huttanagoudar - 1:11.0.9.11-1 -- Added patch to apply tzdata 2020b - -* Thu Oct 15 2020 Andrew Hughes - 1:11.0.9.11-0 -- Update to jdk-11.0.9+11 -- Update release notes for 11.0.9 release. -- Add backport of JDK-8254177 to update to tzdata 2020b -- Require tzdata 2020b due to resource changes in JDK-8254177 -- Delay tzdata 2020b dependency until tzdata update has shipped. -- This tarball is embargoed until 2020-10-20 @ 1pm PT. -- Resolves: rhbz#1876665 - -* Thu Oct 15 2020 Andrew Hughes - 1:11.0.9.10-0.3.ea -- Improve quoting of vendor name -- Resolves: rhbz#1883849 - -* Wed Oct 14 2020 Jiri Vanek - 1:11.0.9.10-0.2.ea -- Set vendor property and vendor URLs -- Made URLs to be preconfigured by OS -- Moved vendor_version_string to a better place -- Resolves: rhbz#1883849 - -* Tue Oct 13 2020 Andrew Hughes - 1:11.0.9.10-0.1.ea -- Update to jdk-11.0.9+10 (EA) -- Resolves: rhbz#1876665 - -* Tue Oct 13 2020 Andrew Hughes - 1:11.0.9.9-0.1.ea -- Update to jdk-11.0.9+9 (EA) -- Resolves: rhbz#1876665 - -* Tue Oct 13 2020 Andrew Hughes - 1:11.0.9.8-0.1.ea -- Update to jdk-11.0.9+8 (EA) -- Remove JDK-8252258/RH1868406 now applied upstream. -- Resolves: rhbz#1876665 - -* Tue Oct 13 2020 Andrew Hughes - 1:11.0.9.7-0.1.ea -- Update to jdk-11.0.9+7 (EA) -- Resolves: rhbz#1876665 - -* Tue Sep 29 2020 Andrew Hughes - 1:11.0.9.6-0.1.ea -- Add JDK-8252258 to return default vendor to the original value of 'Oracle Corporation' -- Include a test in the RPM to check the build has the correct vendor information. -- Use 'oj_' prefix on new vendor globals to avoid a conflict with RPM's vendor value. -- Resolves: rhbz#1876665 - -* Fri Sep 25 2020 Andrew Hughes - 1:11.0.9.6-0.0.ea -- Update to jdk-11.0.9+6 (EA) - -* Thu Sep 24 2020 Jayashree Huttanagoudar - 1:11.0.9.5-0.1.ea -- Changing the spec file to have one single debuginfo bundle. -- Because contents of these bundles are almost identical. - -* Tue Sep 08 2020 Andrew Hughes - 1:11.0.9.5-0.0.ea -- Update to jdk-11.0.9+5 (EA) - -* Thu Sep 03 2020 Andrew Hughes - 1:11.0.9.4-0.0.ea -- Update to jdk-11.0.9+4 (EA) - -* Wed Aug 19 2020 Andrew Hughes - 1:11.0.9.3-0.0.ea -- Update to jdk-11.0.9+3 (EA) - -* Wed Aug 12 2020 Andrew Hughes - 1:11.0.9.2-0.1.ea -- Following JDK-8005165, class data sharing can be enabled on all JIT architectures -- Synchronise architecture group documentation with Fedora - -* Tue Aug 11 2020 Andrew Hughes - 1:11.0.9.2-0.0.ea -- Update to jdk-11.0.9+2 (EA) -- With Shenandoah now upstream in OpenJDK 11, we can use jdk-updates/jdk11 directly - -* Tue Aug 11 2020 Andrew Hughes - 1:11.0.9.1-0.2.ea -- Cleanup architecture and JVM feature handling in preparation for using upstreamed Shenandoah. - -* Fri Aug 07 2020 Andrew Hughes - 1:11.0.9.1-0.1.ea -- Update to shenandoah-jdk-11.0.9+1 (EA) -- Switch to EA mode for 11.0.9 pre-release builds. -- Drop JDK-8227269 & JDK-8241750 backports now applied upstream. - -* Sat Jul 11 2020 Andrew Hughes - 1:11.0.8.10-0 -- Update to shenandoah-jdk-11.0.8+10 (GA) -- Switch to GA mode for final release. -- Update release notes with last minute fix (JDK-8248505). -- This tarball is embargoed until 2020-07-14 @ 1pm PT. -- Resolves: rhbz#1838811 - -* Fri Jul 10 2020 Andrew Hughes - 1:11.0.8.9-0.0.ea -- Update to shenandoah-jdk-11.0.8+9 (EA) -- Update release notes for 11.0.8 release. -- This tarball is embargoed until 2020-07-14 @ 1pm PT. -- Resolves: rhbz#1838811 - -* Thu Jul 09 2020 Andrew Hughes - 1:11.0.8.8-0.1.ea -- java-11-openjdk doesn't have a JRE tree, so don't try and copy alt-java there... -- Resolves: rhbz#1838811 - -* Thu Jul 09 2020 Jiri Vanek - 1:11.0.8.8-0.0.ea -- Create a copy of java as alt-java with alternatives and man pages -- Resolves: rhbz#1838811 - -* Thu Jul 09 2020 Andrew Hughes - 1:11.0.8.8-0.0.ea -- Update to shenandoah-jdk-11.0.8+8 (EA) -- Resolves: rhbz#1838811 - -* Thu Jul 09 2020 Andrew Hughes - 1:11.0.8.7-0.0.ea -- Update to shenandoah-jdk-11.0.8+7 (EA) -- Resolves: rhbz#1838811 - -* Thu Jul 09 2020 Andrew Hughes - 1:11.0.8.6-0.0.ea -- Update to shenandoah-jdk-11.0.8+6 (EA) -- Resolves: rhbz#1838811 - -* Thu Jul 09 2020 Andrew Hughes - 1:11.0.8.5-0.0.ea -- Update to shenandoah-jdk-11.0.8+5 (EA) -- Resolves: rhbz#1838811 - -* Thu Jul 09 2020 Andrew Hughes - 1:11.0.8.4-0.0.ea -- Update to shenandoah-jdk-11.0.8+4 (EA) -- Resolves: rhbz#1838811 - -* Thu Jul 09 2020 Andrew Hughes - 1:11.0.8.3-0.0.ea -- Update to shenandoah-jdk-11.0.8+3 (EA) -- Resolves: rhbz#1838811 - -* Tue Jun 02 2020 Andrew Hughes - 1:11.0.8.2-0.1.ea -- Update to shenandoah-jdk-11.0.8+2 (EA) -- Resolves: rhbz#1838811 - -* Mon May 25 2020 Andrew Hughes - 1:11.0.8.1-0.1.ea -- Update to shenandoah-jdk-11.0.8+1 (EA) -- Switch to EA mode for 11.0.8 pre-release builds. -- Drop JDK-8228407 backports now applied upstream. -- Resolves: rhbz#1838811 - -* Sat May 23 2020 Andrew John Hughes - 1:11.0.7.10-7 -- Add backports of JDK-8227269 & JDK-8241750 to resolve slow class loading with JDWP enabled. -- Resolves: rhbz#1826915 - -* Wed Apr 15 2020 Andrew Hughes - 1:11.0.7.10-1 -- Add JDK-8228407 backport to resolve crashes during verification. -- Resolves: rhbz#1810557 - -* Tue Apr 14 2020 Andrew Hughes - 1:11.0.7.10-1 -- Amend release notes, removing issue actually fixed in 11.0.6. -- Resolves: rhbz#1810557 - -* Tue Apr 14 2020 Andrew Hughes - 1:11.0.7.10-1 -- Re-apply --with-extra-asflags as crash was not due to this. -- Resolves: rhbz#1810557 - -* Mon Apr 13 2020 Andrew Hughes - 1:11.0.7.10-1 -- Add release notes. -- Resolves: rhbz#1810557 - -* Tue Mar 31 2020 Andrew Hughes - 1:11.0.7.10-0 -- Update to shenandoah-jdk-11.0.7+10 (GA) -- Switch to GA mode for final release. -- Resolves: rhbz#1810557 - -* Sat Mar 28 2020 Andrew Hughes - 1:11.0.7.9-0.0.ea -- Update to shenandoah-jdk-11.0.7+9 (EA) -- Resolves: rhbz#1810557 - -* Sat Mar 28 2020 Andrew Hughes - 1:11.0.7.8-0.0.ea -- Update to shenandoah-jdk-11.0.7+8 (EA) -- Resolves: rhbz#1810557 - -* Sat Mar 28 2020 Andrew Hughes - 1:11.0.7.7-0.0.ea -- Update to shenandoah-jdk-11.0.7+7 (EA) -- Resolves: rhbz#1810557 - -* Mon Mar 16 2020 Andrew Hughes - 1:11.0.7.6-0.0.ea -- Update to shenandoah-jdk-11.0.7+6 (EA) -- Resolves: rhbz#1810557 - -* Sun Mar 15 2020 Andrew Hughes - 1:11.0.7.5-0.0.ea -- Update to shenandoah-jdk-11.0.7+5 (EA) -- Resolves: rhbz#1810557 - -* Fri Feb 28 2020 Andrew Hughes - 1:11.0.7.4-0.0.ea -- Update to shenandoah-jdk-11.0.7+4 (EA) -- Resolves: rhbz#1810557 - -* Tue Feb 18 2020 Andrew Hughes - 1:11.0.7.3-0.0.ea -- Update to shenandoah-jdk-11.0.7+3 (EA) -- Resolves: rhbz#1810557 - -* Sun Feb 16 2020 Andrew Hughes - 1:11.0.7.2-0.0.ea -- Update to shenandoah-jdk-11.0.7+2 (EA) -- Resolves: rhbz#1810557 - -* Sun Feb 16 2020 Andrew Hughes - 1:11.0.7.1-0.0.ea -- Update to shenandoah-jdk-11.0.7+1 (EA) -- Switch to EA mode for 11.0.7 pre-release builds. -- Drop JDK-8236039 backport now applied upstream. -- Resolves: rhbz#1810557 - -* Sat Feb 15 2020 Jiri Vanek - 1:11.0.6.10-2 -- get rid of openjdkportable in favour of el - -* Sat Feb 15 2020 Jiri Vanek - 1:11.0.6.10-1 -- renamed static to more accurate portable - -* Sat Feb 15 2020 Jiri Vanek - 1:11.0.6.10-1 -- added support for jre via legacy-jre-image - -* Tue Oct 15 2019 Andrew Hughes - 1:11.0.6.10-0 -- Update to shenandoah-jdk-11.0.5+10 (GA) -- Switch to GA mode for final release. -- Remove PR1834/RH1022017 which is now handled by JDK-8228825 upstream. -- Drop JDK-8223482 which is included upstream in 11.0.5+1. - -* Mon Oct 07 2019 Jiri Vanek - 1:11.0.5.2-0.0.ea -- Update to shenandoah-jdk-11.0.5+2 (EA) - -* Wed Jul 31 2019 Jiri Vanek - 1:11.0.4.11-5 -- for release, build debugsymbols to special archive - -* Tue Jul 23 2019 Jiri Vanek - 1:11.0.4.11-4 -- filtered out -g from extra flags - -* Fri Jul 19 2019 Jiri Vanek - 1:11.0.4.11-3 -- Moved to with-stdcpplib=static - -* Tue Jul 09 2019 Andrew Hughes - 1:11.0.4.11-2 -- Drop NSS runtime dependencies and patches to link against it. -- Resolves: rhbz#1678554 - -* Tue Jul 09 2019 Andrew Hughes - 1:11.0.4.11-1 -- Update to shenandoah-jdk-11.0.4+11 (GA) -- Switch to GA mode for final release. -- Resolves: rhbz#1724452 - -* Mon Jul 08 2019 Andrew Hughes - 1:11.0.4.10-0.1.ea -- Update to shenandoah-jdk-11.0.4+10 (EA) -- Resolves: rhbz#1724452 - -* Mon Jul 08 2019 Andrew Hughes - 1:11.0.4.9-0.1.ea -- Update to shenandoah-jdk-11.0.4+9 (EA) -- Resolves: rhbz#1724452 - -* Mon Jul 08 2019 Andrew Hughes - 1:11.0.4.8-0.1.ea -- Update to shenandoah-jdk-11.0.4+8 (EA) -- Resolves: rhbz#1724452 - -* Sun Jul 07 2019 Andrew John Hughes - 1:11.0.4.7-0.2.ea -- fontconfig build requirement should be fontconfig-devel, previously masked by Gtk3+ dependency -- Resolves: rhbz#1724452 - -* Sun Jul 07 2019 Andrew John Hughes - 1:11.0.4.7-0.2.ea -- Add missing build requirement for libXrandr-devel, previously masked by Gtk3+ dependency -- Resolves: rhbz#1724452 - -* Sun Jul 07 2019 Andrew John Hughes - 1:11.0.4.7-0.2.ea -- Add missing build requirement for libXrender-devel, previously masked by Gtk3+ dependency -- Resolves: rhbz#1724452 - -* Sun Jul 07 2019 Andrew Hughes - 1:11.0.4.7-0.1.ea -- Update to shenandoah-jdk-11.0.4+7 (EA) -- Resolves: rhbz#1724452 - -* Wed Jul 03 2019 Andrew Hughes - 1:11.0.4.6-0.1.ea -- Obsolete javadoc-debug and javadoc-debug-zip packages via javadoc and javadoc-zip respectively. -- Resolves: rhbz#1724452 - -* Wed Jul 03 2019 Andrew Hughes - 1:11.0.4.6-0.1.ea -- Update to shenandoah-jdk-11.0.4+6 (EA) -- Resolves: rhbz#1724452 - -* Wed Jul 03 2019 Andrew Hughes - 1:11.0.4.5-0.1.ea -- Update to shenandoah-jdk-11.0.4+5 (EA) -- Resolves: rhbz#1724452 - -* Tue Jul 02 2019 Andrew Hughes - 1:11.0.4.4-0.1.ea -- Update to shenandoah-jdk-11.0.4+4 (EA) -- Resolves: rhbz#1724452 - -* Mon Jul 01 2019 Andrew Hughes - 1:11.0.4.3-0.1.ea -- Update to shenandoah-jdk-11.0.4+3 (EA) -- Resolves: rhbz#1724452 - -* Sun Jun 30 2019 Andrew John Hughes - 1:11.0.4.2-0.1.ea -- Update to shenandoah-jdk-11.0.4+2 (EA) -- Resolves: rhbz#1724452 - -* Fri Jun 21 2019 Severin Gehwolf - 1:11.0.4.2-0.1.ea -- Package jspawnhelper (see JDK-8220360). -- Resolves: rhbz#1724452 - -* Fri Jun 21 2019 Severin Gehwolf - 1:11.0.3.7-5 -- Include 'ea' designator in Release when appropriate. -- Resolves: rhbz#1724452 - -* Wed May 22 2019 Andrew Hughes - 1:11.0.3.7-5 -- Handle milestone as variables so we can alter it easily and set the docs zip filename appropriately. -- Resolves: rhbz#1724452 - -* Thu Apr 25 2019 Severin Gehwolf - 1:11.0.3.7-4 -- Don't build the test images needlessly. -- Don't produce javadoc/javadoc-zip sub packages for the debug variant build. -- Don't perform a bootcycle build for the debug variant build. -- Resolves: rhbz#1724452 - -* Wed Apr 24 2019 Severin Gehwolf - 1:11.0.3.7-3 -- Do not generate lib-style requires for -slowdebug subpackages. -- Resolves: rhbz#1693468 - -* Sun Apr 07 2019 Andrew Hughes - 1:11.0.3.7-0 -- Update to shenandoah-jdk-11.0.3+7 (April 2019 GA) -- Resolves: rhbz#1693468 - -* Sat Apr 06 2019 Andrew Hughes - 1:11.0.3.6-0 -- Update to shenandoah-jdk-11.0.3+6 (April 2019 EA) -- Drop JDK-8210416/RH1632174 applied upstream. -- Drop JDK-8210425/RH1632174 applied upstream. -- Drop JDK-8210647/RH1632174 applied upstream. -- Drop JDK-8210761/RH1632174 applied upstream. -- Drop JDK-8210703/RH1632174 applied upstream. -- Add cast to resolve s390 ambiguity in call to log2_intptr -- Resolves: rhbz#1693468 - -* Thu Mar 21 2019 Severin Gehwolf - 1:11.0.2.7-3 -- Add patch for RH1566890 -- Resolves: rhbz#1693468 - -* Tue Mar 12 2019 Jiri Vanek - 1:11.0.2.7-2 -- name adapted to current tag - -* Tue Feb 26 2019 Jiri Vanek - 1:11.0.2.7-2 -- cripled rpms original specto roduce only portable build -- Resolves: rhbz#1661577 diff --git a/SOURCES/jconsole.desktop.in b/SOURCES/jconsole.desktop.in deleted file mode 100644 index 8a3b04d..0000000 --- a/SOURCES/jconsole.desktop.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@) -Comment=Monitor and manage OpenJDK applications -Exec=_SDKBINDIR_/jconsole -Icon=java-@JAVA_VER@-@JAVA_VENDOR@ -Terminal=false -Type=Application -StartupWMClass=sun-tools-jconsole-JConsole -Categories=Development;Profiling;Java; -Version=1.0 diff --git a/SOURCES/jdk8312489-max_sig_default_increase.patch b/SOURCES/jdk8312489-max_sig_default_increase.patch deleted file mode 100644 index e0c4eeb..0000000 --- a/SOURCES/jdk8312489-max_sig_default_increase.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 50074a04e62f91faa080b831d9ce343396ead252 -Author: Andrew John Hughes -Date: Tue Sep 5 20:48:42 2023 +0000 - - 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar - - Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750 - -diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java -index cb7e308e0d..cce897c0d3 100644 ---- a/src/java.base/share/classes/java/util/jar/JarFile.java -+++ b/src/java.base/share/classes/java/util/jar/JarFile.java -@@ -809,7 +809,9 @@ class JarFile extends ZipFile { - throw new IOException("Unsupported size: " + uncompressedSize + - " for JarEntry " + ze.getName() + - ". Allowed max size: " + -- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes"); -+ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " + -+ "You can use the jdk.jar.maxSignatureFileSize " + -+ "system property to increase the default value."); - } - int len = (int)uncompressedSize; - int bytesRead; -diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -index cb477fc134..a766b8249f 100644 ---- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -+++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -@@ -852,16 +852,16 @@ public class SignatureFileVerifier { - * the maximum allowed number of bytes for the signature-related files - * in a JAR file. - */ -- Integer tmp = GetIntegerAction.privilegedGetProperty( -- "jdk.jar.maxSignatureFileSize", 8000000); -+ int tmp = GetIntegerAction.privilegedGetProperty( -+ "jdk.jar.maxSignatureFileSize", 16000000); - if (tmp < 0 || tmp > MAX_ARRAY_SIZE) { - if (debug != null) { -- debug.println("Default signature file size 8000000 bytes " + -- "is used as the specified size for the " + -- "jdk.jar.maxSignatureFileSize system property " + -+ debug.println("The default signature file size of 16000000 bytes " + -+ "will be used for the jdk.jar.maxSignatureFileSize " + -+ "system property since the specified value " + - "is out of range: " + tmp); - } -- tmp = 8000000; -+ tmp = 16000000; - } - return tmp; - } diff --git a/SPECS/java-11-openjdk-portable.spec b/SPECS/java-11-openjdk-portable.spec index e90a14f..a8ce26b 100644 --- a/SPECS/java-11-openjdk-portable.spec +++ b/SPECS/java-11-openjdk-portable.spec @@ -339,7 +339,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 22 +%global updatever 23 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -392,8 +392,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 7 -%global rpmrelease 1 +%global buildver 9 +%global rpmrelease 2 #%%global tagsuffix %%{nil} # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk @@ -571,7 +571,7 @@ Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz # 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 @@ -726,8 +726,9 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel %ifarch %{zero_arches} BuildRequires: libffi-devel %endif -# 2023c required as of JDK-8305113 -BuildRequires: tzdata-java >= 2023c +# 2024a required as of JDK-8325150 +# Use 2023d until 2024a is in the buildroot +BuildRequires: tzdata-java >= 2023d # cacerts build requirement in portable mode BuildRequires: ca-certificates # Earlier versions have a bug in tree vectorization on PPC @@ -747,17 +748,17 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h -Provides: bundled(freetype) = 2.13.0 +Provides: bundled(freetype) = 2.13.2 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.1 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 7.2.0 +Provides: bundled(harfbuzz) = 8.2.2 # Version in src/java.desktop/share/native/liblcms/lcms2.h Provides: bundled(lcms2) = 2.15.0 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h Provides: bundled(libjpeg) = 6b # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h -Provides: bundled(libpng) = 1.6.39 +Provides: bundled(libpng) = 1.6.40 # We link statically against libstdc++ to increase portability BuildRequires: libstdc++-static %endif @@ -1062,9 +1063,6 @@ function buildjdk() { bash ${top_dir_abs_src_path}/configure \ %ifarch %{zero_arches} --with-jvm-variants=zero \ -%endif -%ifarch %{ppc64le} - --with-jobs=1 \ %endif --with-cacerts-file=`readlink -f %{_sysconfdir}/pki/java/cacerts` \ --with-version-build=%{buildver} \ @@ -1648,8 +1646,25 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog -* Sun Jan 21 2024 Arkady L. Shane - 1:11.0.22.0.7-1 -- Rebuilt for MSVSphere 9.3 +* Tue Apr 23 2024 Arkady L. Shane - 1:11.0.23.0.9-2 +- Rebuilt for MSVSphere + +* Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 +- Fix 11.0.22 release date in NEWS + +* Wed Apr 10 2024 Anton Bobrov - 1:11.0.23.0.9-1 +- Update to jdk-11.0.23+9 (GA) +- Update release notes to 11.0.23+9 +- Switch to GA mode for release +- Require tzdata 2024a due to upstream inclusion of JDK-8322725 +- Only require tzdata 2023d for now as 2024a is unavailable in buildroot +- Speed up PPC build by removing ppc64le --with-jobs=1 workaround +- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. ** + +* Thu Mar 21 2024 Anton Bobrov - 1:11.0.23.0.1-0.1.ea +- Update to jdk-11.0.23+1 (EA) +- Update release notes to 11.0.23+1 +- Switch to EA mode * Wed Jan 10 2024 Andrew Hughes - 1:11.0.22.0.7-1 - Update to jdk-11.0.22+7 (GA)