diff --git a/java-1.8.0-openjdk-portable.specfile b/java-1.8.0-openjdk-portable.specfile index 3acc164..f5318fb 100644 --- a/java-1.8.0-openjdk-portable.specfile +++ b/java-1.8.0-openjdk-portable.specfile @@ -37,10 +37,12 @@ %global system_libs 1 %global link_type system %global jpeg_lib |libjavajpeg[.]so.* +%global freetype_lib %{nil} %else %global system_libs 0 %global link_type bundled %global jpeg_lib |libjpeg[.]so.* +%global freetype_lib |libfreetype[.]so.* %endif # Turn off the debug package as we just produce a bunch of tarballs @@ -269,7 +271,7 @@ # Define version of OpenJDK 8 used %global project openjdk %global repo shenandoah-jdk8u -%global openjdk_revision 8u472-b08 +%global openjdk_revision 8u482-b08 %global shenandoah_revision shenandoah%{openjdk_revision} # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 3.15.0 @@ -367,7 +369,7 @@ # as to why some libraries *cannot* be excluded. In particular, # these are: # libjsig.so, libjava.so, libjawt.so, libjvm.so and libverify.so -%global _privatelibs libatk-wrapper[.]so.*|libattach[.]so.*|libawt_headless[.]so.*|libawt[.]so.*|libawt_xawt[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libhprof[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas_unix[.]so.*|libjava_crw_demo[.]so.*%{jpeg_lib}|libjdwp[.]so.*|libjli[.]so.*|libjsdt[.]so.*|libjsoundalsa[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libnpt[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsplashscreen[.]so.*|libsunec[.]so.*|libsystemconf[.]so.*|libunpack[.]so.*|libzip[.]so.*|lib[.]so\\(SUNWprivate_.* +%global _privatelibs libatk-wrapper[.]so.*|libattach[.]so.*|libawt_headless[.]so.*|libawt[.]so.*|libawt_xawt[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*%{freetype_lib}|libhprof[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas_unix[.]so.*|libjava_crw_demo[.]so.*%{jpeg_lib}|libjdwp[.]so.*|libjli[.]so.*|libjsdt[.]so.*|libjsoundalsa[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libnpt[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsplashscreen[.]so.*|libsunec[.]so.*|libsystemconf[.]so.*|libunpack[.]so.*|libzip[.]so.*|lib[.]so\\(SUNWprivate_.* %global __provides_exclude ^(%{_privatelibs})$ %global __requires_exclude ^(%{_privatelibs})$ @@ -654,7 +656,6 @@ BuildRequires: desktop-file-utils BuildRequires: elfutils-devel BuildRequires: file BuildRequires: fontconfig-devel -BuildRequires: freetype-devel # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3-8 BuildRequires: gcc-c++ @@ -688,20 +689,23 @@ BuildRequires: systemtap-sdt-devel %endif %if %{system_libs} +BuildRequires: freetype-devel BuildRequires: giflib-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: zlib-devel %else +# Version in jdk/src/share/native/sun/awt/libfreetype/include/freetype/freetype.h +Provides: bundled(freetype) = 2.13.3 # Version in jdk/src/share/native/sun/awt/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.2 # Version in jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h -Provides: bundled(lcms2) = 2.11.0 +Provides: bundled(lcms2) = 2.14.0 # Version in jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h Provides: bundled(libjpeg) = 6b # Version in jdk/src/share/native/sun/awt/libpng/png.h -Provides: bundled(libpng) = 1.6.39 +Provides: bundled(libpng) = 1.6.51 # Version in jdk/src/share/native/java/util/zip/zlib/zlib.h Provides: bundled(zlib) = 1.3.1 # We link statically against libstdc++ to increase portability @@ -935,9 +939,13 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg # Setup security policy -#Commented because NA to portable +# Commented because N/A to portable #sed -i -e "s:^security.systemCACerts=.*:security.systemCACerts=%{cacerts_file}:" %{security_file} +(cd %{top_level_dir_name}/common/autoconf + bash ./autogen.sh +) + %build # How many CPU's do we have? @@ -970,10 +978,6 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing" EXTRA_ASFLAGS="${EXTRA_CFLAGS} -Wa,--generate-missing-build-notes=yes" export EXTRA_CFLAGS EXTRA_ASFLAGS -(cd %{top_level_dir_name}/common/autoconf - bash ./autogen.sh -) - function buildjdk() { local outputdir=${1} local buildjdk=${2} @@ -1016,7 +1020,6 @@ function buildjdk() { --enable-libffi-bundling \ %endif --with-cacerts-file=`readlink -f %{_sysconfdir}/pki/java/cacerts` \ - --with-native-debug-symbols=${debug_symbols} \ --with-milestone=%{milestone} \ --with-update-version=%{updatever} \ --with-build-number=%{buildver} \ @@ -1026,10 +1029,12 @@ function buildjdk() { --with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \ --with-boot-jdk=${buildjdk} \ --with-debug-level=${debuglevel} \ + --with-native-debug-symbols=${debug_symbols} \ --disable-sysconf-nss \ --enable-unlimited-crypto \ --with-zlib=${link_opt} \ --with-giflib=${link_opt} \ + --with-freetype=${link_opt} \ %if %{with system_libs} --with-libjpeg=${link_opt} \ --with-libpng=${link_opt} \ @@ -1331,6 +1336,13 @@ export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}/images/%{jdkimage} $JAVA_HOME/bin/javac -d . %{SOURCE18} $JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE + # Check blacklisted.certs is valid (OPENJDK-4362) + jtreg_test=$(pwd)/%{top_level_dir_name}/jdk/test/lib/security/CheckBlacklistedCerts.java + jtreg_class=$(basename ${jtreg_test} | sed "s|\.java||") + jtreg_dir=$(dirname ${jtreg_test}) + $JAVA_HOME/bin/javac -d . ${jtreg_test} + $JAVA_HOME/bin/java -Dtest.src=${jtreg_dir} ${jtreg_class} + # Check src.zip has all sources. See RHBZ#1130490 unzip -l $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe' @@ -1551,6 +1563,23 @@ done %endif %changelog +* Mon Jan 19 2026 Andrew Hughes - 1:1.8.0.482.b08-1 +- Update to 8u482-b08 (GA). +- Update release notes for 8u482-b08. +- Remove generated-configure.sh changes from JDK-8141590 & FIPS patch as we already autogenerate this +- Turn on system FreeType as on later JDK versions and add to _privatelibs +- Set bundled FreeType version to 2.13.2 following JDK-8316028 +- Bump LCMS 2 version to 2.14.0 following JDK-8297088 +- Bump libpng version to 1.6.51 following JDK-8372534 +- Add test to ensure blocked.certs is valid (OPENJDK-4362) +- Handle 'upgrade' as an alternative to 'update' in openjdk_news.sh +- ** This tarball is embargoed until 2026-01-20 @ 1pm PT. ** +- Resolves: OPENJDK-4348 +- Resolves: OPENJDK-4265 +- Resolves: OPENJDK-4272 +- Resolves: OPENJDK-4385 +- Resolves: OPENJDK-4394 + * Thu Oct 16 2025 Andrew Hughes - 1:1.8.0.472.b08-1 - Update to 8u472-b08 (GA). - Update release notes for 8u472-b08. diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 3e6b455..33478eb 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -2980,6 +2980,7 @@ cjc.mainProgram(args) - Bump libpng version to 1.6.51 following JDK-8372534 - Update FIPS patch to include nss.fips.cfg that grants CKA_ENCRYPT - Handle 'upgrade' as an alternative to 'update' in openjdk_news.sh +- Sync the copy of the portable specfile with the latest update - ** This tarball is embargoed until 2026-01-20 @ 1pm PT. ** - Resolves: RHEL-142687 - Resolves: RHEL-139534