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

Fri May 4 22:35:53 CEST 2012

commit e98e81ce8c86639e562839ed0184173e82868ca2
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri May 4 22:35:53 2012 +0200

    sun-jre: updated to 7u4
---
 compilers/sun-jdk/POST_REMOVE    |    2 +-
 compilers/sun-jre/BUILD          |   15 ++++++++++++++-
 compilers/sun-jre/CONFIGURE      |    6 ++++++
 compilers/sun-jre/DETAILS        |   11 ++++-------
 compilers/sun-jre/DETAILS.x86_64 |   20 --------------------
 compilers/sun-jre/POST_REMOVE    |    2 +-
 compilers/sun-jre/PRE_BUILD      |   14 ++++++++++++++
 7 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/compilers/sun-jdk/POST_REMOVE b/compilers/sun-jdk/POST_REMOVE
index 1187205..8e7caad 100644
--- a/compilers/sun-jdk/POST_REMOVE
+++ b/compilers/sun-jdk/POST_REMOVE
@@ -1 +1 @@
-rm -rf /usr/java/jdk1.7.0
+rm -rf /usr/java/jdk1.7.0*
diff --git a/compilers/sun-jre/BUILD b/compilers/sun-jre/BUILD
index 4e19d90..71b370a 100644
--- a/compilers/sun-jre/BUILD
+++ b/compilers/sun-jre/BUILD
@@ -47,8 +47,21 @@
      ln -sf /usr/java/latest/lib/i386/libnpjp2.so /opt/lunar/plugins/
   fi &&
 
+  cd /usr/java/jre${DVERSION}/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-jre.rc &&
   echo export PATH=\"'$PATH':'$JAVA_HOME'/bin\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
-  install -m644 $SOURCE_DIRECTORY/sun-jre.rc /etc/profile.d/
+  install -m644 $SOURCE_DIRECTORY/sun-jre.rc /etc/profile.d/ &&
+
+  rm -rf /usr/java/jre${DVERSION}/jre${DVERSION} &&
+  rm -rf /usr/java/jre${DVERSION}/old.libraries
 
 ) > $C_FIFO 2>&1
diff --git a/compilers/sun-jre/CONFIGURE b/compilers/sun-jre/CONFIGURE
new file mode 100644
index 0000000..220f70f
--- /dev/null
+++ b/compilers/sun-jre/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-jre/DETAILS b/compilers/sun-jre/DETAILS
index 3d8a044..bb06dbc 100644
--- a/compilers/sun-jre/DETAILS
+++ b/compilers/sun-jre/DETAILS
@@ -1,15 +1,12 @@
           MODULE=sun-jre
-         VERSION=7u3
-        FVERSION=$VERSION-b04
-        DVERSION=1.7.0_03
-          SOURCE=jre-$VERSION-linux-i586.tar.gz
-      SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/$FVERSION
-      SOURCE_VFY=sha1:40496eea225fd89eb719563e3001b7561d8efb37
+         VERSION=7u4
+        FVERSION=$VERSION-b20
+        DVERSION=1.7.0_04
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/jre$DVERSION
         WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
          LICENSE="proprietary"
          ENTERED=20061113
-         UPDATED=20120220
+         UPDATED=20120503
            FUZZY=off
        LDD_CHECK=off
          ARCHIVE=off
diff --git a/compilers/sun-jre/DETAILS.x86_64 b/compilers/sun-jre/DETAILS.x86_64
deleted file mode 100644
index afdf494..0000000
--- a/compilers/sun-jre/DETAILS.x86_64
+++ /dev/null
@@ -1,20 +0,0 @@
-          MODULE=sun-jre
-         VERSION=7u3
-        FVERSION=$VERSION-b04
-        DVERSION=1.7.0_03
-          SOURCE=jre-$VERSION-linux-x64.tar.gz
-      SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/$FVERSION
-      SOURCE_VFY=sha1:8a7f5280392b442c6c930058b71fc6ba7692e9f2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/jre$DVERSION
-        WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
-         LICENSE="proprietary"
-         ENTERED=20061113
-         UPDATED=20120220
-           FUZZY=off
-       LDD_CHECK=off
-         ARCHIVE=off
-           SHORT="SUN java runtime environment"
-cat << EOF
-sun-jre is only the run time environment, should be sufficient for
-most users.
-EOF
diff --git a/compilers/sun-jre/POST_REMOVE b/compilers/sun-jre/POST_REMOVE
index fd21087..db6db96 100644
--- a/compilers/sun-jre/POST_REMOVE
+++ b/compilers/sun-jre/POST_REMOVE
@@ -1 +1 @@
-rm -rf /usr/java/jre1.7.0
+rm -rf /usr/java/jre1.7.0*
diff --git a/compilers/sun-jre/PRE_BUILD b/compilers/sun-jre/PRE_BUILD
new file mode 100644
index 0000000..767349e
--- /dev/null
+++ b/compilers/sun-jre/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/jre-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/jre-7u4-linux-$bits.tar.gz
+cd $SOURCE_DIRECTORY/lib/security
+unzip $SOURCE_CACHE/UnlimitedJCEPolicyJDK7.zip
+cd $CURDIR
