diff --git a/SPECS/java-21-openjdk.spec b/SPECS/java-21-openjdk.spec index 4e45155..7a90c40 100644 --- a/SPECS/java-21-openjdk.spec +++ b/SPECS/java-21-openjdk.spec @@ -21,6 +21,8 @@ %bcond_without release # Enable static library builds by default. %bcond_without staticlibs +# Build with system libraries +%bcond_with system_libs # Workaround for stripping of debug symbols from static libraries %if %{with staticlibs} @@ -30,14 +32,24 @@ %global include_staticlibs 0 %endif -#placeholder - used in regexes, otherwise for no use in portables +%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 +# With LTO flags enabled, debuginfo checks fail for some reason. Disable +# LTO for a passing build. This really needs to be looked at. +%define _lto_cflags %{nil} # 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 @@ -46,14 +58,10 @@ # (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. @@ -107,30 +115,28 @@ %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} -# 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 which support class data sharing +# See https://bugzilla.redhat.com/show_bug.cgi?id=513605 +# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT +%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x # 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 for which java has short vector math library (libsvml.so) +# Set of architectures for which java has short vector math library (libjsvml.so) %global svml_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 debug build during main build on JIT architectures %if %{with slowdebug} @@ -177,10 +183,14 @@ # 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} +%if 0%{?flatpak} +%global bootstrap_build false %else -%global staticlibs_loop %{nil} +%ifarch %{bootstrap_arches} +%global bootstrap_build true +%else +%global bootstrap_build false +%endif %endif %if %{include_staticlibs} @@ -196,18 +206,25 @@ # RPM JDK builds keep the debug symbols internal, to be later stripped by RPM %global debug_symbols internal -# VM variant being built -%ifarch %{zero_arches} -%global vm_variant zero -%else -%global vm_variant server -%endif - -# 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) +# unlike portables,the rpms have to use static_libs_target very dynamically +%global bootstrap_targets images +%global release_targets images docs-zip +# No docs nor bootcycle for debug builds +%global debug_targets images +# Target to use to just build HotSpot +%global hotspot_target hotspot + +# debugedit tool for rewriting ELF file paths +%global debugedit %{_rpmconfigdir}/debugedit + +# 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} # In some cases, the arch used by the JDK does # not match _arch. @@ -280,15 +297,14 @@ %global interimver 0 %global updatever 0 %global patchver 0 - # We don't add any LTS designator for STS packages (Fedora and EPEL). # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined. %if 0%{?rhel} && !0%{?epel} %global lts_designator "LTS" %global lts_designator_zip -%{lts_designator} %else - %global lts_designator "" - %global lts_designator_zip "" + %global lts_designator "" + %global lts_designator_zip "" %endif # Define vendor information used by OpenJDK @@ -310,18 +326,32 @@ %endif %endif %endif -%global oj_vendor_version (Red_Hat-%{version}-%{release}) +%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease}) # 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 75ffdc48eda +# Define JDK versions +%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} +%global javaver %{featurever} +# 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 %{origin} +%global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 35 %global rpmrelease 2 +# Settings used by the portable build +%global portablerelease 2 +%global portablesuffix el9_3 +%global portablebuilddir /builddir/build/BUILD + # 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 @@ -334,14 +364,6 @@ # for techpreview, using 1, so slowdebugs can have 0 %global priority %( printf '%08d' 1 ) %endif -%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver} -%global javaver %{featurever} - -# 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}} # Define milestone (EA for pre-releases, GA for releases) # Release will be (where N is usually a number starting at 1): @@ -350,15 +372,15 @@ %global is_ga 1 %if %{is_ga} %global build_type GA -%global expected_ea_designator "" +%global ea_designator "" %global ea_designator_zip "" %global extraver %{nil} %global eaprefix %{nil} %else %global build_type EA -%global expected_ea_designator ea -%global ea_designator_zip -%{expected_ea_designator} -%global extraver .%{expected_ea_designator} +%global ea_designator ea +%global ea_designator_zip -%{ea_designator} +%global extraver .%{ea_designator} %global eaprefix 0. %endif @@ -368,11 +390,8 @@ # images directories from upstream build %global jdkimage jdk %global static_libs_image static-libs -# installation directory for static libraries -%global static_libs_root lib/static -%global static_libs_arch_dir %{static_libs_root}/linux-%{archinstall} -%global static_libs_install_dir %{static_libs_arch_dir}/glibc - +# output dir stub +%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?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 @@ -382,7 +401,7 @@ # 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.*|libsystemconf[.]so.*|libzip[.]so.*%{freetype_lib} +%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.*|lible[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsystemconf[.]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})$ @@ -398,6 +417,12 @@ %global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$ %endif +# VM variant being built +%ifarch %{zero_arches} +%global vm_variant zero +%else +%global vm_variant server +%endif %global etcjavasubdir %{_sysconfdir}/java/java-%{javaver}-%{origin} %define etcjavadir() %{expand:%{etcjavasubdir}/%{uniquesuffix -- %{?1}}} @@ -409,6 +434,7 @@ %define jrebindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin} %global alt_java_name alt-java +%global alt_java_versioned %{alt_java_name}-%{featurever} %global rpm_state_dir %{_localstatedir}/lib/rpm-state/ @@ -437,13 +463,6 @@ %global tapsetdir %{tapsetdirttapset}/%{stapinstall} %endif -# x86 is no longer supported -%if 0%{?java_arches:1} -ExclusiveArch: %{java_arches} -%else -ExcludeArch: %{ix86} -%endif - # not-duplicated scriptlets for normal/debug packages %global update_desktop_icons /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -512,7 +531,7 @@ key=java alternatives \\ --install %{_bindir}/java $key %{jrebindir -- %{?1}}/java $PRIORITY --family %{family} \\ --slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\ - --slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{jrebindir -- %{?1}}/%{alt_java_name} \\ + --slave %{_bindir}/%{alt_java_name} %{alt_java_name} %{_bindir}/%{alt_java_versioned} \\ --slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\ --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\ --slave %{_mandir}/man1/java.1$ext java.1$ext \\ @@ -538,6 +557,10 @@ alternatives --install %{_jvmdir}/jre-%{javaver}-%{origin} $key %{_jvmdir}/%{jre } %define post_headless() %{expand: +%ifarch %{share_arches} +%{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null +%endif + update-desktop-database %{_datadir}/applications &> /dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -787,8 +810,10 @@ exit 0 %define files_jre_headless() %{expand: %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal +%{_bindir}/%{alt_java_versioned} %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/NEWS -%{_jvmdir}/%{sdkdir -- %{?1}}/NEWS +%doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/README.md +%doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/java-%{featurever}-openjdk-portable.specfile %dir %{_sysconfdir}/.java/.systemPrefs %dir %{_sysconfdir}/.java %dir %{_jvmdir}/%{sdkdir -- %{?1}} @@ -796,11 +821,10 @@ exit 0 %{_jvmdir}/%{jrelnk -- %{?1}} %dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin %{_jvmdir}/%{sdkdir -- %{?1}}/bin/java -%{_jvmdir}/%{sdkdir -- %{?1}}/bin/%{alt_java_name} %{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool %{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry %dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib -%ifarch %{share_arches} +%ifarch %{jit_arches} %{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist %endif %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec @@ -810,7 +834,6 @@ exit 0 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/psfont.properties.ja %{_jvmdir}/%{sdkdir -- %{?1}}/lib/psfontj2d.properties %{_jvmdir}/%{sdkdir -- %{?1}}/lib/tzdb.dat -%{_jvmdir}/%{sdkdir -- %{?1}}/lib/tzdb.dat.upstream %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjli.so %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jvm.cfg %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libattach.so @@ -820,7 +843,9 @@ exit 0 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libawt_headless.so %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libdt_socket.so %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libfontmanager.so +%if ! %{system_libs} %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libfreetype.so +%endif %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libinstrument.so %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2gss.so %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pcsc.so @@ -859,22 +884,18 @@ exit 0 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc %{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1* -#%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1* #TODO, resolve alt-java man page +%{_mandir}/man1/%{alt_java_name}-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1* %{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/ %ifarch %{share_arches} -%attr(444, root, root) %{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/classes.jsa -%ifnarch %{ix86} %{arm32} -%attr(444, root, root) %{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/classes_nocoops.jsa -%endif +%attr(444, root, root) %ghost %{_jvmdir}/%{sdkdir -- %{?1}}/lib/%{vm_variant}/classes.jsa %endif %dir %{etcjavasubdir} %dir %{etcjavadir -- %{?1}} %dir %{etcjavadir -- %{?1}}/lib %dir %{etcjavadir -- %{?1}}/lib/security %{etcjavadir -- %{?1}}/lib/security/cacerts -%{etcjavadir -- %{?1}}/lib/security/cacerts.upstream %dir %{etcjavadir -- %{?1}}/conf %dir %{etcjavadir -- %{?1}}/conf/sdp %dir %{etcjavadir -- %{?1}}/conf/management @@ -893,17 +914,16 @@ exit 0 %{etcjavadir -- %{?1}}/conf/security/policy/README.txt %config(noreplace) %{etcjavadir -- %{?1}}/conf/security/java.policy %config(noreplace) %{etcjavadir -- %{?1}}/conf/security/java.security -%config(noreplace) %{etcjavadir -- %{?1}}/conf/logging.properties -%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.cfg %config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.fips.cfg %config(noreplace) %{etcjavadir -- %{?1}}/conf/management/jmxremote.access # This is a config template, thus not config-noreplace %config %{etcjavadir -- %{?1}}/conf/management/jmxremote.password.template %config %{etcjavadir -- %{?1}}/conf/sdp/sdp.conf.template %config(noreplace) %{etcjavadir -- %{?1}}/conf/management/management.properties +%config(noreplace) %{etcjavadir -- %{?1}}/conf/jaxp.properties +%config(noreplace) %{etcjavadir -- %{?1}}/conf/logging.properties %config(noreplace) %{etcjavadir -- %{?1}}/conf/net.properties %config(noreplace) %{etcjavadir -- %{?1}}/conf/sound.properties -%config(noreplace) %{etcjavadir -- %{?1}}/conf/jaxp.properties %{_jvmdir}/%{sdkdir -- %{?1}}/conf %{_jvmdir}/%{sdkdir -- %{?1}}/lib/security %if %is_system_jdk @@ -975,22 +995,22 @@ exit 0 %{_mandir}/man1/jconsole-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jcmd-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jdb-%{uniquesuffix -- %{?1}}.1* +%{_mandir}/man1/jdeprscan-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jdeps-%{uniquesuffix -- %{?1}}.1* +%{_mandir}/man1/jfr-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jinfo-%{uniquesuffix -- %{?1}}.1* +%{_mandir}/man1/jlink-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jmap-%{uniquesuffix -- %{?1}}.1* +%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jps-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jpackage-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jrunscript-%{uniquesuffix -- %{?1}}.1* +%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jstack-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jstat-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1* -%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1* -%{_mandir}/man1/jdeprscan-%{uniquesuffix -- %{?1}}.1* -%{_mandir}/man1/jlink-%{uniquesuffix -- %{?1}}.1* -%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1* -%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1* -%{_mandir}/man1/jfr-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/jwebserver-%{uniquesuffix -- %{?1}}.1* +%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1* %if %{with_systemtap} %dir %{tapsetroot} @@ -1002,7 +1022,6 @@ exit 0 %if %{is_release_build -- %{?1}} %ghost %{_bindir}/javac %ghost %{_jvmdir}/java -%ghost %{_jvmdir}/%{alt_java_name} %ghost %{_bindir}/jlink %ghost %{_bindir}/jmod %ghost %{_bindir}/jhsdb @@ -1044,14 +1063,13 @@ exit 0 %define files_src() %{expand: %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal %{_jvmdir}/%{sdkdir -- %{?1}}/lib/src.zip -%{_jvmdir}/%{sdkdir -- %{?1}}/full_sources } %define files_static_libs() %{expand: -%dir %{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_root} -%dir %{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_arch_dir} -%dir %{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_install_dir} -%{_jvmdir}/%{sdkdir -- %{?1}}/%{static_libs_install_dir}/lib*.a +%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/static +%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/static/linux-%{archinstall} +%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/static/linux-%{archinstall}/glibc +%{_jvmdir}/%{sdkdir -- %{?1}}/lib/static/linux-%{archinstall}/glibc/lib*.a } %define files_javadoc() %{expand: @@ -1080,6 +1098,9 @@ exit 0 %endif } +# x86 is not supported by OpenJDK 17 +ExcludeArch: %{ix86} + # not-duplicated requires/provides/obsoletes for normal/debug packages %define java_rpo() %{expand: Requires: fontconfig%{?_isa} @@ -1239,16 +1260,9 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} # Prevent brp-java-repack-jars from being run %global __jar_repack 0 -%global portable_name %{name}-portable -# the version must match, but sometmes we need to more precise, so including release -%global portable_version %{version}-1 - -Name: java-21-%{origin} +Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -# This package needs `.rolling` as part of Release so as to not conflict on install with -# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as -# java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298 -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.inferit +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 @@ -1283,6 +1297,9 @@ Group: Development/Languages 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/ +# The source tarball, generated using generate_source_tarball.sh +Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/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. @@ -1291,6 +1308,12 @@ Source8: tapsets-icedtea-%{icedteaver}.tar.xz # Desktop files. Adapted from IcedTea Source9: jconsole.desktop.in +# Source code for alt-java +Source11: alt-java.c + +# Removed libraries that we link instead +Source12: remove-intree-libraries.sh + # Ensure we aren't using the limited crypto policy Source13: TestCryptoLevel.java @@ -1306,53 +1329,155 @@ Source16: CheckVendor.java # Ensure translations are available for new timezones Source18: TestTranslations.java -BuildRequires: %{portable_name}-sources >= %{portable_version} +# Include portable spec and instructions on how to rebuild +Source19: README.md +Source20: java-%{featurever}-openjdk-portable.specfile + +# Setup variables to reference correct sources +%global releasezip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.unstripped.jdk.%{_arch}.tar.xz +%global staticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.static-libs.%{_arch}.tar.xz +%global docszip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.docs.%{_arch}.tar.xz +%global misczip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.misc.%{_arch}.tar.xz +%global slowdebugzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.slowdebug.jdk.%{_arch}.tar.xz +%global slowdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.slowdebug.static-libs.%{_arch}.tar.xz +%global fastdebugzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.fastdebug.jdk.%{_arch}.tar.xz +%global fastdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{portablerelease}.portable.fastdebug.static-libs.%{_arch}.tar.xz + +############################################ +# +# RPM/distribution specific patches +# +############################################ + +# Crypto policy and FIPS support patches +# Patch is generated from the fips-21u tree at https://github.com/rh-openjdk/jdk/tree/fips-21u +# as follows: git diff %%{vcstag} src make test > fips-21u-$(git show -s --format=%h HEAD).patch +# Diff is limited to src and make subdirectories to exclude .github changes +# Fixes currently included: +# PR3183, RH1340845: Follow system wide 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 +# RH1995150: Disable non-FIPS crypto in SUN and SunEC security providers +# 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: Resolve outstanding FIPS issues +# RH2052819: Fix FIPS reliance on crypto policies +# RH2052829: Detect NSS at Runtime for FIPS detection +# RH2052070: Enable AlgorithmParameters and AlgorithmParameterGenerator services in FIPS mode +# RH2023467: Enable FIPS keys export +# RH2094027: SunEC runtime permission for FIPS +# RH2036462: sun.security.pkcs11.wrapper.PKCS11.getInstance breakage +# RH2090378: Revert to disabling system security properties and FIPS mode support together +# RH2104724: Avoid import/export of DH private keys +# RH2092507: P11Key.getEncoded does not work for DH keys in FIPS mode +# Build the systemconf library on all platforms +# RH2048582: Support PKCS#12 keystores [now part of JDK-8301553 upstream] +# RH2020290: Support TLS 1.3 in FIPS mode +# Add nss.fips.cfg support to OpenJDK tree +# RH2117972: Extend the support for NSS DBs (PKCS11) in FIPS mode +# Remove forgotten dead code from RH2020290 and RH2104724 +# OJ1357: Fix issue on FIPS with a SecurityManager in place +# RH2134669: Add missing attributes when registering services in FIPS mode. +# test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class +# RH1940064: Enable XML Signature provider in FIPS mode +# RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized [now part of JDK-8301553 upstream] +Patch1001: fips-%{featurever}u-%{fipsver}.patch + +############################################# +# +# OpenJDK patches in need of upstreaming +# +############################################# -%if %{include_normal_build} -BuildRequires: %{portable_name} >= %{portable_version} -BuildRequires: %{portable_name}-devel >= %{portable_version} -%if %{include_staticlibs} -BuildRequires: %{portable_name}-static-libs >= %{portable_version} -%endif -%endif -%if %{include_fastdebug_build} -BuildRequires: %{portable_name}-fastdebug >= %{portable_version} -BuildRequires: %{portable_name}-devel-fastdebug >= %{portable_version} -%if %{include_staticlibs} -BuildRequires: %{portable_name}-static-libs-fastdebug >= %{portable_version} -%endif -%endif -%if %{include_debug_build} -BuildRequires: %{portable_name}-slowdebug >= %{portable_version} -BuildRequires: %{portable_name}-devel-slowdebug >= %{portable_version} -%if %{include_staticlibs} -BuildRequires: %{portable_name}-static-libs-slowdebug >= %{portable_version} -%endif -%endif +# JDK-8009550, RH910107: Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo +# PR: https://github.com/openjdk/jdk/pull/15409 +Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch + +# Currently empty + +############################################# +# +# OpenJDK patches which missed last update +# +############################################# + +# Currently empty + +############################################# +# +# Portable build specific patches +# +############################################# + +# Currently empty +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: fontconfig-devel +BuildRequires: gcc-c++ BuildRequires: gdb -# for modyfying build-id in clashing binaries -BuildRequires: /usr/bin/gcc -BuildRequires: /usr/bin/objcopy -BuildRequires: /usr/bin/readelf -# Requirement for setting up nss.cfg and nss.fips.cfg +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.fips.cfg BuildRequires: nss-devel # Requirement for system security property test BuildRequires: crypto-policies BuildRequires: pkgconfig +BuildRequires: xorg-x11-proto-devel BuildRequires: zip -BuildRequires: unzip BuildRequires: javapackages-filesystem -# ? -BuildRequires: tzdata-java >= 2022g +%if %{include_normal_build} +BuildRequires: java-%{featurever}-openjdk-portable-unstripped = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-static-libs = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix} +%endif +%if %{include_fastdebug_build} +BuildRequires: java-%{featurever}-openjdk-portable-devel-fastdebug = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-static-libs-fastdebug = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix} +%endif +%if %{include_debug_build} +BuildRequires: java-%{featurever}-openjdk-portable-devel-slowdebug = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-static-libs-slowdebug = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix} +%endif +BuildRequires: java-%{featurever}-openjdk-portable-docs = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix} +# Zero-assembler build requirement +%ifarch %{zero_arches} +BuildRequires: libffi-devel +%endif +# 2023c required as of JDK-8305113 +BuildRequires: tzdata-java >= 2023c +# 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.12.1 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h @@ -1365,8 +1490,7 @@ Provides: bundled(lcms2) = 2.12.0 Provides: bundled(libjpeg) = 6b # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h Provides: bundled(libpng) = 1.6.37 -# 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 @@ -1479,7 +1603,7 @@ Group: Development/Tools %{java_devel_rpo -- %{fastdebug_suffix_unquoted}} %description devel-fastdebug -The %{origin_nice} %{featurever} development tools. +The %{origin_nice} %{featurever} development tools . %{fastdebug_warning} %endif @@ -1676,8 +1800,16 @@ The %{origin_nice} %{featurever} API documentation compressed in a single archiv %endif %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 @@ -1700,6 +1832,8 @@ if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{includ 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 @@ -1707,29 +1841,42 @@ if [ $prioritylength -ne 8 ] ; then exit 14 fi -tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.sources.noarch.tar.xz -%if %{include_normal_build} -tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jdk.%{_arch}.tar.xz -#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.jre.%{_arch}.tar.xz -%if %{include_staticlibs} -tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.static-libs.%{_arch}.tar.xz -%endif -%endif -%if %{include_fastdebug_build} -tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jdk.%{_arch}.tar.xz -#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.jre.%{_arch}.tar.xz -%if %{include_staticlibs} -tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.fastdebug.static-libs.%{_arch}.tar.xz -%endif -%endif -%if %{include_debug_build} -tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{_arch}.tar.xz -#tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jre.%{_arch}.tar.xz -%if %{include_staticlibs} -tar -xf %{_jvmdir}/%{compatiblename}*%{version}*portable.slowdebug.static-libs.%{_arch}.tar.xz -%endif +# 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} +# Add crypto policy and FIPS support +%patch1001 -p1 +# Patches in need of upstreaming +%patch6 -p1 +popd # openjdk + + +# The OpenJDK version file includes the current +# upstream version information. For some reason, +# configure does not automatically use the +# default pre-version supplied there (despite +# what the file claims), so we pass it manually +# to configure +VERSION_FILE=$(pwd)/%{top_level_dir_name}/make/conf/version-numbers.conf +if [ -f ${VERSION_FILE} ] ; then + UPSTREAM_EA_DESIGNATOR=$(grep '^DEFAULT_PROMOTED_VERSION_PRE' ${VERSION_FILE} | cut -d '=' -f 2) +else + echo "Could not find OpenJDK version file."; + exit 16 +fi +if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then + echo "WARNING: Designator mismatch"; + echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'" + echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'"; + exit 17 +fi + # Extract systemtap tapsets %if %{with_systemtap} tar --strip-components=1 -x -I xz -f %{SOURCE8} @@ -1743,7 +1890,7 @@ cp -r tapset tapset%{fastdebug_suffix} for suffix in %{build_loop} ; do for file in "tapset"$suffix/*.in; do OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"` - sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1 + sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/%{vm_variant}/libjvm.so:g" $file > $file.1 sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2 # TODO find out which architectures other than i686 have a client vm %ifarch %{ix86} @@ -1778,103 +1925,178 @@ done %build -%install -function installjdk() { +function customisejdk() { local imagepath=${1} 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 nss.cfg right away as we will be using the JRE above - #is already there from portables - # Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies) - #is already there from portables - # Turn on system security properties sed -i -e "s:^security.useSystemPropertiesFile=.*:security.useSystemPropertiesFile=true:" \ ${imagepath}/conf/security/java.security # Use system-wide tzdata - mv ${imagepath}/lib/tzdb.dat{,.upstream} - ln -sv %{_datadir}/javazi-1.8/tzdb.dat ${imagepath}/lib/tzdb.dat - - # Rename OpenJDK cacerts database - mv ${imagepath}/lib/security/cacerts{,.upstream} - # Install cacerts symlink needed by some apps which hard-code the path - ln -sv /etc/pki/java/cacerts ${imagepath}/lib/security - - # add alt-java man page - # alt-java man and bianry are here from portables. Or not? + rm ${imagepath}/lib/tzdb.dat + ln -s %{_datadir}/javazi-1.8/tzdb.dat ${imagepath}/lib/tzdb.dat fi } -# Checks on debuginfo must be performed before the files are stripped -# by the RPM installation stage -function debugcheckjdk() { - local imagepath=${1} +for suffix in %{build_loop} ; do - if [ -d ${imagepath} ] ; then + if [ "x$suffix" = "x" ] ; then + jdkzip=%{releasezip} + staticlibzip=%{staticlibzip} + elif [ "x$suffix" = "x%{fastdebug_suffix_unquoted}" ] ; then + jdkzip=%{fastdebugzip} + staticlibzip=%{fastdebugstaticlibzip} + else # slowdebug + jdkzip=%{slowdebugzip} + staticlibzip=%{slowdebugstaticlibzip} + fi - so_suffix="so" - # Check debug symbols are present and can identify code - find "${imagepath}" -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 and .S 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|S|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 "${imagepath}/bin/java" <" > a.c - echo "int main(void) { printf(\"$libjsvml\"); }" >> a.c - gcc a.c -o exe - readelf -n exe | grep "Build ID" - readelf -n $libjsvml | grep "Build ID" - objcopy --dump-section .note.gnu.build-id=id exe - objcopy --update-section .note.gnu.build-id=id $libjsvml - readelf -n $libjsvml | grep -i "Build ID" - popd - rm -rf $libjsvmlgcchackdir - done - # Check debug symbols were built into the dynamic libraries - if [ $jdkjre == jdk ] ; then - #jdk only? - debugcheckjdk ${top_dir_abs_main_build_path} - fi - # Print release information - cat ${top_dir_abs_main_build_path}/release - done -# build cycles -done # end of release / debug cycle loop +# Check class files include useful debugging information +$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from" +$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable +$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable + +# Check generated class files include useful debugging information +$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from" +$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable +$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable +# build cycles check +done + +%install STRIP_KEEP_SYMTAB=libjvm* for suffix in %{build_loop} ; do - if [ "x$suffix" = "x" ] ; then - debugbuild="" - else - # change -something to .something - debugbuild=`echo $suffix | sed "s/-/./g"` - fi - buildoutputdir=`ls -d %{compatiblename}*portable${debugbuild}.jdk*` - top_dir_abs_main_build_path=$(pwd)/${buildoutputdir} -%if %{include_staticlibs} - top_dir_abs_staticlibs_build_path=`ls -d $top_dir_abs_main_build_path/lib/static/*/glibc/` -%endif - jdk_image=${top_dir_abs_main_build_path} - src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"` -# Install the jdk -mkdir -p $RPM_BUILD_ROOT%{_jvmdir} +jdk_image=$(pwd)/%{installoutputdir -- ${suffix}} +# Should match same definitions in build section +docdir=$(pwd)/%{installoutputdir -- "-docs"} +miscdir=%{installoutputdir -- "-misc"} -# Install icons -for s in 16 24 32 48 ; do - install -D -p -m 644 \ - ${src_image}/openjdk/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png -done +# Install %{alt_java_name} binary versioned +install -D -p -m 755 ${miscdir}/%{alt_java_name} \ + $RPM_BUILD_ROOT%{_bindir}/%{alt_java_versioned} +# Install release notes and rebuild instructions +commondocdir=${RPM_BUILD_ROOT}%{_defaultdocdir}/%{uniquejavadocdir -- $suffix} +install -d -m 755 ${commondocdir} +mv ${jdk_image}/NEWS ${commondocdir} +cp -a %{SOURCE19} %{SOURCE20} ${commondocdir} +# Install the jdk +mkdir -p $RPM_BUILD_ROOT%{_jvmdir} cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix} -cp -a ${src_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/full_sources pushd ${jdk_image} @@ -1979,17 +2158,24 @@ pushd ${jdk_image} # Install systemtap support files install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset # note, that uniquesuffix is in BUILD dir in this case - cp -a $RPM_BUILD_DIR/tapset$suffix/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/ + cp -a $RPM_BUILD_DIR/%{uniquesuffix ""}/tapset$suffix/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/ pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/ tapsetFiles=`ls *.stp` popd install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir} for name in $tapsetFiles ; do targetName=`echo $name | sed "s/.stp/$suffix.stp/"` - ln -srvf $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset/$name $RPM_BUILD_ROOT%{tapsetdir}/$targetName + ln -sf %{_jvmdir}/%{sdkdir -- $suffix}/tapset/$name $RPM_BUILD_ROOT%{tapsetdir}/$targetName done %endif + # Remove empty cacerts database + rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/security/cacerts + # Install cacerts symlink needed by some apps which hard-code the path + pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/security + ln -sf /etc/pki/java/cacerts . + popd + # Install version-ed symlinks pushd $RPM_BUILD_ROOT%{_jvmdir} ln -sf %{sdkdir -- $suffix} %{jrelnk -- $suffix} @@ -2002,37 +2188,33 @@ pushd ${jdk_image} # Convert man pages to UTF8 encoding iconv -f ISO_8859-1 -t UTF8 $manpage -o $manpage.tmp mv -f $manpage.tmp $manpage - install -m 644 -p $manpage $RPM_BUILD_ROOT%{_mandir}/man1/$(basename $manpage .1)-%{uniquesuffix -- $suffix}.1 + install -m 644 -p $manpage $RPM_BUILD_ROOT%{_mandir}/man1/$(basename \ + $manpage .1)-%{uniquesuffix -- $suffix}.1 done # Remove man pages from jdk image rm -rf $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/man popd -# Install static libs artefacts -%if %{include_staticlibs} -mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/%{static_libs_install_dir} -cp -a ${top_dir_abs_staticlibs_build_path}/*.a $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/%{static_libs_install_dir} -%endif - if ! echo $suffix | grep -q "debug" ; then - # Install Javadoc documentation - install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} - install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} - built_doc_archive=javadocs.zip - cp -a ${top_dir_abs_main_build_path}/${built_doc_archive} \ - $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path} - pushd $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} - unzip ${top_dir_abs_main_build_path}/${built_doc_archive} - popd + # Install Javadoc documentation + install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} + cp -a ${docdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} + built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip + cp -a ${docdir}/${built_doc_archive} \ + $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}/bundles/ + touch $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip fi -# Install release notes -commondocdir=${RPM_BUILD_ROOT}%{_defaultdocdir}/%{uniquejavadocdir -- $suffix} -install -d -m 755 ${commondocdir} -cp -a ${top_dir_abs_main_build_path}/NEWS ${commondocdir} +# Install icons and menu entries +for s in 16 24 32 48 ; do + install -D -p -m 644 \ + ${miscdir}/java-icon${s}.png \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-%{origin}.png +done # Install desktop files +# TODO: provide desktop files via portable install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps} for e in jconsole$suffix ; do desktop-file-install --vendor=%{uniquesuffix -- $suffix} --mode=644 \ @@ -2049,104 +2231,21 @@ mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib mv $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/conf/ $RPM_BUILD_ROOT/%{etcjavadir -- $suffix} mv $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/lib/security $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix} - ln -srv $RPM_BUILD_ROOT%{etcjavadir -- $suffix}/conf ./conf + ln -s %{etcjavadir -- $suffix}/conf ./conf popd pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/lib - ln -srv $RPM_BUILD_ROOT%{etcjavadir -- $suffix}/lib/security ./security + ln -s %{etcjavadir -- $suffix}/lib/security ./security popd # end moving files to /etc -#TODO this is done also i portables and in install jdk. But hard to say where the operation will hapen at the end # stabilize permissions find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "*.so" -exec chmod 755 {} \; ; find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -type d -exec chmod 755 {} \; ; find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 644 {} \; ; -if [ "x$suffix" = "x" ] ; then - rm $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/javadocs.zip #is in subpackages, 1 renamed, 2nd unpacked -fi # end, dual install done -%check - -# We test debug first as it will give better diagnostics on a crash -for suffix in %{build_loop} ; do - -# Tests in the check stage are performed on the installed image -# rpmbuild operates as follows: build -> install -> test -export JAVA_HOME=${RPM_BUILD_ROOT}%{_jvmdir}/%{sdkdir -- $suffix} - -#check Shenandoah is enabled -%if %{use_shenandoah_hotspot} -$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -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" -$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} true -$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false - -# 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 correct vendor values have been set -$JAVA_HOME/bin/javac -d . %{SOURCE16} -#TODO skipped vendor check. It now points to PORTABLE version of jdk. -#$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}" - -%if ! 0%{?flatpak} -# Check translations are available for new timezones (during flatpak builds, the -# tzdb.dat used by this test is not where the test expects it, so this is -# disabled for flatpak builds) -$JAVA_HOME/bin/javac -d . %{SOURCE18} -#TODO doublecheck tzdata handling -$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE || echo "TZDATA no longer can be synced with system, because we repack" -$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR || echo "TZDATA no longer can be synced with system, because we repack" -%endif - -%if %{include_staticlibs} -# Check debug symbols in static libraries (smoke test) -export STATIC_LIBS_HOME=${JAVA_HOME}/%{static_libs_install_dir} -readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet4AddressImpl.c -readelf --debug-dump $STATIC_LIBS_HOME/libnet.a | grep Inet6AddressImpl.c -%endif - -# Check src.zip has all sources. See RHBZ#1130490 -$JAVA_HOME/bin/jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe' - -# Check class files include useful debugging information -$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from" -$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable -$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable - -# Check generated class files include useful debugging information -$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from" -$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable -$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable - -# build cycles check -done - %if %{include_normal_build} # intentionally only for non-debug %pretrans headless -p @@ -2391,934 +2490,83 @@ cjc.mainProgram(args) %endif %changelog -* Tue Oct 10 2023 Arkady L. Shane - 1:21.0.0.0.35-2.inferit -- Fedora build Style - -* Tue Aug 29 2023 Jiri Vanek - 1:21.0.0.0.35-1.rolling -- updated to jdk 21 - -* Mon Aug 07 2023 Jiri Vanek - 1:20.0.2.0.9-2.rolling -- updated to July security update 20.0.2.9 portables - -* Thu Jul 20 2023 Fedora Release Engineering - 1:20.0.1.0.9-8.rolling.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu May 11 2023 Andrew Hughes - 1:20.0.1.0.9-8.rolling -- Following JDK-8005165, class data sharing can be enabled on all JIT architectures - -* Wed May 10 2023 Severin Gehwolf - 1:20.0.1.0.9-6.rolling -- Fix packaging of CDS archives - -* Fri Apr 28 2023 Jiri Vanek - 1:20.0.1.0.9-6.rolling -- faking build-id in libjsvml.so - -* Fri Apr 28 2023 Jiri Vanek - 1:20.0.1.0.9-5.rolling -- returned news - -* Fri Apr 28 2023 Jiri Vanek - 1:20.0.1.0.9-4.rolling -- now expecting the exact version in portbale filename - -* Fri Apr 28 2023 Jiri Vanek - 1:20.0.1.0.9-3.rolling -- updated to 20.0.1.0.9 underlying portables - -* Wed Apr 19 2023 Jiri Vanek - 1:20.0.0.0.36-3.rolling -- using icons from source package -- providing full sources via src package -- requiring exact version.reelase of portables -- returned libsystemconf.so - -* Mon Apr 03 2023 Jiri Vanek - 1:20.0.0.0.36-1.rolling -- bumed to jdk20 -- removed no loger existing libsystemconf.so -- commented out usage if Source15 TestSecurityProperties.java test, as honoring of --- system crypto policies comes from fips aptch which is not yet adapted - -* Mon Jan 30 2023 Jiri Vanek - 1:19.0.2.0.7-5.rolling -- Using icons whcih are now part of the portble tarball - -* Mon Jan 30 2023 Jiri Vanek - 1:19.0.2.0.7-4.rolling -- repacked bits are now requested in exact version - -* Mon Jan 30 2023 Petra Alice Mikova - 1:19.0.2.0.7-3.rolling -- return libfreetype.so binary to resolve requires problems -- remove BuildRequires: java-latest-openjdk - -* Thu Jan 26 2023 Jiri Vanek - 1:19.0.2.0.7-2.rolling -- repacked portables -- todo icons -- disabled tzdata tests - todo, resolve -- left some duplicated "final tunings" -- todo, lost alt java manpage.. probably already in portables -- TODO conslut this clean up - javdoc, freetype and NEWS -- todo, debuginfo - -* Thu Jan 26 2023 Andrew Hughes - 1:19.0.2.0.7-1.rolling +* Wed Nov 8 2023 Arkady L. Shane - 1:21.0.0.0.35-2 +- Rebuilt for MSVSphere 9.3 + +* Thu Aug 24 2023 Andrew Hughes - 1:21.0.0.0.35-2 +- Update documentation (README.md) +- Replace alt-java patch with a binary separate from the JDK +- Drop stale patches that are of little use any more: +- * nss.cfg has been disabled since early PKCS11 work and long superseded by FIPS work +- * No accessibility subpackage to warrant RH1648242 & RH1648644 patches any more +- * No use of system libjpeg turbo to warrant RH649512 patch any more +- Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed +- Adapt alt-java test to new binary where there is always a set_speculation function +- Related: rhbz#2192748 + +* Mon Aug 21 2023 Andrew Hughes - 1:21.0.0.0.35-1 +- Update to jdk-21.0.0+35 +- Update system crypto policy & FIPS patch from new fips-21u tree +- Update generate_tarball.sh to sync with upstream vanilla script inc. no more ECC removal +- Drop fakefeaturever now it is no longer needed +- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball +- Use upstream release URL for OpenJDK source +- Re-enable tzdata tests now we are on the latest JDK and things are back in sync +- Install jaxp.properties introduced by JDK-8303530 +- Install lible.so introduced by JDK-8306983 +- Related: rhbz#2192748 + +* Mon Aug 21 2023 Petra Alice Mikova - 1:21.0.0.0.35-1 +- Replace smoke test files used in the staticlibs test, as fdlibm was removed by JDK-8303798 +- Related: rhbz#2192748 + +* Wed Aug 16 2023 Andrew Hughes - 1:20.0.0.0.36-1 +- Update to jdk-20.0.2+9 +- Update release notes to 20.0.2+9 +- Update system crypto policy & FIPS patch from new fips-20u tree +- Update generate_tarball.sh ICEDTEA_VERSION +- Update CLDR reference data following update to 42 (Rocky Mountain-Normalzeit => Rocky-Mountain-Normalzeit) +- Related: rhbz#2192748 + +* Wed Aug 16 2023 Jiri Vanek - 1:20.0.0.0.36-1 +- Dropped JDK-8295447, JDK-8296239 & JDK-8299439 patches now upstream +- Adapted rh1750419-redhat_alt_java.patch +- Related: rhbz#2192748 + +* Tue Aug 15 2023 Andrew Hughes - 1:19.0.1.0.10-1 - Update to jdk-19.0.2 release - Update release notes to 19.0.2 -- Drop JDK-8293834 (CLDR update for Kyiv) which is now upstream -- Drop JDK-8294357 (tzdata2022d), JDK-8295173 (tzdata2022e) & JDK-8296108 (tzdata2022f) local patches which are now upstream -- Drop JDK-8296715 (CLDR update for 2022f) which is now upstream -- Add local patch JDK-8295447 (javac NPE) which was accepted into 19u upstream but not in the GA tag -- Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases - -* Thu Jan 19 2023 Fedora Release Engineering - 1:19.0.1.0.10-3.rolling.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Dec 16 2022 Andrew Hughes - 1:19.0.1.0.10-3.rolling -- Update in-tree tzdata & CLDR to 2022g with JDK-8296108, JDK-8296715 & JDK-8297804 -- Update TestTranslations.java to test the new America/Ciudad_Juarez zone - -* Wed Dec 07 2022 Stephan Bergmann - 1:19.0.1.0.10-3.rolling -- Fix flatpak builds by disabling TestTranslations test due to missing tzdb.dat - -* Wed Oct 26 2022 Andrew Hughes - 1:19.0.1.0.10-2.rolling -- 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 - -* Thu Oct 20 2022 Andrew Hughes - 1:19.0.1.0.10-1.rolling -- Update to jdk-19.0.1 release -- Update release notes to 19.0.1 - -* Wed Sep 21 2022 Andrew Hughes - 1:19.0.0.0.36-3.rolling -- The stdc++lib, zlib & freetype options should always be set from the global, so they are not altered for staticlibs builds -- Remove freetype sources along with zlib sources - -* Tue Aug 30 2022 Andrew Hughes - 1:19.0.0.0.36-2.rolling -- Switch buildjdkver back to being featurever, now java-19-openjdk is available in the buildroot - -* Mon Aug 29 2022 Andrew Hughes - 1:19.0.0.0.36-2.rolling -- Switch to static builds, reducing system dependencies and making build more portable - -* Mon Aug 29 2022 Andrew Hughes - 1:19.0.0.0.36-1.rolling -- Update to RC version of OpenJDK 19 -- Update release notes to 19.0.0 - Rebase FIPS patches from fips-19u branch -- Need to include the '.S' suffix in debuginfo checks after JDK-8284661 -- Add patch to provide translations for Europe/Kyiv added in tzdata2022b -- Add test to ensure timezones can be translated - Remove references to sample directory removed by JDK-8284999 +- Add local patch JDK-8295447 (javac NPE) which was accepted into 19u upstream but not in the GA tag +- Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases +- Related: rhbz#2192748 -* Fri Jul 22 2022 Andrew Hughes - 1:18.0.2.0.9-1.rolling +* Thu Aug 10 2023 Andrew Hughes - 1:18.0.2.0.9-1 - Update to jdk-18.0.2 release -- Update release notes to 18.0.2 -- Drop JDK-8282004 patch which is now upstreamed under JDK-8282231 -- Exclude x86 where java_arches is undefined, in order to unbreak build - -* Fri Jul 22 2022 Jiri Vanek - 1:18.0.1.1.2-8.rolling -- moved to build only on %%{java_arches} --- https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs -- reverted : --- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild (always mess up release) --- Try to build on x86 again by creating a husk of a JDK which does not depend on itself --- Exclude x86 from builds as the bootstrap JDK is now completely broken and unusable --- Replaced binaries and .so files with bash-stubs on i686 -- added ExclusiveArch: %%{java_arches} --- this now excludes i686 --- this is safely backport-able to older fedoras, as the macro was backported properly (with i686 included) -- https://bugzilla.redhat.com/show_bug.cgi?id=2104125 - -* Thu Jul 21 2022 Fedora Release Engineering - 1:18.0.1.1.2-7.rolling.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Andrew Hughes - 1:18.0.1.1.2-7.rolling -- Try to build on x86 again by creating a husk of a JDK which does not depend on itself - -* Sun Jul 17 2022 Andrew Hughes - 1:18.0.1.1.2-6.rolling -- Exclude x86 from builds as the bootstrap JDK is now completely broken and unusable - -* Wed Jul 13 2022 Andrew Hughes - 1:18.0.1.1.2-5.rolling -- Explicitly require crypto-policies during build and runtime for system security properties - -* Wed Jul 13 2022 Jiri Vanek - 1:18.0.1.1.2-4.rolling. -- Replaced binaries and .so files with bash-stubs on i686 in preparation of the removal on that architecture: -- https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs - -* Wed Jul 13 2022 Andrew Hughes - 1:18.0.1.1.2-3.rolling -- Make use of the vendor version string to store our version & release rather than an upstream release date - -* Tue Jul 12 2022 FeRD (Frank Dana) - 1:18.0.1.1.2-2.rolling -- Add javaver- and origin-specific javadoc and javadoczip alternatives. - -* Mon Jul 11 2022 Andrew Hughes - 1:18.0.1.1.2-1.rolling -- Update to jdk-18.0.1.1 interim release -- Update release notes to actually reflect OpenJDK 18 and subsequent releases 18.0.1 & 18.0.1.1 -- 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 -- Include script to generate bug list for release notes -- Update tzdata requirement to 2022a to match JDK-8283350 - -* Sat Jul 09 2022 Jayashree Huttanagoudar - 1:18.0.1.0.10-8.rolling -- 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. - -* Sat Jul 09 2022 Andrew Hughes - 1:18.0.1.0.10-8.rolling -- Include a test in the RPM to check the build has the correct vendor information. - -* Fri Jul 08 2022 Andrew Hughes - 1:18.0.1.0.10-7.rolling -- Fix whitespace in spec file - -* Fri Jul 08 2022 Andrew Hughes - 1:18.0.1.0.10-7.rolling -- Sequence spec file sections as they are run by rpmbuild (build, install then test) - -* Fri Jul 08 2022 Andrew Hughes - 1:18.0.1.0.10-7.rolling -- Turn on system security properties as part of the build's install section -- Move cacerts replacement to install section and retain original of this and tzdb.dat -- Run tests on the installed image, rather than the build image -- Introduce variables to refer to the static library installation directories -- Use relative symlinks so they work within the image -- Run debug symbols check during build stage, before the install strips them - -* Thu Jul 07 2022 Stephan Bergmann - 1:18.0.1.0.10-6.rolling -- Fix flatpak builds by exempting them from bootstrap - -* Thu Jun 30 2022 Francisco Ferrari Bihurriet - 1:18.0.1.0.10-5.rolling -- RH2007331: SecretKey generate/import operations don't add the CKA_SIGN attribute in FIPS mode - -* Thu Jun 30 2022 Stephan Bergmann - 1:18.0.1.0.10-4.rolling -- Fix flatpak builds (catering for their uncompressed manual pages) - -* Fri Jun 24 2022 Andrew Hughes - 1:18.0.1.0.10-3.rolling -- Update FIPS support to bring in latest changes -- * RH2023467: Enable FIPS keys export -- * RH2094027: SunEC runtime permission for FIPS -- * 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 -- Minor sync-ups with java-17-openjdk spec file - -* Wed May 25 2022 Andrew Hughes - 1:18.0.1.0.10-2.rolling -- Exclude s390x from the gdb test on RHEL 7 where we see failures with the portable build - -* Wed Apr 27 2022 Jiri Vanek - 1:18.0.1.0.10-1.rolling. -- updated to CPU jdk-18.0.1+10 sources - -* Wed Apr 06 2022 Jiri Vanek - 1:18.0.0.0.37-4.rolling -- Remove hardcoded /usr/lib/jvm by %%{_jvmdir} to make rpmlint happy - -* Wed Mar 23 2022 Andrew Hughes - 1:18.0.0.0.37-3.rolling -- Automatically turn off building a fresh HotSpot first, if the bootstrap JDK is not the same major version as that being built - -* Mon Mar 21 2022 Jiri Vanek - 1:18.0.0.0.37-2.rolling -- replaced tabs by sets of spaces to make rpmlint happy -- set build jdk to 18 -- as ga is 1, set vendor_version_string to 22.3 - -* Wed Mar 16 2022 Andrew Hughes - 1:18.0.0.0.37-1.rolling -- Update to RC version of OpenJDK 18 - Support JVM variant zero following JDK-8273494 no longer installing Zero's libjvm.so in the server directory -- Disable HotSpot-only pre-build which is incompatible with the boot JDK being a different major version to that being built -- Rebase FIPS patches from fips-18u branch and simplify by using a single patch from that repository -- Detect NSS at runtime for FIPS detection -- Turn off build-time NSS linking and go back to an explicit Requires on NSS -- Enable AlgorithmParameters and AlgorithmParameterGenerator services in FIPS mode +- Rebase FIPS patches from fips-18u branch - Rebase RH1648249 nss.cfg patch so it applies after the FIPS patch +- Drop now unused fresh_libjvm, build_hotspot_first, bootjdk and buildjdkver variables, as we don't build a JDK here +- Drop tzdata patches added for 17.0.7 which will eventually appear in the upstream tarball when we reach OpenJDK 21 +- Disable tzdata tests until we are on the latest JDK and things are back in sync +- Use empty nss.fips.cfg until it is again available via the FIPS patch +- Related: rhbz#2192748 + +* Thu Aug 10 2023 Petra Alice Mikova - 1:18.0.2.0.9-1 +- Update to ea version of jdk18 +- Add new slave jwebserver and corresponding manpage +- Adjust rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch +- Related: rhbz#2192748 + +* Thu Aug 10 2023 FeRD (Frank Dana) - 1:18.0.2.0.9-1 +- Add javaver- and origin-specific javadoc and javadoczip alternatives. +- Related: rhbz#2192748 -* Wed Mar 16 2022 Petra Alice Mikova - 1:18.0.0.0.37-1.rolling -- update to ea version of jdk18 -- add new slave jwebserver and corresponding manpage -- adjust rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch - -* Wed Feb 16 2022 Andrew Hughes - 1:17.0.2.0.8-5 -- Reinstate JIT builds on x86_32. -- Add JDK-8282004 to fix missing CALL effects on x86_32. - -* Mon Feb 07 2022 Severin Gehwolf - 1:17.0.2.0.8-4 -- Re-enable gdb backtrace check. -- Resolves RHBZ#2041970 - -* Fri Feb 04 2022 Andrew Hughes - 1:17.0.2.0.8-3 -- Temporarily move x86 to use Zero in order to get a working build -- Replace -mstackrealign with -mincoming-stack-boundary=2 -mpreferred-stack-boundary=4 on x86_32 for stack alignment -- Support a HotSpot-only build so a freshly built libjvm.so can then be used in the bootstrap JDK. -- 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 - -* Mon Jan 24 2022 Andrew Hughes - 1:17.0.2.0.8-2.rolling -- Introduce stapinstall variable to set SystemTap arch directory correctly (e.g. arm64 on aarch64) -- Need to support noarch for creating source RPMs for non-scratch builds. - -* Mon Jan 24 2022 Andrew Hughes - 1:17.0.2.0.8-1.rolling -- January 2022 security update to jdk 17.0.2+8 -- Extend LTS check to exclude EPEL. -- Rename libsvml.so to libjsvml.so following JDK-8276025 -- Remove JDK-8276572 patch which is now upstream. -- Rebase RH1995150 & RH1996182 patches following JDK-8275863 addition to module-info.java - -* Mon Jan 24 2022 Severin Gehwolf - 1:17.0.2.0.8-1.rolling -- Set LTS designator. - -* Mon Jan 24 2022 Andrew Hughes - 1:17.0.1.0.12-16.rolling -- Separate crypto policy initialisation from FIPS initialisation, now they are no longer interdependent - -* Thu Jan 20 2022 Fedora Release Engineering - 1:17.0.1.0.12-15.rolling.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 18 2022 Andrew Hughes - 1:17.0.1.0.12-15.rolling -- Sync gdb test with java-1.8.0-openjdk and improve architecture restrictions. -- Disable on x86, x86_64, ppc64le & s390x while these are broken in rawhide. - -* Thu Jan 13 2022 Andrew Hughes - 1:17.0.1.0.12-14.rolling -- Fix FIPS issues in native code and with initialisation of java.security.Security - -* Thu Dec 09 2021 Jiri Vanek - 1:17.0.1.0.12-13.rolling -- Storing and restoring alterntives during update manually -- Fixing Bug 2001567 - update of JDK/JRE is removing its manually selected alterantives and select (as auto) system JDK/JRE --- The move of alternatives creation to posttrans to fix: --- Bug 1200302 - dnf reinstall breaks alternatives --- Had caused the alternatives to be removed, and then created again, --- instead of being added, and then removing the old, and thus persisting --- the selection in family --- Thus this fix, is storing the family of manually selected master, and if --- stored, then it is restoring the family of the master - -* Thu Dec 09 2021 Jiri Vanek - 1:17.0.1.0.12-12.rolling -- Family extracted to globals - -* Thu Dec 09 2021 Jiri Vanek - 1:17.0.1.0.12-11.rolling -- javadoc-zip got its own provides next to plain javadoc ones - -* Thu Dec 09 2021 Jiri Vanek - 1:17.0.1.0.12-10.rolling -- replaced tabs by sets of spaces to make rpmlint happy - -* Mon Nov 29 2021 Andrew Hughes - 1:17.0.1.0.12-9.rolling -- Handle Fedora in distro conditionals that currently only pertain to RHEL. - -* Fri Nov 05 2021 Andrew Hughes - 1:17.0.1.0.12-8.rolling -- Patch syslookup.c so it actually has some code to be compiled into libsyslookup -- Related: rhbz#2013846 - -* Wed Nov 03 2021 Severin Gehwolf - 1:17.0.1.0.12-7.rolling -- Use 'sql:' prefix in nss.fips.cfg as F35+ no longer ship the legacy - secmod.db file as part of nss +* Tue Aug 08 2023 Andrew Hughes - 1:17.0.7.0.7-4 +- Add files missed by centpkg import. +- Related: rhbz#2192748 -* Wed Nov 03 2021 Andrew Hughes - 1:17.0.1.0.12-6.rolling -- Turn off bootstrapping for slow debug builds, which are particularly slow on ppc64le. - -* Thu Oct 28 2021 Andrew Hughes - 1:17.0.1.0.12-5.rolling -- Sync desktop files with upstream IcedTea release 3.15.0 using new script - -* Tue Oct 26 2021 Andrew Hughes - 1:17.0.1.0.12-4.rolling -- 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 - -* Tue Oct 26 2021 Jiri Vanek - 1:17.0.1.0.12-3.rolling -- Minor cosmetic improvements to make spec more comparable between variants - -* Thu Oct 21 2021 Andrew Hughes - 1:17.0.1.0.12-2.rolling -- Update tapsets from IcedTea 6.x repository with fix for JDK-8015774 changes (_heap->_heaps) and @JAVA_SPEC_VER@ -- Update icedtea_sync.sh with a VCS mode that retrieves sources from a Mercurial repository - -* Wed Oct 20 2021 Petra Alice Mikova - 1:17.0.1.0.12-1.rolling -- October CPU update to jdk 17.0.1+12 -- dropped commented-out source line - -* Sun Oct 10 2021 Andrew Hughes - 1:17.0.0.0.35-5.rolling -- Allow plain key import to be disabled with -Dcom.redhat.fips.plainKeySupport=false - -* Sun Oct 10 2021 Martin Balao - 1:17.0.0.0.35-5.rolling -- Add patch to allow plain key import. - -* Thu Sep 30 2021 Andrew Hughes - 1:17.0.0.0.35-4.rolling -- Fix unused function compiler warning found in systemconf.c -- Extend the default security policy to accomodate PKCS11 accessing jdk.internal.access. - -* Thu Sep 30 2021 Martin Balao - 1:17.0.0.0.35-4.rolling -- Add patch to login to the NSS software token when in FIPS mode. - -* Mon Sep 27 2021 Andrew Hughes - 1:17.0.0.0.35-3.rolling -- Update release notes to document the major changes between OpenJDK 11 & 17. - -* Thu Sep 16 2021 Martin Balao - 1:17.0.0.0.35-2.rolling -- Add patch to disable non-FIPS crypto in the SUN and SunEC security providers. - -* Tue Sep 14 2021 Andrew Hughes - 1:17.0.0.0.35-1.rolling -- Update to jdk-17+35, also known as jdk-17-ga. -- Switch to GA mode. - -* Wed Sep 08 2021 Andrew Hughes - 1:17.0.0.0.33-0.3.ea.rolling -- Minor code cleanups on FIPS detection patch and check for SECMOD_GetSystemFIPSEnabled in configure. -- Remove unneeded Requires on NSS as it will now be dynamically linked and detected by RPM. - -* Wed Sep 08 2021 Martin Balao - 1:17.0.0.0.33-0.3.ea.rolling -- Detect FIPS using SECMOD_GetSystemFIPSEnabled in the new libsystemconf JDK library. - -* Mon Sep 06 2021 Andrew Hughes - 1:17.0.0.0.33-0.2.ea.rolling -- Update RH1655466 FIPS patch with changes in OpenJDK 8 version. -- SunPKCS11 runtime provider name is a concatenation of "SunPKCS11-" and the name in the config file. -- Change nss.fips.cfg config name to "NSS-FIPS" to avoid confusion with nss.cfg. -- No need to substitute path to nss.fips.cfg as java.security file supports a java.home variable. -- Disable FIPS mode support unless com.redhat.fips is set to "true". -- Enable alignment with FIPS crypto policy by default (-Dcom.redhat.fips=false to disable). -- Add explicit runtime dependency on NSS for the PKCS11 provider in FIPS mode -- Move setup of JavaSecuritySystemConfiguratorAccess to Security class so it always occurs (RH1915071) - -* Mon Sep 06 2021 Martin Balao - 1:17.0.0.0.33-0.2.ea.rolling -- Support the FIPS mode crypto policy (RH1655466) -- Use appropriate keystore types when in FIPS mode (RH1818909) -- Disable TLSv1.3 when the FIPS crypto policy and the NSS-FIPS provider are in use (RH1860986) - -* Mon Aug 30 2021 Jiri Vanek - 1:17.0.0.0.33-0.1.ea.rolling -- alternatives creation moved to posttrans -- Thus fixing the old reisntall issue: -- https://bugzilla.redhat.com/show_bug.cgi?id=1200302 -- https://bugzilla.redhat.com/show_bug.cgi?id=1976053 - -* Fri Jul 30 2021 Andrew Hughes - 1:17.0.0.0.33-0.0.ea.rolling -- Update to jdk-17+33, including JDWP fix and July 2021 CPU -- Resolves: rhbz#1972529 - -* Thu Jul 22 2021 Fedora Release Engineering - 1:17.0.0.0.26-0.4.ea.rolling.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jul 02 2021 Andrew Hughes - 1:17.0.0.0.26-0.4.ea.rolling -- Use the "reverse" build loop (debug first) as the main and only build loop to get more diagnostics. -- Remove restriction on disabling product build, as debug packages no longer have javadoc packages. - -* Mon Jun 28 2021 Petra Alice Mikova - 1:17.0.0.0.26-0.3.ea.rolling -- fix patch rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch which made the SunPKCS provider show up again -- Resolves: rhbz#1971120 - -* Thu Jun 24 2021 Severin Gehwolf - 1:17.0.0.0.26-0.2.ea.rolling -- Re-enable TestSecurityProperties after inclusion of PR3695 - -* Thu Jun 24 2021 Andrew Hughes - 1:17.0.0.0.26-0.2.ea.rolling -- Add PR3695 to allow the system crypto policy to be turned off - -* Thu Jun 24 2021 Severin Gehwolf - 1:17.0.0.0.26-0.1.ea.rolling -- Update buildjdkver to 17 so as to build with itself - -* Fri Jun 11 2021 Petra Alice Mikova - 1:17.0.0.0.26-0.0.ea.rolling -- update sources to jdk 17.0.0+26 -- set is_ga to 0, as this is early access build -- change vendor_version_string -- change path to the version-numbers.conf -- removed rmid binary from files and from slaves -- removed JAVAC_FLAGS=-g from make command, as it breaks the build since JDK-8258407 -- add lib/libsyslookup.so to files -- renamed lib/security/blacklisted.certs to lib/security/blocked.certs -- add lib/libsvml.so for intel -- skip debuginfo check for libsyslookup.so on s390x - -* Fri May 07 2021 Jiri Vanek -1:16.0.1.0.9-3.rolling -- removed cjc backward comaptiblity, to fix when both rpm 4.16 and 4.17 are in transaction - -* Thu Apr 29 2021 Jiri Vanek - 1:16.0.1.0.9-2.rolling -- adapted to newst cjc to fix issue with rpm 4.17 -- Disable copy-jdk-configs for Flatpak builds - -* Sun Apr 25 2021 Petra Alice Mikova - 1:16.0.1.0.9-1.rolling -- update to 16.0.1+9 april cpu tag -- dropped jdk8259949-allow_cf-protection_on_x86.patch - -* Thu Mar 11 2021 Andrew Hughes - 1:16.0.0.0.36-2.rolling -- Perform static library build on a separate source tree with bundled image libraries -- Make static library build optional -- Based on initial work by Severin Gehwolf - -* Tue Mar 09 2021 Jiri Vanek - 1:16.0.0.0.36-1.rolling -- fixed suggests of wrong pcsc-lite-devel%{?_isa} to correct pcsc-lite-libs%{?_isa} -- bumped buildjdkver to build by itself - 16 - -* Fri Feb 19 2021 Andrew Hughes - 1:16.0.0.0.36-0.rolling -- Update to jdk-16.0.0.0+36 -- Update tarball generation script to use git following OpenJDK's move to github -- Update tarball generation script to use PR3823 which handles JDK-8235710 changes -- Use upstream default for version-pre rather than setting it to "ea" or "" -- Drop libsunec.so which is no longer generated, thanks to JDK-8235710 -- Drop unnecessary compiler flags, dating back to work on GCC 6 & 10 -- Adapt RH1750419 alt-java patch to still apply after some variable re-naming in the makefiles -- Update filever to remove any trailing zeros, as in the OpenJDK build, and use for source filename -- Use system harfbuzz now this is supported. -- Pass SOURCE_DATE_EPOCH to build for reproducible builds - -* Fri Feb 19 2021 Stephan Bergmann - 1:15.0.2.0.7-1.rolling -- Hardcode /usr/sbin/alternatives for Flatpak builds - -* Tue Jan 26 2021 Fedora Release Engineering - 1:15.0.2.0.7-0.rolling.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 22 2021 Andrew Hughes - 1:15.0.2.0.7-0.rolling -- Update to jdk-15.0.2.0+7 -- Add release notes for 15.0.1.0 & 15.0.2.0 -- Use JEP-322 Time-Based Versioning so we can handle a future 11.0.9.1-like release correctly. -- Still use 15.0.x rather than 15.0.x.0 for file naming, as the trailing zero is omitted from tags. -- Cleanup debug package descriptions and version number placement. -- Remove unused patch files. - -* Tue Jan 19 2021 Andrew Hughes - 1:15.0.1.9-10.rolling -- Use -march=i686 for x86 builds if -fcf-protection is detected (needs CMOV) - -* Tue Dec 22 2020 Jiri Vanek - 1:15.0.1.9-9.rolling -- fixed missing condition for fastdebug packages being counted as debug ones - -* Sat Dec 19 2020 Jiri Vanek - 1:15.0.1.9-8.rolling -- removed lib-style provides for fastdebug_suffix_unquoted - -* Sat Dec 19 2020 Jiri Vanek - 1:15.0.1.9-6.rolling -- many cosmetic changes taken from more maintained jdk11 -- introduced debug_arches, bootstrap_arches, systemtap_arches, fastdebug_arches, sa_arches, share_arches, shenandoah_arches, zgc_arches - instead of various hardcoded ifarches -- updated systemtap -- added requires excludes for debug pkgs -- removed redundant logic around jsa files -- added runtime requires of lksctp-tools and libXcomposite% -- added and used Source15 TestSecurityProperties.java, but is made always positive as jdk15 now does not honor system policies -- s390x excluded form fastdebug build - -* Thu Dec 17 2020 Andrew Hughes - 1:15.0.1.9-5.rolling -- introduced nm based check to verify alt-java on x86_64 is patched, and no other alt-java or java is patched -- patch600 rh1750419-redhat_alt_java.patch amended to die, if it is used wrongly -- introduced ssbd_arches with currently only valid arch of x86_64 to separate real alt-java architectures - -* Wed Dec 9 2020 Jiri Vanek - 1:15.0.1.9-4.rolling -- moved wrongly placed licenses to accompany other ones -- this bad placement was killng parallel-installability and thus having bad impact to leapp if used - -* Tue Dec 01 2020 Jiri Vanek - 1:15.0.1.9-3.rolling -- added patch600, rh1750419-redhat_alt_java.patch, suprassing removed patch -- no longer copying of java->alt-java as it is created by patch600 - -* Mon Nov 23 2020 Jiri Vanek - 1:15.0.1.9-2.rolling -- Create a copy of java as alt-java with alternatives and man pages -- java-11-openjdk doesn't have a JRE tree, so don't try and copy alt-java there... - -* Sun Oct 25 2020 Petra Alice Mikova - 1:15.0.1.9-1.rolling -- updated to October CPU 2020 sources - -* Thu Oct 22 2020 Severin Gehwolf - 1:15.0.0.36-4.rolling -- Fix directory ownership of -static-libs sub-package. - -* Fri Oct 09 2020 Jiri Vanek - 1:15.0.0.36-3.rolling -- Build static-libs-image and add resulting files via -static-libs sub-package. -- Disable stripping of debug symbols for static libraries part of the -static-libs sub-package. -- JDK-8245832 increases the set of static libraries, so try and include them all with a wildcard. -- Update static-libs packaging to new layout - -* Mon Sep 21 2020 Petra Alice Mikova - 1:15.0.0.36-2.rolling -- Add support for fastdebug builds on 64 bit architectures - -* Tue Sep 15 2020 Severin Gehwolf - 1:15.0.0.36-1.rolling -- Remove EA designation -- Re-generate sources with PR3803 patch - -* Mon Aug 31 2020 Petra Alice Mikova - 1:15.0.0.36-0.1.ea.rolling -- Update to jdk 15.0.0.36 tag -- Modify rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch -- Update vendor version string to 20.9 -- jjs removed from packaging after JEP 372: Nashorn removal -- rmic removed from packaging after JDK-8225319 - -* Mon Jul 27 2020 Severin Gehwolf - 1:14.0.2.12-2.rolling -- Disable LTO so as to pass debuginfo check - -* Wed Jul 22 2020 Petra Alice Mikova - 1:14.0.2.12-1.rolling -- update to jdk 14.0.2.12 CPU version -- remove upstreamed patch jdk8237879-make_4_3_build_fixes.patch -- remove upstreamed patch jdk8235833-posixplatform_cpp_should_not_include_sysctl_h.patch -- remove upstreamed patch jdk8243059-build_fails_when_with_vendor_contains_comma.patch - -* Thu Jul 09 2020 Andrew Hughes - 1:14.0.1.7-4.rolling -- Re-introduce java-openjdk-src & java-openjdk-demo for system_jdk builds. -- Fix accidental renaming of java-openjdk-devel to java-devel-openjdk. - -* Thu May 14 2020 Petra Alice Mikova - 1:14.0.1.7-3.rolling -- introduce patch jdk8235833-posixplatform_cpp_should_not_include_sysctl_h to fix build issues in rawhide -- rename and reorganize patch sections - -* Thu Apr 23 2020 Severin Gehwolf - 1:14.0.1.7-2.rolling -- Fix vendor version to 20.3 (from 19.9) - -* Fri Apr 17 2020 Petra Alice Mikova - 1:14.0.1.7-1.rolling -- April security update -- uploaded new src tarball - -* Wed Apr 08 2020 Jiri Vanek - 1:14.0.0.36-4.rolling -- set vendor property and vendor urls -- made urls to be preconfigured by os - -* Tue Mar 24 2020 Petra Alice Mikova - 1:14.0.0.36-3.rolling -- Remove s390x workaround flags for GCC 10 -- bump buildjdkver to 14 -- uploaded new src tarball - -* Mon Mar 23 2020 Petra Alice Mikova - 1:14.0.0.36-2.rolling -- removed a whitespace causing fail of postinstall script -- removed backslashes at the end of alternatives command - -* Fri Mar 13 2020 Petra Alice Mikova - 1:14.0.0.36-1.rolling -- update to jdk 14+36 ga build -- remove JDK-8224851 patch, as OpenJDK 14 already contains it -- removed pack200 and unpack200 binaries, slaves, manpages and libunpack.so library -- added listings for jpackage binary, manpages and added slave records to alternatives - -* Thu Mar 12 2020 Petra Alice Mikova - 1:13.0.2.8-4.rolling -- add patch for build issues with make 4.3 - -* Thu Feb 27 2020 Severin Gehwolf - 1:13.0.2.8-3.rolling -- add workaround for issues with build with GCC10 on s390x (see RHBZ#1799531) -- fix issues with build with GCC10: JDK-8224851, -fcommon switch - -* Thu Feb 27 2020 Petra Alice Mikova pmikova@redhat.com> - 1:13.0.2.8-3.rolling -- Add JDK-8224851 patch to resolve aarch64 issues - -* Tue Feb 04 2020 Petra Alice Mikova - 1:13.0.2.8-2.rolling -- fix Release, as it was broken by last rpmdev-bumpspec - -* Wed Jan 29 2020 Fedora Release Engineering - 1:13.0.2.8-1.rolling.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Petra Alice Mikova - 1:13.0.2.8-1.rolling -- removed patch jdk8231405_guarantee_d_nonequals_null_failed_null_dominator_info.patch -- removed patch jdk8231583_fix_register_clash_in_sbsa_resolve_forwarding_pointer_borrowing.patch -- updated sources to the 13.0.2+8 tag - -* Fri Oct 25 2019 Petra Alice Mikova - 1:13.0.1.9-2.rolling -- Fixed hardcoded major version in jdk13u to macro -- added jdk8231405_guarantee_d_nonequals_null_failed_null_dominator_info.patch -- added jdk8231583_fix_register_clash_in_sbsa_resolve_forwarding_pointer_borrowing.patch - -* Mon Oct 21 2019 Petra Alice Mikova - 1:13.0.1.9-1.rolling -- Updated to October 2019 CPU sources - -* Wed Oct 16 2019 Petra Alice Mikova - 1:13.0.0.33-3.rolling -- synced up generate tarball script with other OpenJDK packages -- dropped pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch from the sources -- regenerated sources with the updated script - -* Wed Oct 02 2019 Andrew Hughes - 1:13.0.0.33-3.rolling -- Switch to in-tree SunEC code, dropping NSS runtime dependencies and patches to link against it. - -* Wed Oct 02 2019 Andrew John Hughes - 1:13.0.0.33-3.rolling -- Drop unnecessary build requirement on gtk3-devel, as OpenJDK searches for Gtk+ at runtime. -- Add missing build requirement for libXrender-devel, previously masked by Gtk3+ dependency -- Add missing build requirement for libXrandr-devel, previously masked by Gtk3+ dependency -- fontconfig build requirement should be fontconfig-devel, previously masked by Gtk3+ dependency - -* Wed Oct 02 2019 Andrew Hughes - 1:13.0.0.33-3.rolling -- Obsolete javadoc-slowdebug and javadoc-slowdebug-zip packages via javadoc and javadoc-zip respectively. - -* Tue Oct 01 2019 Severin Gehwolf - 1:13.0.0.33-2.rolling -- Don't produce javadoc/javadoc-zip sub packages for the - debug variant build. -- Don't perform a bootcycle build for the debug variant build. - -* Mon Sep 30 2019 Severin Gehwolf - 1:13.0.0.33-2.rolling -- Fix vendor version as JDK 13 has been GA'ed September 2019: 19.3 => 19.9 - -* Wed Aug 14 2019 Petra Alice Mikova - 1:13.0.0.33-1.rolling -- updated to 13+33 sources -- added two manpages to file listings (jfr, jaotc) -- set is_ga to 1 to match build from jdk.java.net - -* Fri Jul 26 2019 Severin Gehwolf - 1:13.0.0.28-0.2.ea.rolling -- Fix bootjdkver macro. It attempted to build with jdk 12, which is - no longer available in rawhide (it's 13 instead). -- Fix Release as rpmdev-bumpspec doesn't do it correctly. - -* Thu Jul 25 2019 Fedora Release Engineering - 1:13.0.0.28-0.1.ea.rolling.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jul 09 2019 Petra Alice Mikova - 1:13.0.0.28-0.1.ea.rolling -- updated to jdk 13 -- adapted pr2126-synchronise_elliptic_curves_in_sun_security_ec_namedcurve_with_those_listed_by_nss.patch -- adapted rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch -- fixed file listings -- included https://src.fedoraproject.org/rpms/java-11-openjdk/pull-request/49: -- Include 'ea' designator in Release when appropriate -- Handle milestone as variables so we can alter it easily and set the docs zip filename appropriately - -* Tue May 21 2019 Petra Alice Mikova - 1:12.0.1.12-2.rolling -- fixed requires/provides for the non-system JDK case (backport of RHBZ#1702324) - -* Thu Apr 18 2019 Petra Mikova - 1:12.0.1.12-1.rolling -- updated sources to current CPU release - -* Thu Apr 04 2019 Petra Mikova - 1:12.0.0.33-4.rolling -- added slave for jfr binary in devel package - -* Thu Mar 21 2019 Petra Mikova - 1:12.0.0.33-3.rolling -- Replaced pcsc-lite-devel (which is in optional channel) with pcsc-lite-libs. -- added rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch to make jdk work with pcsc -- removed LTS string from LTS designator, because epel builds get identified as rhel and JDK 12 is not LTS -- removed duplicated dependency on lksctp-tools - -* Wed Mar 20 2019 Peter Robinson 1:12.0.0.33-2.ea.1.rolling -- Drop chkconfig dep, 1.7 shipped in f24 - -* Thu Mar 07 2019 Petra Mikova - 1:12.0.0.33-1.ea.1.rolling -- bumped sources to jdk12+33 - -* Mon Feb 11 2019 Severin Gehwolf - 1:12.0.0.30-1.ea.1.rolling -- Only build 'bootcycle-images docs' target and 'images docs' targets, respectively. - -* Fri Feb 01 2019 Fedora Release Engineering - 1:12.0.0.25-0.ea.1.rolling.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Dec 21 2018 Jiri Vanek - 1:12.0.0.25-0.ea.1.rolling -- bumped sources to jdk12. Crypto list synced. -- adapted patches to usptream (removed are upstreamed) -- removed fixed upstreamed patch6, jdk8211105-aarch64-disable_cos_sin_and_log_intrinsics.patch: -- renamed patch5, pr1983-rh1565658-..._sunec_provider_jdk11.patch to pr1983-rh1565658-..._sunec_provider_jdk12.patch -- adapted patch5, pr1983-rh1565658 to jdk12 (libraries.m4 and /Lib-jdk.crypto.ec.gmk) -- removed patch8, jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch -- removed patch9, jdk8210425-rh1632174-sharedRuntimeTrig_sharedRuntimeTrans_compiled_without_optimization.patch -- removed patch10, jdk8210647-rh1632174. Is rummored to be in upstream -- removed patch11, jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch -- removed patch12, jdk8210703-rh1632174-vmStructs_cpp_no_longer_compiled_with_o0 -- removed patch584, jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch -- removed patch585, jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch -- set build jdk to jdk11; buildjdkver set to 11 -- todo, revisit _privatelibs and slaves, discuse patch10, more? -- now building with --no-print-directory to workaround JDK8215213 -- renamed original of docs zip to jdk-major+build -- check shenandaoh with -XX:+UnlockExperimentalVMOptions -- libjli moved from lib/libjli to lib -- added lib/jspawnhelper and bin/jfr and conf/sdp/sdp.conf.template -- added explanation to the --no-print-directory -- re-added lts_designator_zip macro -- added patch6 for rh1673833-remove_removal_of_wformat_during_test_compilation.patch - -* Wed Dec 5 2018 Jiri Vanek - 1:11.0.1.13-10.rolling -- for non debug supackages, ghosted all masters and slaves (rhbz1649776) -- for tech-preview packages, if-outed versionless provides. Aligned versions to be %%{epoch}:%%{version}-%%{release} instead of chaotic -- Removed all slowdebug provides (rhbz1655938); for tech-preview packages also removed all internal provides - -* Tue Dec 04 2018 Severin Gehwolf - 1:11.0.1.13-9 -- Added %%global _find_debuginfo_opts -g -- Resolves: RHBZ#1520879 (Detailed NMT issue) - -* Fri Nov 30 2018 Jiri Vanek - 1:11.0.1.13-8 -- added rolling suffix to release (before dist) to prevent conflict with java-11-openjdk which now have same major version - -* Mon Nov 12 2018 Jiri Vanek - 1:11.0.1.13-6 -- fixed tck failures of arraycopy and process exec with shenandoah on -- added patch585 rh1648995-shenandoah_array_copy_broken_by_not_always_copy_forward_for_disjoint_arrays.patch - -* Wed Nov 07 2018 Jiri Vanek - 1:11.0.1.13-5 -- headless' suggests of cups, replaced by Requires of cups-libs - -* Thu Nov 01 2018 Jiri Vanek - 1:11.0.1.13-3 -- added Patch584 jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch - -* Mon Oct 29 2018 Severin Gehwolf - 1:11.0.1.13-3 -- Use upstream's version of Aarch64 intrinsics disable patch: - - Removed: - RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch - RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch - - Superceded by: - jdk8211105-aarch64-disable_cos_sin_and_log_intrinsics.patch - -* Thu Oct 18 2018 Severin Gehwolf - 1:11.0.1.13-2 -- Use LTS designator in version output for RHEL. - -* Thu Oct 18 2018 Severin Gehwolf - 1:11.0.1.13-1 -- Update to October 2018 CPU release, 11.0.1+13. - -* Wed Oct 17 2018 Severin Gehwolf - 1:11.0.0.28-2 -- Use --with-vendor-version-string=18.9 so as to show original - GA date for the JDK. - -* Fri Sep 28 2018 Severin Gehwolf - 1:11.0.0.28-1 -- Identify as GA version and no longer as early access (EA). -- JDK 11 has been released for GA on 2018-09-25. - -* Fri Sep 28 2018 Severin Gehwolf - 1:11.0.ea.28-9 -- Rework changes from 1:11.0.ea.22-6. RHBZ#1632174 supercedes - RHBZ-1624122. -- Add patch, jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch, so as to - optimize compilation of fdlibm library. -- Add patch, jdk8210425-rh1632174-sharedRuntimeTrig_sharedRuntimeTrans_compiled_without_optimization.patch, so - as to optimize compilation of sharedRuntime{Trig,Trans}.cpp -- Add patch, jdk8210647-rh1632174-libsaproc_is_being_compiled_without_optimization.patch, so as to - optimize compilation of libsaproc (extra c flags won't override - optimization). -- Add patch, jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch, so as to - optimize compilation of libjsig. -- Add patch, jdk8210703-rh1632174-vmStructs_cpp_no_longer_compiled_with_o0, so as to - optimize compilation of vmStructs.cpp (part of libjvm.so). -- Reinstate filtering of opt flags coming from redhat-rpm-config. - -* Thu Sep 27 2018 Jiri Vanek - 1:11.0.ea.28-8 -- removed version less provides -- javadocdir moved to arched dir as it is no longer noarch - -* Thu Sep 20 2018 Severin Gehwolf - 1:11.0.ea.28-6 -- Add patch, RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch, - so as to disable log math intrinsic on aarch64. Work-around for - JDK-8210858 - -* Thu Sep 13 2018 Severin Gehwolf - 1:11.0.ea.28-5 -- Add patch, RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch, - so as to disable dsin/dcos math intrinsics on aarch64. Work-around for - JDK-8210461. - -* Wed Sep 12 2018 Severin Gehwolf - 1:11.0.ea.22-6 -- Add patch, JDK-8210416-RHBZ-1624122-fdlibm-opt-fix.patch, so as to - optimize compilation of fdlibm library. -- Add patch, JDK-8210425-RHBZ-1624122-sharedRuntimeTrig-opt-fix.patch, so - as to optimize compilation of sharedRuntime{Trig,Trans}.cpp -- Add patch, JDK-8210647-RHBZ-1624122-libsaproc-opt-fix.patch, so as to - optimize compilation of libsaproc (extra c flags won't override - optimization). -- Add patch, JDK-8210703-RHBZ-1624122-vmStructs-opt-fix.patch, so as to - optimize compilation of vmStructs.cpp (part of libjvm.so). -- No longer filter -O flags from C flags coming from - redhat-rpm-config. - -* Mon Sep 10 2018 Jiri Vanek - 1:11.0.ea.28-4 -- link to jhsdb followed its file to ifarch jit_arches ifnarch s390x - -* Fri Sep 7 2018 Severin Gehwolf - 1:11.0.ea.28-3 -- Enable ZGC on x86_64. - -* Tue Sep 4 2018 Jiri Vanek - 1:11.0.ea.28-2 -- jfr/*jfc files listed for all arches -- lib/classlist do not exists s390, ifarch-ed via jit_arches out - -* Fri Aug 31 2018 Severin Gehwolf - 1:11.0.ea.28-1 -- Update to latest upstream build jdk11+28, the first release - candidate. - -* Wed Aug 29 2018 Severin Gehwolf - 1:11.0.ea.22-8 -- Adjust system NSS patch, pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk11.patch, so - as to filter -Wl,--as-needed from linker flags. Fixes FTBFS issue. - -* Thu Aug 23 2018 Jiri Vanek - 1:11.0.ea.22-6 -- dissabled accessibility, fixed provides for main package's debug variant - -* Mon Jul 30 2018 Jiri Vanek - 1:11.0.ea.22-5 -- now buildrequires javapackages-filesystem as the issue with macros should be fixed - -* Wed Jul 18 2018 Jiri Vanek - 1:11.0.ea.22-2 -- changed to build by itself instead of by jdk10 - -* Tue Jul 17 2018 Jiri Vanek - 1:11.0.ea.22-1 -- added Recommends gtk3 for main package -- changed BuildRequires from gtk2-devel to gtk3-devel (it can be more likely dropped) -- added Suggests lksctp-tools, pcsc-lite-devel, cups for headless package -- see RHBZ1598152 -- added trick to catch hs_err files (sgehwolf) -- updated to shenandaoh-jdk-11+22 - -* Sat Jul 07 2018 Jiri Vanek - 1:11.0.ea.20-1 -- removed patch6 JDK-8205616-systemLcmsAndJpgFixFor-rev_f0aeede1b855.patch -- improved a bit generate_source_tarball.sh to serve also for systemtap -- thus deleted generate_tapsets.sh -- simplified and cleared update_package.sh -- moved to single source jdk - from shenandoah/jdk11 -- bumped to latest jdk11+20 -- adapted PR2126 to jdk11+20 -- adapted handling of systemtap sources to new style -- (no (misleading) version inside (full version is in name), thus different sed on tapsets and different directory) -- shortened summaries and descriptions to around 80 chars -- Hunspell spell checked -- license fixed to correct jdk11 (sgehwolf) -- more correct handling of internal libraries (sgehwolf) -- added lib/security/public_suffix_list.dat as +20 have added it (JDK-8201815) -- added test for shenandaoh GC presence where expected -- Removed workaround for broken aarch64 slowdebug build -- Removed all defattrs -- Removed no longer necessary cleanup of diz and debuginfo files - -* Fri Jun 22 2018 Jiri Vanek - 1:11.0.ea.19-1 -- updated sources to jdk-11+19 -- added patch6 systemLcmsAndJpgFixFor-f0aeede1b855.patch to fix regression of system libraries after f0aeede1b855 commit -- adapted pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk11.patch to accommodate changes after f0aeede1b855 commit - -* Thu Jun 14 2018 Severin Gehwolf - 1:11.0.ea.16-5 -- Revert rename: java-11-openjdk => java-openjdk. - -* Wed Jun 13 2018 Severin Gehwolf - 1:11.0.ea.16-4 -- Add aarch64 to aot_arches. - -* Wed Jun 13 2018 Severin Gehwolf - 1:11.0.ea.16-3 -- Rename to package java-11-openjdk. - -* Wed Jun 13 2018 Severin Gehwolf - 1:11.0.ea.16-2 -- Disable Aarch64 slowdebug build (see JDK-8204331). -- s390x doesn't have the SA even though it's a JIT arch. - -* Wed Jun 13 2018 Severin Gehwolf - 1:11.0.ea.16-1 -- Initial version of JDK 11 ea based on tag jdk-11+16. -- Removed patches no longer needed or upstream: - sorted-diff.patch (see JDK-8198844) - JDK-8201788-bootcycle-images-jobs.patch - JDK-8201509-s390-atomic_store.patch - JDK-8202262-libjsig.so-extra-link-flags.patch (never was an issue on 11) - JDK-8193802-npe-jar-getVersionMap.patch -- Updated and renamed patches: - java-openjdk-s390-size_t.patch => JDK-8203030-s390-size_t.patch -- Updated patches for JDK 11: - pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk11.patch - -* Tue Jun 12 2018 Severin Gehwolf - 1:10.0.1.10-9 -- Use proper private_libs expression for filtering requires/provides. - -* Fri Jun 08 2018 Severin Gehwolf - 1:10.0.1.10-8 -- Bump release and rebuild for fixed gdb. See RHBZ#1589118. - -* Mon Jun 04 2018 Jiri Vanek - 1:10.0.1.10-7 -- quoted sed expressions, changed possibly confusing # by @ -- added vendor(origin) into icons -- removed last trace of relative symlinks -- added BuildRequires of javapackages-tools to fix build failure after Requires change to javapackages-filesystem - -* Thu May 17 2018 Severin Gehwolf - 1:10.0.1.10-5 -- Move to javapackages-filesystem for directory ownership. - Resolves RHBZ#1500288 - -* Mon Apr 30 2018 Severin Gehwolf - 1:10.0.1.10-4 -- Add JDK-8193802-npe-jar-getVersionMap.patch so as to fix - RHBZ#1557375. - -* Mon Apr 23 2018 Severin Gehwolf - 1:10.0.1.10-3 -- Inject build flags properly. See RHBZ#1571359 -- Added patch JDK-8202262-libjsig.so-extra-link-flags.patch - since libjsig.so doesn't get linker flags injected properly. - -* Fri Apr 20 2018 Severin Gehwolf - 1:10.0.1.10-2 -- Removed unneeded patches: - PStack-808293.patch - multiple-pkcs11-library-init.patch - ppc_stack_overflow_fix.patch -- Added patches for s390 Zero builds: - JDK-8201495-s390-java-opts.patch - JDK-8201509-s390-atomic_store.patch -- Renamed patches for clarity: - aarch64BuildFailure.patch => JDK-8200556-aarch64-slowdebug-crash.patch - systemCryptoPolicyPR3183.patch => pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch - bootcycle_jobs.patch => JDK-8201788-bootcycle-images-jobs.patch - system-nss-ec-rh1565658.patch => pr1983-rh1565658-support_using_the_system_installation_of_nss_with_the_sunec_provider_jdk11.patch - -* Fri Apr 20 2018 Jiri Vanek - 1:10.0.1.10-1 -- updated to security update 1 -- jexec unlinked from path -- used java-openjdk as boot jdk -- aligned provides/requires -- renamed zip javadoc - -* Tue Apr 10 2018 Severin Gehwolf - 1:10.0.0.46-12 -- Enable basic EC ciphers test in %%check. - -* Tue Apr 10 2018 Severin Gehwolf - 1:10.0.0.46-11 -- Port Martin Balao's JDK 9 patch for system NSS support to JDK 10. -- Resolves RHBZ#1565658 - -* Mon Apr 09 2018 Jiri Vanek - 1:10.0.0.46-10 -- jexec linked to path - -* Fri Apr 06 2018 Jiri Vanek - 1:10.0.0.46-9 -- subpackage(s) replaced by sub-package(s) and other cosmetic changes - -* Tue Apr 03 2018 Jiri Vanek - 1:10.0.0.46-8 -- removed accessibility sub-packages -- kept applied patch and properties files -- debug sub-packages renamed to slowdebug - -* Fri Feb 23 2018 Jiri Vanek - 1:10.0.0.46-1 -- initial load +* Fri Aug 04 2023 Andrew Hughes - 1:17.0.7.0.7-3 +- Create java-21-openjdk package based on java-17-openjdk +- Related: rhbz#2192748