The package rpms/java-1.8.0-openjdk.git has added or updated architecture specific content
in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id...
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id...
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id...
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id....
Change:
+ExcludeArch: %{ix86}
-%ifnarch %{ix86}
+%ifarch %{ix86}
+%ifnarch %{ix86}
Thanks.
Full change:
============
commit e81d45acc1fe1980ce0e50ecad188128c62f35a0
Merge: ff51728 c48f90a
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Mon Jul 25 01:07:43 2022 +0100
Merge rawhide into f35
diff --cc java-1.8.0-openjdk.spec
index 4a2ca97,486f3ac..a0b50bd
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@@ -2824,7 -2832,51 +2832,51 @@@ cjc.mainProgram(args
%endif
%changelog
+ * Sun Jul 24 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b07-1
+ - Update to shenandoah-jdk8u342-b07 (GA)
+ - Update release notes for 8u342-b07.
+ - Switch to GA mode for final release.
+ - Exclude x86 where java_arches is undefined, in order to unbreak build
+
+ * Fri Jul 22 2022 Jiri Vanek <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.4.ea
+ - 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
+ -- Reinstate demo package on x86
+ -- Temporarily disable noarch status of javadoc and javadoc-zip so x86 can differ
+ -- 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 proeprly
(with i686 included)
+ -
https://bugzilla.redhat.com/show_bug.cgi?id=2104129
+
+ * Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.0.342.b06-0.3.ea.1
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+ * Tue Jul 19 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.3.ea
+ - Reinstate demo package on x86
+
+ * Mon Jul 18 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.2.ea
+ - Temporarily disable noarch status of javadoc and javadoc-zip so x86 can differ
+
+ * Mon Jul 18 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.2.ea
+ - 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 <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.1.ea
+ - Update to shenandoah-jdk8u342-b06 (EA)
+ - Update release notes for shenandoah-8u342-b06.
+ - Switch to EA mode for 8u342 pre-release builds.
+ - Print release file during build, which should now include a correct SOURCE value from
.src-rev
+ - Update tarball script with IcedTea GitHub URL and .src-rev generation
+ - Use "git apply" with patches in the tarball script to allow binary diffs
+ - Remove redundant "REPOS" variable from tarball script
+ - Include script to generate bug list for release notes
+ - Update tzdata requirement to 2022a to match JDK-8283350
+
-* Sun Jul 17 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.332.b09-7
+* Sun Jul 17 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.332.b09-2
- Rebase FIPS patches from fips branch and simplify by using a single patch from that
repository
- * RH2051605: Detect NSS at Runtime for FIPS detection
- * RH2036462: sun.security.pkcs11.wrapper.PKCS11.getInstance breakage
commit c48f90a969a0220c4ef5270cf4cbb5118bf7598c
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Sun Jul 24 22:12:28 2022 +0100
Update to shenandoah-jdk8u342-b07 (GA)
Update release notes for 8u342-b07.
Switch to GA mode for final release.
Exclude x86 where java_arches is undefined, in order to unbreak build
diff --git a/.gitignore b/.gitignore
index da2aef1..1f95540 100644
--- a/.gitignore
+++ b/.gitignore
@@ -256,3 +256,4 @@
/openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b06-4curve.tar.xz
/openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b09-4curve.tar.xz
/openjdk-shenandoah-jdk8u-shenandoah-jdk8u342-b06-4curve.tar.xz
+/openjdk-shenandoah-jdk8u-shenandoah-jdk8u342-b07-4curve.tar.xz
diff --git a/NEWS b/NEWS
index 883a62c..a826722 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,15 @@ Live versions of these release notes can be found at:
*
https://bitly.com/openjdk8u342
*
https://builds.shipilev.net/backports-monitor/release-notes-openjdk8u342.txt
+* Security fixes
+ - JDK-8272243: Improve DER parsing
+ - JDK-8272249: Better properties of loaded Properties
+ - JDK-8277608: Address IP Addressing
+ - JDK-8281859, CVE-2022-21540: Improve class compilation
+ - JDK-8281866, CVE-2022-21541: Enhance MethodHandle invocations
+ - JDK-8283190: Improve MIDI processing
+ - JDK-8284370: Improve zlib usage
+ - JDK-8285407, CVE-2022-34169: Improve Xalan supports
* Other changes
- JDK-8031567: Better model for storing source revision information
- JDK-8076190: Customizing the generation of a PKCS12 keystore
@@ -21,6 +30,7 @@ Live versions of these release notes can be found at:
- JDK-8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative
initial size for ByteArrayOutputStream
- JDK-8194154: System property user.dir should not be changed
- JDK-8202142: jfr/event/io/TestInstrumentation is unstable
+ - JDK-8209771: jdk.test.lib.Utils::runAndCheckException error
- JDK-8221988: add possibility to build with Visual Studio 2019
- JDK-8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
- JDK-8230865: [TESTBUG] jdk/jfr/event/io/EvilInstrument.java fails at-run shell
MakeJAR.sh target
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index a301a7c..486f3ac 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -335,7 +335,7 @@
# note, following three variables are sedded from update_sources if used correctly.
Hardcode them rather there.
%global shenandoah_project openjdk
%global shenandoah_repo shenandoah-jdk8u
-%global openjdk_revision jdk8u342-b06
+%global openjdk_revision jdk8u342-b07
%global shenandoah_revision shenandoah-%{openjdk_revision}
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
@@ -351,12 +351,12 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease 4
+%global rpmrelease 1
# 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,
# - N%%{?extraver}{?dist} for GA releases
-%global is_ga 0
+%global is_ga 1
%if %{is_ga}
%global milestone fcs
%global milestone_version %{nil}
@@ -451,7 +451,11 @@
%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 || :
@@ -2828,6 +2832,12 @@ cjc.mainProgram(args)
%endif
%changelog
+* Sun Jul 24 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b07-1
+- Update to shenandoah-jdk8u342-b07 (GA)
+- Update release notes for 8u342-b07.
+- Switch to GA mode for final release.
+- Exclude x86 where java_arches is undefined, in order to unbreak build
+
* Fri Jul 22 2022 Jiri Vanek <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.4.ea
- moved to build only on %%{java_arches}
--
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
@@ -2843,6 +2853,9 @@ cjc.mainProgram(args)
-- this is safely backport-able to older fedoras, as the macro was backported proeprly
(with i686 included)
-
https://bugzilla.redhat.com/show_bug.cgi?id=2104129
+* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.0.342.b06-0.3.ea.1
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
* Tue Jul 19 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.3.ea
- Reinstate demo package on x86
diff --git a/sources b/sources
index 8c41d22..06bd55f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (openjdk-shenandoah-jdk8u-shenandoah-jdk8u342-b06-4curve.tar.xz) =
bc7fb9c21f33b2edab948b2b31e3198441c7901369476cd4d4ba0056dbba394a0a19099a2d57987641575f17383a4fd2b85a791ee56fbe2deaa246ec89fe9d81
+SHA512 (openjdk-shenandoah-jdk8u-shenandoah-jdk8u342-b07-4curve.tar.xz) =
64b467edeb332062fd3e1c0647dc2e75616fdaf8a629922d017a49e89324c19eb762d03a951399891fa08db188fc3dee8c7f34351b415e6121c0a51520043ea1
commit 27bb7416e6815eafdf9a9e8a55ea9771282fe6bf
Author: Jiri <jvanek(a)redhat.com>
Date: Fri Jul 22 14:56:46 2022 +0200
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
-- Reinstate demo package on x86
-- Temporarily disable noarch status of javadoc and javadoc-zip so x86 can differ
-- 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
proeprly (with i686 included)
-
https://bugzilla.redhat.com/show_bug.cgi?id=2104129
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 64c833d..a301a7c 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -282,7 +282,7 @@
# New Version-String scheme-style defines
%global majorver 8
-%ifarch x86_64
+%ifarch %{ix86} x86_64
%global with_openjfx_binding 1
%global openjfx_path %{_jvmdir}/openjfx8
# links src directories
@@ -351,7 +351,7 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease 3
+%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,
@@ -450,6 +450,9 @@
%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
%endif
+# x86 is no longer supported
+ExclusiveArch: %{java_arches}
+
# not-duplicated scriptlets for normal/debug packages
%global update_desktop_icons /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
&>/dev/null || :
@@ -835,9 +838,6 @@ exit 0
exit 0
}
-%ifarch %{ix86}
-%define files_jre() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-jre.sh}
-%else
%define files_jre() %{expand:
%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}-%{origin}.png
%{_datadir}/applications/*policytool%{?1}.desktop
@@ -852,11 +852,8 @@ exit 0
%endif
%endif
}
-%endif
-%ifarch %{ix86}
-%define files_jre_headless() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-headless.sh}
-%else
+
%define files_jre_headless() %{expand:
%defattr(-,root,root,-)
%dir %{_sysconfdir}/.java/.systemPrefs
@@ -1037,11 +1034,7 @@ exit 0
%endif
%endif
}
-%endif
-%ifarch %{ix86}
-%define files_devel() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-devel.sh}
-%else
%define files_devel() %{expand:
%defattr(-,root,root,-)
%license %{_jvmdir}/%{sdkdir -- %{?1}}/ASSEMBLY_EXCEPTION
@@ -1199,30 +1192,19 @@ exit 0
%endif
%endif
}
-%endif
-%ifarch %{ix86}
-%define files_demo() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-demo.sh}
-%else
+
%define files_demo() %{expand:
%defattr(-,root,root,-)
%license %{_jvmdir}/%{jredir -- %{?1}}/LICENSE
}
-%endif
-%ifarch %{ix86}
-%define files_src() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-src.sh}
-%else
%define files_src() %{expand:
%defattr(-,root,root,-)
%doc README.md
%{_jvmdir}/%{sdkdir -- %{?1}}/src.zip
}
-%endif
-%ifarch %{ix86}
-%define files_javadoc() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-javadoc.sh}
-%else
%define files_javadoc() %{expand:
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
@@ -1237,11 +1219,7 @@ exit 0
%endif
%endif
}
-%endif
-%ifarch %{ix86}
-%define files_javadoc_zip() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-javadoc_zip.sh}
-%else
%define files_javadoc_zip() %{expand:
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
@@ -1256,7 +1234,6 @@ exit 0
%endif
%endif
}
-%endif
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
@@ -1400,7 +1377,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
+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
@@ -1670,14 +1647,8 @@ BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
BuildRequires: unzip
-# x86 is deprecated and the package no longer contains a working JDK
-%ifarch %{ix86}
-# Require javapackages-filesystem to define %{_jvmdir}
-BuildRequires: javapackages-filesystem
-%else
# Require a boot JDK which doesn't fail due to RH1482244
BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3
-%endif
# Zero-assembler build requirement
%ifarch %{zero_arches}
BuildRequires: libffi-devel
@@ -1867,8 +1838,7 @@ The %{compatiblename}-src-fastdebug sub-package contains the
complete %{origin_n
Summary: %{origin_nice} %{majorver} API documentation
Requires: javapackages-filesystem
Obsoletes: javadoc-slowdebug < 1:1.8.0.222.b10-1
-# Temporarily disabled while we have a cripped x86 build
-#BuildArch: noarch
+BuildArch: noarch
%{java_javadoc_rpo -- %{nil} -zip}
%{java_javadoc_rpo -- %{nil} %{nil}}
@@ -1882,8 +1852,7 @@ The %{origin_nice} %{majorver} API documentation.
Summary: %{origin_nice} %{majorver} API documentation compressed in a single archive
Requires: javapackages-filesystem
Obsoletes: javadoc-zip-slowdebug < 1:1.8.0.222.b10-1
-# Temporarily disabled while we have a cripped x86 build
-#BuildArch: noarch
+BuildArch: noarch
%{java_javadoc_rpo -- %{nil} %{nil}}
@@ -2109,12 +2078,6 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} >
nss.cfg
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
%build
-
-# x86 is deprecated
-%ifarch %{ix86}
- exit 0
-%endif
-
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
export NUM_PROC=${NUM_PROC:-1}
@@ -2327,14 +2290,6 @@ done
# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
-%ifarch %{ix86}
-
- # Fake debugsourcefiles.list here after find-debuginfo.sh has already had a go
- echo "%{_jvmdir}/%{sdkdir -- ${suffix}}/gone-debugsourcefiles.sh" >>
debugsourcefiles.list
- cat debugsourcefiles.list
-
-%else
-
export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}/images/%{jdkimage}
# Check unlimited policy has been used
@@ -2448,8 +2403,6 @@ $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
-%endif
-
# build cycles check
done
@@ -2458,34 +2411,6 @@ STRIP_KEEP_SYMTAB=libjvm*
for suffix in %{build_loop} ; do
-%ifarch %{ix86}
-
- mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- ${suffix}}
-
- file=/tmp/gonejdk.$$
- echo "OpenJDK on x86 is now deprecated"
- echo '#!/bin/bash' > $file
- echo 'echo "We are going to remove i686 jdk. Please fix your package
accordingly!"' >> $file
- echo 'echo "See
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs"' >> $file
- echo 'echo "See
https://pagure.io/fesco/issue/2772"' >> $file
- echo 'echo "See
https://bugzilla.redhat.com/show_bug.cgi?id=2083750"'
>> $file
- echo 'exit 1' >> $file
-
- for pkgsuffix in jre headless devel demo src debugsourcefiles ; do
- cp -a ${file} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir --
${suffix}}/gone-${pkgsuffix}.sh
- done
-
- # Docs were only in the normal build
- if ! echo $suffix | grep -q "debug" ; then
- for pkgsuffix in javadoc javadoc_zip ; do
- cp -a ${file} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- ${suffix}}/gone-${pkgsuffix}.sh
- done
- fi
-
- rm -f ${file}
-
-%else
-
# Install the jdk
pushd %{installoutputdir -- $suffix}/images/%{jdkimage}
@@ -2665,8 +2590,6 @@ find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name
"ASSEMBLY_EXCEPTION"
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "LICENSE" -exec
chmod 644 {} \; ;
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name
"THIRD_PARTY_README" -exec chmod 644 {} \; ;
-%endif
-
# end, dual install
done
@@ -2837,11 +2760,7 @@ cjc.mainProgram(args)
%files devel
%{files_devel %{nil}}
-%ifarch %{ix86}
-%files demo
-%else
%files demo -f %{name}-demo.files
-%endif
%{files_demo %{nil}}
%files src
@@ -2872,9 +2791,7 @@ cjc.mainProgram(args)
%files devel-slowdebug
%{files_devel -- %{debug_suffix_unquoted}}
-%ifnarch %{ix86}
%files demo-slowdebug -f %{name}-demo.files-slowdebug
-%endif
%{files_demo -- %{debug_suffix_unquoted}}
%files src-slowdebug
@@ -2897,9 +2814,7 @@ cjc.mainProgram(args)
%files devel-fastdebug
%{files_devel -- %{fastdebug_suffix_unquoted}}
-%ifnarch %{ix86}
%files demo-fastdebug -f %{name}-demo.files-fastdebug
-%endif
%{files_demo -- %{fastdebug_suffix_unquoted}}
%files src-fastdebug
@@ -2913,8 +2828,20 @@ cjc.mainProgram(args)
%endif
%changelog
-* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.0.342.b06-0.3.ea.1
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+* Fri Jul 22 2022 Jiri Vanek <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.4.ea
+- 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
+-- Reinstate demo package on x86
+-- Temporarily disable noarch status of javadoc and javadoc-zip so x86 can differ
+-- 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 proeprly
(with i686 included)
+-
https://bugzilla.redhat.com/show_bug.cgi?id=2104129
* Tue Jul 19 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.3.ea
- Reinstate demo package on x86
commit 4c5d1a87de1491566865c3dd6774b3afc07ad20d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 21 15:05:19 2022 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 2fa57d7..64c833d 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -1400,7 +1400,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
+Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
# 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
@@ -2913,6 +2913,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:1.8.0.342.b06-0.3.ea.1
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
* Tue Jul 19 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.3.ea
- Reinstate demo package on x86
commit 475808beae0ebe555834046d8194ba36e859d694
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Tue Jul 19 10:53:48 2022 +0100
Reinstate demo package on x86
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 98fd882..2fa57d7 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -351,7 +351,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 3
# 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,
@@ -2837,7 +2837,9 @@ cjc.mainProgram(args)
%files devel
%{files_devel %{nil}}
-%ifnarch %{ix86}
+%ifarch %{ix86}
+%files demo
+%else
%files demo -f %{name}-demo.files
%endif
%{files_demo %{nil}}
@@ -2911,6 +2913,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Tue Jul 19 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.3.ea
+- Reinstate demo package on x86
+
* Mon Jul 18 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.2.ea
- Temporarily disable noarch status of javadoc and javadoc-zip so x86 can differ
commit fbc7fb3c17414e43cd5c436e0b092a4175b7929d
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Tue Jul 19 01:00:39 2022 +0100
Temporarily disable noarch status of javadoc and javadoc-zip so x86 can differ
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 166ccdf..98fd882 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -1867,7 +1867,8 @@ The %{compatiblename}-src-fastdebug sub-package contains the
complete %{origin_n
Summary: %{origin_nice} %{majorver} API documentation
Requires: javapackages-filesystem
Obsoletes: javadoc-slowdebug < 1:1.8.0.222.b10-1
-BuildArch: noarch
+# Temporarily disabled while we have a cripped x86 build
+#BuildArch: noarch
%{java_javadoc_rpo -- %{nil} -zip}
%{java_javadoc_rpo -- %{nil} %{nil}}
@@ -1881,7 +1882,8 @@ The %{origin_nice} %{majorver} API documentation.
Summary: %{origin_nice} %{majorver} API documentation compressed in a single archive
Requires: javapackages-filesystem
Obsoletes: javadoc-zip-slowdebug < 1:1.8.0.222.b10-1
-BuildArch: noarch
+# Temporarily disabled while we have a cripped x86 build
+#BuildArch: noarch
%{java_javadoc_rpo -- %{nil} %{nil}}
@@ -2909,6 +2911,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Mon Jul 18 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.2.ea
+- Temporarily disable noarch status of javadoc and javadoc-zip so x86 can differ
+
* Mon Jul 18 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.2.ea
- Try to build on x86 again by creating a husk of a JDK which does not depend on itself
commit eb7f165236a680147276ce9ba31fc2e01df39a5e
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Mon Jul 18 16:03:38 2022 +0100
Try to build on x86 again by creating a husk of a JDK which does not depend on itself
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index d48de49..166ccdf 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -282,7 +282,7 @@
# New Version-String scheme-style defines
%global majorver 8
-%ifarch %{ix86} x86_64
+%ifarch x86_64
%global with_openjfx_binding 1
%global openjfx_path %{_jvmdir}/openjfx8
# links src directories
@@ -351,7 +351,7 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease 1
+%global rpmrelease 2
# 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,
@@ -450,9 +450,6 @@
%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
%endif
-# x86 is no longer supported
-ExcludeArch: %{ix86}
-
# not-duplicated scriptlets for normal/debug packages
%global update_desktop_icons /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
&>/dev/null || :
@@ -838,6 +835,9 @@ exit 0
exit 0
}
+%ifarch %{ix86}
+%define files_jre() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-jre.sh}
+%else
%define files_jre() %{expand:
%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}-%{origin}.png
%{_datadir}/applications/*policytool%{?1}.desktop
@@ -852,8 +852,11 @@ exit 0
%endif
%endif
}
+%endif
-
+%ifarch %{ix86}
+%define files_jre_headless() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-headless.sh}
+%else
%define files_jre_headless() %{expand:
%defattr(-,root,root,-)
%dir %{_sysconfdir}/.java/.systemPrefs
@@ -1034,7 +1037,11 @@ exit 0
%endif
%endif
}
+%endif
+%ifarch %{ix86}
+%define files_devel() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-devel.sh}
+%else
%define files_devel() %{expand:
%defattr(-,root,root,-)
%license %{_jvmdir}/%{sdkdir -- %{?1}}/ASSEMBLY_EXCEPTION
@@ -1192,19 +1199,30 @@ exit 0
%endif
%endif
}
+%endif
-
+%ifarch %{ix86}
+%define files_demo() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-demo.sh}
+%else
%define files_demo() %{expand:
%defattr(-,root,root,-)
%license %{_jvmdir}/%{jredir -- %{?1}}/LICENSE
}
+%endif
+%ifarch %{ix86}
+%define files_src() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-src.sh}
+%else
%define files_src() %{expand:
%defattr(-,root,root,-)
%doc README.md
%{_jvmdir}/%{sdkdir -- %{?1}}/src.zip
}
+%endif
+%ifarch %{ix86}
+%define files_javadoc() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-javadoc.sh}
+%else
%define files_javadoc() %{expand:
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
@@ -1219,7 +1237,11 @@ exit 0
%endif
%endif
}
+%endif
+%ifarch %{ix86}
+%define files_javadoc_zip() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/gone-javadoc_zip.sh}
+%else
%define files_javadoc_zip() %{expand:
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
@@ -1234,6 +1256,7 @@ exit 0
%endif
%endif
}
+%endif
# not-duplicated requires/provides/obsoletes for normal/debug packages
%define java_rpo() %{expand:
@@ -1647,8 +1670,14 @@ BuildRequires: pkgconfig
BuildRequires: xorg-x11-proto-devel
BuildRequires: zip
BuildRequires: unzip
+# x86 is deprecated and the package no longer contains a working JDK
+%ifarch %{ix86}
+# Require javapackages-filesystem to define %{_jvmdir}
+BuildRequires: javapackages-filesystem
+%else
# Require a boot JDK which doesn't fail due to RH1482244
BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3
+%endif
# Zero-assembler build requirement
%ifarch %{zero_arches}
BuildRequires: libffi-devel
@@ -2078,6 +2107,12 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} >
nss.cfg
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
%build
+
+# x86 is deprecated
+%ifarch %{ix86}
+ exit 0
+%endif
+
# How many CPU's do we have?
export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
export NUM_PROC=${NUM_PROC:-1}
@@ -2286,12 +2321,18 @@ fi
done
%check
-%ifarch %{ix86}
- exit 0
-%endif
+
# We test debug first as it will give better diagnostics on a crash
for suffix in %{build_loop} ; do
+%ifarch %{ix86}
+
+ # Fake debugsourcefiles.list here after find-debuginfo.sh has already had a go
+ echo "%{_jvmdir}/%{sdkdir -- ${suffix}}/gone-debugsourcefiles.sh" >>
debugsourcefiles.list
+ cat debugsourcefiles.list
+
+%else
+
export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}/images/%{jdkimage}
# Check unlimited policy has been used
@@ -2405,6 +2446,8 @@ $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
+%endif
+
# build cycles check
done
@@ -2413,20 +2456,36 @@ STRIP_KEEP_SYMTAB=libjvm*
for suffix in %{build_loop} ; do
-# Install the jdk
-pushd %{installoutputdir -- $suffix}/images/%{jdkimage}
-
%ifarch %{ix86}
- for file in $(find $(pwd) | grep -e "/bin/" -e "\.so$") ; do
- echo "deprecating $file"
- echo '#!/bin/bash' > $file
- echo 'echo "We are going to remove i686 jdk. Please fix your package
accordingly!"' >> $file
- echo 'echo "See
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs"' >> $file
- echo 'echo "See
https://pagure.io/fesco/issue/2772"' >>
$file
- echo 'echo "See
https://bugzilla.redhat.com/show_bug.cgi?id=2083750"' >> $file
- echo 'exit 1' >> $file
+
+ mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- ${suffix}}
+
+ file=/tmp/gonejdk.$$
+ echo "OpenJDK on x86 is now deprecated"
+ echo '#!/bin/bash' > $file
+ echo 'echo "We are going to remove i686 jdk. Please fix your package
accordingly!"' >> $file
+ echo 'echo "See
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs"' >> $file
+ echo 'echo "See
https://pagure.io/fesco/issue/2772"' >> $file
+ echo 'echo "See
https://bugzilla.redhat.com/show_bug.cgi?id=2083750"'
>> $file
+ echo 'exit 1' >> $file
+
+ for pkgsuffix in jre headless devel demo src debugsourcefiles ; do
+ cp -a ${file} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir --
${suffix}}/gone-${pkgsuffix}.sh
done
-%endif
+
+ # Docs were only in the normal build
+ if ! echo $suffix | grep -q "debug" ; then
+ for pkgsuffix in javadoc javadoc_zip ; do
+ cp -a ${file} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- ${suffix}}/gone-${pkgsuffix}.sh
+ done
+ fi
+
+ rm -f ${file}
+
+%else
+
+# Install the jdk
+pushd %{installoutputdir -- $suffix}/images/%{jdkimage}
# Install jsa directories so we can owe them
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{jredir -- $suffix}/lib/%{archinstall}/server/
@@ -2604,6 +2663,8 @@ find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name
"ASSEMBLY_EXCEPTION"
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name "LICENSE" -exec
chmod 644 {} \; ;
find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/ -name
"THIRD_PARTY_README" -exec chmod 644 {} \; ;
+%endif
+
# end, dual install
done
@@ -2774,7 +2835,9 @@ cjc.mainProgram(args)
%files devel
%{files_devel %{nil}}
+%ifnarch %{ix86}
%files demo -f %{name}-demo.files
+%endif
%{files_demo %{nil}}
%files src
@@ -2805,7 +2868,9 @@ cjc.mainProgram(args)
%files devel-slowdebug
%{files_devel -- %{debug_suffix_unquoted}}
+%ifnarch %{ix86}
%files demo-slowdebug -f %{name}-demo.files-slowdebug
+%endif
%{files_demo -- %{debug_suffix_unquoted}}
%files src-slowdebug
@@ -2828,7 +2893,9 @@ cjc.mainProgram(args)
%files devel-fastdebug
%{files_devel -- %{fastdebug_suffix_unquoted}}
+%ifnarch %{ix86}
%files demo-fastdebug -f %{name}-demo.files-fastdebug
+%endif
%{files_demo -- %{fastdebug_suffix_unquoted}}
%files src-fastdebug
@@ -2842,6 +2909,9 @@ cjc.mainProgram(args)
%endif
%changelog
+* Mon Jul 18 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.2.ea
+- 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 <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.1.ea
- Update to shenandoah-jdk8u342-b06 (EA)
- Update release notes for shenandoah-8u342-b06.
commit 1a5e8e1c00dc366d0e1453f376f9ddc23cc2f52b
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Sun Jul 17 17:18:02 2022 +0100
Update to shenandoah-jdk8u342-b06 (EA)
Update release notes for shenandoah-8u342-b06.
Switch to EA mode for 8u342 pre-release builds.
Print release file during build, which should now include a correct SOURCE value from
.src-rev
Update tarball script with IcedTea GitHub URL and .src-rev generation
Use "git apply" with patches in the tarball script to allow binary diffs
Remove redundant "REPOS" variable from tarball script
Include script to generate bug list for release notes
Update tzdata requirement to 2022a to match JDK-8283350
diff --git a/.gitignore b/.gitignore
index a973960..da2aef1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -255,3 +255,4 @@
/openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b01-4curve.tar.xz
/openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b06-4curve.tar.xz
/openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b09-4curve.tar.xz
+/openjdk-shenandoah-jdk8u-shenandoah-jdk8u342-b06-4curve.tar.xz
diff --git a/NEWS b/NEWS
index f9af271..883a62c 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,112 @@ Key:
JDK-X -
https://bugs.openjdk.java.net/browse/JDK-X
CVE-XXXX-YYYY:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release OpenJDK 8u342 (2022-07-19):
+===========================================
+Live versions of these release notes can be found at:
+ *
https://bitly.com/openjdk8u342
+ *
https://builds.shipilev.net/backports-monitor/release-notes-openjdk8u342.txt
+
+* Other changes
+ - JDK-8031567: Better model for storing source revision information
+ - JDK-8076190: Customizing the generation of a PKCS12 keystore
+ - JDK-8129572: Cleanup usage of getResourceAsStream in jaxp
+ - JDK-8132256: jaxp: Investigate removal of
com/sun/org/apache/bcel/internal/util/ClassPath.java
+ - JDK-8168926: C2: Bytecode escape analyzer crashes due to stack overflow
+ - JDK-8170385: JDK-8031567 broke source bundles
+ - JDK-8170392: JDK-8031567 broke builds from source bundles
+ - JDK-8170530: bash configure output contains a typo in a suggested library name
+ - JDK-8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative
initial size for ByteArrayOutputStream
+ - JDK-8194154: System property user.dir should not be changed
+ - JDK-8202142: jfr/event/io/TestInstrumentation is unstable
+ - JDK-8221988: add possibility to build with Visual Studio 2019
+ - JDK-8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
+ - JDK-8230865: [TESTBUG] jdk/jfr/event/io/EvilInstrument.java fails at-run shell
MakeJAR.sh target
+ - JDK-8235211: serviceability/attach/RemovingUnixDomainSocketTest.java fails with
AttachNotSupportedException: Unable to open socket file
+ - JDK-8244973: serviceability/attach/RemovingUnixDomainSocketTest.java fails
"stderr was not empty"
+ - JDK-8248876: LoadObject with bad base address created for exec file on linux
+ - JDK-8253424: Add support for running pre-submit testing using GitHub Actions
+ - JDK-8253865: Pre-submit testing using GitHub Actions does not detect failures
reliably
+ - JDK-8254054: Pre-submit testing using GitHub Actions should not use the deprecated
set-env command
+ - JDK-8254173: Add Zero, Minimal hotspot targets to submit workflow
+ - JDK-8254175: Build no-pch configuration in debug mode for submit checks
+ - JDK-8254282: Add Linux x86_32 builds to submit workflow
+ - JDK-8255239: The timezone of the hs_err_pid log file is corrupted in Japanese locale
+ - JDK-8255305: Add Linux x86_32 tier1 to submit workflow
+ - JDK-8255352: Archive important test outputs in submit workflow
+ - JDK-8255373: Submit workflow artifact name is always "test-results_.zip"
+ - JDK-8255895: Submit workflow artifacts miss hs_errs/replays due to ZIP include
mismatch
+ - JDK-8256127: Add cross-compiled foreign architectures builds to submit workflow
+ - JDK-8256277: Github Action build on macOS should define OS and Xcode versions
+ - JDK-8256354: Github Action build on Windows should define OS and MSVC versions
+ - JDK-8256393: Github Actions build on Linux should define OS and GCC versions
+ - JDK-8256414: add optimized build to submit workflow
+ - JDK-8256747: GitHub Actions: decouple the hotspot build-only jobs from Linux x64
testing
+ - JDK-8257056: Submit workflow should apt-get update to avoid package installation
errors
+ - JDK-8259924: GitHub actions fail on Linux x86_32 with "Could not configure
libc6:i386"
+ - JDK-8260460: GitHub actions still fail on Linux x86_32 with "Could not configure
libc6:i386"
+ - JDK-8261107: ArrayIndexOutOfBoundsException in the
ICC_Profile.getInstance(InputStream)
+ - JDK-8263667: Avoid running GitHub actions on branches named pr/*
+ - JDK-8266187: Memory leak in appendBootClassPath()
+ - JDK-8274658: ISO 4217 Amendment 170 Update
+ - JDK-8274751: Drag And Drop hangs on Windows
+ - JDK-8278138: OpenJDK8 fails to start on Windows 8.1 after upgrading compiler to
VS2017
+ - JDK-8279669: test/jdk/com/sun/jdi/TestScaffold.java uses wrong condition
+ - JDK-8281814: Debuginfo.diz contains redundant build path after backport JDK-8025936
+ - JDK-8282225: GHA: Allow one concurrent run per PR only
+ - JDK-8282458: Update .jcheck/conf file for 8u move to git
+ - JDK-8282552: Bump update version of OpenJDK: 8u342
+ - JDK-8283350: (tz) Update Timezone Data to 2022a
+ - JDK-8284620: CodeBuffer may leak _overflow_arena
+ - JDK-8284772: 8u GHA: Use GCC Major Version Dependencies Only
+ - JDK-8285445: cannot open file "NUL:"
+ - JDK-8285523: Improve test java/io/FileOutputStream/OpenNUL.java
+ - JDK-8285591: [11] add signum checks in DSA.java engineVerify
+ - JDK-8285727: [11u, 17u] Unify fix for JDK-8284920 with version from head
+ - JDK-8286989: Build failure on macOS after 8281814
+ - JDK-8287537: 8u JDK-8284620 backport broke AArch64 build
+
+Notes on individual issues:
+===========================
+
+security-libs/java.security:
+
+JDK-8215293: Customizing PKCS12 keystore Generation
+===================================================
+New system and security properties have been added to enable users to
+customize the generation of PKCS #12 keystores. This includes
+algorithms and parameters for key protection, certificate protection,
+and MacData. The detailed explanation and possible values for these
+properties can be found in the "PKCS12 KeyStore properties" section of
+the `java.security` file.
+
+Also, support for the following SHA-2 based HmacPBE algorithms has
+been added to the SunJCE provider:
+
+* HmacPBESHA224
+* HmacPBESHA256
+* HmacPBESHA384
+* HmacPBESHA512
+* HmacPBESHA512/224
+* HmacPBESHA512/256
+
+core-libs/java.io:
+
+JDK-8285660: Enable Windows Alternate Data Streams by default
+=============================================================
+The Windows implementation of `java.io.File` has been changed so that
+strict validity checks are **not** performed by default on file
+paths. This includes allowing colons (':') in the path other than only
+immediately after a single drive letter. It also allows paths that
+represent NTFS Alternate Data Streams (ADS), such as
+"filename:streamname". This restores the default behavior of
+`java.io.File` to what it was prior to the April 2022 CPU in which
+strict validity checks were not performed by default on file paths on
+Windows. To re-enable strict path checking in `java.io.File`, the
+system property `jdk.io.File.enableADS` should be set to `false` (case
+ignored). This might be preferable, for example, if Windows special
+device paths such as `NUL:` are *not* used.
+
New in release OpenJDK 8u332 (2022-04-19):
===========================================
Live versions of these release notes can be found at:
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 61aad1f..3f33d68 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -42,8 +42,8 @@ set -e
OPENJDK_URL_DEFAULT=https://github.com
COMPRESSION_DEFAULT=xz
-# jdk is last for its size
-REPOS_DEFAULT="hotspot corba jaxws jaxp langtools nashorn jdk"
+# Corresponding IcedTea version
+ICEDTEA_VERSION=3.0
if [ "x$1" = "xhelp" ] ; then
echo -e "Behaviour may be specified by setting the following variables:\n"
@@ -56,7 +56,6 @@ if [ "x$1" = "xhelp" ] ; then
echo "REPO_ROOT - the location of the Mercurial repository to archive (optional;
defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
echo "PR3822 - the path to the PR3822 patch to apply (optional; downloaded if
unavailable)"
echo "JCONSOLE_JS_PATCH - the path to a patch to fix non-availiability of
jconsole.js (optional; defaults to ${JCONSOLE_JS_PATCH_DEFAULT})"
- echo "REPOS - specify the repositories to use (optional; defaults to
${REPOS_DEFAULT})"
exit 1;
fi
@@ -102,10 +101,6 @@ if [ "x$REPO_ROOT" = "x" ] ; then
REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
echo "No repository root specified; default to ${REPO_ROOT}"
fi;
-if [ "x$REPOS" = "x" ] ; then
- REPOS=${REPOS_DEFAULT}
- echo "No repositories specified; defaulting to ${REPOS}"
-fi;
echo -e "Settings:"
echo -e "\tVERSION: ${VERSION}"
@@ -117,13 +112,13 @@ echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}"
echo -e "\tREPO_ROOT: ${REPO_ROOT}"
echo -e "\tPR3822: ${PR3822}"
echo -e "\tJCONSOLE_JS_PATCH: ${JCONSOLE_JS_PATCH}"
-echo -e "\tREPOS: ${REPOS}"
mkdir "${FILE_NAME_ROOT}"
pushd "${FILE_NAME_ROOT}"
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
git clone -b ${VERSION} ${REPO_ROOT} openjdk
+
pushd openjdk
# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it
non-Free
@@ -132,39 +127,50 @@ if [ -d langtools ] ; then
rm -vf langtools/test/tools/javadoc/api/basic/TagletPathTest.java
rm -vf langtools/test/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
fi
+
if [ -d jdk ]; then
-# jconsole.js has a BSD license with a field-of-use restriction, making it non-Free
-echo "Removing jconsole-plugin file with non-Free license"
-rm -vf jdk/src/share/demo/scripting/jconsole-plugin/src/resources/jconsole.js
-echo "Removing EC source code we don't build"
-rm -vf jdk/src/share/native/sun/security/ec/impl/ec2.h
-rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_163.c
-rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_193.c
-rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_233.c
-rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_aff.c
-rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_mont.c
-rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_192.c
-rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_224.c
-
-echo "Syncing EC list with NSS"
-if [ "x$PR3822" = "x" ] ; then
-# get pr3822.patch (from
http://icedtea.classpath.org/hg/icedtea8) from most correct tag
-# Do not push it or publish it (see
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3822)
- wget -O pr3822.patch
http://icedtea.classpath.org/hg/icedtea8/raw-file/tip/patches/pr3822-4cur...
- patch -Np1 < pr3822.patch
- rm pr3822.patch
-else
- echo "Applying ${PR3822}"
- patch -Np1 < $PR3822
-fi;
+ # jconsole.js has a BSD license with a field-of-use restriction, making it non-Free
+ echo "Removing jconsole-plugin file with non-Free license"
+ rm -vf jdk/src/share/demo/scripting/jconsole-plugin/src/resources/jconsole.js
+ echo "Removing EC source code we don't build"
+ rm -vf jdk/src/share/native/sun/security/ec/impl/ec2.h
+ rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_163.c
+ rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_193.c
+ rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_233.c
+ rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_aff.c
+ rm -vf jdk/src/share/native/sun/security/ec/impl/ec2_mont.c
+ rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_192.c
+ rm -vf jdk/src/share/native/sun/security/ec/impl/ecp_224.c
+
+ echo "Syncing EC list with NSS"
+ if [ "x$PR3822" = "x" ] ; then
+ # get pr3822.patch (from
https://github.com/icedtea-git/icedtea) in the
${ICEDTEA_VERSION} branch
+ # Do not push it or publish it
+ wget -O pr3822.patch
https://github.com/icedtea-git/icedtea/raw/${ICEDTEA_VERSION}/patches/pr3...
+ echo "Applying ${PWD}/pr3822.patch"
+ git apply --stat --apply -v -p1 pr3822.patch
+ rm pr3822.patch
+ else
+ echo "Applying ${PR3822}"
+ git apply --stat --apply -v -p1 $PR3822
+ fi;
fi
echo "Patching out use of jconsole.js"
-patch -Np1 < ${JCONSOLE_JS_PATCH}
+git apply --stat --apply -v -p1 ${JCONSOLE_JS_PATCH}
find . -name '*.orig' -exec rm -vf '{}' ';'
popd
+
+# Generate .src-rev so build has knowledge of the revision the tarball was created from
+mkdir build
+pushd build
+sh ${PWD}/../openjdk/configure
+make store-source-revision
+popd
+rm -rf build
+
echo "Compressing remaining forest"
if [ "X$COMPRESSION" = "Xxz" ] ; then
SWITCH=cJf
@@ -177,5 +183,3 @@ mv ${TARBALL_NAME} ..
popd
echo "Done. You may want to remove the uncompressed version."
-
-
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index dac508d..d48de49 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -335,7 +335,7 @@
# note, following three variables are sedded from update_sources if used correctly.
Hardcode them rather there.
%global shenandoah_project openjdk
%global shenandoah_repo shenandoah-jdk8u
-%global openjdk_revision jdk8u332-b09
+%global openjdk_revision jdk8u342-b06
%global shenandoah_revision shenandoah-%{openjdk_revision}
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
@@ -351,12 +351,12 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease 7
+%global rpmrelease 1
# 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,
# - N%%{?extraver}{?dist} for GA releases
-%global is_ga 1
+%global is_ga 0
%if %{is_ga}
%global milestone fcs
%global milestone_version %{nil}
@@ -1270,8 +1270,8 @@ Requires: ca-certificates
# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
Requires: javapackages-filesystem
# Require zoneinfo data provided by tzdata-java subpackage.
-# 2021e required as of JDK-8275766 in January 2022 CPU
-Requires: tzdata-java >= 2021e
+# 2022a required as of JDK-8283350 in 8u342
+Requires: tzdata-java >= 2022a
# for support of kernel stream control
# libsctp.so.1 is being `dlopen`ed on demand
Requires: lksctp-tools%{?_isa}
@@ -1653,8 +1653,8 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel >=
1.7.0.151-2.6.11.3
%ifarch %{zero_arches}
BuildRequires: libffi-devel
%endif
-# 2021e required as of JDK-8275766 in January 2022 CPU
-BuildRequires: tzdata-java >= 2021e
+# 2022a required as of JDK-8283350 in 8u342
+BuildRequires: tzdata-java >= 2022a
# Earlier versions have a bug in tree vectorization on PPC
BuildRequires: gcc >= 4.8.3-8
@@ -2230,6 +2230,10 @@ function installjdk() {
echo "Hardened java binary recommended for launching untrusted code from the Web
e.g. javaws" > man/man1/%{alt_java_name}.1
cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
popd
+
+ # Print release information
+ cat ${imagepath}/release
+
fi
}
@@ -2838,6 +2842,17 @@ cjc.mainProgram(args)
%endif
%changelog
+* Sun Jul 17 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.342.b06-0.1.ea
+- Update to shenandoah-jdk8u342-b06 (EA)
+- Update release notes for shenandoah-8u342-b06.
+- Switch to EA mode for 8u342 pre-release builds.
+- Print release file during build, which should now include a correct SOURCE value from
.src-rev
+- Update tarball script with IcedTea GitHub URL and .src-rev generation
+- Use "git apply" with patches in the tarball script to allow binary diffs
+- Remove redundant "REPOS" variable from tarball script
+- Include script to generate bug list for release notes
+- Update tzdata requirement to 2022a to match JDK-8283350
+
* Sun Jul 17 2022 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.332.b09-7
- Rebase FIPS patches from fips branch and simplify by using a single patch from that
repository
- * RH2051605: Detect NSS at Runtime for FIPS detection
diff --git a/openjdk_news.sh b/openjdk_news.sh
new file mode 100755
index 0000000..560b356
--- /dev/null
+++ b/openjdk_news.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Copyright (C) 2022 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>, 2012-2022
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <
http://www.gnu.org/licenses/>.
+
+OLD_RELEASE=$1
+NEW_RELEASE=$2
+SUBDIR=$3
+REPO=$4
+SCRIPT_DIR=$(dirname ${0})
+
+if test "x${SUBDIR}" = "x"; then
+ echo "No subdirectory specified; using .";
+ SUBDIR=".";
+fi
+
+if test "x$REPO" = "x"; then
+ echo "No repository specified; using ${PWD}"
+ REPO=${PWD}
+fi
+
+if test x${TMPDIR} = x; then
+ TMPDIR=/tmp;
+fi
+
+echo "Repository: ${REPO}"
+
+if [ -e ${REPO}/.git ] ; then
+ TYPE=git;
+elif [ -e ${REPO}/.hg ] ; then
+ TYPE=hg;
+else
+ echo "No Mercurial or Git repository detected.";
+ exit 1;
+fi
+
+if test "x$OLD_RELEASE" = "x" || test "x$NEW_RELEASE" =
"x"; then
+ echo "ERROR: Need to specify old and new release";
+ exit 2;
+fi
+
+echo "Listing fixes between $OLD_RELEASE and $NEW_RELEASE in $REPO"
+rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 ${TMPDIR}/fixes
+for repos in . $(${SCRIPT_DIR}/discover_trees.sh ${REPO});
+do
+ if test "x$TYPE" = "xhg"; then
+ hg log -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') -
tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
+ egrep '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:|
]*summary:\W*([0-9])# - JDK-\1#'| \
+ sed 's#^[o:| ]*summary:\W*# - #' >> ${TMPDIR}/fixes2;
+ hg log -v -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') -
tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
+ egrep '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})# - JDK-\1#'
>> ${TMPDIR}/fixes3;
+ else
+ git -C ${REPO} log --no-merges --pretty=format:%B ${NEW_RELEASE}...${OLD_RELEASE} --
${SUBDIR} |egrep '^[0-9]{7}' | \
+ sed -r 's#^([0-9])# - JDK-\1#' >> ${TMPDIR}/fixes2;
+ touch ${TMPDIR}/fixes3 ; # unused
+ fi
+done
+
+sort ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 | uniq > ${TMPDIR}/fixes
+rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3
+
+echo "In ${TMPDIR}/fixes:"
+cat ${TMPDIR}/fixes
diff --git a/sources b/sources
index 4662b4c..8c41d22 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (openjdk-shenandoah-jdk8u-shenandoah-jdk8u332-b09-4curve.tar.xz) =
23d906ecce6864e0bd3ae4c95ac597eb697c1e28356371aafd7aabab5c3a9a9d861c326125e7a45f15340a5a106c1915808fa93b3ff7cdc8b003647a44caf7fd
+SHA512 (openjdk-shenandoah-jdk8u-shenandoah-jdk8u342-b06-4curve.tar.xz) =
bc7fb9c21f33b2edab948b2b31e3198441c7901369476cd4d4ba0056dbba394a0a19099a2d57987641575f17383a4fd2b85a791ee56fbe2deaa246ec89fe9d81