From b39ded541d6d794db344ed9ad70f326ac7eb6ead Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Tue, 22 Dec 2015 12:17:05 +0000
Subject: [PATCH 1/2] 8145990: Move sun.misc math support classes to
 jdk.internal.math

Reviewed-by: bpb, darcy
---
 modules.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules.xml b/modules.xml
index e22f2141860..161181bf102 100644
--- a/modules.xml
+++ b/modules.xml
@@ -222,6 +222,10 @@
       <name>jdk.internal.jimage.decompressor</name>
       <to>jdk.dev</to>
     </export>
+    <export>
+      <name>jdk.internal.math</name>
+      <to>java.desktop</to>
+    </export>
     <export>
       <name>jdk.internal.misc</name>
       <to>java.corba</to>

From 9db7585276835bbb87199cf06b34dbc7d6f6a5bb Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 23 Dec 2015 10:00:37 +0100
Subject: [PATCH 2/2] 8146002: Need to support mirrors for bootstrapping Jib

Reviewed-by: ihse, tbell
---
 common/bin/jib.sh | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/common/bin/jib.sh b/common/bin/jib.sh
index 0fc60e9e76f..454d78ce1d7 100644
--- a/common/bin/jib.sh
+++ b/common/bin/jib.sh
@@ -32,7 +32,7 @@ installed_jib_script=${mydir}/../../.jib/jib
 install_data=${mydir}/../../.jib/.data
 
 setup_url() {
-    if [ -f "~/.config/jib/jib.conf" ]; then
+    if [ -f ~/.config/jib/jib.conf ]; then
         source ~/.config/jib/jib.conf
     fi
 
@@ -50,6 +50,9 @@ setup_url() {
     if [ -n "${JIB_SERVER}" ]; then
         jib_server="${JIB_SERVER}"
     fi
+    if [ -n "${JIB_SERVER_MIRRORS}" ]; then
+        jib_server_mirrors="${JIB_SERVER_MIRRORS}"
+    fi
     if [ -n "${JIB_REPOSITORY}" ]; then
         jib_repository="${JIB_REPOSITORY}"
     fi
@@ -70,8 +73,9 @@ setup_url() {
         jib_url="${JIB_URL}"
         data_string="${jib_url}"
     else
-        data_string="${jib_repository}/${jib_organization}/${jib_module}/${jib_revision}/${jib_module}-${jib_revision}.${jib_ext}"
-        jib_url="${jib_server}/${data_string}"
+        jib_path="${jib_repository}/${jib_organization}/${jib_module}/${jib_revision}/${jib_module}-${jib_revision}.${jib_ext}"
+        data_string="${jib_path}"
+        jib_url="${jib_server}/${jib_path}"
     fi
 }
 
@@ -104,7 +108,25 @@ install_jib() {
     ${getcmd} ${jib_url} > "${installed_jib_script}.gz"
     if [ ! -s "${installed_jib_script}.gz" ]; then
         echo "Failed to download ${jib_url}"
-        exit 1
+        if [ -n "${jib_path}" -a -n "${jib_server_mirrors}" ]; then
+            OLD_IFS="${IFS}"
+            IFS=" ,"
+            for mirror in ${jib_server_mirrors}; do
+                echo "Trying mirror ${mirror}"
+                jib_url="${mirror}/${jib_path}"
+                ${getcmd} ${jib_url} > "${installed_jib_script}.gz"
+                if [ -s "${installed_jib_script}.gz" ]; then
+                    echo "Download from mirror successful"
+                    break
+                else
+                    echo "Failed to download ${jib_url}"
+                fi
+            done
+            IFS="${OLD_IFS}"
+        fi
+        if [ ! -s "${installed_jib_script}.gz" ]; then
+            exit 1
+        fi
     fi
     echo "Extracting JIB bootstrap script"
     rm -f "${installed_jib_script}"