- added patch12,removeSunEcProvider-RH1154143

- xdump excluded from ppc64le (rh1156151)
- Add check for src.zip completeness. See RH1130490 (by sgehwolf@redhat.com)
This commit is contained in:
Jiri Vanek 2014-10-24 13:48:54 +02:00
parent 33767a37b3
commit c02b449769
2 changed files with 38 additions and 2 deletions

View File

@ -123,7 +123,7 @@
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever} Version: %{javaver}.%{updatever}
Release: 11.%{buildver}%{?dist} Release: 12.%{buildver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # 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 # 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 # also included the epoch in their virtual provides. This created a
@ -189,6 +189,7 @@ Patch6: disable-doclint-by-default.patch
Patch7: include-all-srcs.patch Patch7: include-all-srcs.patch
# Problem discovered with make 4.0 # Problem discovered with make 4.0
Patch11: hotspot-build-j-directive.patch Patch11: hotspot-build-j-directive.patch
Patch12: removeSunEcProvider-RH1154143.patch
# #
# OpenJDK specific patches # OpenJDK specific patches
@ -452,6 +453,7 @@ sh %{SOURCE12}
%patch6 %patch6
%patch7 %patch7
%patch11 %patch11
%patch12
# s390 build fixes # s390 build fixes
%ifarch s390 %ifarch s390
@ -611,6 +613,9 @@ if [ -f "$ZERO_JVM" ] ; then
nm -aCl "$ZERO_JVM" | grep javaCalls.cpp nm -aCl "$ZERO_JVM" | grep javaCalls.cpp
fi fi
# Check src.zip has all sources. See RHBZ#1130490
jar -tf $JAVA_HOME/src.zip | grep Unsafe
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
STRIP_KEEP_SYMTAB=libjvm* STRIP_KEEP_SYMTAB=libjvm*
@ -992,9 +997,11 @@ exit 0
# fixed upstream. # fixed upstream.
%post headless %post headless
%ifarch %{jit_arches} %ifarch %{jit_arches}
%ifnarch %{ppc64le}
#see https://bugzilla.redhat.com/show_bug.cgi?id=513605 #see https://bugzilla.redhat.com/show_bug.cgi?id=513605
%{jrebindir}/java -Xshare:dump >/dev/null 2>/dev/null %{jrebindir}/java -Xshare:dump >/dev/null 2>/dev/null
%endif %endif
%endif
ext=.gz ext=.gz
alternatives \ alternatives \
@ -1330,7 +1337,13 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties %{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog %changelog
* Thu Sep 25 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.20-11.b26 * Fri Oct 24 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.40-12.b02
- added patch12,removeSunEcProvider-RH1154143
- xdump excluded from ppc64le (rh1156151)
- Add check for src.zip completeness. See RH1130490 (by sgehwolf@redhat.com)
- Resolves: rhbz#1125260
* Thu Sep 25 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.40-11.b02
- fixing flags usages (thanx to jerboaa!) - fixing flags usages (thanx to jerboaa!)
* Thu Sep 25 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.20-10.b26 * Thu Sep 25 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.20-10.b26

View File

@ -0,0 +1,23 @@
--- jdk8/jdk/src/share/lib/security/java.security-linux
+++ jdk8/jdk/src/share/lib/security/java.security-linux
@@ -67,13 +67,13 @@
#
security.provider.1=sun.security.provider.Sun
security.provider.2=sun.security.rsa.SunRsaSign
-security.provider.3=sun.security.ec.SunEC
-security.provider.4=com.sun.net.ssl.internal.ssl.Provider
-security.provider.5=com.sun.crypto.provider.SunJCE
-security.provider.6=sun.security.jgss.SunProvider
-security.provider.7=com.sun.security.sasl.Provider
-security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-security.provider.9=sun.security.smartcardio.SunPCSC
+security.provider.3=com.sun.net.ssl.internal.ssl.Provider
+security.provider.4=com.sun.crypto.provider.SunJCE
+security.provider.5=sun.security.jgss.SunProvider
+security.provider.6=com.sun.security.sasl.Provider
+security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+security.provider.8=sun.security.smartcardio.SunPCSC
+
#
# Sun Provider SecureRandom seed source.