scripts: Update download locations

This change updates the download locations to default to the official
download site.

For gcc and gdb, also separate out the linaro download locations so that
if you are downloading the linaro variant, it skips trying to download
from the official gcc mirror.

This commit closes #3

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

17 files changed, 52 insertions, 47 deletions

diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index 79a1add..1cc8739 100644
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -9,8 +9,8 @@ do_binutils_get() {
                      "${CT_BINUTILS_CUSTOM_LOCATION}"
     else
         CT_GetFile "binutils-${CT_BINUTILS_VERSION}"                                        \
-                   {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils   \
-                   ftp://gcc.gnu.org/pub/binutils/{releases,snapshots}
+                   ftp://{sourceware.org,gcc.gnu.org}/pub/binutils/{releases,snapshots}     \
+                   {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils
     fi
 
     if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 9dbc41e..ff82421 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -19,16 +19,17 @@ do_cc_get() {
                           |sed -r -e 's/-.*//;'         \
                         )"
 
-        # Ah! gcc folks are kind of 'different': they store the tarballs in
-        # subdirectories of the same name!
-        # Arrgghh! Some of those versions does not follow this convention:
-        # gcc-3.3.3 lives in releases/gcc-3.3.3, while gcc-2.95.* isn't in a
-        # subdirectory!
-        CT_GetFile "gcc-${CT_CC_VERSION}"                                                       \
-                   {ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/gcc-${CT_CC_VERSION}}         \
-                   ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/releases/gcc-${CT_CC_VERSION} \
-                   ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION}                         \
+	# The official gcc hosts put gcc under a gcc/release/ directory,
+	# whereas the mirrors put it in the gcc/ directory.
+	# Also, Split out linaro mirrors, so that downloads happen faster.
+        if [ x"${linaro_version}" = x"" ]; then
+            CT_GetFile "gcc-${CT_CC_VERSION}"                                                \
+                ftp://{gcc.gnu.org,sourceware.org}/pub/gcc/releases/gcc-${CT_CC_VERSION}     \
+                {http,ftp,https}://ftp.gnu.org/gnu/gcc/gcc-${CT_CC_VERSION}                  \
+        else
+            CT_GetFile "gcc-${CT_CC_VERSION}"                                                \
                    "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
+        fi
 
     fi # ! custom location
     # Starting with GCC 4.3, ecj is used for Java, and will only be
diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh
index 8674f16..beb75ea 100644
--- a/scripts/build/companion_libs/100-gmp.sh
+++ b/scripts/build/companion_libs/100-gmp.sh
@@ -12,7 +12,9 @@ if [ "${CT_GMP}" = "y" ]; then
 
 # Download GMP
 do_gmp_get() {
-    CT_GetFile "gmp-${CT_GMP_VERSION}" {ftp,http}://{ftp.sunet.se/pub,ftp.gnu.org}/gnu/gmp
+    CT_GetFile "gmp-${CT_GMP_VERSION}"         \
+        https://gmplib.org/download/gmp        \
+        {http,ftp,https}://ftp.gnu.org/gnu/gmp
 }
 
 # Extract GMP
diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh
index 1a917c2..2fb03aa 100644
--- a/scripts/build/companion_libs/110-mpfr.sh
+++ b/scripts/build/companion_libs/110-mpfr.sh
@@ -12,8 +12,9 @@ if [ "${CT_MPFR}" = "y" ]; then
 
 # Download MPFR
 do_mpfr_get() {
-    CT_GetFile "mpfr-${CT_MPFR_VERSION}" http://www.mpfr.org/mpfr-current/  \
-                                 http://www.mpfr.org/mpfr-${CT_MPFR_VERSION}/
+    CT_GetFile "mpfr-${CT_MPFR_VERSION}"            \
+        http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} \
+        {http,ftp,https}://ftp.gnu.org/gnu/mpfr
 }
 
 # Extract MPFR
diff --git a/scripts/build/companion_libs/120-ppl.sh b/scripts/build/companion_libs/120-ppl.sh
index 87d1512..c95ea56 100644
--- a/scripts/build/companion_libs/120-ppl.sh
+++ b/scripts/build/companion_libs/120-ppl.sh
@@ -12,8 +12,9 @@ if [ "${CT_PPL}" = "y" ]; then
 
 # Download PPL
 do_ppl_get() {
-    CT_GetFile "ppl-${CT_PPL_VERSION}"  \
-        http://bugseng.com/products/ppl/download/ftp/releases/${CT_PPL_VERSION}
+    CT_GetFile "ppl-${CT_PPL_VERSION}"                                          \
+        http://bugseng.com/products/ppl/download/ftp/releases/${CT_PPL_VERSION} \
+        ftp://ftp.cs.unipr.it/pub/ppl/releases/${CT_PPL_VERSION}
 }
 
 # Extract PPL
diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh
index 48b15df..6c06ab0 100644
--- a/scripts/build/companion_libs/121-isl.sh
+++ b/scripts/build/companion_libs/121-isl.sh
@@ -12,9 +12,8 @@ if [ "${CT_ISL}" = "y" ]; then
 
 # Download ISL
 do_isl_get() {
-    CT_GetFile "isl-${CT_ISL_VERSION}"  \
-        ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/ \
-        http://mirrors.kernel.org/sources.redhat.com/gcc/infrastructure
+    CT_GetFile "isl-${CT_ISL_VERSION}" \
+        http://isl.gforge.inria.fr
 }
 
 # Extract ISL
diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh
index fe5ba13..1a3b91a 100644
--- a/scripts/build/companion_libs/130-cloog.sh
+++ b/scripts/build/companion_libs/130-cloog.sh
@@ -24,8 +24,7 @@ if [ "${CT_CLOOG}" = "y" ]; then
 # Download CLooG
 do_cloog_get() {
     CT_GetFile "$(cloog_basename_version)"          \
-        http://www.bastoul.net/cloog/pages/download \
-        ftp://gcc.gnu.org/pub/gcc/infrastructure
+        http://www.bastoul.net/cloog/pages/download
 }
 
 # Extract CLooG
diff --git a/scripts/build/companion_libs/140-mpc.sh b/scripts/build/companion_libs/140-mpc.sh
index 9ceb7e5..03071d3 100644
--- a/scripts/build/companion_libs/140-mpc.sh
+++ b/scripts/build/companion_libs/140-mpc.sh
@@ -13,7 +13,7 @@ if [ "${CT_MPC}" = "y" ]; then
 # Download MPC
 do_mpc_get() {
     CT_GetFile "mpc-${CT_MPC_VERSION}" .tar.gz      \
-        http://www.multiprecision.org/mpc/download
+        {http,ftp,https}://ftp.gnu.org/gnu/mpc
 }
 
 # Extract MPC
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh
index 6524e35..601e267 100644
--- a/scripts/build/companion_tools/050-make.sh
+++ b/scripts/build/companion_tools/050-make.sh
@@ -3,8 +3,8 @@
 CT_MAKE_VERSION=3.81
 
 do_companion_tools_make_get() {
-    CT_GetFile "make-${CT_MAKE_VERSION}" \
-               {http,ftp}://ftp.gnu.org/gnu/make
+    CT_GetFile "make-${CT_MAKE_VERSION}"        \
+        {http,ftp,https}://ftp.gnu.org/gnu/make
 }
 
 do_companion_tools_make_extract() {
diff --git a/scripts/build/companion_tools/100-m4.sh b/scripts/build/companion_tools/100-m4.sh
index ff4e19f..dd8380e 100644
--- a/scripts/build/companion_tools/100-m4.sh
+++ b/scripts/build/companion_tools/100-m4.sh
@@ -3,8 +3,8 @@
 CT_M4_VERSION=1.4.13
 
 do_companion_tools_m4_get() {
-    CT_GetFile "m4-${CT_M4_VERSION}" \
-               {ftp,http}://ftp.gnu.org/gnu/m4
+    CT_GetFile "m4-${CT_M4_VERSION}"          \
+        {http,ftp,https}://ftp.gnu.org/gnu/m4
 }
 
 do_companion_tools_m4_extract() {
diff --git a/scripts/build/companion_tools/200-autoconf.sh b/scripts/build/companion_tools/200-autoconf.sh
index 1d3317f..78e1b32 100644
--- a/scripts/build/companion_tools/200-autoconf.sh
+++ b/scripts/build/companion_tools/200-autoconf.sh
@@ -3,8 +3,8 @@
 CT_AUTOCONF_VERSION=2.65
 
 do_companion_tools_autoconf_get() {
-    CT_GetFile "autoconf-${CT_AUTOCONF_VERSION}" \
-               {ftp,http}://ftp.gnu.org/gnu/autoconf
+    CT_GetFile "autoconf-${CT_AUTOCONF_VERSION}"    \
+        {http,ftp,https}://ftp.gnu.org/gnu/autoconf
 }
 
 do_companion_tools_autoconf_extract() {
diff --git a/scripts/build/companion_tools/300-automake.sh b/scripts/build/companion_tools/300-automake.sh
index 029bb83..ae0c49b 100644
--- a/scripts/build/companion_tools/300-automake.sh
+++ b/scripts/build/companion_tools/300-automake.sh
@@ -3,8 +3,8 @@
 CT_AUTOMAKE_VERSION=1.11.1
 
 do_companion_tools_automake_get() {
-    CT_GetFile "automake-${CT_AUTOMAKE_VERSION}" \
-               {ftp,http}://ftp.gnu.org/gnu/automake
+    CT_GetFile "automake-${CT_AUTOMAKE_VERSION}"    \
+        {http,ftp,https}://ftp.gnu.org/gnu/automake
 }
 
 do_companion_tools_automake_extract() {
diff --git a/scripts/build/companion_tools/400-libtool.sh b/scripts/build/companion_tools/400-libtool.sh
index 47a1e92..9ddf00f 100644
--- a/scripts/build/companion_tools/400-libtool.sh
+++ b/scripts/build/companion_tools/400-libtool.sh
@@ -3,8 +3,8 @@
 CT_LIBTOOL_VERSION=2.2.6b
 
 do_companion_tools_libtool_get() {
-    CT_GetFile "libtool-${CT_LIBTOOL_VERSION}" \
-               {ftp,http}://ftp.gnu.org/gnu/libtool
+    CT_GetFile "libtool-${CT_LIBTOOL_VERSION}"     \
+        {http,ftp,https}://ftp.gnu.org/gnu/libtool
 }
 
 do_companion_tools_libtool_extract() {
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index 029a58f..0c63724 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -51,16 +51,20 @@ do_debug_gdb_get() {
         if [ "${CT_GDB_CUSTOM}" = "y" ]; then
             CT_GetCustom "gdb" "${CT_GDB_VERSION}" "${CT_GDB_CUSTOM_LOCATION}"
         else
-            CT_GetFile "gdb-${CT_GDB_VERSION}"                          \
-                       {ftp,http}://ftp.gnu.org/pub/gnu/gdb             \
-                       ftp://sources.redhat.com/pub/gdb/{,old-}releases \
-                       "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
+            if [ x"${linaro_release}" = x"" ]; then
+                CT_GetFile "gdb-${CT_GDB_VERSION}"                      \
+                    ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases \
+                    {http,ftp,https}://ftp.gnu.org/pub/gnu/gdb          \
+            else
+                CT_GetFile "gdb-${CT_GDB_VERSION}"                                    \
+                    "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
+            fi
         fi
     fi
 
     if [ "${need_ncurses_src}" = "y" ]; then
         CT_GetFile "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}" .tar.gz  \
-                   {ftp,http}://ftp.gnu.org/pub/gnu/ncurses \
+                   {http,ftp,https}://ftp.gnu.org/pub/gnu/ncurses     \
                    ftp://invisible-island.net/ncurses
     fi
 
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index 44f8af2..01e8081 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/scripts/build/debug/400-ltrace.sh
@@ -2,7 +2,7 @@
 
 do_debug_ltrace_get() {
     CT_GetFile "ltrace_${CT_LTRACE_VERSION}.orig" .tar.gz               \
-               {ftp,http}://ftp.de.debian.org/debian/pool/main/l/ltrace/
+               {ftp,http}://ftp.debian.org/debian/pool/main/l/ltrace/
     # Create a link so that the following steps are easier to do:
     CT_Pushd "${CT_TARBALLS_DIR}"
     ltrace_ext=$(CT_GetFileExtension "ltrace_${CT_LTRACE_VERSION}.orig")
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index 76fb98c..864562e 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -49,7 +49,7 @@ do_kernel_get() {
             2.6.*)  rel_dir=v2.6;;
             3.*)    rel_dir=v3.x;;
         esac
-        korg_base="http://ftp.kernel.org/pub/linux/kernel/${rel_dir}"
+        korg_base="http://www.kernel.org/pub/linux/kernel/${rel_dir}"
         CT_GetFile "linux-${CT_KERNEL_VERSION}"         \
                    "${korg_base}"                       \
                    "${korg_base}/longterm/v${k_ver}"    \
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 47731e7..7bc47c5 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -19,10 +19,9 @@ do_libc_get() {
     addons_list=($(do_libc_add_ons_list " "))
 
     # Main source
-    CT_GetFile "glibc-${CT_LIBC_VERSION}"               \
-               {ftp,http}://ftp.gnu.org/gnu/glibc       \
-               ftp://gcc.gnu.org/pub/glibc/releases     \
-               ftp://gcc.gnu.org/pub/glibc/snapshots
+    CT_GetFile "glibc-${CT_LIBC_VERSION}"                                        \
+               {http,ftp,https}://ftp.gnu.org/gnu/glibc                          \
+               ftp://{sourceware.org,gcc.gnu.org}/pub/glibc/{releases,snapshots}
 
     # C library addons
     for addon in "${addons_list[@]}"; do
@@ -37,10 +36,9 @@ do_libc_get() {
             ports:*)    continue;;
         esac
 
-        if ! CT_GetFile "glibc-${addon}-${CT_LIBC_VERSION}"     \
-                        {ftp,http}://ftp.gnu.org/gnu/glibc      \
-                        ftp://gcc.gnu.org/pub/glibc/releases    \
-                        ftp://gcc.gnu.org/pub/glibc/snapshots
+        if ! CT_GetFile "glibc-${addon}-${CT_LIBC_VERSION}"                      \
+               {http,ftp,https}://ftp.gnu.org/gnu/glibc                          \
+               ftp://{sourceware.org,gcc.gnu.org}/pub/glibc/{releases,snapshots}
         then
             # Some add-ons are bundled with glibc, others are
             # bundled in their own tarball. Eg. NPTL is internal,