diff --git a/dragonwell-extended-8.15.16_jdk8u372-ga.tar.gz b/dragonwell-extended-8.19.20_jdk8u412-ga.tar.gz similarity index 82% rename from dragonwell-extended-8.15.16_jdk8u372-ga.tar.gz rename to dragonwell-extended-8.19.20_jdk8u412-ga.tar.gz index fa9f5488cdc3e6146336080dd7db169ab5083d5e..1891534909e23a805034ed2f0c64aebb85bce764 100644 Binary files a/dragonwell-extended-8.15.16_jdk8u372-ga.tar.gz and b/dragonwell-extended-8.19.20_jdk8u412-ga.tar.gz differ diff --git a/java-1.8.0-alibaba-dragonwell.spec b/java-1.8.0-alibaba-dragonwell.spec index 88c18c230e32df5c0b6eb5c43e7239034a541518..a0ab476f71249e2a7cdc0552d0f5aa5facfeb0ca 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 @@ -10,13 +10,13 @@ %global is_system_jdk 1 %global major_ver 8 -%global minor_ver 15 -%global patch_ver 16 -%global update_ver 372 +%global minor_ver 19 +%global patch_ver 20 +%global update_ver 412 %global buildver ga %global dragonwell_src_ver %{major_ver}.%{minor_ver}.%{patch_ver} -%global alibaba_ver 8u372 +%global alibaba_ver %{major_ver}u%{update_ver} %global newdragonwellver %{dragonwell_src_ver}.%{update_ver} %global dragsourcename dragonwell-extended-%{dragonwell_src_ver}_jdk%{alibaba_ver}-ga @@ -101,9 +101,6 @@ %define stap_dir arm64 %endif -%global tapsetroot /usr/share/systemtap -%global tapsetdirttapset %{tapsetroot}/tapset/ -%global tapsetdir %{tapsetdirttapset}/%{stap_dir} %global alternatives_requires %{_sbindir}/alternatives %global rpm_state_dir %{_localstatedir}/lib/rpm-state/ %global update_desktop_icons /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -164,12 +161,9 @@ License: GPL-v2 URL: https://github.com/alibaba/Dragonwell8 Source0: https://github.com/alibaba/Dragonwell8/archive/refs/tags/%{dragsourcename}.tar.gz -Source3: Alibaba_Dragonwell_8.10.11_x64_linux.tar.gz +Source3: https://dragonwell.oss-cn-shanghai.aliyuncs.com/8.10.11/Alibaba_Dragonwell_8.10.11_x64_linux.tar.gz -Source4: Alibaba_Dragonwell_8.10.11_aarch64_linux.tar.gz - -# Systemtap tapsets. Zipped up to keep it small. -Source8: tapsets-icedtea-3.15.0.tar.xz +Source4: https://dragonwell.oss-cn-shanghai.aliyuncs.com/8.10.11/Alibaba_Dragonwell_8.10.11_aarch64_linux.tar.gz BuildArch: x86_64 aarch64 @@ -188,9 +182,6 @@ BuildRequires: giflib-devel BuildRequires: gcc-c++ BuildRequires: gdb BuildRequires: harfbuzz-devel -BuildRequires: lcms2-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel BuildRequires: libxslt BuildRequires: libX11-devel BuildRequires: libXi-devel @@ -199,7 +190,6 @@ BuildRequires: libXrender-devel BuildRequires: libXinerama-devel BuildRequires: libXt-devel BuildRequires: libXtst-devel -BuildRequires: nss-devel BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: zip @@ -211,8 +201,6 @@ BuildRequires: libffi-devel BuildRequires: tzdata-java >= 2015d # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3 -# Build requirements for SunEC system NSS support -BuildRequires: nss-softokn-freebl-devel >= 3.16.1 BuildRequires: systemtap-sdt-devel Requires: fontconfig @@ -266,7 +254,6 @@ Summary: Alibaba Dragonwell 1.8.0 headless Requires: tzdata-java >= 2015d Requires: lksctp-tools Requires: cups-libs -Requires: nss # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros Requires: javapackages-filesystem Requires(post): %{alternatives_requires} @@ -394,7 +381,6 @@ Summary: Alibaba Dragonwell 1.8.0 Runtime Environment headless slowdebug Requires: tzdata-java >= 2015d Requires: lksctp-tools Requires: cups-libs -Requires: nss # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros Requires: javapackages-filesystem Requires(post): %{alternatives_requires} @@ -508,7 +494,6 @@ Summary: Alibaba Dragonwell 1.8.0 Runtime Environment headless fastdebug Requires: tzdata-java >= 2015d Requires: lksctp-tools Requires: cups-libs -Requires: nss # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros Requires: javapackages-filesystem Requires(post): %{alternatives_requires} @@ -594,28 +579,6 @@ mv %{dragbuildname} %{top_level_dir_name} chmod +x %{top_level_dir_name}/configure sed -i 's/WARNINGS_ARE_ERRORS = -Werror/WARNINGS_ARE_ERRORS = -Wno-all/g' %{top_level_dir_name}/hotspot/make/linux/makefiles/gcc.make -# Extract systemtap tapsets -tar --strip-components=1 -x -I xz -f %{SOURCE8} - -%if %{with slowdebug} -cp -r tapset tapset-slowdebug -%endif - -%if %{with fastdebug} -cp -r tapset tapset-fastdebug -%endif - -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 "/@ABS_CLIENT_LIBJVM_SO@/d" $file.1 > $OUTPUT_FILE - sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE - sed -i -e "s:@INSTALL_ARCH_DIR@:%{arch_dir}:g" $OUTPUT_FILE - sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE - done -done - %build # How many CPU's do we have? export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :) @@ -762,7 +725,6 @@ for suffix in %{build_loop} ; do installjdk ${builddir} ${installdir} fi - # Install nss.cfg right away as we will be using the JRE above export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}/images/j2sdk-image # Use system-wide tzdata @@ -789,18 +751,6 @@ for suffix in %{build_loop} ; do install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir -- $suffix} cp -a jre/bin jre/lib jre/{ASSEMBLY_EXCEPTION,LICENSE,THIRD_PARTY_README} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir -- $suffix} - # Install systemtap support files - install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/tapset - cp -a $RPM_BUILD_DIR/%{dragbuildname}/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 -sf %{_jvmdir}/%{sdkdir -- $suffix}/tapset/$name $RPM_BUILD_ROOT%{tapsetdir}/$targetName - done - # Remove empty cacerts database rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir -- $suffix}/lib/security/cacerts # Install cacerts symlink needed by some apps which hardcode the path @@ -1645,6 +1595,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{jredir}/lib/security/java.security %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs %{_jvmdir}/%{jredir}/lib/logging.properties +%{_jvmdir}/%{jredir}/lib/quickstart.properties %{_mandir}/man1/java-%{uniquesuffix}.1* %{_mandir}/man1/alt-java-%{uniquesuffix}.1* %{_mandir}/man1/jjs-%{uniquesuffix}.1* @@ -1782,6 +1733,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{sdkdir}/bin/javap %{_jvmdir}/%{sdkdir}/bin/java-rmi.cgi %{_jvmdir}/%{sdkdir}/bin/jcmd +%{_jvmdir}/%{sdkdir}/bin/jclass4cds %{_jvmdir}/%{sdkdir}/bin/jconsole %{_jvmdir}/%{sdkdir}/bin/jdb %{_jvmdir}/%{sdkdir}/bin/jdeps @@ -1816,7 +1768,6 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{sdkdir}/include/* %{_jvmdir}/%{sdkdir}/lib/%{arch_dir} %{_jvmdir}/%{sdkdir}/lib/ct.sym -%{_jvmdir}/%{sdkdir}/tapset %{_jvmdir}/%{sdkdir}/lib/ir.idl %{_jvmdir}/%{sdkdir}/lib/jconsole.jar %{_jvmdir}/%{sdkdir}/lib/orb.idl @@ -1853,10 +1804,6 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_mandir}/man1/wsgen-%{uniquesuffix}.1* %{_mandir}/man1/wsimport-%{uniquesuffix}.1* %{_mandir}/man1/xjc-%{uniquesuffix}.1* -%dir %{tapsetroot} -%dir %{tapsetdirttapset} -%dir %{tapsetdir} -%{tapsetdir}/*%{_arch}.stp %if %is_system_jdk %ghost %{_jvmdir}/java %ghost %{_bindir}/appletviewer @@ -1982,6 +1929,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{jredir -- %{slowdebug_build}}/lib/security/java.security %{_jvmdir}/%{jredir -- %{slowdebug_build}}/lib/security/blacklisted.certs %{_jvmdir}/%{jredir -- %{slowdebug_build}}/lib/logging.properties +%{_jvmdir}/%{jredir -- %{slowdebug_build}}/lib/quickstart.properties %{_mandir}/man1/java-%{uniquesuffix -- %{slowdebug_build}}.1* %{_mandir}/man1/alt-java-%{uniquesuffix -- %{slowdebug_build}}.1* %{_mandir}/man1/jjs-%{uniquesuffix -- %{slowdebug_build}}.1* @@ -2106,6 +2054,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/javap %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/java-rmi.cgi %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/jcmd +%{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/jclass4cds %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/jconsole %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/jdb %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/bin/jdeps @@ -2140,7 +2089,6 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/include/* %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/lib/%{arch_dir} %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/lib/ct.sym -%{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/tapset %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/lib/ir.idl %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/lib/jconsole.jar %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/lib/orb.idl @@ -2177,14 +2125,6 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_mandir}/man1/wsgen-%{uniquesuffix -- %{slowdebug_build}}.1* %{_mandir}/man1/wsimport-%{uniquesuffix -- %{slowdebug_build}}.1* %{_mandir}/man1/xjc-%{uniquesuffix -- %{slowdebug_build}}.1* -%dir %{tapsetroot} -%dir %{tapsetdirttapset} -%dir %{tapsetdir} -%{tapsetdir}/*%{_arch}%{slowdebug_build}.stp -%dir %{tapsetroot} -%dir %{tapsetdirttapset} -%dir %{tapsetdir} -%{tapsetdir}/*%{_arch}%{slowdebug_build}.stp %files demo-slowdebug %{_jvmdir}/%{sdkdir -- %{slowdebug_build}}/demo @@ -2309,6 +2249,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/charsets.jar %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/classlist %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/content-types.properties +%{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/quickstart.properties %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/currency.data %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/flavormap.properties %{_jvmdir}/%{jredir -- %{fastdebug_build}}/lib/hijrah-config-umalqura.properties @@ -2371,6 +2312,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/javap %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/java-rmi.cgi %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/jcmd +%{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/jclass4cds %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/jconsole %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/jdb %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/bin/jdeps @@ -2405,7 +2347,6 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/include/* %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/lib/%{arch_dir} %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/lib/ct.sym -%{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/tapset %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/lib/ir.idl %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/lib/jconsole.jar %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/lib/orb.idl @@ -2442,10 +2383,6 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_mandir}/man1/wsgen-%{uniquesuffix -- %{fastdebug_build}}.1* %{_mandir}/man1/wsimport-%{uniquesuffix -- %{fastdebug_build}}.1* %{_mandir}/man1/xjc-%{uniquesuffix -- %{fastdebug_build}}.1* -%dir %{tapsetroot} -%dir %{tapsetdirttapset} -%dir %{tapsetdir} -%{tapsetdir}/*%{_arch}%{fastdebug_build}.stp %files demo-fastdebug %{_jvmdir}/%{sdkdir -- %{fastdebug_build}}/demo @@ -2456,6 +2393,9 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %endif %changelog +* Thu Aug 22 2024 lvfei.lv - 3:8.19.20.412-1 +- update source code to 8.19.20.412 + * Thu Nov 23 2023 lvfei.lv - 3:8.15.16.372-3 - remove all patches diff --git a/tapsets-icedtea-3.15.0.tar.xz b/tapsets-icedtea-3.15.0.tar.xz deleted file mode 100644 index a503df251d463cdbf2fce63d769733c72782a21f..0000000000000000000000000000000000000000 Binary files a/tapsets-icedtea-3.15.0.tar.xz and /dev/null differ