[jhbuild] 3.26: Use HTTPS protocol whenever possible

[Michael Catanzaro <mcatanzaro src gnome org>]

commit d7667cce6163f7ec7fb488d59c8f48d1676f17b7
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Jul 31 22:23:51 2017 +0100

    3.26: Use HTTPS protocol whenever possible
    
    This eliminates usage of the git:// protocol from the maintained 3.26
    modulesets. Some usage remains in gnome-world.

 modulesets/gnome-apps-3.26.modules             |   12 ++--
 modulesets/gnome-suites-core-3.26.modules      |   18 ++---
 modulesets/gnome-suites-core-deps-3.26.modules |   91 ++++++++++--------------
 modulesets/gnome-world.modules                 |    3 +-
 4 files changed, 53 insertions(+), 71 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.26.modules b/modulesets/gnome-apps-3.26.modules
index adcefc9..c2aae17 100644
--- a/modulesets/gnome-apps-3.26.modules
+++ b/modulesets/gnome-apps-3.26.modules
@@ -6,19 +6,17 @@
 
 <!-- git repos -->
   <repository type="git" name="git.gnome.org" default="yes"
-      href="git://git.gnome.org/"/>
+      href="https://git.gnome.org/"/>
   <repository type="git" name="github.com"
-      href="git://github.com/"/>
+      href="https://github.com/"/>
 
 <!-- tarball repos -->
-  <repository type="tarball" name="gnome.org"
-    href="https://download.gnome.org/sources/"/>
   <repository type="tarball" name="ftp.gnu.org"
-      href="http://ftp.gnu.org/gnu/"/>
+      href="https://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="qqwing"
-      href="http://ostermiller.org/qqwing/"/>
+      href="https://qqwing.com/"/>
   <repository type="tarball" name="tarball.github.com"
-    href="https://github.com/"/>
+      href="https://github.com/"/>
 
   <include href="gnome-suites-core-3.26.modules"/>
 
diff --git a/modulesets/gnome-suites-core-3.26.modules b/modulesets/gnome-suites-core-3.26.modules
index 35ce74e..9302957 100644
--- a/modulesets/gnome-suites-core-3.26.modules
+++ b/modulesets/gnome-suites-core-3.26.modules
@@ -6,23 +6,19 @@
 
 <!-- git repos -->
   <repository type="git" name="git.gnome.org" default="yes"
-      href="git://git.gnome.org/"/>
+      href="https://git.gnome.org/"/>
   <repository type="git" name="git.freedesktop.org"
-      href="git://anongit.freedesktop.org/"/>
-  <repository type="git" name="pulseaudio.freedesktop.org"
-      href="git://anongit.freedesktop.org/pulseaudio/"/>
-  <repository type="git" name="telepathy.freedesktop.org"
-    href="git://anongit.freedesktop.org/telepathy/"/>
+      href="https://anongit.freedesktop.org/git/"/>
   <repository type="git" name="github.com"
-      href="git://github.com/"/>
+      href="https://github.com/"/>
 
 <!-- tarball repos -->
   <repository type="tarball" name="freedesktop.org"
-      href="http://freedesktop.org/"/>
+      href="https://freedesktop.org/"/>
   <repository type="tarball" name="gnome.org"
       href="https://download.gnome.org/sources/"/>
   <repository type="tarball" name="kernel.org"
-      href="http://www.kernel.org"/>
+      href="https://www.kernel.org"/>
 
 <include href="gnome-suites-core-deps-3.26.modules"/>
 
@@ -568,7 +564,9 @@
   <autotools id="telepathy-mission-control"
              autogenargs="--disable-upower"
              supports-non-srcdir-builds="no">
-    <branch repo="telepathy.freedesktop.org" revision="telepathy-mission-control-5.16"/>
+    <branch repo="git.freedesktop.org"
+            module="telepathy/telepathy-mission-control"
+            revision="telepathy-mission-control-5.16"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index 875b938..fc27b29 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -5,53 +5,35 @@
 
 <!-- git repos -->
 <repository type="git" name="git.gnome.org" default="yes"
