[Lunar-commits] <moonbase> sun-jre: updated to 1.6.0_22 Removed old redundand code which was used to install/choose old/new web browser plugin. Because there are no old browsers in Lunar removing legacy code.

Zbigniew Luszpinski zbiggy at lunar-linux.org
Fri Oct 22 00:37:15 CEST 2010 

commit 5c0c203a3c440fea340d64ba35b057053358714b
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Oct 22 00:37:15 2010 +0200

    sun-jre: updated to 1.6.0_22
    Removed old redundand code which was used to install/choose old/new
    web browser plugin. Because there are no old browsers in Lunar
    removing legacy code.
---
 compilers/sun-jdk/BUILD          |    9 +--------
 compilers/sun-jdk/BUILD.x86_64   |    9 +--------
 compilers/sun-jdk/CONFIGURE      |    1 -
 compilers/sun-jre/BUILD          |    9 +--------
 compilers/sun-jre/BUILD.x86_64   |    9 +--------
 compilers/sun-jre/CONFIGURE      |    1 -
 compilers/sun-jre/DETAILS        |    8 ++++----
 compilers/sun-jre/DETAILS.x86_64 |    8 ++++----
 8 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/compilers/sun-jdk/BUILD b/compilers/sun-jdk/BUILD
index b40d50b..c772f24 100644
--- a/compilers/sun-jdk/BUILD
+++ b/compilers/sun-jdk/BUILD
@@ -42,14 +42,7 @@
   # Always use new plugin.
   # Firefox 3, Seamonkey 2, Google chrome/inium use it
   # KDE3/4 Konqueror and Opera always uses Java directly so do not use any plugin
-  # if [ $NEWPLUGIN == 'y' ]; then
-  ln -sf /usr/java/latest/jre/lib/i386/libnpjp2.so \
-         /opt/lunar/plugins/ &&
-  # else
-  # We do not have firefox 1/2 or Seamonkey 1 anymore so no browser uses old plugin
-  # ln -sf /usr/java/latest/jre/plugin/i386/ns7/libjavaplugin_oji.so \
-  #       /opt/lunar/plugins/
-  # fi &&
+  ln -sf /usr/java/latest/jre/lib/i386/libnpjp2.so /opt/lunar/plugins/ &&
 
   # This didn't get created, dead link. Do it this way.
   ln -sf /usr/java/latest/jre/lib/i386/server/libjvm.so /usr/lib/libjvm.so &&
diff --git a/compilers/sun-jdk/BUILD.x86_64 b/compilers/sun-jdk/BUILD.x86_64
index cacbf57..cd43d07 100644
--- a/compilers/sun-jdk/BUILD.x86_64
+++ b/compilers/sun-jdk/BUILD.x86_64
@@ -42,14 +42,7 @@
   # Always use new plugin.
   # Firefox 3, Seamonkey 2, Google chrome/inium use it
   # KDE3/4 Konqueror and Opera always uses Java directly so do not use any plugin
-  # if [ $NEWPLUGIN == 'y' ]; then
-  ln -sf /usr/java/latest/jre/lib/amd64/libnpjp2.so \
-         /opt/lunar/plugins/ &&
-  # else
-  # We do not have firefox 1/2 or Seamonkey 1 anymore so no browser uses old plugin
-  # ln -sf /usr/java/latest/jre/plugin/amd64/libjavaplugin_jni.so \
-  #       /opt/lunar/plugins/
-  # fi &&
+  ln -sf /usr/java/latest/jre/lib/amd64/libnpjp2.so /opt/lunar/plugins/ &&
 
   # This didn't get created, dead link. Do it this way.
   ln -sf /usr/java/latest/jre/lib/amd64/server/libjvm.so /usr/lib/libjvm.so &&
diff --git a/compilers/sun-jdk/CONFIGURE b/compilers/sun-jdk/CONFIGURE
deleted file mode 100644
index 6b46697..0000000
--- a/compilers/sun-jdk/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
- mquery NEWPLUGIN "Use new web browser plugin instead of old one ? (Yes if you use only firefox3 or need to run new applets)" n
diff --git a/compilers/sun-jre/BUILD b/compilers/sun-jre/BUILD
index 02bf033..4b2b5d7 100644
--- a/compilers/sun-jre/BUILD
+++ b/compilers/sun-jre/BUILD
@@ -31,14 +31,7 @@
   # Always use new plugin.
   # Firefox 3, Seamonkey 2, Google chrome/inium use it
   # KDE3/4 Konqueror and Opera always use Java directly so do not use any plugin
