From 7350b9825613312e01039952ccadcf04f7efe014 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vszakats.net>
Date: Mon, 13 Aug 2018 16:38:36 +0000
Subject: [PATCH] secure/fix URLs

---
 docs/index.html             | 8 ++++----
 src/bzip2.mk                | 6 +++---
 src/gtkimageview.mk         | 2 +-
 src/libaacs.mk              | 1 -
 src/libbluray.mk            | 1 -
 src/libpaper.mk             | 4 ++--
 src/libtorrent-rasterbar.mk | 2 +-
 src/libwebp.mk              | 2 +-
 src/luabind.mk              | 2 +-
 src/mpc.mk                  | 2 +-
 src/neon.mk                 | 6 +++---
 src/popt.mk                 | 2 +-
 src/smpeg.mk                | 2 +-
 src/tre.mk                  | 2 +-
 14 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 9f3330d7..6c748496 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -565,7 +565,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
         <td></td>
     </tr>
     <tr>
-        <td><a href="http://www.bzip.org/">Bzip2</a></td>
+        <td><a href="https://en.wikipedia.org/wiki/Bzip2">Bzip2</a></td>
         <td></td>
     </tr>
     <tr>
@@ -577,7 +577,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
         <td></td>
     </tr>
     <tr>
-        <td><a href="http://www.gdk-pixbuf.org/">gdk-pixbuf</a></td>
+        <td><a href="https://developer.gnome.org/gdk-pixbuf/">gdk-pixbuf</a></td>
         <td></td>
     </tr>
     <tr>
@@ -2908,7 +2908,7 @@ endef</pre>
 
     <ul>
     <li>
-        <a href="http://www.valdyas.org/fading/index.cgi/hacking/krita/mxe_krita.html">Cross-compiling Krita using MXE</a>
+        <a href="https://valdyas.org/fading/hacking/cross-compiling-krita-using-mxe/">Cross-compiling Krita using MXE</a>
         <br>
         Experience report of the
         <a href="https://krita.org/">Krita project</a>
@@ -3016,7 +3016,7 @@ endef</pre>
         <a href="https://cvtool.sourceforge.io/">cvtool</a>
     </li>
     <li>
-        <a href="http://www.qtrac.eu/diffpdf.html">DiffPDF</a>
+        <a href="https://www.qtrac.eu/diffpdf.html">DiffPDF</a>
     </li>
     <li>
         <a href="https://www.digikam.org/">digiKam</a>
diff --git a/src/bzip2.mk b/src/bzip2.mk
index 2ba726a0..4bb38e84 100644
--- a/src/bzip2.mk
+++ b/src/bzip2.mk
@@ -1,17 +1,17 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := bzip2
-$(PKG)_WEBSITE  := http://www.bzip.org/
+$(PKG)_WEBSITE  := https://en.wikipedia.org/wiki/Bzip2
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.0.6
 $(PKG)_CHECKSUM := a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
 $(PKG)_SUBDIR   := bzip2-$($(PKG)_VERSION)
 $(PKG)_FILE     := bzip2-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.bzip.org/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := https://ftp.osuosl.org/pub/clfs/conglomeration/bzip2/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.bzip.org/downloads.html' | \
+    $(WGET) -q -O- 'https://ftp.osuosl.org/pub/clfs/conglomeration/bzip2/' | \
     grep 'bzip2-' | \
     $(SED) -n 's,.*bzip2-\([0-9][^>]*\)\.tar.*,\1,p' | \
     head -1