-    href="git://git.gnome.org/"/>
+    href="https://git.gnome.org/"/>
 <repository type="git" name="gitlab.gnome.org"
     href="https://gitlab.gnome.org/"/>
 <repository type="git" name="git.freedesktop.org"
-    href="git://anongit.freedesktop.org/"/>
-<repository type="git" name="gstreamer.freedesktop.org"
-    href="git://anongit.freedesktop.org/gstreamer/"/>
-<repository type="git" name="telepathy.freedesktop.org"
-    href="git://anongit.freedesktop.org/telepathy/"/>
-<repository type="git" name="wayland.freedesktop.org"
-    href="git://anongit.freedesktop.org/git/wayland"/>
-<repository type="git" name="xorg.freedesktop.org"
-    href="git://anongit.freedesktop.org/git/xorg"/>
+    href="https://anongit.freedesktop.org/git/"/>
 <repository type="git" name="github.com"
-    href="git://github.com/"/>
-<repository type="git" name="linuxwacom.git.sourceforge.net"
-    href="git://linuxwacom.git.sourceforge.net/"/>
-<repository type="git" name="quvi"
-    href="git://repo.or.cz/"/>
-  <repository type="git" name="gitlab.com"
-      href="https://gitlab.com/"/>
-<repository type="git" name="git.libvirt.org"
-    href="git://libvirt.org/"/>
+    href="https://github.com/"/>
+<repository type="git" name="gitlab.com"
+    href="https://gitlab.com/"/>
 
 <!-- tarball repos -->
 <repository type="tarball" name="cairo.org"
-    href="http://cairographics.org/"/>
+    href="https://cairographics.org/"/>
 <repository type="tarball" name="iso-codes"
-    href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
+    href="https://pkg-isocodes.alioth.debian.org/downloads/"/>
 <repository type="tarball" name="sourceforge.net"
-    href="http://sourceforge.net/projects/"/>
+    href="https://sourceforge.net/projects/"/>
 <repository type="tarball" name="webkitgtk.org"
-    href="http://webkitgtk.org/releases/"/>
+    href="https://webkitgtk.org/releases/"/>
 <repository type="tarball" name="freedesktop.org"
-    href="http://freedesktop.org/software/"/>
+    href="https://freedesktop.org/software/"/>
 <repository type="tarball" name="people.freedesktop.org"
-    href="http://people.freedesktop.org/"/>
+    href="https://people.freedesktop.org/"/>
 <repository type="tarball" name="icon-theme.freedesktop.org"
-    href="http://icon-theme.freedesktop.org/releases/"/>
+    href="https://icon-theme.freedesktop.org/releases/"/>
 <repository type="tarball" name="nice.freedesktop.org"
-    href="http://nice.freedesktop.org/releases/"/>
-<repository type="tarball" name="ftp.mozilla.org"
-      href="http://ftp.mozilla.org/"/>
-<repository type="tarball" name="kernel.org"
-      href="http://www.kernel.org"/>
+    href="https://nice.freedesktop.org/releases/"/>
 <repository type="tarball" name="ftp.gnu.org"
-    href="http://ftp.gnu.org/gnu/"/>
+    href="https://ftp.gnu.org/gnu/"/>
 <repository type="tarball" name="mir"
     href="https://launchpad.net/mir/"/>
 <repository type="tarball" name="xorg-tar"
@@ -60,18 +42,15 @@
     href="https://github.com/"/>
 <repository type="tarball" name="tarball.github.com"
     href="https://github.com/"/>
+<!-- FIXME: Not available via HTTPS -->
 <repository type="tarball" name="pcre"
-    href="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"/>
+    href="http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"/>
 <repository type="tarball" name="speech-dispatcher"
-    href="http://devel.freebsoft.org/pub/projects/speechd/"/>
+    href="https://devel.freebsoft.org/pub/projects/speechd/"/>
 <repository type="tarball" name="spice"
-    href="http://www.spice-space.org/download/"/>
-<repository type="tarball" name="people.mozilla.org"
-    href="https://people.mozilla.org/~sstangl/"/>
-<repository type="tarball" name="mozilla2"
-    href="https://people-mozilla.org/~sfink/"/>
+    href="https://www.spice-space.org/download/"/>
 <repository type="tarball" name="savannah-download"
