contrib: Use https where possible.

download.handbrake.fr now uses https, and some other hostnames do as well.

34 files changed, 53 insertions, 53 deletions

diff --git a/contrib/autoconf/module.defs b/contrib/autoconf/module.defs
index 77b94f9e3..4c831af7b 100644
--- a/contrib/autoconf/module.defs
+++ b/contrib/autoconf/module.defs
@@ -1,6 +1,6 @@
 $(eval $(call import.MODULE.defs,AUTOCONF,autoconf,M4))
 $(eval $(call import.CONTRIB.defs,AUTOCONF))
 
-AUTOCONF.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/autoconf-2.69.tar.gz
-AUTOCONF.FETCH.url += http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
+AUTOCONF.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/autoconf-2.69.tar.gz
+AUTOCONF.FETCH.url += https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
 AUTOCONF.FETCH.md5 =  82d05e03b93e45f5a39b828dc9c6c29b
diff --git a/contrib/automake/module.defs b/contrib/automake/module.defs
index 3ab899301..d798644f2 100644
--- a/contrib/automake/module.defs
+++ b/contrib/automake/module.defs
@@ -1,10 +1,10 @@
 $(eval $(call import.MODULE.defs,AUTOMAKE,automake,AUTOCONF))
 $(eval $(call import.CONTRIB.defs,AUTOMAKE))
 
-AUTOMAKE.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/automake-1.13.1.tar.gz
-AUTOMAKE.FETCH.url += http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz
+AUTOMAKE.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/automake-1.13.1.tar.gz
+AUTOMAKE.FETCH.url += https://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz
 AUTOMAKE.FETCH.md5 =  78a0ef8216b0556b44508e7b5b0c0847
 
 # TODO: automake >= 1.15
-#AUTOMAKE.FETCH.url = http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz
+#AUTOMAKE.FETCH.url = https://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz
 #AUTOMAKE.FETCH.md5 = 716946a105ca228ab545fc37a70df3a3
diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs
index 89c3e3cda..4438d117f 100644
--- a/contrib/bzip2/module.defs
+++ b/contrib/bzip2/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,BZIP2,bzip2))
 $(eval $(call import.CONTRIB.defs,BZIP2))
 
-BZIP2.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/bzip2-1.0.6-official.tar.gz
+BZIP2.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/bzip2-1.0.6-official.tar.gz
 BZIP2.FETCH.url += http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
 BZIP2.FETCH.md5 =  00b516f4704d4a7cb50a1d97e6e8e15b
 BZIP2.FETCH.basename  = bzip2-1.0.6-official.tar.gz
diff --git a/contrib/cmake/module.defs b/contrib/cmake/module.defs
index cd3b866e0..ea3d2ff5d 100644
--- a/contrib/cmake/module.defs
+++ b/contrib/cmake/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,CMAKE,cmake))
 $(eval $(call import.CONTRIB.defs,CMAKE))
 
-CMAKE.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/cmake-3.3.2.tar.gz
+CMAKE.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/cmake-3.3.2.tar.gz
 CMAKE.FETCH.url += https://cmake.org/files/v3.3/cmake-3.3.2.tar.gz
 CMAKE.FETCH.md5 =  5febbd11bcaac854a27eebaf4a124be2
 
diff --git a/contrib/fdk-aac/module.defs b/contrib/fdk-aac/module.defs
index 1dbc5b65f..1b14c5532 100644
--- a/contrib/fdk-aac/module.defs
+++ b/contrib/fdk-aac/module.defs
@@ -1,8 +1,8 @@
 $(eval $(call import.MODULE.defs,FDKAAC,fdkaac))
 $(eval $(call import.CONTRIB.defs,FDKAAC))
 
-FDKAAC.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/fdk-aac-0.1.4.tar.gz
-FDKAAC.FETCH.url += http://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-0.1.4.tar.gz
+FDKAAC.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/fdk-aac-0.1.4.tar.gz
+FDKAAC.FETCH.url += https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-0.1.4.tar.gz
 FDKAAC.FETCH.md5 =  e274a7d7f6cd92c71ec5c78e4dc9f8b7
 
 # fdk-aac configure script fails to add compiler optimizations if the
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 6e13442bc..c6bbba45a 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -9,7 +9,7 @@ endif
 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libav-11.3.tar.gz