diff --git a/src/gtkimageview.mk b/src/gtkimageview.mk
index f08a9ba3..77cb38a2 100644
--- a/src/gtkimageview.mk
+++ b/src/gtkimageview.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := gtkimageview
-$(PKG)_WEBSITE  := http://trac.bjourne.webfactional.com/
+$(PKG)_WEBSITE  := https://web.archive.org/web/20130517010338/trac.bjourne.webfactional.com/
 $(PKG)_DESCR    := GtkImageView
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.6.4
diff --git a/src/libaacs.mk b/src/libaacs.mk
index 9e84c51e..c53288e5 100644
--- a/src/libaacs.mk
+++ b/src/libaacs.mk
@@ -8,7 +8,6 @@ $(PKG)_CHECKSUM := 95c344a02c47c9753c50a5386fdfb8313f9e4e95949a5c523a452f0bcb01b
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
 $(PKG)_URL      := https://download.videolan.org/pub/videolan/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_URL_2    := http://videolan-nyc.defaultroute.com/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc libgcrypt libgpg_error
 
 define $(PKG)_UPDATE
diff --git a/src/libbluray.mk b/src/libbluray.mk
index a27d639c..9c60166f 100644
--- a/src/libbluray.mk
+++ b/src/libbluray.mk
@@ -8,7 +8,6 @@ $(PKG)_CHECKSUM := efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
 $(PKG)_URL      := https://download.videolan.org/pub/videolan/libbluray/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_URL_2    := http://videolan-nyc.defaultroute.com/libbluray/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc freetype libxml2
 
 define $(PKG)_UPDATE
diff --git a/src/libpaper.mk b/src/libpaper.mk
index f0fd74ca..82ee1092 100644
--- a/src/libpaper.mk
+++ b/src/libpaper.mk
@@ -7,8 +7,8 @@ $(PKG)_VERSION  := 1.1.24+nmu5
 $(PKG)_CHECKSUM := e29deda4cd7350189c71af0925cbf4a4473f9841d1419a922e1e8ff1954db1f2
 $(PKG)_SUBDIR   := libpaper-$($(PKG)_VERSION)
 $(PKG)_FILE     := libpaper_$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://ftp.debian.org/debian/pool/main/libp/$(PKG)/$($(PKG)_FILE)
-$(PKG)_URL_2    := http://linux.mirrors.es.net/pub/ubuntu/pool/main/libp/$(PKG)/$($(PKG)_FILE)
+$(PKG)_URL      := https://deb.debian.org/debian/pool/main/libp/$(PKG)/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://mirrorservice.org/sites/ftp.debian.org/debian/pool/main/libp/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE
diff --git a/src/libtorrent-rasterbar.mk b/src/libtorrent-rasterbar.mk
index d187af00..c07fa22e 100644
--- a/src/libtorrent-rasterbar.mk
+++ b/src/libtorrent-rasterbar.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := libtorrent-rasterbar
-$(PKG)_WEBSITE  := http://www.rasterbar.com/products/libtorrent/
+$(PKG)_WEBSITE  := https://www.libtorrent.org/
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.1.6
 $(PKG)_CHECKSUM := b7c74d004bd121bd6e9f8975ee1fec3c95c74044c6a6250f6b07f259f55121ef
