From 18aad24c835744cac4da326339c697641f8b4195 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <vszakats@users.noreply.github.com>
Date: Thu, 19 Oct 2017 18:39:25 +0000
Subject: URL upgrades and fixes

---
 plugins/gcc4/gcc4-overlay.mk | 4 ++--
 plugins/gcc6/gcc6-overlay.mk | 2 +-
 plugins/gcc7/gcc7-overlay.mk | 2 +-
 src/cblas.mk                 | 2 +-
 src/cloog.mk                 | 2 +-
 src/gnutls.mk                | 4 ++--
 src/hdf-eos2.mk              | 2 +-
 src/isl.mk                   | 4 ++--
 src/lapack.mk                | 2 +-
 src/libffi.mk                | 2 +-
 src/opencv.mk                | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/gcc4/gcc4-overlay.mk b/plugins/gcc4/gcc4-overlay.mk
index 3746346..5c0fe68 100644
--- a/plugins/gcc4/gcc4-overlay.mk
+++ b/plugins/gcc4/gcc4-overlay.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.bastoul.net/cloog/pages/download/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 $(PKG)_DEPS_$(BUILD) := gmp isl
 
@@ -19,4 +19,4 @@ $(PKG)_CHECKSUM := f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
diff --git a/plugins/gcc6/gcc6-overlay.mk b/plugins/gcc6/gcc6-overlay.mk
index e1476b9..9a66cb1 100644
--- a/plugins/gcc6/gcc6-overlay.mk
+++ b/plugins/gcc6/gcc6-overlay.mk
@@ -14,7 +14,7 @@ $(PKG)_CHECKSUM := 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae97012
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
 
 PKG             := gcc
 $(PKG)_VERSION  := 6.4.0
diff --git a/plugins/gcc7/gcc7-overlay.mk b/plugins/gcc7/gcc7-overlay.mk
index 3dad13d..737549e 100644
--- a/plugins/gcc7/gcc7-overlay.mk
+++ b/plugins/gcc7/gcc7-overlay.mk
@@ -14,7 +14,7 @@ $(PKG)_CHECKSUM := 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae97012
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
 
 PKG             := gcc
 $(PKG)_VERSION  := 7.2.0
diff --git a/src/cblas.mk b/src/cblas.mk
index 209cb65..91e8918 100644
--- a/src/cblas.mk
+++ b/src/cblas.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 0f6354fd67fabd909baf57ced2ef84e962db58fae126e4f41b21dd4fec60a
 $(PKG)_SUBDIR   := CBLAS
 $(PKG)_FILE     := $(PKG).tgz
 $(PKG)_URL      := http://www.netlib.org/blas/blast-forum/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.eq.uc.pt/pub/software/math/netlib/blas/blast-forum/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://ftp.eq.uc.pt/software/math/netlib/blas/blast-forum/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc blas
 
 define $(PKG)_UPDATE
diff --git a/src/cloog.mk b/src/cloog.mk
index 3f9259a..2c99ef5 100644
--- a/src/cloog.mk
+++ b/src/cloog.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a7
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.bastoul.net/cloog/pages/download/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc gmp isl
 
 define $(PKG)_UPDATE
diff --git a/src/gnutls.mk b/src/gnutls.mk
index b255a19..75b0014 100644
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 046081108b8b1fe455a13a4c5a4eaa0368e185b678f1670fe09a11a2d7ecf
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://gnupg.org/ftp/gcrypt/gnutls/v3.5/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnutls/v3.5/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc gettext gmp libgnurx libidn2 libunistring nettle zlib
 
 define $(PKG)_UPDATE
@@ -20,7 +20,7 @@ endef
 
 define $(PKG)_BUILD
     # AI_ADDRCONFIG referenced by src/serv.c but not provided by mingw.
-    # Value taken from https://msdn.microsoft.com/en-us/library/windows/desktop/ms737530%28v=vs.85%29.aspx
+    # Value taken from https://msdn.microsoft.com/library/windows/desktop/ms737530
     cd '$(1)' && autoreconf -fi && ./configure \
         $(MXE_CONFIGURE_OPTS) \
         --disable-rpath \
diff --git a/src/hdf-eos2.mk b/src/hdf-eos2.mk
index 700eea0..f0e30cf 100644
--- a/src/hdf-eos2.mk
+++ b/src/hdf-eos2.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := hdf-eos2
-$(PKG)_WEBSITE  := https://hdfeos.org/software/library.php
+$(PKG)_WEBSITE  := http://hdfeos.org/software/library.php
 $(PKG)_DESCR    := HDF-EOS2
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 19v1.00
diff --git a/src/isl.mk b/src/isl.mk
index a4625b4..6532aa9 100644
--- a/src/isl.mk
+++ b/src/isl.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 8ceebbf4d9a81afa2b4449113cee4b7cb14a687d7a549a963deb5e2a41458
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 $(PKG)_DEPS     := gcc gmp
 
@@ -19,7 +19,7 @@ $(PKG)_DEPS_$(BUILD) := gmp
 # while in gcc4 series specific versions are required:
 # https://web.archive.org/web/20141031011459/https://gcc.gnu.org/install/prerequisites.html
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'ftp://gcc.gnu.org/pub/gcc/infrastructure/' | \
+    $(WGET) -q -O- 'https://gcc.gnu.org/pub/gcc/infrastructure/' | \
     $(SED) -n 's,.*isl-\([0-9][^>]*\)\.tar.*,\1,p' | \
     $(SORT) -V |
     tail -1
diff --git a/src/lapack.mk b/src/lapack.mk
index ddfb3bf..ded80ad 100644
--- a/src/lapack.mk
+++ b/src/lapack.mk
@@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := a9a0082c918fe14e377bbd570057616768dca76cbdc713457d8199aaa233f
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
 $(PKG)_URL      := http://www.netlib.org/$(PKG)/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://ftp.eq.uc.pt/pub/software/math/netlib/$(PKG)/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://ftp.eq.uc.pt/software/math/netlib/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc cblas
 
 define $(PKG)_UPDATE
diff --git a/src/libffi.mk b/src/libffi.mk
index 27bbbd5..267985a 100644
--- a/src/libffi.mk
+++ b/src/libffi.mk
@@ -9,7 +9,7 @@ $(PKG)_GH_CONF  := atgreen/libffi, v
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.mirrorservice.org/sites/sourceware.org/pub/$(PKG)/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://sourceware.org/pub/$(PKG)/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://sourceware.org/pub/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_BUILD
diff --git a/src/opencv.mk b/src/opencv.mk
index 5a90727..e82e426 100644
--- a/src/opencv.mk
+++ b/src/opencv.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := opencv
-$(PKG)_WEBSITE  := http://opencv.org/
+$(PKG)_WEBSITE  := https://opencv.org/
 $(PKG)_DESCR    := OpenCV
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3.3.0
-- 
cgit v0.12