+FFMPEG.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/libav-11.3.tar.gz
 FFMPEG.FETCH.url += https://libav.org/releases/libav-11.3.tar.gz
 FFMPEG.FETCH.md5 =  1a2eb461b98e0f1d1d6c4d892d51ac9b
 
diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs
index 95ba4574b..3802a5741 100644
--- a/contrib/fontconfig/module.defs
+++ b/contrib/fontconfig/module.defs
@@ -2,7 +2,7 @@ __deps__ := FREETYPE LIBXML2 LIBICONV
 $(eval $(call import.MODULE.defs,FONTCONFIG,fontconfig,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FONTCONFIG))
 
-FONTCONFIG.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/fontconfig-2.12.1.tar.bz2
+FONTCONFIG.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/fontconfig-2.12.1.tar.bz2
 FONTCONFIG.FETCH.url += https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.1.tar.bz2
 FONTCONFIG.FETCH.md5 =  b5af5a423ee3b5cfc34846838963c058
 
diff --git a/contrib/freetype/module.defs b/contrib/freetype/module.defs
index 63b8476d1..a62f9b447 100644
--- a/contrib/freetype/module.defs
+++ b/contrib/freetype/module.defs
@@ -2,7 +2,7 @@ __deps__ := BZIP ZLIB
 $(eval $(call import.MODULE.defs,FREETYPE,freetype,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FREETYPE))
 
-FREETYPE.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/freetype-2.6.5.tar.bz2
+FREETYPE.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/freetype-2.6.5.tar.bz2
 FREETYPE.FETCH.url += https://download.savannah.gnu.org/releases/freetype/freetype-2.6.5.tar.bz2
 FREETYPE.FETCH.md5 =  6a386964e18ba28cb93370e57a19031b
 
diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index 43cdb4d02..d6402e008 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -5,8 +5,8 @@ endif
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 
-FRIBIDI.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.bz2
-FRIBIDI.FETCH.url += http://fribidi.org/download/fribidi-0.19.7.tar.bz2
+FRIBIDI.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.bz2
+FRIBIDI.FETCH.url += https://fribidi.org/download/fribidi-0.19.7.tar.bz2
 FRIBIDI.FETCH.md5 =  6c7e7cfdd39c908f7ac619351c1c5c23
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs
index 8727da414..f58063bfe 100644
--- a/contrib/harfbuzz/module.defs
+++ b/contrib/harfbuzz/module.defs
@@ -2,7 +2,7 @@ __deps__ := FONTCONFIG FREETYPE
 $(eval $(call import.MODULE.defs,HARFBUZZ,harfbuzz,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,HARFBUZZ))
 
-HARFBUZZ.FETCH.url = http://download.handbrake.fr/handbrake/contrib/harfbuzz-1.3.0.tar.bz2
+HARFBUZZ.FETCH.url = https://download.handbrake.fr/handbrake/contrib/harfbuzz-1.3.0.tar.bz2
 HARFBUZZ.FETCH.url += https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.3.0.tar.bz2
 HARFBUZZ.FETCH.md5 = a82d49ff67197bc3c96ea34b98880c52
 
diff --git a/contrib/jansson/module.defs b/contrib/jansson/module.defs
index b388becb2..8a771d1be 100644
--- a/contrib/jansson/module.defs
+++ b/contrib/jansson/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,JANSSON,jansson))
 $(eval $(call import.CONTRIB.defs,JANSSON))
 
-JANSSON.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/jansson-2.6.tar.bz2
+JANSSON.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/jansson-2.6.tar.bz2
 JANSSON.FETCH.url += http://www.digip.org/jansson/releases/jansson-2.6.tar.bz2
 JANSSON.FETCH.md5 =  c70a52488db623a26f7213c7c6b7c878
 
diff --git a/contrib/lame/module.defs b/contrib/lame/module.defs
index bbacc9691..8e3e82151 100644
--- a/contrib/lame/module.defs
+++ b/contrib/lame/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LAME,lame))
 $(eval $(call import.CONTRIB.defs,LAME))
 