diff --git a/src/libwebp.mk b/src/libwebp.mk
index 376bcfec..80ce5840 100644
--- a/src/libwebp.mk
+++ b/src/libwebp.mk
@@ -12,7 +12,7 @@ $(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://developers.google.com/speed/webp/download' | \
-    $(SED) -n 's,.*<a href="http://downloads.webmproject.org/releases/webp/libwebp-\([0-9][^"]*\)\.tar.gz">Download</a> |,\1,p' | \
+    $(SED) -n 's,.*<a href="//storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-\([0-9][^"]*\)\.tar.gz">Download</a> |,\1,p' | \
     $(SORT) -V | \
     tail -1
 endef
diff --git a/src/luabind.mk b/src/luabind.mk
index acc4a509..11c3526d 100644
--- a/src/luabind.mk
+++ b/src/luabind.mk
@@ -1,7 +1,7 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG             := luabind
-$(PKG)_WEBSITE  := http://www.rasterbar.com/products/luabind.html
+$(PKG)_WEBSITE  := https://github.com/luabind/luabind
 $(PKG)_DESCR    := Luabind
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.9.1
diff --git a/src/mpc.mk b/src/mpc.mk
index 2c04401d..15c56da4 100644
--- a/src/mpc.mk
+++ b/src/mpc.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := b561f54d8a479cee3bc891ee52735f18ff86712ba30f036f8b8537bae380c
 $(PKG)_SUBDIR   := mpc-$($(PKG)_VERSION)
 $(PKG)_FILE     := mpc-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/mpc/$($(PKG)_FILE)
-$(PKG)_URL_2    := http://ftp.debian.org/debian/pool/main/m/mpclib/mpclib_$($(PKG)_VERSION).orig.tar.gz
+$(PKG)_URL_2    := https://deb.debian.org/debian/pool/main/m/mpclib/mpclib_$($(PKG)_VERSION).orig.tar.gz
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 $(PKG)_DEPS     := cc gmp mpfr
 
diff --git a/src/neon.mk b/src/neon.mk
index 6a27c279..bbc6c509 100644
--- a/src/neon.mk
+++ b/src/neon.mk
@@ -8,12 +8,12 @@ $(PKG)_VERSION  := 0.30.2
 $(PKG)_CHECKSUM := db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://webdav.org/$(PKG)/$(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL_2    := https://fossies.org/linux/www/$(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://fossies.org/linux/www/$(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL_2    := https://mirrorservice.org/sites/distfiles.macports.org/$(PKG)/$(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := cc expat gettext openssl
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://webdav.org/$(PKG)/' | \
+    $(WGET) -q -O- 'https://mirrorservice.org/sites/distfiles.macports.org/$(PKG)/' | \
     $(SED) -n 's,.*/\([0-9][^"]*\)/"\.tar.*,\1,p' | \
     sort | uniq | \
     head -1
diff --git a/src/popt.mk b/src/popt.mk
index f0a9fc06..ad9280df 100644
--- a/src/popt.mk
+++ b/src/popt.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://rpm5.org/files/popt/$($(PKG)_FILE)
-$(PKG)_URL_2    := http://ftp.debian.org/debian/pool/main/p/$(PKG)/$(PKG)_$($(PKG)_VERSION).orig.tar.gz
+$(PKG)_URL_2    := https://deb.debian.org/debian/pool/main/p/$(PKG)/$(PKG)_$($(PKG)_VERSION).orig.tar.gz
 $(PKG)_DEPS     := cc gettext libiconv
 
 define $(PKG)_UPDATE
diff --git a/src/smpeg.mk b/src/smpeg.mk
index 94b9f3ed..4a83cbf1 100644
--- a/src/smpeg.mk
+++ b/src/smpeg.mk
@@ -7,7 +7,7 @@ $(PKG)_VERSION  := 0.4.5+cvs20030824
 $(PKG)_CHECKSUM := 1276ea797dd9fde8a12dd3f33f180153922544c28ca9fc7b477c018876be1916
 $(PKG)_SUBDIR   := smpeg-$($(PKG)_VERSION).orig
 $(PKG)_FILE     := smpeg_$($(PKG)_VERSION).orig.tar.gz
-$(PKG)_URL      := http://ftp.debian.org/debian/pool/main/s/$(PKG)/$($(PKG)_FILE)
+$(PKG)_URL      := https://deb.debian.org/debian/pool/main/s/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc sdl
 
 define $(PKG)_UPDATE
diff --git a/src/tre.mk b/src/tre.mk
index bab4abca..09ba41e3 100644
--- a/src/tre.mk
+++ b/src/tre.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := be8670a55198bc57485a6a8ae4b497d7db98ea25f90968585b7eb07d94c6a
 $(PKG)_SUBDIR   := tre-$($(PKG)_VERSION)
 $(PKG)_FILE     := tre-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://laurikari.net/tre/$($(PKG)_FILE)
-$(PKG)_URL_2    := http://ftp.debian.org/debian/pool/main/t/$(PKG)/$(PKG)_$($(PKG)_VERSION).orig.tar.gz
+$(PKG)_URL_2    := https://deb.debian.org/debian/pool/main/t/$(PKG)/$(PKG)_$($(PKG)_VERSION).orig.tar.gz
 $(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE