[java-1.8.0-openjdk/f20: 1/2] - added patch12, removeSunEcProvider-RH1154143 - Add check for src.zip completeness. See RH1130490 (b

[jiri vanek]

commit 2764250597f69b57e2ce3706738d5c4df066fdff
Author: Jiri Vanek <jvanek at redhat.com>
Date:   Fri Oct 24 13:51:09 2014 +0200

    - added patch12,removeSunEcProvider-RH1154143
    - Add check for src.zip completeness. See RH1130490 (by sgehwolf at redhat.com)
    - Resolves: rhbz#1125260

 java-1.8.0-openjdk.spec             |   13 +++++++++++--
 removeSunEcProvider-RH1154143.patch |   23 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 6d05452..9eb29ad 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -128,7 +128,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 0.%{buildver}%{?dist}
+Release: 1.%{buildver}%{?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
@@ -194,6 +194,7 @@ Patch6: disable-doclint-by-default.patch
 Patch7: include-all-srcs.patch
 # Problem discovered with make 4.0
 Patch11: hotspot-build-j-directive.patch
+Patch12: removeSunEcProvider-RH1154143.patch
 
 #
 # OpenJDK specific patches
@@ -279,7 +280,6 @@ Provides: java8-fonts = %{epoch}:%{version}
 %description
 The OpenJDK runtime environment.
 
-
 %package headless
 Summary: OpenJDK Runtime Environment
 Group:   Development/Languages
@@ -429,6 +429,7 @@ sh %{SOURCE12}
 %patch3
 %patch4
 %patch5
+%patch12
 
 %patch99
 
@@ -589,6 +590,9 @@ if [ -f "$ZERO_JVM" ] ; then
   nm -aCl "$ZERO_JVM" | grep javaCalls.cpp
 fi
 
+# Check src.zip has all sources. See RHBZ#1130490
+jar -tf $JAVA_HOME/src.zip | grep Unsafe
+
 %install
 rm -rf $RPM_BUILD_ROOT
 STRIP_KEEP_SYMTAB=libjvm*
@@ -1126,6 +1130,11 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Fri Oct 24 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.25-1.b18
+- added patch12,removeSunEcProvider-RH1154143
+- Add check for src.zip completeness. See RH1130490 (by sgehwolf at redhat.com)
+- Resolves: rhbz#1125260
+
 * Wed Oct 15 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.25-0.b18
 - updated to security u25
 - partial sync with f21
diff --git a/removeSunEcProvider-RH1154143.patch b/removeSunEcProvider-RH1154143.patch
new file mode 100644
index 0000000..8b9ced9
--- /dev/null
+++ b/removeSunEcProvider-RH1154143.patch
@@ -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.