[Lunar-commits] <moonbase> sun-jre, sun-jdk: Update to 1.6.0_05 for both.

[Moritz Heiber]

commit 7f27f8160d34b2877df00cfdb6e4b63a5312870d
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Wed Mar 26 11:21:46 2008 +0100

    sun-jre, sun-jdk: Update to 1.6.0_05 for both.
    
    I discovered the so called "DLJ" packages for distribution developer use
    only (so .. by us). Its way easier to get than any other SUN related
    package and its just the regular SDK in disguise.
    
    Also, I got rid of the license hack. Apparently, the sources are only
    self-extracting zip files .. and the extractor accepts the option
    --accept-license. Way to go.
---
 compilers/sun-jdk/BUILD   |    7 ++++---
 compilers/sun-jdk/DETAILS |   12 ++++++------
 compilers/sun-jre/BUILD   |    6 +++---
 compilers/sun-jre/DETAILS |   12 ++++++------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/compilers/sun-jdk/BUILD b/compilers/sun-jdk/BUILD
index ca5980f..629ffdc 100644
--- a/compilers/sun-jdk/BUILD
+++ b/compilers/sun-jdk/BUILD
@@ -1,8 +1,7 @@
 (
-
-  echo export PATH=\"'${PATH}':/usr/lib/jdk"${VERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
+  
   chmod +x $SOURCE &&
-  echo "yes" | MORE="20000000" ./$SOURCE        &&
+  ./$SOURCE --accept-license --unpack &&
 
   prepare_install  &&
 
@@ -22,6 +21,8 @@
   ln -sf /usr/lib/jdk${VERSION}/jre/plugin/i386/ns7/libjavaplugin_oji.so \
          /opt/lunar/plugins/ &&
 
+
+  echo export PATH=\"'${PATH}':/usr/lib/jdk"${VERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
   install -m644 $SOURCE_DIRECTORY/sun-jdk.rc /etc/profile.d/
 
 ) > $C_FIFO 2>&1
diff --git a/compilers/sun-jdk/DETAILS b/compilers/sun-jdk/DETAILS
index 7198e27..fa328dd 100644
--- a/compilers/sun-jdk/DETAILS
+++ b/compilers/sun-jdk/DETAILS
@@ -1,12 +1,12 @@
           MODULE=sun-jdk
-         VERSION=1.5.0_11
-          SOURCE=jdk-1_5_0_11-linux-i586.bin
-      SOURCE_URL=http://download.lunar-linux.org/lunar/mirrors/
-      SOURCE_VFY=sha1:21f38159c8e3e1bb1c4fac46fed90dd5a7dd427a
-        WEB_SITE=http://java.sun.com
+         VERSION=1.6.0_05
+          SOURCE=jdk-6u5-dlj-linux-i586.bin
+      SOURCE_URL=http://download.java.net/dlj/binaries/
+      SOURCE_VFY=sha1:ba7f5e5c0567db73cf8a9f3b41bcff32e2aed542
+        WEB_SITE=https://jdk-distros.dev.java.net/developer.html
          LICENSE="proprietary"
          ENTERED=20070210
-         UPDATED=20070210
+         UPDATED=20080326
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"
diff --git a/compilers/sun-jre/BUILD b/compilers/sun-jre/BUILD
index ce89795..4cc74d7 100644
--- a/compilers/sun-jre/BUILD
+++ b/compilers/sun-jre/BUILD
@@ -1,8 +1,6 @@
 (
-
-  echo export PATH=\"'${PATH}':/usr/lib/jre"${VERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
   chmod +x $SOURCE &&
-  echo "yes" | MORE="20000000" ./$SOURCE        &&
+  ./$SOURCE --accept-license --unpack &&
 
   prepare_install  &&
 
@@ -13,6 +11,8 @@
   ln -sf /usr/lib/jre${VERSION}/plugin/i386/ns7/libjavaplugin_oji.so \
          /opt/lunar/plugins/ &&
 
+
+  echo export PATH=\"'${PATH}':/usr/lib/jre"${VERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
   install -m644 $SOURCE_DIRECTORY/sun-jre.rc /etc/profile.d/
 
 ) > $C_FIFO 2>&1
diff --git a/compilers/sun-jre/DETAILS b/compilers/sun-jre/DETAILS
index 693d617..9d168f5 100644
--- a/compilers/sun-jre/DETAILS
+++ b/compilers/sun-jre/DETAILS
@@ -1,12 +1,12 @@
           MODULE=sun-jre
-         VERSION=1.6.0_02
-          SOURCE=jre-6u2-linux-i586.bin 
-      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=11284&/"
-      SOURCE_VFY=sha1:630f9915f1a3da3510c032870dc933b489a9eac2
-        WEB_SITE=http://java.sun.com
+         VERSION=1.6.0_05
+          SOURCE=jre-6u5-linux-i586.bin 
+      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=18705&/"
+      SOURCE_VFY=sha1:12f469a4796ee1b33a801c2a020ea3fa322cde1e
+        WEB_SITE=http://www.java.com/en/download/manual.jsp
          LICENSE="proprietary"
          ENTERED=20061113
-         UPDATED=20070728
+         UPDATED=20080326
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"