From 912264c079565f00e016e63157668b51876e5590 Mon Sep 17 00:00:00 2001 From: Deepak Bhole Date: Feb 03 2013 18:26:57 +0000 Subject: Updated to 2.3.5pre (2.3.4 + Feb. 2013 CPU) --- diff --git a/.gitignore b/.gitignore index 0a1454c..2ff8437 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /openjdk-icedtea-2.1.3.tar.gz /tmp-patches-java-1.7.0-openjdk-f17.tar.gz /openjdk-icedtea-2.3.4.tar.gz +/openjdk-icedtea-2.3.5pre.tar.gz diff --git a/java-1.7.0-openjdk-java-access-bridge-security.patch b/java-1.7.0-openjdk-java-access-bridge-security.patch index 2bcd967..c6c7d95 100644 --- a/java-1.7.0-openjdk-java-access-bridge-security.patch +++ b/java-1.7.0-openjdk-java-access-bridge-security.patch @@ -1,21 +1,25 @@ diff -up openjdk/jdk/src/share/lib/security/java.security.sav openjdk/jdk/src/share/lib/security/java.security ---- openjdk/jdk/src/share/lib/security/java.security.sav 2012-10-11 14:01:25.777475321 -0400 -+++ openjdk/jdk/src/share/lib/security/java.security 2012-10-11 14:02:04.488897512 -0400 -@@ -123,7 +123,7 @@ keystore.type=jks - # passed to checkPackageAccess unless the - # corresponding RuntimePermission ("accessClassInPackage."+package) has - # been granted. --package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal. -+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,org.GNOME.Accessibility.,org.GNOME.Bonobo. +--- openjdk/jdk/src/share/lib/security/java.security.sav 2013-02-01 17:34:10.750939826 -0500 ++++ openjdk/jdk/src/share/lib/security/java.security 2013-02-01 17:36:09.283198885 -0500 +@@ -129,7 +129,9 @@ package.access=sun.,\ + com.sun.org.apache.xerces.internal.utils.,\ + com.sun.org.apache.xalan.internal.utils.,\ + com.sun.org.glassfish.external.,\ +- com.sun.org.glassfish.gmbal. ++ com.sun.org.glassfish.gmbal.,\ ++ org.GNOME.Accessibility.,\ ++ org.GNOME.Bonobo. # # List of comma-separated packages that start with or equal this string -@@ -135,7 +135,7 @@ package.access=sun.,com.sun.xml.internal - # by default, none of the class loaders supplied with the JDK call - # checkPackageDefinition. - # --package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal. -+package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,org.GNOME.Accessibility.,org.GNOME.Bonobo. +@@ -147,7 +149,9 @@ package.definition=sun.,\ + com.sun.org.apache.xerces.internal.utils.,\ + com.sun.org.apache.xalan.internal.utils.,\ + com.sun.org.glassfish.external.,\ +- com.sun.org.glassfish.gmbal. ++ com.sun.org.glassfish.gmbal.,\ ++ org.GNOME.Accessibility.,\ ++ org.GNOME.Bonobo. # # Determines whether this properties file can be appended to diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec index 13b4608..d913318 100644 --- a/java-1.7.0-openjdk.spec +++ b/java-1.7.0-openjdk.spec @@ -153,7 +153,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: %{icedtea_version}.1%{?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 @@ -175,17 +175,18 @@ URL: http://openjdk.java.net/ #current release #REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2 #REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3 -# hg clone $REPO/ openjdk -r %{hg_tag} -# hg clone $REPO/corba/ openjdk/corba -r %{hg_tag} -# hg clone $REPO/hotspot/ openjdk/hotspot -r %{hg_tag} -# hg clone $REPO/jaxp/ openjdk/jaxp -r %{hg_tag} -# hg clone $REPO/jaxws/ openjdk/jaxws -r %{hg_tag} -# hg clone $REPO/jdk/ openjdk/jdk -r %{hg_tag} -# hg clone $REPO/langtools/ openjdk/langtools -r %{hg_tag} +# hg clone $REPO/ openjdk -r %{hg_tag} [8bd8e70d4a03] +# hg clone $REPO/corba/ openjdk/corba -r %{hg_tag} [5116fe321210] +# hg clone $REPO/hotspot/ openjdk/hotspot -r %{hg_tag} [f2b98ad97b3c] +# hg clone $REPO/jaxp/ openjdk/jaxp -r %{hg_tag} [91fcc41a0b4b] +# hg clone $REPO/jaxws/ openjdk/jaxws -r %{hg_tag} [7182233cc27e] +# hg clone $REPO/jdk/ openjdk/jdk -r %{hg_tag} [50e268c1fb1f] +# hg clone $REPO/langtools/ openjdk/langtools -r %{hg_tag} [946195011b30] # find openjdk -name ".hg" -exec rm -rf '{}' \; # DEPRECATED - find openjdk -name ".hgtags" -exec rm -rf '{}' \; - used for check of corect forest # tar czf openjdk-icedtea-%{icedtea_version}.tar.gz openjdk -Source0: openjdk-icedtea-%{icedtea_version}.tar.gz +#Source0: openjdk-icedtea-%{icedtea_version}.tar.gz +Source0: openjdk-icedtea-2.3.5pre.tar.gz # Gnome access bridge # Download-able from accessurl, md5 hash supported @@ -1470,6 +1471,9 @@ exit 0 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE %changelog +* Sun Feb 03 2013 Deepak Bhole - 1.7.0.9-2.3.4.2.fc17 +- Updated to 2.3.5pre (2.3.4 + Feb. 2013 CPU) + * Wed Jan 16 2013 Jiri Vanek - 1.7.0.9-2.3.4.1.fc17 - Added idlj slave to javac - Added jcmd slave to javac diff --git a/sources b/sources index c583ffe..c39705e 100644 --- a/sources +++ b/sources @@ -5,6 +5,6 @@ c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2 a9cdc5f050eb6e97c1b15ddd39978710 mauve-2008-10-22.tar.gz 1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz 8eb5ad93dbf2f4fe86e52631969cfb09 systemtap-tapset.tar.gz -2b760cc11292882f6aba4c7a37b87242 openjdk-icedtea-2.3.4.tar.gz +499557c4af15e692faeef272185d11da openjdk-icedtea-2.3.5pre.tar.gz 11c9bb37d7ad8624c0d04954e9b765ba openjdk-icedtea-2.1.3.tar.gz c5e790214585959e0d9f51fb5d9e98c6 tmp-patches-java-1.7.0-openjdk-f17.tar.gz