From 48470d5965abe7e81840505863858fc438e28ed7 Mon Sep 17 00:00:00 2001 From: Shreenidhi Shedi Date: Wed, 22 Jan 2025 11:58:24 +0530 Subject: [PATCH] openjdk: version upgrades to fix CVEs Fixes: CVE-2024-21208, CVE-2024-21210, CVE-2024-21217, CVE-2024-21235 openjdk21: new addition. Change-Id: I330ad33e8ff4751d2a693d462648c2bdb53a9ef2 Signed-off-by: Shreenidhi Shedi Reviewed-on: http://photon-gerrit.lvn.broadcom.net/c/photon/+/25119 Tested-by: gerrit-photon Reviewed-by: Guruswamy Basavaiah --- SPECS/openjdk/license-openjdk11.txt | 1 + SPECS/openjdk/license-openjdk17.txt | 1 + SPECS/openjdk/license-openjdk21.txt | 1 + SPECS/openjdk/openjdk11.spec | 38 +-- SPECS/openjdk/openjdk17.spec | 46 ++-- SPECS/openjdk/openjdk21.spec | 238 +++++++++++++++++++ support/pullpublishrpms/xrpmfilelist-aarch64 | 2 + support/pullpublishrpms/xrpmfilelist-x86_64 | 2 + 8 files changed, 298 insertions(+), 31 deletions(-) create mode 100644 SPECS/openjdk/license-openjdk11.txt create mode 100644 SPECS/openjdk/license-openjdk17.txt create mode 100644 SPECS/openjdk/license-openjdk21.txt create mode 100644 SPECS/openjdk/openjdk21.spec diff --git a/SPECS/openjdk/license-openjdk11.txt b/SPECS/openjdk/license-openjdk11.txt new file mode 100644 index 0000000000..03d148dbdd --- /dev/null +++ b/SPECS/openjdk/license-openjdk11.txt @@ -0,0 +1 @@ +License: BSD-2-Clause AND Apache-1.1 AND SunPro AND BSD-3-Clause AND FTL AND MIT-Modern-Variant AND (BSD-3-Clause OR Apache-2.0) AND Unicode-DFS-2016 AND LGPL-2.1-or-later AND SAX-PD AND CC0-1.0 AND MPL-2.0 AND GPL-2.0-or-later WITH Autoconf-exception-generic AND MIT-open-group AND Zlib AND Apache-2.0 AND UPL-1.0 AND GPL-2.0-only AND (MIT OR GPL-1.0-or-later) AND (MIT OR GPL-3.0-only) AND GPL-3.0-only AND MIT AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND ISC AND Unicode-DFS-2015 AND HPND-export2-US AND GPL-2.0-only WITH Classpath-exception-2.0 AND W3C-19980720 AND SMLNJ AND Libpng AND GPL-3.0-or-later AND (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND LGPL-2.1-only AND W3C AND Unicode-3.0 AND (MIT OR GPL-3.0-only) AND (FTL OR GPL-2.0-only) AND BSD-3-Clause-No-Nuclear-License AND softSurfer AND IJG \ No newline at end of file diff --git a/SPECS/openjdk/license-openjdk17.txt b/SPECS/openjdk/license-openjdk17.txt new file mode 100644 index 0000000000..cbf9d48b19 --- /dev/null +++ b/SPECS/openjdk/license-openjdk17.txt @@ -0,0 +1 @@ +License: BSD-2-Clause AND Apache-1.1 AND SunPro AND Unicode-TOU AND BSD-3-Clause AND FTL AND MIT-Modern-Variant AND SAX-PD AND CC0-1.0 AND MPL-2.0 AND GPL-2.0-or-later WITH Autoconf-exception-generic AND MIT-open-group AND Zlib AND Apache-2.0 AND UPL-1.0 AND GPL-2.0-only AND (MIT OR GPL-1.0-or-later) AND GPL-3.0-only AND MIT AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND ISC AND W3C-19980720 AND HPND-export2-US AND GPL-2.0-only WITH Classpath-exception-2.0 AND ICU AND SMLNJ AND Libpng AND GPL-3.0-or-later AND (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND W3C AND Unicode-3.0 AND (FTL OR GPL-2.0-only) AND softSurfer AND IJG \ No newline at end of file diff --git a/SPECS/openjdk/license-openjdk21.txt b/SPECS/openjdk/license-openjdk21.txt new file mode 100644 index 0000000000..adc9333169 --- /dev/null +++ b/SPECS/openjdk/license-openjdk21.txt @@ -0,0 +1 @@ +License: CC0-1.0 AND GPL-3.0-or-later WITH Autoconf-exception-macro AND X11 AND GFDL-1.1-only AND FSFAP AND Apache-2.0 AND FSFULLRWD AND FSFUL AND MIT AND GPL-2.0-or-later WITH Libtool-exception AND FSFULLR AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later WITH Autoconf-exception-generic AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-2.0-or-later diff --git a/SPECS/openjdk/openjdk11.spec b/SPECS/openjdk/openjdk11.spec index 7b1d33a291..94752defdd 100644 --- a/SPECS/openjdk/openjdk11.spec +++ b/SPECS/openjdk/openjdk11.spec @@ -1,19 +1,22 @@ %global security_hardening none %define jdk_major_version 1.11.0 %define _use_internal_dependency_generator 0 +%define _jobs %(echo $(( ($(nproc)+1) / 2 ))) Summary: OpenJDK Name: openjdk11 -Version: 11.0.20 -Release: 7%{?dist} -License: GNU General Public License V2 +Version: 11.0.26 +Release: 1%{?dist} URL: https://github.com/openjdk/jdk11u Group: Development/Tools Vendor: VMware, Inc. Distribution: Photon -Source0: https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-%{version}.tar.gz -%define sha512 jdk-11.0=59dd536c613d58d5cd333ed680a8d51b88fc41e8cf2ec11c9996890b0ad704132b2f0f086a6ba280da84565853cb4e21a030e04280ea3d888ecb156c21e8ca29 +Source0: https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-%{version}-ga.tar.gz +%define sha512 jdk-11.0=b5375de7c39aafa4fe1ef6556e17bf5c8ace577953ea8e666c4e8adc3e8b0f6fdbf20b7c426a156420acb99787363e0e4c9d36df20cefcef5e74a48bb75eeb24 + +Source1: license-openjdk11.txt +%include %{SOURCE1} BuildRequires: pcre-devel BuildRequires: which @@ -28,6 +31,15 @@ BuildRequires: freetype2-devel BuildRequires: glib-devel BuildRequires: harfbuzz-devel BuildRequires: elfutils-libelf-devel +BuildRequires: icu icu-devel +BuildRequires: cups cups-devel +BuildRequires: libXtst libXtst-devel libXi libXi-devel +BuildRequires: alsa-lib alsa-lib-devel util-macros +BuildRequires: xcb-proto libXdmcp libXdmcp-devel libXau-devel +BuildRequires: xtrans libxcb-devel proto libxcb libXau +BuildRequires: libX11 libX11-devel libXext libXext-devel +BuildRequires: libXt libXt-devel libXrender libXrender-devel +BuildRequires: libXrandr libXrandr-devel Requires: chkconfig Requires(postun): chkconfig @@ -38,13 +50,7 @@ Obsoletes: openjdk <= %{version} AutoReqProv: no -%ifarch x86_64 -%define ExtraBuildRequires icu-devel, cups, cups-devel, libXtst, libXtst-devel, libXfixes, libXfixes-devel, libXi, libXi-devel, icu, alsa-lib, alsa-lib-devel, xcb-proto, libXdmcp-devel, libXau-devel, util-macros, xtrans, libxcb-devel, proto, libXdmcp, libxcb, libXau, libX11, libX11-devel, libXext, libXext-devel, libXt, libXt-devel, libXrender, libXrender-devel, libXrandr, libXrandr-devel, openjdk11 -%endif - -%ifarch aarch64 -%define ExtraBuildRequires icu-devel, cups, cups-devel, libXtst, libXtst-devel, libXi, libXi-devel, icu, alsa-lib, alsa-lib-devel, xcb-proto, libXdmcp-devel, libXau-devel, util-macros, xtrans, libxcb-devel, proto, libXdmcp, libxcb, libXau, libX11, libX11-devel, libXext, libXext-devel, libXt, libXt-devel, libXrender, libXrender-devel, libXrandr, libXrandr-devel, openjdk11 -%endif +%define ExtraBuildRequires openjdk11 %description The OpenJDK package installs java class library and javac java compiler. @@ -85,7 +91,7 @@ Requires: %{name} = %{version}-%{release} This package provides the runtime library class sources. %prep -%autosetup -p1 -n jdk11u-jdk-%{version}-6 +%autosetup -p1 -n jdk11u-jdk-%{version}-ga %build chmod a+x ./configur* @@ -112,12 +118,12 @@ make \ STRIP_POLICY=no_strip \ POST_STRIP_CMD="" \ LOG=trace \ - JOBS=$(nproc) + JOBS=%{_jobs} %install unset JAVA_HOME # make doesn't support _smp_mflags -make install JOBS=$(nproc) +make install JOBS=%{_jobs} install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version} chown -R root:root %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version} @@ -246,6 +252,8 @@ rm -rf %{buildroot}/* %{_libdir}/jvm/OpenJDK-* %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip %changelog +* Wed Jan 22 2025 Shreenidhi Shedi 11.0.26-1 +- Upgrade to v11.0.26 * Mon Dec 16 2024 Brennan Lamoreaux 11.0.20-7 - Version bump as a part of cups upgrade * Fri Sep 29 2023 Srish Srinivasan 11.0.20-6 diff --git a/SPECS/openjdk/openjdk17.spec b/SPECS/openjdk/openjdk17.spec index f93546388d..f57f714376 100644 --- a/SPECS/openjdk/openjdk17.spec +++ b/SPECS/openjdk/openjdk17.spec @@ -1,19 +1,22 @@ %global security_hardening none %define jdk_major_version 17 %define _use_internal_dependency_generator 0 +%define _jobs %(echo $(( ($(nproc)+1) / 2 ))) Summary: OpenJDK Name: openjdk17 -Version: 17.0.8 -Release: 3%{?dist} -License: GNU General Public License V2 +Version: 17.0.14 +Release: 1%{?dist} URL: https://github.com/openjdk/jdk17u Group: Development/Tools Vendor: VMware, Inc. Distribution: Photon -Source0: https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-%{version}-5.tar.gz -%define sha512 jdk-17=af6ae3759dda8e7612b8860ccc9c69df260ffa18c80fd73ca71737854aa926442c02e1f56d7bd39dc6ec7f24095a47fc1e448bdcf6f0531ad8bbf403056c0dec +Source0: https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-%{version}-ga.tar.gz +%define sha512 jdk-17=0643ac52b68e5884734289ab13592feef7273db96f7b5c0fd77d801e4d4e44a84abcc439fd1b138119c5583986f1d0b058aa74f55b00e0dfd31333cbb536744d + +Source1: license-openjdk17.txt +%include %{SOURCE1} BuildRequires: pcre-devel BuildRequires: which @@ -28,21 +31,26 @@ BuildRequires: freetype2-devel BuildRequires: glib-devel BuildRequires: harfbuzz-devel BuildRequires: elfutils-libelf-devel +BuildRequires: icu icu-devel +BuildRequires: cups cups-devel +BuildRequires: libXtst libXtst-devel libXi libXi-devel +BuildRequires: alsa-lib alsa-lib-devel util-macros +BuildRequires: xcb-proto libXdmcp libXdmcp-devel libXau-devel +BuildRequires: xtrans libxcb-devel proto libxcb libXau +BuildRequires: libX11 libX11-devel libXext libXext-devel +BuildRequires: libXt libXt-devel libXrender libXrender-devel +BuildRequires: libXrandr libXrandr-devel Requires: chkconfig Requires(postun): chkconfig Requires: %{name}-jre = %{version}-%{release} -AutoReqProv: no +Obsoletes: openjdk <= %{version} -%ifarch x86_64 -%define ExtraBuildRequires icu-devel, cups, cups-devel, libXtst, libXtst-devel, libXfixes, libXfixes-devel, libXi, libXi-devel, icu, alsa-lib, alsa-lib-devel, xcb-proto, libXdmcp-devel, libXau-devel, util-macros, xtrans, libxcb-devel, proto, libXdmcp, libxcb, libXau, libX11, libX11-devel, libXext, libXext-devel, libXt, libXt-devel, libXrender, libXrender-devel, libXrandr, libXrandr-devel, openjdk17 -%endif +AutoReqProv: no -%ifarch aarch64 -%define ExtraBuildRequires icu-devel, cups, cups-devel, openjdk17, libXtst, libXtst-devel, libXi, libXi-devel, icu, alsa-lib, alsa-lib-devel, xcb-proto, libXdmcp-devel, libXau-devel, util-macros, xtrans, libxcb-devel, proto, libXdmcp, libxcb, libXau, libX11, libX11-devel, libXext, libXext-devel, libXt, libXt-devel, libXrender, libXrender-devel, libXrandr, libXrandr-devel -%endif +%define ExtraBuildRequires openjdk17 %description The OpenJDK package installs java class library and javac java compiler. @@ -57,7 +65,7 @@ Requires: libstdc++ Requires: libgcc Requires: zlib -Conflicts: %{name} < 17.0.8-1%{?dist} +Conflicts: %{name} < 17.0.8-4%{?dist} %description jre %{summary} @@ -65,6 +73,7 @@ Conflicts: %{name} < 17.0.8-1%{?dist} %package doc Summary: Documentation and demo applications for openjdk Group: Development/Languages/Java +Obsoletes: openjdk-doc <= %{version} Requires: %{name} = %{version}-%{release} %description doc @@ -73,13 +82,16 @@ It contains the documentation and demo applications for openjdk %package src Summary: OpenJDK Java classes for developers Group: Development/Languages/Java +Obsoletes: openjdk-src <= %{version} Requires: %{name} = %{version}-%{release} +Provides: jre = %{version} + %description src This package provides the runtime library class sources. %prep -%autosetup -p1 -n jdk17u-jdk-%{version}-5 +%autosetup -p1 -n jdk17u-jdk-%{version}-ga %build chmod a+x ./configur* @@ -106,12 +118,12 @@ make \ STRIP_POLICY=no_strip \ POST_STRIP_CMD="" \ LOG=trace \ - JOBS=$(nproc) + JOBS=%{_jobs} %install unset JAVA_HOME # make doesn't support _smp_mflags -make install JOBS=$(nproc) +make install JOBS=%{_jobs} install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version} chown -R root:root %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version} @@ -231,6 +243,8 @@ rm -rf %{buildroot}/* %{_libdir}/jvm/OpenJDK-* %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip %changelog +* Wed Jan 22 2025 Shreenidhi Shedi 17.0.14-1 +- Upgrade to v17.0.14 * Mon Dec 16 2024 Brennan Lamoreaux 17.0.8-3 - Version bump as a part of cups upgrade * Fri Sep 29 2023 Srish Srinivasan 17.0.8-2 diff --git a/SPECS/openjdk/openjdk21.spec b/SPECS/openjdk/openjdk21.spec new file mode 100644 index 0000000000..456a95ada5 --- /dev/null +++ b/SPECS/openjdk/openjdk21.spec @@ -0,0 +1,238 @@ +%global security_hardening none +%define jdk_major_version 21 +%define _use_internal_dependency_generator 0 +%define _jobs %(echo $(( ($(nproc)+1) / 2 ))) + +Summary: OpenJDK +Name: openjdk21 +Version: 21.0.6 +Release: 1%{?dist} +URL: https://github.com/openjdk/jdk21u +Group: Development/Tools +Vendor: VMware, Inc. +Distribution: Photon + +Source0: https://github.com/openjdk/jdk21u/archive/refs/tags/jdk-%{version}-ga.tar.gz +%define sha512 jdk-21=fb03362608a35b0f6e131eaa974a52e6ff8a96f90d3bdaeccd2e1268f46db65c72387ed7bba1c8b0d9457c56950eae607fba29e102a338b009259262e1024726 + +Source1: license-openjdk21.txt +%include %{SOURCE1} + +BuildRequires: pcre-devel +BuildRequires: which +BuildRequires: zip +BuildRequires: unzip +BuildRequires: zlib-devel +BuildRequires: ca-certificates +BuildRequires: chkconfig +BuildRequires: freetype2 +BuildRequires: fontconfig-devel +BuildRequires: freetype2-devel +BuildRequires: glib-devel +BuildRequires: harfbuzz-devel +BuildRequires: elfutils-libelf-devel +BuildRequires: icu icu-devel +BuildRequires: cups cups-devel +BuildRequires: libXtst libXtst-devel libXi libXi-devel +BuildRequires: alsa-lib alsa-lib-devel util-macros +BuildRequires: xcb-proto libXdmcp libXdmcp-devel libXau-devel +BuildRequires: xtrans libxcb-devel proto libxcb libXau +BuildRequires: libX11 libX11-devel libXext libXext-devel +BuildRequires: libXt libXt-devel libXrender libXrender-devel +BuildRequires: libXrandr libXrandr-devel + +Requires: chkconfig +Requires(postun): chkconfig + +Requires: %{name}-jre = %{version}-%{release} + +AutoReqProv: no + +%define ExtraBuildRequires openjdk21, openjdk21-jre + +%description +OpenJDK package installs javac and JDK tools. + +%package jre +Summary: JRE subset files from jdk21 +Requires: chkconfig +Requires(postun): chkconfig +Requires: alsa-lib +Requires: freetype2 +Requires: libstdc++ +Requires: libgcc +Requires: zlib + +Provides: libjli.so()(64bit) +Provides: jre = %{version} + +%description jre +OpenJDK shared libraries and Java runtime modules. + +%package doc +Summary: Documentation and demo applications for openjdk +Group: Development/Languages/Java +Requires: %{name} = %{version}-%{release} + +%description doc +Documentation and demo applications for OpenJDK. + +%package src +Summary: OpenJDK Java classes for developers +Group: Development/Languages/Java +Requires: %{name} = %{version}-%{release} + +%description src +This package provides the runtime library class sources. + +%prep +%autosetup -p1 -n jdk21u-jdk-%{version}-ga + +%build +chmod a+x ./configur* +unset JAVA_HOME +ENABLE_HEADLESS_ONLY="true" + +sh ./configur* \ + --with-target-bits=64 \ + --enable-headless-only \ + --with-extra-cxxflags="-Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" \ + --with-extra-cflags="-fno-delete-null-pointer-checks -Wno-error -fno-lifetime-dse" \ + --with-freetype-include=%{_includedir}/freetype2 \ + --with-freetype-lib=%{_libdir} \ + --with-stdc++lib=dynamic \ + --disable-warnings-as-errors + +mkdir -p %{_datadir}/java +# make doesn't support _smp_mflags +make \ + DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \ + SCTP_WERROR= \ + BUILD_HEADLESS_ONLY=1 \ + OPENJDK_TARGET_OS=linux \ + STRIP_POLICY=no_strip \ + POST_STRIP_CMD="" \ + LOG=trace \ + JOBS=%{_jobs} + +%install +unset JAVA_HOME +# make doesn't support _smp_mflags +make install JOBS=%{_jobs} + +install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version} +chown -R root:root %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version} +install -vdm755 %{buildroot}%{_bindir} + +mv %{_usr}/local/jvm/openjdk-%{version}-internal/* \ + %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/ + +cp README.md LICENSE ASSEMBLY_EXCEPTION \ + %{buildroot}%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/ + +%post jre +alternatives --install %{_bindir}/java java %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/java 40000 \ + --slave %{_bindir}/keytool keytool %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/keytool \ + --slave %{_bindir}/rmiregistry rmiregistry %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/rmiregistry + +%postun jre +if [ $1 -eq 0 ]; then + alternatives --remove java %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/java +fi + +%post +alternatives --install %{_bindir}/javac javac %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/javac 40000 \ + --slave %{_bindir}/jar jar %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jar \ + --slave %{_bindir}/jarsigner jarsigner %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jarsigner \ + --slave %{_bindir}/jhsdb jhsdb %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jhsdb \ + --slave %{_bindir}/jimage jimage %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jimage \ + --slave %{_bindir}/jlink jlink %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jlink \ + --slave %{_bindir}/jmod jmod %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jmod \ + --slave %{_bindir}/javadoc javadoc %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/javadoc \ + --slave %{_bindir}/jdeprscan jdeprscan %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jdeprscan \ + --slave %{_bindir}/jconsole jconsole %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jconsole \ + --slave %{_bindir}/jdb jdb %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jdb \ + --slave %{_bindir}/jdeps jdeps %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jdeps \ + --slave %{_bindir}/jinfo jinfo %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jinfo \ + --slave %{_bindir}/jmap jmap %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jmap \ + --slave %{_bindir}/jps jps %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jps \ + --slave %{_bindir}/jrunscript jrunscript %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jrunscript \ + --slave %{_bindir}/jstack jstack %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jstack \ + --slave %{_bindir}/jstat jstat %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jstat \ + --slave %{_bindir}/jstatd jstatd %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jstatd \ + --slave %{_bindir}/serialver serialver %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/serialver \ + --slave %{_bindir}/jpackage jpackage %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jpackage \ + --slave %{_bindir}/javap javap %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/javap \ + --slave %{_bindir}/jcmd jcmd %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jcmd \ + --slave %{_bindir}/jshell jshell %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jshell \ + --slave %{_bindir}/jfr jfr %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jfr \ + --slave %{_bindir}/jwebserver jwebserver %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jwebserver + +%postun +# Do alternative remove only in case of uninstall +if [ $1 -eq 0 ]; then + alternatives --remove javac %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/javac +fi + +%clean +rm -rf %{buildroot}/* %{_libdir}/jvm/OpenJDK-* + +%files +%defattr(-,root,root) +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/LICENSE +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/README.md +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jar +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jarsigner +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/javac +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/javadoc +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/javap +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jcmd +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jconsole +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jdb +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jdeps +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jinfo +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jlink +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jmod +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jmap +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jps +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jshell +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jrunscript +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jstack +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jstat +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jstatd +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/serialver +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jhsdb +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jimage +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jdeprscan +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jfr +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jpackage +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/jwebserver +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/include/ +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/ct.sym + +%files jre +%defattr(-,root,root) +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/ASSEMBLY_EXCEPTION +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/release +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib +%exclude %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/ct.sym +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/conf +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/jmods +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/java +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/keytool +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/rmiregistry +%exclude %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/bin/*.debuginfo + +%files doc +%defattr(-,root,root) +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/man/ +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/legal/ +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/demo + +%files src +%defattr(-,root,root) +%{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip + +%changelog +* Wed Jan 22 2025 Shreenidhi Shedi 21.0.6-1 +- Initial version. diff --git a/support/pullpublishrpms/xrpmfilelist-aarch64 b/support/pullpublishrpms/xrpmfilelist-aarch64 index 1beef1a242..26afda08ed 100644 --- a/support/pullpublishrpms/xrpmfilelist-aarch64 +++ b/support/pullpublishrpms/xrpmfilelist-aarch64 @@ -29,4 +29,6 @@ aarch64/libXtst-1.2.3-1.ph5.aarch64.rpm aarch64/libXtst-devel-1.2.3-1.ph5.aarch64.rpm aarch64/openjdk11-11.0.12-5.ph5.aarch64.rpm aarch64/openjdk17-17.0.5-3.ph5.aarch64.rpm +aarch64/openjdk21-21.0.5-1.ph5.aarch64.rpm +aarch64/openjdk21-jre-21.0.5-1.ph5.aarch64.rpm aarch64/xcb-proto-1.15.2-1.ph5.aarch64.rpm diff --git a/support/pullpublishrpms/xrpmfilelist-x86_64 b/support/pullpublishrpms/xrpmfilelist-x86_64 index 35dea8ae31..921d405612 100644 --- a/support/pullpublishrpms/xrpmfilelist-x86_64 +++ b/support/pullpublishrpms/xrpmfilelist-x86_64 @@ -39,4 +39,6 @@ x86_64/libXtst-1.2.3-1.ph5.x86_64.rpm x86_64/libXtst-devel-1.2.3-1.ph5.x86_64.rpm x86_64/openjdk11-11.0.12-6.ph5.x86_64.rpm x86_64/openjdk17-17.0.5-3.ph5.x86_64.rpm +x86_64/openjdk21-21.0.5-1.ph5.x86_64.rpm +x86_64/openjdk21-jre-21.0.5-1.ph5.x86_64.rpm x86_64/xcb-proto-1.15.2-1.ph5.x86_64.rpm