icedtea6: updated to 1.12.2

14 files changed, 14 insertions, 12 deletions

diff --git a/java/icedtea6/BUILD b/java/icedtea6/BUILD
index ffd9a4738e..99ca5c2c9b 100755
--- a/java/icedtea6/BUILD
+++ b/java/icedtea6/BUILD
@@ -1,11 +1,11 @@
 export PATH_HOLD="${PATH}"                               &&
-export JAVA_HOME="$BUILD_DIRECTORY/icedtea-bin-6.1.11.1" &&
+export JAVA_HOME="$BUILD_DIRECTORY/icedtea-bin-6.1.12.2" &&
 export CLASSPATH=".:/usr/share/java"                     &&
 export PATH="${PATH}:${JAVA_HOME}/bin"                   &&
 
 OPTS="$ICEDTEA6_DOCS $ICEDTEA6_OPT $ICEDTEA6_PARA $OPTS"            &&
 OPTS="--with-tzdata-dir=/usr/share/zoneinfo $OPTS"                  &&
-OPTS="--with-jdk-home=$BUILD_DIRECTORY/icedtea-bin-6.1.11.1 $OPTS"  && 
+OPTS="--with-jdk-home=$BUILD_DIRECTORY/icedtea-bin-6.1.12.2 $OPTS"  && 
 OPTS="--disable-bootstrap $OPTS"                                    &&
 
 unset JAVA_HOME &&
diff --git a/java/icedtea6/DEPENDS b/java/icedtea6/DEPENDS
index 770663e157..63bff5ea63 100755
--- a/java/icedtea6/DEPENDS
+++ b/java/icedtea6/DEPENDS
@@ -1,5 +1,6 @@
 depends gcc                                                                   &&
 depends -sub CXX gcc                                                          &&
+depends libffi                                                                &&
 depends lsb-release                                                           &&
 depends pkgconfig                                                             &&
 depends zip                                                                   &&
diff --git a/java/icedtea6/DETAILS b/java/icedtea6/DETAILS
index c972fe34ef..0a638bf31a 100755
--- a/java/icedtea6/DETAILS
+++ b/java/icedtea6/DETAILS
@@ -1,29 +1,26 @@
             SPELL=icedtea6
-          VERSION=1.11.5
+          VERSION=1.12.2
            SOURCE=$SPELL-$VERSION.tar.gz
           SOURCE2=$SOURCE.sig
-          SOURCE3=openjdk-6-src-b24-14_nov_2011.tar.gz
+          SOURCE3=openjdk-6-src-b27-26_oct_2012.tar.gz
           SOURCE4=jdk6-jaf-b20.zip
-          SOURCE5=jaxp144_03.zip
-#          SOURCE5=jaxp145_01.zip
+          SOURCE5=jaxp144_04.zip
           SOURCE6=jdk6-jaxws2_1_6-2011_06_13.zip
-# SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-hg
     SOURCE_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE
    SOURCE2_IGNORE=signature
    SOURCE2_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE2
-   SOURCE3_URL[0]=http://download.java.net/openjdk/jdk6/promoted/b24/$SOURCE3
+   SOURCE3_URL[0]=http://download.java.net/openjdk/jdk6/promoted/b27/$SOURCE3
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#       SOURCE_GPG="icedtea.gpg:${SOURCE2}:UPSTREAM_KEY"
        SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 case "${SMGL_COMPAT_ARCHS[0]}" in
   ia32|32)
-          SOURCE7=icedtea-bin-core-6.1.11.1-x86.tar.bz2
+          SOURCE7=icedtea-bin-core-6.1.12.2-x86.tar.bz2
   ;;
   x86-64|64)
     if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]; then
-          SOURCE7=icedtea-bin-core-6.1.11.1-amd64.tar.bz2
+          SOURCE7=icedtea-bin-core-6.1.12.2-amd64.tar.bz2
     else
-          SOURCE7=icedtea-bin-core-6.1.11.1-x86.tar.bz2
+          SOURCE7=icedtea-bin-core-6.1.12.2-x86.tar.bz2
     fi
   ;;
 esac
