[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Florin Braescu]

commit 85e031c5751235406a4fb901b7fddc5396ba3cb1
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sat, 28 Jul 2012 11:14:25 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/85e031c5751235406a4fb901b7fddc5396ba3cb1

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  compilers/sun-jdk/DEPENDS                                    +0/-3     
  compilers/sun-jdk/PRE_BUILD                                  +4/-0     
  compilers/sun-jre/DEPENDS                                    +0/-3     
  compilers/sun-jre/PRE_BUILD                                  +12/-3    
  4 files changed, 0 insertions (+), 0 deletions (-)

--- a/compilers/sun-jdk/DEPENDS
+++ b/compilers/sun-jdk/DEPENDS
@@ -1,4 +1 @@
 depends unzip
-# the download location redirects to HTTPS protocol
-# and we need to make sure wget verifies the certificate
-depends ca-certificates
--- a/compilers/sun-jdk/PRE_BUILD
+++ b/compilers/sun-jdk/PRE_BUILD
@@ -10,6 +10,10 @@ fi &&
 JDK_ARCHIVE=jdk-$VERSION-linux-$bits.tar.gz &&
 JDK_POLICY=UnlimitedJCEPolicyJDK7.zip &&
 
+if ! module_installed ca-certificates; then
+   message "${PROBLEM_COLOR}If the following downloads fail, please make sure you build wget with SSL support and and got ca-certificates installed${DEFAULT_COLOR}"
+fi
+
 wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jdk/$FVERSION/$JDK_ARCHIVE &&
 wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jce/7/$JDK_POLICY &&
 
--- a/compilers/sun-jre/DEPENDS
+++ b/compilers/sun-jre/DEPENDS
@@ -1,4 +1 @@
 depends unzip
-# the download location redirects to HTTPS protocol
-# and we need to make sure wget verifies the certificate
-depends ca-certificates
--- a/compilers/sun-jre/PRE_BUILD
+++ b/compilers/sun-jre/PRE_BUILD
@@ -1,15 +1,24 @@
 default_pre_build &&
+
 CURDIR="`pwd`" &&
 cd $SOURCE_CACHE &&
+
 JDK_POLICY=UnlimitedJCEPolicyJDK7.zip &&
+if ! module_installed ca-certificates; then
+   message "${PROBLEM_COLOR}If the following download fails, please make sure you build wget with SSL support and and got ca-certificates installed${DEFAULT_COLOR}"
+fi
 wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jce/7/$JDK_POLICY &&
+
 JCE_SHA1_VFY='7d3c9ee89536b82cd21c680088b1bced16017253  UnlimitedJCEPolicyJDK7.zip' &&
 JCE_SHA1_TST=`sha1sum UnlimitedJCEPolicyJDK7.zip` &&
+
 if [ "$JCE_SHA1_VFY" != "$JCE_SHA1_TST" ]; then
-message "Bad checksum of $JDK_POLICY file - deleting"
-rm -f $JDK_POLICY
-exit 1
+   message "Bad checksum of $JDK_POLICY file - deleting"
+   rm -f $JDK_POLICY
+   exit 1
 fi &&
+
 cd $SOURCE_DIRECTORY/lib/security &&
 unzip $SOURCE_CACHE/$JDK_POLICY &&
+
 cd "$CURDIR"