diff --git a/SPECS/java-1.8.0-openjdk.spec b/SPECS/java-1.8.0-openjdk.spec index 3cc6fc1..02d2f7d 100644 --- a/SPECS/java-1.8.0-openjdk.spec +++ b/SPECS/java-1.8.0-openjdk.spec @@ -266,7 +266,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 2 +%global rpmrelease 4 # Define milestone (EA for pre-releases, GA ("fcs") for releases) # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, @@ -313,6 +313,14 @@ %global rpm_state_dir %{_localstatedir}/lib/rpm-state/ +# For flatpack builds hard-code /usr/sbin/alternatives, +# otherwise use %%{_sbindir} relative path. +%if 0%{?flatpak} +%global alternatives_requires /usr/sbin/alternatives +%else +%global alternatives_requires %{_sbindir}/alternatives +%endif + %if %{with_systemtap} # Where to install systemtap tapset (links) # We would like these to be in a package specific sub-dir, @@ -963,11 +971,11 @@ Requires: cups-libs # for FIPS PKCS11 provider Requires: nss # Post requires alternatives to install tool alternatives -Requires(post): %{_sbindir}/alternatives +Requires(post): %{alternatives_requires} # in version 1.7 and higher for --family switch Requires(post): chkconfig >= 1.7 # Postun requires alternatives to uninstall tool alternatives -Requires(postun): %{_sbindir}/alternatives +Requires(postun): %{alternatives_requires} # in version 1.7 and higher for --family switch Requires(postun): chkconfig >= 1.7 # for optional support of kernel stream control, card reader and printing bindings @@ -995,11 +1003,11 @@ Provides: /usr/bin/jjs Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} # Post requires alternatives to install tool alternatives -Requires(post): %{_sbindir}/alternatives +Requires(post): %{alternatives_requires} # in version 1.7 and higher for --family switch Requires(post): chkconfig >= 1.7 # Postun requires alternatives to uninstall tool alternatives -Requires(postun): %{_sbindir}/alternatives +Requires(postun): %{alternatives_requires} # in version 1.7 and higher for --family switch Requires(postun): chkconfig >= 1.7 @@ -1029,11 +1037,11 @@ Provides: java-%{javaver}-%{origin}-demo%{?1} = %{epoch}:%{version}-%{release} %define java_javadoc_rpo() %{expand: OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} # Post requires alternatives to install javadoc alternative -Requires(post): %{_sbindir}/alternatives +Requires(post): %{alternatives_requires} # in version 1.7 and higher for --family switch Requires(post): chkconfig >= 1.7 # Postun requires alternatives to uninstall javadoc alternative -Requires(postun): %{_sbindir}/alternatives +Requires(postun): %{alternatives_requires} # in version 1.7 and higher for --family switch Requires(postun): chkconfig >= 1.7 @@ -1203,7 +1211,7 @@ Patch400: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch Patch401: pr3655-toggle_system_crypto_policy.patch # RH1868759: FIPS: Ciphers remain in broken state (unusable), after being supplied with wrongly sized buffer Patch540: rh1868759-pkcs11_cancel_on_failure.patch -# RH1750419: Enable build of speculative store bypass hardened alt-java (CVE-2018-3639) +# enable build of speculative store bypass hardened alt-java Patch600: rh1750419-redhat_alt_java.patch ############################################# @@ -2381,61 +2389,63 @@ require "copy_jdk_configs.lua" %endif %changelog -* Sun Jan 17 2021 Andrew Hughes - 1:1.8.0.282.b08-2 +* Wed Feb 17 2021 Stephan Bergmann - 1:1.8.0.282.b08-4 +- Resolves: rhbz#1896014 Hardcode /usr/sbin/alternatives for Flatpak builds + +* Sun Jan 17 2021 Andrew Hughes - 1:1.8.0.282.b08-3 - Cleanup package descriptions and version number placement. - Resolves: rhbz#1908967 -* Sun Jan 17 2021 Jiri Vanek - 1:1.8.0.282.b08-2 +* Sun Jan 17 2021 Jiri Vanek - 1:1.8.0.282.b08-3 - Fix typo in variable - Resolves: rhbz#1908967 -* Sun Jan 17 2021 Andrew Hughes - 1:1.8.0.282.b08-1 +* Sun Jan 17 2021 Andrew Hughes - 1:1.8.0.282.b08-2 - Add explicit runtime dependency on NSS for the PKCS11 provider in FIPS mode - Resolves: rhbz#1913868 -* Fri Jan 15 2021 Andrew Hughes - 1:1.8.0.282.b08-0 +* Fri Jan 15 2021 Andrew Hughes - 1:1.8.0.282.b08-1 - Update to aarch64-shenandoah-jdk8u282-b08 (GA) - Update release notes for 8u282-b08. -- This tarball is embargoed until 2021-01-19 @ 1pm PT. - Resolves: rhbz#1908967 -* Fri Jan 15 2021 Andrew Hughes - 1:1.8.0.282.b07-0.0.ea +* Fri Jan 15 2021 Andrew Hughes - 1:1.8.0.282.b07-0.1.ea - Update to aarch64-shenandoah-jdk8u282-b07 (EA) - Update release notes for 8u282-b07. - Fix placement issue in release notes, caught by comparing with vanilla version. - Resolves: rhbz#1903904 -* Wed Jan 13 2021 Andrew Hughes - 1:1.8.0.282.b06-0.0.ea +* Wed Jan 13 2021 Andrew Hughes - 1:1.8.0.282.b06-0.1.ea - Update to aarch64-shenandoah-jdk8u282-b06 (EA) - Update release notes for 8u282-b06. - Resolves: rhbz#1903904 -* Mon Jan 11 2021 Andrew Hughes - 1:1.8.0.282.b05-0.0.ea +* Mon Jan 11 2021 Andrew Hughes - 1:1.8.0.282.b05-0.1.ea - Update to aarch64-shenandoah-jdk8u282-b05 (EA) - Update release notes for 8u282-b05 and make some minor corrections. - Resolves: rhbz#1903904 -* Wed Jan 06 2021 Andrew Hughes - 1:1.8.0.282.b04-0.0.ea +* Wed Jan 06 2021 Andrew Hughes - 1:1.8.0.282.b04-0.1.ea - Update to aarch64-shenandoah-jdk8u282-b04 (EA) - Update release notes for 8u282-b04. - Remove upstreamed patch PR3519 - Resolves: rhbz#1903904 -* Sat Jan 02 2021 Andrew Hughes - 1:1.8.0.282.b03-0.0.ea +* Sat Jan 02 2021 Andrew Hughes - 1:1.8.0.282.b03-0.1.ea - Update to aarch64-shenandoah-jdk8u282-b03 (EA) - Update release notes for 8u282-b03. - Resolves: rhbz#1903904 -* Fri Dec 18 2020 Andrew Hughes - 1:1.8.0.282.b02-0.1.ea +* Fri Dec 18 2020 Andrew Hughes - 1:1.8.0.282.b02-0.2.ea - Move setup of JavaSecuritySystemConfiguratorAccess to Security class so it always occurs. - Resolves: rhbz#1906862 -* Wed Dec 16 2020 Andrew Hughes - 1:1.8.0.282.b02-0.0.ea +* Wed Dec 16 2020 Andrew Hughes - 1:1.8.0.282.b02-0.1.ea - Update to aarch64-shenandoah-jdk8u282-b02 (EA) - Update release notes for 8u282-b02. - Resolves: rhbz#1903904 -* Mon Dec 07 2020 Andrew Hughes - 1:1.8.0.282.b01-0.0.ea +* Mon Dec 07 2020 Andrew Hughes - 1:1.8.0.282.b01-0.1.ea - Update to aarch64-shenandoah-jdk8u282-b01 (EA) - Update release notes for 8u282-b01. - Switch to EA mode. @@ -2445,25 +2455,34 @@ require "copy_jdk_configs.lua" - Extend RH1750419 alt-java fix to include external debuginfo, following JDK-8252395 - Resolves: rhbz#1903904 -* Fri Nov 27 2020 Jiri Vanek - 1:1.8.0.275.b01-2 -- Added patch600: rh1750419-redhat_alt_java.patch -- Replaced alt-java placeholder with real patched alt-java -- Removed patch529L rh1566890-CVE_2018_3639-speculative_store_bypass.patch -- Removed patch531: rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch -- Both surpassed by new patch +* Fri Nov 27 2020 Jiri Vanek - 1:1.8.0.275.b01-3 +- added patch600, rh1750419-redhat_alt_java.patch +- Replaced alt-java palceholder by real pathced alt-java +- remove patch529 rh1566890-CVE_2018_3639-speculative_store_bypass.patch +- remove patch531 rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch +- both suprassed by new patch - Resolves: rhbz#1750419 -* Fri Nov 06 2020 Andrew Hughes - 1:1.8.0.275.b01-1 +* Fri Nov 06 2020 Andrew Hughes - 1:1.8.0.275.b01-2 - Update to aarch64-shenandoah-jdk8u275-b01 (GA) - Update release notes for 8u275. - Remove JDK-8223940/RH1892216 backport now included in upstream 8u275. - Remove JDK-8236512/RH1889414 backport now included in upstream 8u275. - Resolves: rhbz#1895060 -* Fri Oct 30 2020 Andrew Hughes - 1:1.8.0.272.b10-4 +* Fri Oct 30 2020 Andrew Hughes - 1:1.8.0.272.b10-6 - Add backport of JDK-8223940: "Private key not supported by chosen signature algorithm" to handle lack of provider RSAPSS support - Resolves: rhbz#1892216 +* Fri Oct 30 2020 Jiri Vanek - 1:1.8.0.272.b10-5 +- Added gating test for ipa server +- Resolves: rhbz#1892216 + +* Thu Oct 29 2020 Andrew Hughes - 1:1.8.0.272.b10-4 +- Bump release number to build on RHEL 8.4.0 branch. +- Resolves: rhbz#1876665 +- Resolves: rhbz#1889414 + * Wed Oct 21 2020 Andrew Hughes - 1:1.8.0.272.b10-3 - Add backport of JDK-8236512 to correct use of killSession - Resolves: rhbz#1889414