diff --git a/java/icedtea6/HISTORY b/java/icedtea6/HISTORY
index 043b9c54af..1c8f8e5a6e 100644
--- a/java/icedtea6/HISTORY
+++ b/java/icedtea6/HISTORY
@@ -1,3 +1,7 @@
+2013-02-18 Robin Cook <rcook@wyrms.net>
+	* DETAILS: updated to 1.12.2
+	* DEPENDS: added libffi
+
 2012-10-19 Robin Cook <rcook@wyrms.net>
 	* DETAILS: updated VERSION to 1.11.5
 
diff --git a/java/icedtea6/icedtea-bin-core-6.1.11.1-amd64.tar.bz2.sig b/java/icedtea6/icedtea-bin-core-6.1.11.1-amd64.tar.bz2.sig
deleted file mode 100644
index 1d572e9d12..0000000000
--- a/java/icedtea6/icedtea-bin-core-6.1.11.1-amd64.tar.bz2.sig
+++ /dev/null
diff --git a/java/icedtea6/icedtea-bin-core-6.1.11.1-x86.tar.bz2.sig b/java/icedtea6/icedtea-bin-core-6.1.11.1-x86.tar.bz2.sig
deleted file mode 100644
index 96ef44f18c..0000000000
--- a/java/icedtea6/icedtea-bin-core-6.1.11.1-x86.tar.bz2.sig
+++ /dev/null
diff --git a/java/icedtea6/icedtea-bin-core-6.1.12.2-amd64.tar.bz2.sig b/java/icedtea6/icedtea-bin-core-6.1.12.2-amd64.tar.bz2.sig
new file mode 100644
index 0000000000..de20c72319
--- /dev/null
+++ b/java/icedtea6/icedtea-bin-core-6.1.12.2-amd64.tar.bz2.sig
diff --git a/java/icedtea6/icedtea-bin-core-6.1.12.2-x86.tar.bz2.sig b/java/icedtea6/icedtea-bin-core-6.1.12.2-x86.tar.bz2.sig
new file mode 100644
index 0000000000..0f0af7aa7b
--- /dev/null
+++ b/java/icedtea6/icedtea-bin-core-6.1.12.2-x86.tar.bz2.sig
diff --git a/java/icedtea6/icedtea6-1.11.5.tar.gz.sig b/java/icedtea6/icedtea6-1.11.5.tar.gz.sig
deleted file mode 100644
index c5a8b4a171..0000000000
--- a/java/icedtea6/icedtea6-1.11.5.tar.gz.sig
+++ /dev/null
diff --git a/java/icedtea6/icedtea6-1.12.2.tar.gz.sig b/java/icedtea6/icedtea6-1.12.2.tar.gz.sig
new file mode 100644
index 0000000000..c22e759e0a
--- /dev/null
+++ b/java/icedtea6/icedtea6-1.12.2.tar.gz.sig
diff --git a/java/icedtea6/jaxp144_03.zip.sig b/java/icedtea6/jaxp144_03.zip.sig
deleted file mode 100644
index 8f8efd8dfe..0000000000
--- a/java/icedtea6/jaxp144_03.zip.sig
+++ /dev/null
diff --git a/java/icedtea6/jaxp144_04.zip.sig b/java/icedtea6/jaxp144_04.zip.sig
new file mode 100644
index 0000000000..2c77cc4737
--- /dev/null
+++ b/java/icedtea6/jaxp144_04.zip.sig
diff --git a/java/icedtea6/openjdk-6-src-b24-14_nov_2011.tar.gz.sig b/java/icedtea6/openjdk-6-src-b24-14_nov_2011.tar.gz.sig
deleted file mode 100644
index a8336efde4..0000000000
--- a/java/icedtea6/openjdk-6-src-b24-14_nov_2011.tar.gz.sig
+++ /dev/null
diff --git a/java/icedtea6/openjdk-6-src-b27-26_oct_2012.tar.gz.sig b/java/icedtea6/openjdk-6-src-b27-26_oct_2012.tar.gz.sig
new file mode 100644
index 0000000000..c9f8d9fb09
--- /dev/null
+++ b/java/icedtea6/openjdk-6-src-b27-26_oct_2012.tar.gz.sig