-LAME.FETCH.url = http://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
+LAME.FETCH.url = https://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
 LAME.FETCH.md5 = 7036b52e792538fd665595d56b9e49a0
 LAME.EXTRACT.tarbase = lame
 
@@ -10,11 +10,11 @@ ifneq (none,$(FFMPEG.GCC.g))
 endif
 
 # TODO: Upstream archive differs
-#LAME.FETCH.url = http://sourceforge.net/projects/lame/files/lame/3.98/lame-398.tar.gz
+#LAME.FETCH.url = https://sourceforge.net/projects/lame/files/lame/3.98/lame-398.tar.gz
 #LAME.FETCH.md5 = f44b9f8e1b5d8835d0a77f9cc9cedd1c
 #LAME.FETCH.distfile  = lame-3.98.tar.gz
 #LAME.EXTRACT.tarbase = lame
 #
 # TODO: lame >= 3.99.5, tarbase unnecessary
 #LAME.FETCH.md5 = 84835b313d4a8b68f5349816d33e07ce
-#LAME.FETCH.url = http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz
+#LAME.FETCH.url = https://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index 7af604bd0..f50f92dd6 100644
--- a/contrib/libass/module.defs
+++ b/contrib/libass/module.defs
@@ -2,7 +2,7 @@ __deps__ := YASM FONTCONFIG FREETYPE FRIBIDI HARFBUZZ
 $(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBASS))
 
-LIBASS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libass-0.13.2.tar.gz
+LIBASS.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libass-0.13.2.tar.gz
 LIBASS.FETCH.url += https://github.com/libass/libass/releases/download/0.13.2/libass-0.13.2.tar.gz
 LIBASS.FETCH.md5 = b4d82616bb18e8e954b18746a105a3b8
 
diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs
index 62c97b0bd..afeca6126 100644
--- a/contrib/libbluray/module.defs
+++ b/contrib/libbluray/module.defs
@@ -1,8 +1,8 @@
 $(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,PKGCONFIG LIBXML2 FREETYPE))
 $(eval $(call import.CONTRIB.defs,LIBBLURAY))
 
-LIBBLURAY.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libbluray-0.9.3.tar.bz2
-LIBBLURAY.FETCH.url += http://download.videolan.org/pub/videolan/libbluray/0.9.3/libbluray-0.9.3.tar.bz2
+LIBBLURAY.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/libbluray-0.9.3.tar.bz2
+LIBBLURAY.FETCH.url += https://download.videolan.org/pub/videolan/libbluray/0.9.3/libbluray-0.9.3.tar.bz2
 LIBBLURAY.FETCH.md5 =  c51fd34f933431559371be30b59cff51
 
 ifneq (max,$(LIBBLURAY.GCC.g))
diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
index 96b9503ff..eeca35332 100644
--- a/contrib/libdvdnav/module.defs
+++ b/contrib/libdvdnav/module.defs
@@ -1,12 +1,12 @@
 $(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,PKGCONFIG LIBDVDREAD))
 $(eval $(call import.CONTRIB.defs,LIBDVDNAV))
 
-LIBDVDNAV.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1.tar.bz2
-LIBDVDNAV.FETCH.url += http://download.videolan.org/pub/videolan/libdvdnav/5.0.1/libdvdnav-5.0.1.tar.bz2
+LIBDVDNAV.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1.tar.bz2
+LIBDVDNAV.FETCH.url += https://download.videolan.org/pub/videolan/libdvdnav/5.0.1/libdvdnav-5.0.1.tar.bz2
 LIBDVDNAV.FETCH.md5 =  81e30fb57eaf9f61aa6513a7bd85bd74
 
 # TODO: libdvdnav >= 5.0.3
-#LIBDVDNAV.FETCH.url = http://download.videolan.org/pub/videolan/libdvdnav/5.0.3/libdvdnav-5.0.3.tar.bz2
+#LIBDVDNAV.FETCH.url = https://download.videolan.org/pub/videolan/libdvdnav/5.0.3/libdvdnav-5.0.3.tar.bz2
 #LIBDVDNAV.FETCH.md5 = e9ea4de3bd8f204e61301d407d09f033
 
 LIBDVDNAV.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs
index dc5d6922d..fb6bef9cc 100644
--- a/contrib/libdvdread/module.defs
+++ b/contrib/libdvdread/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBDVDREAD,libdvdread,PKGCONFIG))
 $(eval $(call import.CONTRIB.defs,LIBDVDREAD))
 
-LIBDVDREAD.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.0-6-gcb1ae87.tar.gz
+LIBDVDREAD.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.0-6-gcb1ae87.tar.gz
 LIBDVDREAD.FETCH.md5 = 607a5dd41b0dd2f35433d6deac79b99e
 
 # TODO: libdvdread >= 5.0.3
diff --git a/contrib/libgnurx/module.defs b/contrib/libgnurx/module.defs
index c04bee4a4..22a0bbff6 100644
--- a/contrib/libgnurx/module.defs
+++ b/contrib/libgnurx/module.defs
@@ -1,8 +1,8 @@
 $(eval $(call import.MODULE.defs,LIBGNURX,libgnurx))
 $(eval $(call import.CONTRIB.defs,LIBGNURX))
 
-LIBGNURX.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/mingw-libgnurx-2.5.1-src.tar.gz
-LIBGNURX.FETCH.url += http://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/mingw-regex-2.5.1/mingw-libgnurx-2.5.1-src.tar.gz
+LIBGNURX.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/mingw-libgnurx-2.5.1-src.tar.gz
+LIBGNURX.FETCH.url += https://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/mingw-regex-2.5.1/mingw-libgnurx-2.5.1-src.tar.gz
 LIBGNURX.FETCH.md5 =  35c8fed3101ca1f253e9b6b1966661f6
 LIBGNURX.EXTRACT.tarbase = mingw-libgnurx-2.5.1
 
diff --git a/contrib/libiconv/module.defs b/contrib/libiconv/module.defs
index 411b6e0b1..75dff1569 100644
--- a/contrib/libiconv/module.defs
+++ b/contrib/libiconv/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBICONV,libiconv))
 $(eval $(call import.CONTRIB.defs,LIBICONV))
 
-LIBICONV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libiconv-1.14.tar.gz
+LIBICONV.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libiconv-1.14.tar.gz
 LIBICONV.FETCH.url += https://ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz
 LIBICONV.FETCH.md5 = e34509b1623cec449dfeb73d7ce9c6c6
 
diff --git a/contrib/libmfx/module.defs b/contrib/libmfx/module.defs
index 719b4d840..679a390bf 100644
--- a/contrib/libmfx/module.defs
+++ b/contrib/libmfx/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBMFX,libmfx))
 $(eval $(call import.CONTRIB.defs,LIBMFX))
 
-LIBMFX.FETCH.url = http://download.handbrake.fr/contrib/mfx_dispatch-9f4a84d7.tar.gz
+LIBMFX.FETCH.url = https://download.handbrake.fr/contrib/mfx_dispatch-9f4a84d7.tar.gz
 LIBMFX.FETCH.md5 = 694058b83b43b39b7e5b5fc38dbe2b88
 
 LIBMFX.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv;
diff --git a/contrib/libogg/module.defs b/contrib/libogg/module.defs
index 3f1ce2a84..1756c56e4 100644
--- a/contrib/libogg/module.defs
+++ b/contrib/libogg/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBOGG,libogg))
 $(eval $(call import.CONTRIB.defs,LIBOGG))
 
-LIBOGG.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libogg-1.3.0.tar.gz
+LIBOGG.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/libogg-1.3.0.tar.gz
 LIBOGG.FETCH.url += http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz
 LIBOGG.FETCH.md5 =  0a7eb40b86ac050db3a789ab65fe21c2
 LIBOGG.EXTRACT.tarbase = libogg-1.3.0
diff --git a/contrib/libopus/module.defs b/contrib/libopus/module.defs
index 7292f70bd..57a64b42e 100644
--- a/contrib/libopus/module.defs
+++ b/contrib/libopus/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBOPUS,libopus))
 $(eval $(call import.CONTRIB.defs,LIBOPUS))
 
-LIBOPUS.FETCH.url = http://download.handbrake.fr/contrib/opus-1.1.3.tar.gz
+LIBOPUS.FETCH.url = https://download.handbrake.fr/contrib/opus-1.1.3.tar.gz
 LIBOPUS.FETCH.url += http://downloads.xiph.org/releases/opus/opus-1.1.3.tar.gz
 LIBOPUS.FETCH.md5 = 32bbb6b557fe1b6066adc0ae1f08b629
 
diff --git a/contrib/libsamplerate/module.defs b/contrib/libsamplerate/module.defs
index 5f1cace96..2b14cb2f2 100644
--- a/contrib/libsamplerate/module.defs
+++ b/contrib/libsamplerate/module.defs
@@ -1,17 +1,17 @@
 $(eval $(call import.MODULE.defs,LIBSAMPLERATE,libsamplerate))
 $(eval $(call import.CONTRIB.defs,LIBSAMPLERATE))
 
-LIBSAMPLERATE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.4.tar.gz
+LIBSAMPLERATE.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.4.tar.gz
 LIBSAMPLERATE.FETCH.md5 = 69ec6c05f487458f688dda8f3e722e5d
 LIBSAMPLERATE.EXTRACT.tarbase = libsamplerate
 
 # TODO: Upstream archive differs
-#LIBSAMPLERATE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.4.tar.gz
+#LIBSAMPLERATE.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.4.tar.gz
 #LIBSAMPLERATE.FETCH.md5 = f6fafd5d4971a2442352c72bc3598cbd
 #LIBSAMPLERATE.EXTRACT.tarbase = libsamplerate
 #
 # TODO: libsamplerate >= 0.1.8, tarbase unnecessary
-#LIBSAMPLERATE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.8.tar.gz
+#LIBSAMPLERATE.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.8.tar.gz
 #LIBSAMPLERATE.FETCH.md5 = 1c7fb25191b4e6e3628d198a66a84f47
 
 # Disable to avoid Carbon.h dependency on OSX
diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs
index d7c69931b..fd795a202 100644
--- a/contrib/libtheora/module.defs
+++ b/contrib/libtheora/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBTHEORA,libtheora,LIBOGG LIBVORBIS))
 $(eval $(call import.CONTRIB.defs,LIBTHEORA))
 
-LIBTHEORA.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libtheora-1.1.0.tar.bz2
+LIBTHEORA.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/libtheora-1.1.0.tar.bz2
 LIBTHEORA.FETCH.url += http://downloads.xiph.org/releases/theora/libtheora-1.1.0.tar.bz2
 LIBTHEORA.FETCH.md5 =  d0f83cf7f13e2b3bd068a858ca1398ad
 
diff --git a/contrib/libtool/module.defs b/contrib/libtool/module.defs
index 828f0e605..3986ba3c6 100644
--- a/contrib/libtool/module.defs
+++ b/contrib/libtool/module.defs
@@ -1,10 +1,10 @@
 $(eval $(call import.MODULE.defs,LIBTOOL,libtool,AUTOCONF AUTOMAKE PKGCONFIG))
 $(eval $(call import.CONTRIB.defs,LIBTOOL))
 
-LIBTOOL.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libtool-2.4.2.tar.gz
-LIBTOOL.FETCH.url += http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
+LIBTOOL.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/libtool-2.4.2.tar.gz
+LIBTOOL.FETCH.url += https://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
 LIBTOOL.FETCH.md5 =  d2f3b7d4627e69e13514a40e72a24d50
 
 # TODO: libtool >= 2.4.6
-#LIBTOOL.FETCH.url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz
+#LIBTOOL.FETCH.url = https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz
 #LIBTOOL.FETCH.md5 = addf44b646ddb4e3919805aa88fa7c5e
diff --git a/contrib/libvorbis/module.defs b/contrib/libvorbis/module.defs
index ef9735553..ecb554eaf 100644
--- a/contrib/libvorbis/module.defs
+++ b/contrib/libvorbis/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,LIBVORBIS,libvorbis,LIBOGG))
 $(eval $(call import.CONTRIB.defs,LIBVORBIS))
 
-LIBVORBIS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libvorbis-aotuv_b6.03.tar.bz2
+LIBVORBIS.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libvorbis-aotuv_b6.03.tar.bz2
 LIBVORBIS.FETCH.md5 = 586d2ac0fa13f32cba78be5db4a16330
 LIBVORBIS.EXTRACT.tarbase = aotuv-b6.03_20110424
 
diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
index dd29f5642..45dab687d 100644
--- a/contrib/libvpx/module.defs
+++ b/contrib/libvpx/module.defs
@@ -7,7 +7,7 @@ endif
 $(eval $(call import.MODULE.defs,LIBVPX,libvpx,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBVPX))
 
-LIBVPX.FETCH.url =  http://download.handbrake.fr/contrib/libvpx-1.5.0.tar.bz2
+LIBVPX.FETCH.url =  https://download.handbrake.fr/contrib/libvpx-1.5.0.tar.bz2
 LIBVPX.FETCH.url += http://downloads.webmproject.org/releases/webm/libvpx-1.5.0.tar.bz2
 LIBVPX.FETCH.md5 =  49e59dd184caa255886683facea56fca
 
diff --git a/contrib/libxml2/module.defs b/contrib/libxml2/module.defs
index 48d5b7e61..92a3dd511 100644
--- a/contrib/libxml2/module.defs
+++ b/contrib/libxml2/module.defs
@@ -2,7 +2,7 @@ __deps__ := LIBICONV
 $(eval $(call import.MODULE.defs,LIBXML2,libxml2,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBXML2))
 
-LIBXML2.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/libxml2-2.7.7.tar.gz
+LIBXML2.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/libxml2-2.7.7.tar.gz
 LIBXML2.FETCH.url += ftp://xmlsoft.org/libxml2/libxml2-2.7.7.tar.gz
 LIBXML2.FETCH.md5 =  9abc9959823ca9ff904f1fbcf21df066
 LIBXML2.EXTRACT.tarbase = libxml2-2.7.7
diff --git a/contrib/m4/module.defs b/contrib/m4/module.defs
index b07132931..0e519bbf3 100644
--- a/contrib/m4/module.defs
+++ b/contrib/m4/module.defs
@@ -1,6 +1,6 @@
 $(eval $(call import.MODULE.defs,M4,m4))
 $(eval $(call import.CONTRIB.defs,M4))
 
-M4.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/m4-1.4.17.tar.bz2
+M4.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/m4-1.4.17.tar.bz2
 M4.FETCH.url += https://ftp.gnu.org/gnu/m4/m4-1.4.17.tar.bz2
 M4.FETCH.md5 =  8a1787edcba75ae5cd1dc40d7d8ed03a
diff --git a/contrib/pkgconfig/module.defs b/contrib/pkgconfig/module.defs
index a0f4c6682..8758cdb0b 100644
--- a/contrib/pkgconfig/module.defs
+++ b/contrib/pkgconfig/module.defs
@@ -1,12 +1,12 @@
 $(eval $(call import.MODULE.defs,PKGCONFIG,pkgconfig))
 $(eval $(call import.CONTRIB.defs,PKGCONFIG))
 
-PKGCONFIG.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/pkg-config-0.28.tar.gz
-PKGCONFIG.FETCH.url += http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
+PKGCONFIG.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/pkg-config-0.28.tar.gz
+PKGCONFIG.FETCH.url += https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 PKGCONFIG.FETCH.md5 =  aa3c86e67551adc3ac865160e34a2a0d
 
 # TODO: pkg-config >= 0.29 (test this extensively)
-#PKGCONFIG.FETCH.url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.tar.gz
+#PKGCONFIG.FETCH.url = https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.tar.gz
 #PKGCONFIG.FETCH.md5 = 77f27dce7ef88d0634d0d6f90e03a77f
 
 PKGCONFIG.CONFIGURE.extra = --with-internal-glib --disable-host-tool
diff --git a/contrib/pthreadw32/module.defs b/contrib/pthreadw32/module.defs
index d6b279a2e..a2ae0fd7b 100644
--- a/contrib/pthreadw32/module.defs
+++ b/contrib/pthreadw32/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,PTHREADW32,pthreadw32))
 $(eval $(call import.CONTRIB.defs,PTHREADW32))
 
