diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..0a80fdce31f59c062e2abba28776e9521eddff30 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/Alibaba_Dragonwell_8.10.11_aarch64_linux.tar.gz b/Alibaba_Dragonwell_8.10.11_aarch64_linux.tar.gz index d1d0850f4853e8348a66f0a5be981fdfb0373e1a..180247131e56430dd857a6e60a802400c79d6961 100644 Binary files a/Alibaba_Dragonwell_8.10.11_aarch64_linux.tar.gz and b/Alibaba_Dragonwell_8.10.11_aarch64_linux.tar.gz differ diff --git a/Alibaba_Dragonwell_8.10.11_x64_linux.tar.gz b/Alibaba_Dragonwell_8.10.11_x64_linux.tar.gz index 4f06f97194ee8e25cf7c3934e9ca50368a090ab6..bfe8f38b4b6933e2190aec9a32b6384d3d69694e 100644 Binary files a/Alibaba_Dragonwell_8.10.11_x64_linux.tar.gz and b/Alibaba_Dragonwell_8.10.11_x64_linux.tar.gz differ diff --git a/dragonwell-extended-8.15.16_jdk8u372-ga.tar.gz b/dragonwell-extended-8.15.16_jdk8u372-ga.tar.gz deleted file mode 100644 index fa9f5488cdc3e6146336080dd7db169ab5083d5e..0000000000000000000000000000000000000000 Binary files a/dragonwell-extended-8.15.16_jdk8u372-ga.tar.gz and /dev/null differ diff --git a/dragonwell-extended-8.16.17_jdk8u382-ga.tar.gz b/dragonwell-extended-8.16.17_jdk8u382-ga.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1e41b2588733c12b363b877e7f7b56a8ce7a9346 --- /dev/null +++ b/dragonwell-extended-8.16.17_jdk8u382-ga.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d9fe57431bf467db3457ce4b129372292e858621f86e3b5036bb2455c654a82 +size 94047963 diff --git a/java-1.8.0-alibaba-dragonwell.spec b/java-1.8.0-alibaba-dragonwell.spec index 67ad4e4f77d37458763ce8729ff6eb3662088a30..1d75daa01eaa2e5aca63abc05775cb30b79a92a9 100644 --- a/java-1.8.0-alibaba-dragonwell.spec +++ b/java-1.8.0-alibaba-dragonwell.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 1 %bcond_without fastdebug %bcond_without slowdebug @@ -11,9 +11,9 @@ %global is_system_jdk 1 %global major_ver 8 -%global minor_ver 15 -%global patch_ver 16 -%global update_ver 372 +%global minor_ver 16 +%global patch_ver 17 +%global update_ver 382 %global buildver ga %global dragonwell_src_ver %{major_ver}.%{minor_ver}.%{patch_ver} @@ -732,50 +732,50 @@ cp %{SOURCE100} common/autoconf/build-aux/ cp %{SOURCE101} common/autoconf/build-aux/ # System library fixes -%patch2001 -p1 -%patch201 -p1 -%patch202 -p1 -%patch203 -p1 -%patch204 -p1 +%patch -P2001 -p1 +%patch -P201 -p1 +%patch -P202 -p1 +%patch -P203 -p1 +%patch -P204 -p1 # System security policy fixes -%patch400 -p1 -%patch401 -p1 -%patch5 -p1 +%patch -P400 -p1 +%patch -P401 -p1 +%patch -P5 -p1 # AArch64 fixes # x86 fixes -%patch105 -p1 +%patch -P105 -p1 # Upstreamable fixes -%patch502 -p1 -%patch504 -p1 -%patch512 -p1 -%patch523 -p1 -%patch528 -p1 -%patch571 -p1 -%patch574 -p1 -%patch111 -p1 -%patch112 -p1 -%patch581 -p1 -%patch582 -p1 +%patch -P502 -p1 +%patch -P504 -p1 +%patch -P512 -p1 +%patch -P523 -p1 +%patch -P528 -p1 +%patch -P571 -p1 +%patch -P574 -p1 +%patch -P111 -p1 +%patch -P112 -p1 +%patch -P581 -p1 +%patch -P582 -p1 # RPM-only fixes -%patch539 -p1 -%patch600 -p1 -%patch1000 -p1 -%patch1001 -p1 -%patch1002 -p1 -%patch1003 -p1 -%patch1004 -p1 -%patch2002 -p1 -%patch1005 -p1 -%patch1006 -p1 -%patch1007 -p1 -%patch1008 -p1 -%patch1011 -p1 -%patch1015 -p1 -%patch1016 -p1 -%patch2003 -p1 +%patch -P539 -p1 +%patch -P600 -p1 +%patch -P1000 -p1 +%patch -P1001 -p1 +%patch -P1002 -p1 +%patch -P1003 -p1 +%patch -P1004 -p1 +%patch -P2002 -p1 +%patch -P1005 -p1 +%patch -P1006 -p1 +%patch -P1007 -p1 +%patch -P1008 -p1 +%patch -P1011 -p1 +%patch -P1015 -p1 +%patch -P1016 -p1 +%patch -P2003 -p1 popd # Extract systemtap tapsets @@ -1247,6 +1247,7 @@ alternatives \ --slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \ --slave %{_bindir}/javah javah %{sdkbindir}/javah \ --slave %{_bindir}/javap javap %{sdkbindir}/javap \ + --slave %{_bindir}/jclass4cds jclass4cds %{sdkbindir}/jclass4cds \ --slave %{_bindir}/jcmd jcmd %{sdkbindir}/jcmd \ --slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \ --slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \ @@ -1494,6 +1495,7 @@ alternatives \ --slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{slowdebug_build}}/javadoc \ --slave %{_bindir}/javah javah %{sdkbindir -- %{slowdebug_build}}/javah \ --slave %{_bindir}/javap javap %{sdkbindir -- %{slowdebug_build}}/javap \ + --slave %{_bindir}/jclass4cds jclass4cds %{sdkbindir -- %{slowdebug_build}}/jclass4cds \ --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{slowdebug_build}}/jcmd \ --slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{slowdebug_build}}/jconsole \ --slave %{_bindir}/jdb jdb %{sdkbindir -- %{slowdebug_build}}/jdb \ @@ -1722,6 +1724,7 @@ alternatives \ --slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{fastdebug_build}}/javadoc \ --slave %{_bindir}/javah javah %{sdkbindir -- %{fastdebug_build}}/javah \ --slave %{_bindir}/javap javap %{sdkbindir -- %{fastdebug_build}}/javap \ + --slave %{_bindir}/jclass4cds jclass4cds %{sdkbindir -- %{fastdebug_build}}/jclass4cds \ --slave %{_bindir}/jcmd jcmd %{sdkbindir -- %{fastdebug_build}}/jcmd \ --slave %{_bindir}/jconsole jconsole %{sdkbindir -- %{fastdebug_build}}/jconsole \ --slave %{_bindir}/jdb jdb %{sdkbindir -- %{fastdebug_build}}/jdb \ @@ -1956,6 +1959,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %config(noreplace) %{etcjavadir}/lib/net.properties %{_jvmdir}/%{jredir}/lib/psfont.properties.ja %{_jvmdir}/%{jredir}/lib/psfontj2d.properties +%{_jvmdir}/%{jredir}/lib/quickstart.properties %{_jvmdir}/%{jredir}/lib/resources.jar %{_jvmdir}/%{jredir}/lib/rt.jar %{_jvmdir}/%{jredir}/lib/sound.properties @@ -2018,6 +2022,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{sdkdir}/bin/javah %{_jvmdir}/%{sdkdir}/bin/javap %{_jvmdir}/%{sdkdir}/bin/java-rmi.cgi +%{_jvmdir}/%{sdkdir}/bin/jclass4cds %{_jvmdir}/%{sdkdir}/bin/jcmd %{_jvmdir}/%{sdkdir}/bin/jconsole %{_jvmdir}/%{sdkdir}/bin/jdb @@ -2110,6 +2115,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %ghost %{_bindir}/javadoc %ghost %{_bindir}/javah %ghost %{_bindir}/javap +%ghost %{_bindir}/jclass4cds %ghost %{_bindir}/jcmd %ghost %{_bindir}/jconsole %ghost %{_bindir}/jdb @@ -2305,6 +2311,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %config(noreplace) %{etcjavadir -- %{slowdebug_build}}/lib/net.properties %{_jvmdir}/%{jredir -- %{slowdebug_build}}/lib/psfont.properties.ja %{_jvmdir}/%{jredir -- %{slowdebug_build}}/lib/psfontj2d.properties +%{_jvmdir}/%{jredir -- %{slowdebug_build}}/lib/quickstart.properties %{_jvmdir}/%{jredir -- %{slowdebug_build}}/lib/resources.jar %{_jvmdir}/%{jredir -- %{slowdebug_build}}/lib/rt.jar %{_jvmdir}/%{jredir -- %{slowdebug_build}}/lib/sound.properties @@ -2354,6 +2361,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/javah %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/javap %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/java-rmi.cgi +%{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/jclass4cds %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/jcmd %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/jconsole %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/jdb @@ -2581,6 +2589,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %config(noreplace) %{etcjavadir -- %{fastdebug_build}}/lib/net.properties %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/psfont.properties.ja %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/psfontj2d.properties +%{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/quickstart.properties %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/resources.jar %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/rt.jar %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/sound.properties @@ -2630,6 +2639,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/javah %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/javap %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/java-rmi.cgi +%{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/jclass4cds %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/jcmd %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/jconsole %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/jdb @@ -2717,6 +2727,9 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %endif %changelog +* Sat Aug 26 2023 Funda Wang - 3:1.8.0.382-1 +- update package to 8.16.17.382 + * Fri Jun 02 2023 zhaoyuanfang - 3:1.8.0.372-1 - update package to 8.15.16.372 diff --git a/pr833097-bugfix-openjkd-8-undeined-symbols.patch b/pr833097-bugfix-openjkd-8-undeined-symbols.patch index 82342a74a15eca4df427373541ca687678a33ee1..6796f1957d45c15735491b66985ae976487bbf6c 100644 --- a/pr833097-bugfix-openjkd-8-undeined-symbols.patch +++ b/pr833097-bugfix-openjkd-8-undeined-symbols.patch @@ -77,8 +77,8 @@ index 6df5ebf1..c8fac403 100644 #include "classfile/systemDictionaryShared.hpp" +#include "gc_implementation/g1/g1OopClosures.inline.hpp" #include "memory/iterator.hpp" + #include "memory/resourceArea.hpp" #include "oops/oop.inline.hpp" - #include "prims/jvmtiRedefineClassesTrace.hpp" diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp index 8dd4e6b2..06a12d56 100644 --- a/hotspot/src/share/vm/classfile/symbolTable.cpp