-  # if [ $NEWPLUGIN == 'y' ]; then
-  ln -sf /usr/java/latest/lib/i386/libnpjp2.so \
-         /opt/lunar/plugins/ &&
-  # else
-  # We do not have firefox 1/2 or Seamonkey 1 anymore so no browser uses old plugin
-  # ln -sf /usr/java/latest/plugin/i386/ns7/libjavaplugin_oji.so \
-  #       /opt/lunar/plugins/
-  # fi &&
+  ln -sf /usr/java/latest/lib/i386/libnpjp2.so /opt/lunar/plugins/ &&
 
   # This didn't get created, dead link. Do it this way.
   ln -sf /usr/java/latest/lib/i386/server/libjvm.so /usr/lib/libjvm.so &&
diff --git a/compilers/sun-jre/BUILD.x86_64 b/compilers/sun-jre/BUILD.x86_64
index 4eb314e..fac9977 100644
--- a/compilers/sun-jre/BUILD.x86_64
+++ b/compilers/sun-jre/BUILD.x86_64
@@ -31,14 +31,7 @@
   # Always use new plugin.
   # Firefox 3, Seamonkey 2, Google chrome/inium use it
   # KDE3/4 Konqueror and Opera always use Java directly so do not use any plugin
-  # if [ $NEWPLUGIN == 'y' ]; then
-  ln -sf /usr/java/latest/lib/amd64/libnpjp2.so \
-         /opt/lunar/plugins/ &&
-  # else
-  # We do not have firefox 1/2 or Seamonkey 1 anymore so no browser uses old plugin
-  # ln -sf /usr/java/latest/plugin/amd64/ns7/libjavaplugin_oji.so \
-  #       /opt/lunar/plugins/
-  # fi &&
+  ln -sf /usr/java/latest/lib/amd64/libnpjp2.so /opt/lunar/plugins/ &&
 
   # This didn't get created, dead link. Do it this way.
   ln -sf /usr/java/latest/lib/amd64/server/libjvm.so /usr/lib/libjvm.so &&
diff --git a/compilers/sun-jre/CONFIGURE b/compilers/sun-jre/CONFIGURE
deleted file mode 100644
index 6b46697..0000000
--- a/compilers/sun-jre/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
- mquery NEWPLUGIN "Use new web browser plugin instead of old one ? (Yes if you use only firefox3 or need to run new applets)" n
diff --git a/compilers/sun-jre/DETAILS b/compilers/sun-jre/DETAILS
index 95600c5..748e22b 100644
--- a/compilers/sun-jre/DETAILS
+++ b/compilers/sun-jre/DETAILS
@@ -1,13 +1,13 @@
           MODULE=sun-jre
-         VERSION=6u21
+         VERSION=6u22
         FVERSION=1.${VERSION/u/.0_}
           SOURCE=jre-$VERSION-linux-i586.bin
-      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=40907&/"
-      SOURCE_VFY=sha1:22373a2e86cce53536a4c801d5b128a106cd3eaf
+      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=42723&/"
+      SOURCE_VFY=sha1:9ecafd6d14bece66d763ab8a9c5d21aa51e9da66
         WEB_SITE=http://www.java.com/en/download/manual.jsp
          LICENSE="proprietary"
          ENTERED=20061113
-         UPDATED=20100718
+         UPDATED=20101021
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"
diff --git a/compilers/sun-jre/DETAILS.x86_64 b/compilers/sun-jre/DETAILS.x86_64
index be5da7b..c36e114 100644
--- a/compilers/sun-jre/DETAILS.x86_64
+++ b/compilers/sun-jre/DETAILS.x86_64
@@ -1,13 +1,13 @@
           MODULE=sun-jre
-         VERSION=6u21
+         VERSION=6u22
         FVERSION=1.${VERSION/u/.0_}
           SOURCE=jre-$VERSION-linux-x64.bin
-      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=40911&/"
-      SOURCE_VFY=sha1:6ad666f9230e06312e32ef0d5680975309cf538b
+      SOURCE_URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=42727&/"
+      SOURCE_VFY=sha1:b77776b8549c9b3018b03eddd58603eb4474147e
         WEB_SITE=http://www.java.com/en/download/manual.jsp
          LICENSE="proprietary"
          ENTERED=20061113
-         UPDATED=20100718
+         UPDATED=20101021
            FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"

More information about the Lunar-commits mailing list