[java-1.7.0-openjdk/f20] updated to security patched icedtea7-forest-2.5.1

[jiri vanek]

commit 164ed652295460f922ca689dc4eb17e57098e52b
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Wed Jul 16 08:25:17 2014 +0200

    updated to security patched icedtea7-forest-2.5.1

 .gitignore               |    1 +
 java-1.7.0-openjdk.spec  |   19 ++++++++++++++-----
 pr1864_smartcardIO.patch |   10 ++++++++++
 sources                  |    2 +-
 4 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d52238f..b70745a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@
 /jdk7u60_b04_aarch64_832.tar.bz2
 /openjdk-icedtea-2.5.0.tar.xz
 /jdk7u60_b30_aarch64_360d11d249a6.tar.bz2
+/openjdk-icedtea-2.5.1.tar.xz
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index a60f13e..a732808 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1,7 +1,7 @@
 # If debug is 1, OpenJDK is built with all debug info present.
 %global debug 0
 
-%global icedtea_version 2.5.0
+%global icedtea_version 2.5.1
 %global hg_tag icedtea-{icedtea_version}
 
 %global aarch64_rev 360d11d249a6
@@ -127,8 +127,8 @@
 
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
-%global updatever       60
-%global buildver        30
+%global updatever       65
+%global buildver        17
 # Keep priority on 6digits in case updatever>9
 %global priority        1700%{updatever}
 %global javaver         1.7.0
@@ -172,7 +172,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: %{icedtea_version}.3%{?dist}
+Release: %{icedtea_version}.2%{?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
@@ -292,8 +292,10 @@ Patch400: rh1022017.patch
 #Workaround RH902004
 Patch403: PStack-808293.patch
 Patch4030: PStack-808293-aarch64.patch
-# End of tmp patches
 Patch404: gtk3ToBeReverted.patch
+Patch405: pr1864_smartcardIO.patch
+# End of tmp patches
+
 
 
 BuildRequires: autoconf
@@ -583,6 +585,7 @@ tar xzf %{SOURCE9}
 %endif
 
 %patch404 -R
+%patch405
 
 
 %build
@@ -1565,6 +1568,12 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Mon Jul 14 2014 Jiri Vanek  <jvanek at redhat.com> - 1.7.0.65-2.5.1.2
+- added and applied fix for samrtcard io patch405, pr1864_smartcardIO.patch
+
+* Mon Jul 07 2014 Jiri Vanek  <jvanek at redhat.com> - 1.7.0.65-2.5.1.1
+- updated to security patched icedtea7-forest-2.5.1
+
 * Wed Jul 02 2014 Jiri Vanek  <jvanek at redhat.com> - 1.7.0.60-2.5.0.3
 - Added arrch64 support
 
diff --git a/pr1864_smartcardIO.patch b/pr1864_smartcardIO.patch
new file mode 100644
index 0000000..cd9389c
--- /dev/null
+++ b/pr1864_smartcardIO.patch
@@ -0,0 +1,10 @@
+--- openjdk/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c	
++++ openjdk/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c	
+@@ -79,7 +79,6 @@ 
+ 
+ #ifndef USE_SYSTEM_PCSC
+ void *findFunction(JNIEnv *env, void *hModule, char *functionName) {
+-    return NULL;
+     void *fAddress = dlsym(hModule, functionName);
+     if (fAddress == NULL) {
+         char errorMessage[256];
diff --git a/sources b/sources
index 7946811..0c4e7f5 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 ea344cc5b53b73f375558ba41760ff64  class-rewriter.tar.gz
-0ec4aa81608dc91aedd40650f13c8f70  openjdk-icedtea-2.5.0.tar.xz
+2b8e853503e6a8315b78b801fb73c794  openjdk-icedtea-2.5.1.tar.xz
 1cb61996cf5dbe80827abbe7d009bf28  pulseaudio.tar.gz
 013ddff65e090aafe9ff89d4ce767e8d  systemtap-tapset-2014-03-19.tar.xz
 899f24693cfc1aff25158ce2a218bcd6  jdk7u60_b30_aarch64_360d11d249a6.tar.bz2