[Lunar-commits] <moonbase> sun-jdk: updated to 7u4

[Zbigniew Luszpinski]

commit ae0e4da862280c685bd1dda7a43c58f6a4475143
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri May 4 21:04:10 2012 +0200

    sun-jdk: updated to 7u4
---
 compilers/sun-jdk/BUILD          |   15 ++++++++++++++-
 compilers/sun-jdk/CONFIGURE      |    6 ++++++
 compilers/sun-jdk/DETAILS        |   11 ++++-------
 compilers/sun-jdk/DETAILS.x86_64 |   19 -------------------
 compilers/sun-jdk/PRE_BUILD      |   14 ++++++++++++++
 5 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/compilers/sun-jdk/BUILD b/compilers/sun-jdk/BUILD
index fecd483..a8c5cdf 100644
--- a/compilers/sun-jdk/BUILD
+++ b/compilers/sun-jdk/BUILD
@@ -47,8 +47,21 @@
      ln -sf /usr/java/latest/jre/lib/i386/libnpjp2.so /opt/lunar/plugins/
   fi &&
 
+  cd /usr/java/jdk${DVERSION}/jre/lib/security &&
+  if [ JCEYES == "y" ]; then
+    rm -f US_export_policy.jar local_policy.jar
+    ln -s UnlimitedJCEPolicy/US_export_policy.jar US_export_policy.jar
+    ln -s UnlimitedJCEPolicy/local_policy.jar local_policy.jar
+  else
+    rm -rf UnlimitedJCEPolicy
+  fi   &&
+  cd - &&
+
   echo export JAVA_HOME=\"/usr/java/latest\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
   echo export PATH=\"'$PATH':'$JAVA_HOME'/bin\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
-  install -m644 $SOURCE_DIRECTORY/sun-jdk.rc /etc/profile.d/
+  install -m644 $SOURCE_DIRECTORY/sun-jdk.rc /etc/profile.d/ &&
+
+  rm -rf /usr/java/jdk${DVERSION}/jdk${DVERSION} &&
+  rm -rf /usr/java/jdk${DVERSION}/old.libraries
 
 ) > $C_FIFO 2>&1
diff --git a/compilers/sun-jdk/CONFIGURE b/compilers/sun-jdk/CONFIGURE
new file mode 100644
index 0000000..220f70f
--- /dev/null
+++ b/compilers/sun-jdk/CONFIGURE
@@ -0,0 +1,6 @@
+mquery JCEYES "Due to import control restrictions of some countries,
+ strong but limited cryptography have be to used by default.
+ An unlimited strength version of these files indicating no restrictions
+ on cryptographic strengths is available for those living
+ in eligible countries (most countries).
+ If you are allowed to use unlimited strength choose y" y
diff --git a/compilers/sun-jdk/DETAILS b/compilers/sun-jdk/DETAILS
index b73298a..65a7537 100644
--- a/compilers/sun-jdk/DETAILS
+++ b/compilers/sun-jdk/DETAILS
@@ -1,15 +1,12 @@
           MODULE=sun-jdk
-         VERSION=7u3
-        FVERSION=$VERSION-b04
-        DVERSION=1.7.0_03
-          SOURCE=jdk-$VERSION-linux-i586.tar.gz
-      SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/$FVERSION
-      SOURCE_VFY=sha1:15c97191c8fd58d74f36e84eb4f65371be573cf3
+         VERSION=7u4
+        FVERSION=$VERSION-b20
+        DVERSION=1.7.0_04
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk$DVERSION
         WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
          LICENSE="proprietary"
          ENTERED=20070210
-         UPDATED=20120220
+         UPDATED=20120503
            FUZZY=off
        LDD_CHECK=off
          ARCHIVE=off
diff --git a/compilers/sun-jdk/DETAILS.x86_64 b/compilers/sun-jdk/DETAILS.x86_64
deleted file mode 100644
index ce29bcd..0000000
--- a/compilers/sun-jdk/DETAILS.x86_64
+++ /dev/null
@@ -1,19 +0,0 @@
-          MODULE=sun-jdk
-         VERSION=7u3
-        FVERSION=$VERSION-b04
-        DVERSION=1.7.0_03
-          SOURCE=jdk-$VERSION-linux-x64.tar.gz
-      SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/$FVERSION
-      SOURCE_VFY=sha1:163fdfddfb7a4d6df1181acffed17aa7aab6835b
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk$DVERSION
-        WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
-         LICENSE="proprietary"
-         ENTERED=20070210
-         UPDATED=20120220
-           FUZZY=off
-       LDD_CHECK=off
-         ARCHIVE=off
-           SHORT="SUN java runtime environment"
-cat << EOF
-sun-jdk is a full features Java SDK including a Java runtime environment.
-EOF
diff --git a/compilers/sun-jdk/PRE_BUILD b/compilers/sun-jdk/PRE_BUILD
new file mode 100644
index 0000000..d5306b9
--- /dev/null
+++ b/compilers/sun-jdk/PRE_BUILD
@@ -0,0 +1,14 @@
+CURDIR=`pwd`
+cd $SOURCE_CACHE
+if [ "$(arch)" == "x86_64" ]; then
+bits=x64
+else
+bits=i586
+fi
+wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jdk/7u4-b20/jdk-7u4-linux-$bits.tar.gz
+wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip
+cd $BUILD_DIRECTORY
+tar -xzpvf $SOURCE_CACHE/jdk-7u4-linux-$bits.tar.gz
+cd $SOURCE_DIRECTORY/jre/lib/security
+unzip $SOURCE_CACHE/UnlimitedJCEPolicyJDK7.zip
+cd $CURDIR