diff --git a/SOURCES/remove-intree-libraries.sh b/SOURCES/remove-intree-libraries.sh index 84d693e..4afe0ff 100644 --- a/SOURCES/remove-intree-libraries.sh +++ b/SOURCES/remove-intree-libraries.sh @@ -80,12 +80,3 @@ if [ ! -d ${PCSC_SRC} ]; then exit 1 fi rm -rvf ${PCSC_SRC} - -echo "Removing SunEC sources" -rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java -rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDSASignature.java -rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java -rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java -rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunECEntries.java -rm -rvf openjdk/jdk/src/share/native/sun/security/ec -rm -rvf openjdk/jdk/make/sun/security/ec diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index cdd8e1d..d9564da 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -98,6 +98,7 @@ %else %global buildoutputdir openjdk/build/linux-%{archbuild} %endif + %global with_pulseaudio 1 %ifarch %{jit_arches} @@ -167,7 +168,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}.1%{?dist} +Release: %{icedtea_version}.3%{?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 @@ -321,6 +322,8 @@ BuildRequires: xorg-x11-utils BuildRequires: nss-devel # Required for NIO2 BuildRequires: libattr-devel +# Build requirements for SunEC system NSS support +BuildRequires: nss-softokn-freebl-devel >= 3.16.1 # Required for smartcard support BuildRequires: pcsc-lite-devel # Required for SCTP support @@ -511,6 +514,9 @@ cp %{SOURCE2} . # ECC fix %patch400 +# Temporary fixes +# End of temporary fixes + # Add systemtap patches if enabled %if %{with_systemtap} %endif @@ -688,7 +694,6 @@ export SYSTEM_LCMS=false mkdir bootstrap make \ - DISABLE_INTREE_EC=true \ UNLIMITED_CRYPTO=true \ ANT="/usr/bin/ant" \ DISTRO_NAME="Red Hat Enterprise Linux 7" \ @@ -709,6 +714,10 @@ make \ STRIP_POLICY="no_strip" \ JAVAC_WARNINGS_FATAL="false" \ INSTALL_LOCATION=%{_jvmdir}/%{sdkdir} \ + SYSTEM_NSS="true" \ + NSS_LIBS="`pkg-config --libs nss` -lfreebl" \ + NSS_CFLAGS="`pkg-config --cflags nss-softokn` " \ + ECC_JUST_SUITE_B="true" \ SYSTEM_GSETTINGS="true" \ BUILD_JAXP=false BUILD_JAXWS=false BUILD_LANGTOOLS=false BUILD_JDK=false BUILD_CORBA=false \ ALT_JDK_IMPORT_PATH=${JDK_TO_BUILD_WITH} ALT_OUTPUTDIR=${PWD}/bootstrap \ @@ -728,7 +737,6 @@ export ALT_BOOTDIR=${PWD}/bootstrap-vm # to turn off the stripping of debuginfo. FULL_DEBUG_SYMBOLS # does the same for product builds, but is ignored on non-product builds. make \ - DISABLE_INTREE_EC=true \ UNLIMITED_CRYPTO=true \ ANT="/usr/bin/ant" \ DISTRO_NAME="Red Hat Enterprise Linux 7" \ @@ -749,6 +757,10 @@ make \ STRIP_POLICY="no_strip" \ JAVAC_WARNINGS_FATAL="false" \ INSTALL_LOCATION=%{_jvmdir}/%{sdkdir} \ + SYSTEM_NSS="true" \ + NSS_LIBS="`pkg-config --libs nss` -lfreebl" \ + NSS_CFLAGS="`pkg-config --cflags nss-softokn` " \ + ECC_JUST_SUITE_B="true" \ SYSTEM_GSETTINGS="true" \ %{debugbuild} @@ -1272,11 +1284,6 @@ exit 0 alternatives --remove jre_%{javaver} %{_jvmdir}/%{jredir} alternatives --remove jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk} - # avoid unnecessary failure - if [ -e %{_jvmdir}/%{uniquesuffix} ] ; then - # as lua copied all necessary config files, we do not wont the double rpmnew and rpm.save - rm -rf %{_jvmdir}/%{uniquesuffix} - fi exit 0 %posttrans @@ -1548,78 +1555,107 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog -* Tue Oct 20 2015 Jiri Vanek - 1:1.7.0.91-2.6.2.1 +* Tue Oct 20 2015 Jiri Vanek - 1:1.7.0.91-2.6.2.3 - added and applied patch500 8072932or8074489.patch to fix tck failure -- Resolves: rhbz#1271921 +- Resolves: rhbz#1271923 -* Mon Oct 19 2015 Andrew Hughes - 1:1.7.0.91-2.6.2.0 +* Mon Oct 19 2015 Andrew Hughes - 1:1.7.0.91-2.6.2.2 - Turn off deletion of in-tree LCMS sources as we now need them. -- Resolves: rhbz#1271921 +- Resolves: rhbz#1271923 -* Mon Oct 19 2015 Andrew Hughes - 1:1.7.0.91-2.6.2.0 +* Mon Oct 19 2015 Andrew Hughes - 1:1.7.0.91-2.6.2.1 - Bump to 2.6.2 and u91b00. - Disable system LCMS 2 for now until security of it can be verified. +- Drop patches for PR2560/RH1245855 as now applied upstream. - Sync minor changes from RHEL 6 spec file. -- Resolves: rhbz#1271921 +- Resolves: rhbz#1271923 -* Wed Oct 14 2015 Jiri Vanek - 1:1.7.0.85-2.6.1.3 +* Wed Oct 14 2015 Jiri Vanek - 1:1.7.0.85-2.6.1.7 - removed link to soundfont. Unused in rhel7 and will be fixed upstream - Resolves: rhbz#1257653 +* Mon Aug 31 2015 Jiri Vanek - 1:1.7.0.85-2.6.1.6 +- bumped release to allow update testing of previous chnageset +- Resolves: rhbz#1235159 + +* Mon Aug 31 2015 Jiri Vanek - 1:1.7.0.85-2.6.1.5 +- removed rm -rf in headless post +- Resolves: rhbz#1235159 + +* Mon Jul 27 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.4 +- Backport JDWP null fixes. +- Resolves: rhbz#1245855 + +* Thu Jul 23 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.3 +- Backport fixes for debugger crash +- Resolves: rhbz#1245855 + * Sat Jul 11 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.2 - Bump upstream tarball to u25b01 to fix issue with 8075374 backport. -- Resolves: rhbz#1235158 +- Resolves: rhbz#1235159 * Thu Jul 09 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.1 - Update OpenJDK tarball so correct version is used. -- Resolves: rhbz#1235158 +- Resolves: rhbz#1235159 * Thu Jul 09 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.0 - Add additional java.security md5sum from January CPU -- Resolves: rhbz#1235158 +- Resolves: rhbz#1235159 * Thu Jul 09 2015 Andrew Hughes - 1:1.7.0.85-2.6.1.0 - Bump to 2.6.1 and u85b00. -- Resolves: rhbz#1235158 +- Resolves: rhbz#1235159 * Wed Jul 08 2015 Andrew Hughes - 1:1.7.0.80-2.6.0.1 - Pass SYSTEM_GSETTINGS="true" to the OpenJDK build to explicitly enable the GSettings API. -- Resolves: rhbz#1235158 +- Resolves: rhbz#1194226 * Wed Jul 08 2015 Andrew Hughes - 1:1.7.0.80-2.6.0.0 - Add GConf2-devel dependency for native proxy fallback support. - Remove libxslt dependency pulled in from IcedTea builds. - Reduce redhat-lsb dependency to redhat-lsb-core (lsb_release) -- Resolves: rhbz#1235158 +- Resolves: rhbz#1194226 * Wed Jul 08 2015 Andrew Hughes - 1:1.7.0.80-2.6.0.0 - Bump to 2.6.0 and u80b32. - Drop upstreamed patches and separate AArch64 HotSpot. - Add dependencies on pcsc-lite-devel (PR2496) and lksctp-tools-devel (PR2446) - Only run -Xshare:dump on JIT archs other than power64 as port lacks support -- Update remove-intree-libraries script to cover LCMS and PCSC headers and SunEC. -- Resolves: rhbz#1235158 +- Update remove-intree-libraries script to cover LCMS and PCSC headers. +- Resolves: rhbz#1194226 + +* Wed Jun 24 2015 Andrew Hughes - 1:1.7.0.79-2.5.5.4 +- Fix name resolution when /etc/resolv.conf lists an IPv6 nameserver +- Resolves: rhbz#1203666 + +* Wed Apr 29 2015 Andrew Hughes - 1:1.7.0.79-2.5.5.3 +- Re-based SunEC changes onto latest RPM from private branch +- Resolves: rhbz#1121210 * Fri Apr 24 2015 Andrew Hughes - 1:1.7.0.79-2.5.5.2 - Fix crash on ppc64le when running Apache Oozie -- Resolves: rhbz#1220273 +- Resolves: rhbz#1201393 * Fri Apr 10 2015 Jiri Vanek - 1:1.7.0.79-2.5.5.1 - repacked sources -- Resolves: rhbz#1209072 +- Resolves: rhbz#1209073 * Tue Apr 07 2015 Andrew Hughes - 1:1.7.0.79-2.5.5.0 - Bump to 2.5.5 using OpenJDK 7u79 b14. - Update OpenJDK tarball creation comments - Remove test case for RH1191652 now fix has been verified. - Drop AArch64 version of RH1191652 HotSpot patch as included upstream. -- Resolves: rhbz#1209072 +- Resolves: rhbz#1209073 * Wed Mar 04 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.7 - ppc64le now has pulseaudio - Resolves: rhbz#1191652 * Tue Mar 03 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.6 +- Fix use of unapproved bug ID (resolved as duplicate) in changelog entry. +- Resolves: rhbz#1191652 + +* Tue Mar 03 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.6 - Provide AArch64 version of RH1191652 HotSpot patch. - Resolves: rhbz#1191652 @@ -1632,6 +1668,14 @@ exit 0 - Resolves: rhbz#1191652 * Fri Feb 27 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.5 +- Turn off hsbootstrap on all archs +- Resolves: rhbz#1191652 + +* Fri Feb 27 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.5 +- Add missing bracket. +- Resolves: rhbz#1191652 + +* Fri Feb 27 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.5 - Ensure VM directory exists before copying libjvm.so - Resolves: rhbz#1191652 @@ -1661,6 +1705,18 @@ exit 0 - Resolves: rhbz#1191652 * Fri Feb 13 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.5 +- Adjust archbuild instead as JDK build is now using ppc64le +- Resolves: rhbz#1191652 + +* Fri Feb 13 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.5 +- Add ppc64le defines for javax.sound +- Resolves: rhbz#1191652 + +* Fri Feb 13 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.5 +- Add jvm.cfg for ppc64le +- Resolves: rhbz#1191652 + +* Fri Feb 13 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.5 - Add patch for RH1191652 on the JDK side - Resolves: rhbz#1191652 @@ -1677,6 +1733,14 @@ exit 0 - Resolves: rhbz#1191652 * Fri Feb 13 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.5 +- Fix patch for RH1191652 to override LIBARCH on ppc64le as there is no BUILDARCH +- Resolves: rhbz#1191652 + +* Fri Feb 13 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.5 +- Fix patch for RH1191652 to apply against 2.5 (original against HEAD) +- Resolves: rhbz#1191652 + +* Fri Feb 13 2015 Andrew Hughes - 1:1.7.0.75-2.5.4.5 - Use arch name of ppc64le on ppc64le rather than ppc64. - Resolves: rhbz#1191652 @@ -1775,6 +1839,10 @@ exit 0 - Update aarch64 to latest version - Resolves: rhbz#1082779 +* Thu Jul 17 2014 Andrew Hughes - 1:1.7.0.65-2.5.1.3 +- NSS_LIBS should be set from nss pkgconfig, not nss-softokn +- Resolves: rhbz#1121210 + * Mon Jul 14 2014 Jiri Vanek - 1.7.0.65-2.5.1.2 - added and applied fix for samrtcard io patch405, pr1864_smartcardIO.patch - Resolves: rhbz#1115877 @@ -1787,6 +1855,14 @@ exit 0 - updated to icedtea7-forest-2.5.0 (rh1114934) - Resolves: rhbz#1099566 +* Tue Jul 01 2014 Andrew Hughes - 1:1.7.0.60-2.5.0.2 +- Add nss-softokn dependency for SunEC provider +- Resolves: rhbz#1121210 + +* Mon Jun 30 2014 Andrew Hughes - 1:1.7.0.60-2.5.0.1 +- Enable SunEC provider with system NSS support. +- Resolves: rhbz#1121210 + * Fri May 30 2014 Andrew John Hughes - 1.7.0.55-2.4.7.2 - Remove NSS patches. Issues with PKCS11 provider mean it shouldn't be enabled. - Always setup nss.cfg and depend on nss-devel at build-time to do so.