-    href="http://download.savannah.gnu.org/releases/"/>
+    href="https://download.savannah.gnu.org/releases/"/>
 <repository type="tarball" name="gnome-download"
     href="https://download.gnome.org/"/>
 
@@ -701,8 +680,8 @@
   </autotools>
 
   <meson id="gstreamer">
-    <branch repo="gstreamer.freedesktop.org"
-            module="gstreamer"
+    <branch repo="git.freedesktop.org"
+            module="gstreamer/gstreamer"
             checkoutdir="gstreamer"/>
     <dependencies>
       <dep package="glib"/>
@@ -720,9 +699,9 @@
   </meson>
 
   <meson id="gst-plugins-bad">
-    <branch repo="gstreamer.freedesktop.org"
+    <branch repo="git.freedesktop.org"
             checkoutdir="gst-plugins-bad"
-            module="gst-plugins-bad"/>
+            module="gstreamer/gst-plugins-bad"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -733,8 +712,8 @@
   </meson>
 
   <meson id="gst-plugins-base">
-    <branch repo="gstreamer.freedesktop.org"
-            module="gst-plugins-base"
+    <branch repo="git.freedesktop.org"
+            module="gstreamer/gst-plugins-base"
             checkoutdir="gst-plugins-base"/>
     <dependencies>
       <dep package="gstreamer"/>
@@ -749,8 +728,8 @@
   </meson>
 
   <meson id="gst-plugins-good">
-    <branch repo="gstreamer.freedesktop.org"
-            module="gst-plugins-good"
+    <branch repo="git.freedesktop.org"
+            module="gstreamer/gst-plugins-good"
             checkoutdir="gst-plugins-good"/>
     <dependencies>
       <dep package="gstreamer"/>
@@ -1452,7 +1431,9 @@
   </autotools>
 
   <autotools id="libvirt-glib" autogenargs="--enable-werror=no">
-    <branch repo="git.libvirt.org" module="libvirt-glib.git"/>
+    <branch repo="github.com"
+            checkoutdir="libvirt"
+            module="libvirt/libvirt-glib.git"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1725,7 +1706,8 @@
              supports-non-srcdir-builds="no"
              autogenargs="--enable-vala-bindings --disable-fatal-warnings">
     <pkg-config>telepathy-glib.pc</pkg-config>
-    <branch repo="telepathy.freedesktop.org"/>
+    <branch repo="git.freedesktop.org"
+            module="telepathy/telepathy-glib"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
@@ -1738,7 +1720,8 @@
 
   <autotools id="telepathy-logger" supports-non-srcdir-builds="no">
     <pkg-config>telepathy-logger-0.2.pc</pkg-config>
-    <branch repo="telepathy.freedesktop.org"/>
+    <branch repo="git.freedesktop.org"
+            module="telepathy/telepathy-logger"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
@@ -1834,7 +1817,8 @@
   </autotools>
 
   <autotools id="wayland-protocols">
-    <branch repo="wayland.freedesktop.org"/>
+    <branch repo="git.freedesktop.org"
+            module="wayland/wayland-protocols"/>
     <dependencies>
       <dep package="wayland"/>
     </dependencies>
@@ -1842,7 +1826,8 @@
 
   <autotools id="wayland"
              autogenargs="--disable-documentation">
-    <branch repo="wayland.freedesktop.org"/>
+    <branch repo="git.freedesktop.org"
+            module="wayland/wayland"/>
     <dependencies>
       <dep package="libffi"/>
       <dep package="doxygen"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 44b9fb6..afacb47 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -3,8 +3,9 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <!-- vim:set ts=2 expandtab: -->
 <moduleset>
+  <!-- FIXME: Change repositories and tarballs to use HTTPS wherever possible. -->
   <repository type="git" name="git.gnome.org" default="yes"
-      href="git://git.gnome.org/"/>
+      href="https://git.gnome.org/"/>
   <repository type="svn" name="svn.abisource.com"
       href="http://svn.abisource.com/"/>
   <repository type="git" name="wayland.freedesktop.org"