-PTHREADW32.FETCH.url = http://download.handbrake.fr/handbrake/contrib/pthreads-w32-2-9-1-release.tar.gz
+PTHREADW32.FETCH.url = https://download.handbrake.fr/handbrake/contrib/pthreads-w32-2-9-1-release.tar.gz
 PTHREADW32.FETCH.url += ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.tar.gz
 PTHREADW32.FETCH.md5 = 36ba827d6aa0fa9f9ae740a35626e2e3
 
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index 75af41c88..924e48fb4 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32))
 $(eval $(call import.CONTRIB.defs,X264))
 
-X264.FETCH.url  = http://download.handbrake.fr/handbrake/contrib/x264-snapshot-20160920-2245-stable.tar.bz2
+X264.FETCH.url  = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20160920-2245-stable.tar.bz2
 X264.FETCH.url += https://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160920-2245-stable.tar.bz2
 X264.FETCH.md5  = af6a0a6e26a0b866718eb72ef3725992
 
diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index 7dcae836b..689eef9e3 100644
--- a/contrib/x265/module.defs
+++ b/contrib/x265/module.defs
@@ -2,7 +2,7 @@ __deps__ := YASM CMAKE
 $(eval $(call import.MODULE.defs,X265,x265,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,X265))
 
-X265.FETCH.url =  http://download.handbrake.fr/contrib/x265_2.1-1.tar.gz
+X265.FETCH.url =  https://download.handbrake.fr/contrib/x265_2.1-1.tar.gz
 X265.FETCH.url += https://bitbucket.org/multicoreware/x265/downloads/x265_2.1.tar.gz
 X265.FETCH.url += https://download.videolan.org/pub/videolan/x265/x265_2.1.tar.gz
 X265.FETCH.md5 =  2d9cb183d2675dfb325abdedd2424bfa
diff --git a/contrib/yasm/module.defs b/contrib/yasm/module.defs
index 7b403ae32..a084bb870 100644
--- a/contrib/yasm/module.defs
+++ b/contrib/yasm/module.defs
@@ -1,6 +1,6 @@
 $(eval $(call import.MODULE.defs,YASM,yasm))
 $(eval $(call import.CONTRIB.defs,YASM))
 
-YASM.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/yasm-1.3.0.tar.gz
+YASM.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/yasm-1.3.0.tar.gz
 YASM.FETCH.url += https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz
 YASM.FETCH.md5 =  fc9e586751ff789b34b1f21d572d96af
diff --git a/contrib/zlib/module.defs b/contrib/zlib/module.defs
index 1cb7ff15f..3855d3429 100644
--- a/contrib/zlib/module.defs
+++ b/contrib/zlib/module.defs
@@ -1,17 +1,17 @@
 $(eval $(call import.MODULE.defs,ZLIB,zlib))
 $(eval $(call import.CONTRIB.defs,ZLIB))
 
-ZLIB.FETCH.url =  http://download.handbrake.fr/handbrake/contrib/zlib-1.2.3.tar.gz
+ZLIB.FETCH.url =  https://download.handbrake.fr/handbrake/contrib/zlib-1.2.3.tar.gz
 ZLIB.FETCH.md5 =  af3358a811ad3469a2e54db49f77d52a
 ZLIB.EXTRACT.tarbase = zlib
 
 # TODO: Upstream archive differs
-#ZLIB.FETCH.url += http://sourceforge.net/projects/libpng/files/zlib/1.2.3/zlib-1.2.3.tar.gz
+#ZLIB.FETCH.url += https://sourceforge.net/projects/libpng/files/zlib/1.2.3/zlib-1.2.3.tar.gz
 #ZLIB.FETCH.md5 =  debc62758716a169df9f62e6ab2bc634
 #ZLIB.EXTRACT.tarbase = zlib
 #
 # TODO: zlib >= 1.2.8
-#ZLIB.FETCH.url += http://sourceforge.net/projects/libpng/files/zlib/1.2.8/zlib-1.2.8.tar.gz
+#ZLIB.FETCH.url += https://sourceforge.net/projects/libpng/files/zlib/1.2.8/zlib-1.2.8.tar.gz
 #ZLIB.FETCH.md5 =  44d667c142d7cda120332623eab69f40
 #ZLIB.EXTRACT.tarbase = zlib