From e467d9d1ecde181ca0ae2bdcb2e8301f8b4343af Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vszakats.net>
Date: Mon, 30 Jul 2018 06:27:30 +0000
Subject: Secure URLs

---
 LICENSE.md                 | 2 +-
 README.md                  | 2 +-
 docs/index.html            | 4 ++--
 plugins/luarocks/README.md | 2 +-
 plugins/luarocks/test.lua  | 2 +-
 src/blas.mk                | 2 +-
 src/cblas.mk               | 2 +-
 src/cc.mk                  | 2 +-
 src/gdal.mk                | 2 +-
 src/icu4c.mk               | 4 ++--
 src/jpeg.mk                | 6 +++---
 src/libshout.mk            | 4 ++--
 src/libvpx.mk              | 2 +-
 src/libwebp.mk             | 2 +-
 tools/build-pkg.lua        | 2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index f4d9897..9d05bb8 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -46,4 +46,4 @@ websites for further details.
 [issue-tracker]: https://github.com/mxe/mxe/issues
 [config.guess]: https://github.com/mxe/mxe/blob/master/ext/config.guess#L3-L27
 [gmsl]: https://github.com/mxe/mxe/blob/master/ext/gmsl#L8-L40
-[packages]: http://mxe.cc/#packages
+[packages]: https://mxe.cc/#packages
diff --git a/README.md b/README.md
index f9c1a42..4ac1c28 100644
--- a/README.md
+++ b/README.md
@@ -41,4 +41,4 @@ various target platforms, which:
       - i686: dw2
       - x86_64: sjlj
 
