Update to Java 7u6_b30 using icedtea-2.3.1

2 files changed, 18 insertions, 14 deletions

diff --git a/openjdk/build/BUILDING.txt b/openjdk/build/BUILDING.txt
index 40e42a28..5c00ec4e 100644
--- a/openjdk/build/BUILDING.txt
+++ b/openjdk/build/BUILDING.txt
@@ -1,18 +1,23 @@
 # You can run this script in the sources/ subdirectory to download the sources.
 
-# For icedtea-2.2.1 the tarballs are:
-wget http://icedtea.classpath.org/download/source/icedtea-2.2.1.tar.gz
+# For icedtea-2.3.1 the tarballs are:
+wget http://icedtea.classpath.org/download/source/icedtea-2.3.1.tar.gz
 #
 # These source URLs are constructed from reading the Makefile.in of icedtea:
 # egrep '(^OPENJDK_VERSION|^JDK_UPDATE_VERSION|^CORBA_CHANGESET|^HOTSPOT_CHANGESET|^JAXP_CHANGESET|^JAXWS_CHANGESET|^JDK_CHANGESET|^LANGTOOLS_CHANGESET|^OPENJDK_CHANGESET|^CACAO_VERSION|^CACAO_BASE_URL|^JAMVM_VERSION|^JAMVM_BASE_URL|^ICEDTEA_PREFIX|^ICEDTEA_HG_URL)' Makefile.in
 #
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/archive/0b776ef59474.tar.gz -O openjdk.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba/archive/38deb372c569.tar.gz -O corba.tar.gz 
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp/archive/335fb0b059b7.tar.gz -O jaxp.tar.gz 
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jdk/archive/6c3b742b735d.tar.gz -O jdk.tar.gz 
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/langtools/archive/beea46c7086b.tar.gz -O langtools.tar.gz 
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/hotspot/archive/889dffcf4a54.tar.gz -O hotspot.tar.gz 
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxws/archive/5471e01ef43b.tar.gz -O jaxws.tar.gz 
+# In icedtea-2.3.1 you can choose between "default" and "zero" versions
+# of the VM. The zero vm is meant for ARM based systems.
+# Use this command to find out the hash of the hopspot.zip
+# grep default hotspot.map
+#
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/a3fa5d49d528.tar.gz -O openjdk.tar.gz
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/e9b200124386.tar.gz -O corba.tar.gz 
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/9bd1d8e8b802.tar.gz -O jaxp.tar.gz 
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/507eee662587.tar.gz -O jdk.tar.gz 
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/0cf6181d44db.tar.gz -O langtools.tar.gz 
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/3e0087ab5e92.tar.gz -O hotspot.tar.gz 
+wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/9a744f20cfc5.tar.gz -O jaxws.tar.gz 
 wget http://icedtea.classpath.org/download/drops/cacao/a567bcb7f589.tar.gz -O cacao-a567bcb7f589.tar.gz
-wget http://icedtea.classpath.org/download/drops/jamvm/jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz
+wget http://icedtea.classpath.org/download/drops/jamvm/jamvm-e70f2450890b82c37422616cc85e1a23385f03cd.tar.gz
 
diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild
index 11ff90fd..1e0d4710 100755
--- a/openjdk/build/openjdk.SlackBuild
+++ b/openjdk/build/openjdk.SlackBuild
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 # Copyright 2011, 2012  Eric Hameleers, Eindhoven, The Netherlands
-# Copyright 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +23,9 @@
 
 PKGNAM1=openjdk
 PKGNAM2=openjre
-JAVAVER=7u5
-JAVABLD=b21
-ICEDTEA=2.2.1
+JAVAVER=7u6
+JAVABLD=b30
+ICEDTEA=2.3.1
 
 VERSION="${JAVAVER}_${JAVABLD}"
 BUILD=${BUILD:-1}