-Please see [mxe.cc](http://mxe.cc/) for further information and package support matrix.
+Please see [mxe.cc](https://mxe.cc/) for further information and package support matrix.
diff --git a/docs/index.html b/docs/index.html
index 9caab7e..9f3330d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2884,7 +2884,7 @@ endef</pre>
 
     <ul class="compact-list">
     <li>
-        <a href="https://mxe.cc">Website</a>
+        <a href="https://mxe.cc/">Website</a>
     </li>
     <li>
         <a href="https://github.com/mxe/mxe">Project on GitHub</a>
@@ -3034,7 +3034,7 @@ endef</pre>
         <a href="https://www.nongnu.org/galois/">Galois</a>
     </li>
     <li>
-        <a href="http://gcompris.net/">GCompris</a>
+        <a href="https://www.gcompris.net/">GCompris</a>
     </li>
     <li>
         <a href="https://www.nongnu.org/gta/">Generic Tagged Arrays</a>
diff --git a/plugins/luarocks/README.md b/plugins/luarocks/README.md
index 761fed2..902aae2 100644
--- a/plugins/luarocks/README.md
+++ b/plugins/luarocks/README.md
@@ -19,7 +19,7 @@ function `require`.
 Example:
 ```
 $ luarocks install luasocket
-$ lua -e 'http = require "socket.http"; print(http.request("http://mxe.cc"))'
+$ lua -e 'http = require "socket.http"; print(http.request("https://mxe.cc/"))'
 <!DOCTYPE html>
 ....
 ```
diff --git a/plugins/luarocks/test.lua b/plugins/luarocks/test.lua
index 1016231..acb3d80 100644
--- a/plugins/luarocks/test.lua
+++ b/plugins/luarocks/test.lua
@@ -2,7 +2,7 @@ local lpeg = require 'lpeg'
 assert(((lpeg.R('AZ'))^1):match("TEXT") == 5)
 
 local http = require "socket.http"
-assert(http.request("http://mxe.cc"):match('MXE'))
+assert(http.request("https://mxe.cc/"):match('MXE'))
 
 local ll = require 'llthreads2'
 local thread = ll.new("return 123")
diff --git a/src/blas.mk b/src/blas.mk
index 4df70d6..f581814 100644
--- a/src/blas.mk
+++ b/src/blas.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := blas
-$(PKG)_WEBSITE  := http://www.netlib.org/blas/
+$(PKG)_WEBSITE  := https://www.netlib.org/blas/
 $(PKG)_DESCR    := Reference BLAS (Basic Linear Algebra Subprograms)
 $(PKG)_IGNORE    = $(lapack_IGNORE)
 $(PKG)_VERSION   = $(lapack_VERSION)
diff --git a/src/cblas.mk b/src/cblas.mk
index 3c5c1b3..6c5af89 100644
--- a/src/cblas.mk
+++ b/src/cblas.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := cblas
-$(PKG)_WEBSITE  := http://www.netlib.org/blas/
+$(PKG)_WEBSITE  := https://www.netlib.org/blas/
 $(PKG)_DESCR    := C interface to Reference BLAS
 $(PKG)_IGNORE    = $(lapack_IGNORE)
 $(PKG)_VERSION   = $(lapack_VERSION)
diff --git a/src/cc.mk b/src/cc.mk
index 64a4d34..a5fbae0 100644
--- a/src/cc.mk
+++ b/src/cc.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := cc
-$(PKG)_WEBSITE  := https://mxe.cc
+$(PKG)_WEBSITE  := https://mxe.cc/
 $(PKG)_DESCR    := Dependency package for cross libraries
 $(PKG)_VERSION  := 1
 $(PKG)_DEPS     := gcc
diff --git a/src/gdal.mk b/src/gdal.mk
index 94a1342..5276bc0 100644
--- a/src/gdal.mk
+++ b/src/gdal.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := gdal
-$(PKG)_WEBSITE  := http://www.gdal.org/
+$(PKG)_WEBSITE  := https://www.gdal.org/
 $(PKG)_DESCR    := GDAL
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.2.3
diff --git a/src/icu4c.mk b/src/icu4c.mk
index 8589bc7..b51574f 100644
--- a/src/icu4c.mk
+++ b/src/icu4c.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := icu4c
-$(PKG)_WEBSITE  := http://site.icu-project.org/
+$(PKG)_WEBSITE  := https://ssl.icu-project.org/
 $(PKG)_DESCR    := ICU4C
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 56.1
@@ -9,7 +9,7 @@ $(PKG)_MAJOR    := $(word 1,$(subst ., ,$($(PKG)_VERSION)))
 $(PKG)_CHECKSUM := 3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816
 $(PKG)_SUBDIR   := icu
 $(PKG)_FILE     := $(PKG)-$(subst .,_,$($(PKG)_VERSION))-src.tgz
-$(PKG)_URL      := http://download.icu-project.org/files/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := https://ssl.icu-project.org/files/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE
diff --git a/src/jpeg.mk b/src/jpeg.mk
index dd0a224..142af16 100644
--- a/src/jpeg.mk
+++ b/src/jpeg.mk
@@ -1,17 +1,17 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := jpeg
-$(PKG)_WEBSITE  := http://www.ijg.org/
+$(PKG)_WEBSITE  := https://www.ijg.org/
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 9c
 $(PKG)_CHECKSUM := 650250979303a649e21f87b5ccd02672af1ea6954b911342ea491f351ceb7122
 $(PKG)_SUBDIR   := jpeg-$($(PKG)_VERSION)
 $(PKG)_FILE     := jpegsrc.v$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.ijg.org/files/$($(PKG)_FILE)
+$(PKG)_URL      := https://www.ijg.org/files/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.ijg.org/' | \
+    $(WGET) -q -O- 'https://www.ijg.org/' | \
     $(SED) -n 's,.*jpegsrc\.v\([0-9][^>]*\)\.tar.*,\1,p' | \
     head -1
 endef
diff --git a/src/libshout.mk b/src/libshout.mk
index 1f1124b..5f534c9 100644
--- a/src/libshout.mk
+++ b/src/libshout.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := libshout
-$(PKG)_WEBSITE  := http://www.icecast.org/
+$(PKG)_WEBSITE  := https://icecast.org/
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.4.1
 $(PKG)_CHECKSUM := f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d
@@ -11,7 +11,7 @@ $(PKG)_URL      := https://downloads.xiph.org/releases/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc ogg openssl speex theora vorbis
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.icecast.org/download.php' | \
+    $(WGET) -q -O- 'https://icecast.org/download/' | \
     $(SED) -n 's,.*libshout-\([0-9][^>]*\)\.tar.*,\1,p' | \
     head -1
 endef
diff --git a/src/libvpx.mk b/src/libvpx.mk
index 8cf28a6..56d4779 100644
--- a/src/libvpx.mk
+++ b/src/libvpx.mk
@@ -12,7 +12,7 @@ $(PKG)_URL      := https://storage.googleapis.com/downloads.webmproject.org/rele
 $(PKG)_DEPS     := cc pthreads yasm
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://downloads.webmproject.org/releases/webm/index.html' | \
+    $(WGET) -q -O- 'https://storage.googleapis.com/downloads.webmproject.org/releases/webm/index.html' | \
     $(SED) -n 's,.*libvpx-\([0-9][^>]*\)\.tar.*,\1,p' | \
     $(SORT) -Vr | \
     head -1
diff --git a/src/libwebp.mk b/src/libwebp.mk
index 40e159c..376bcfe 100644
--- a/src/libwebp.mk
+++ b/src/libwebp.mk
@@ -7,7 +7,7 @@ $(PKG)_VERSION  := 0.4.4
 $(PKG)_CHECKSUM := c65d34edb57338e331ba4d622227a2b3179444cfca17d02c34f1ead63f603e86
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://downloads.webmproject.org/releases/webp/$($(PKG)_FILE)
+$(PKG)_URL      := https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE
diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua
index fab5872..66c612c 100755
--- a/tools/build-pkg.lua
+++ b/tools/build-pkg.lua
@@ -772,7 +772,7 @@ Priority: optional
 Architecture: %s%s
 Installed-Size: %d
 Maintainer: Boris Nagaev <bnagaev@gmail.com>
-Homepage: http://mxe.cc
+Homepage: https://mxe.cc/
 Description: %s
  MXE (M cross environment) is a Makefile that compiles
  a cross compiler and cross compiles many free libraries
-- 
cgit v0.12