From 0db342a590691c8a681e528ebc1664148b5f8579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 12 Nov 2012 23:34:03 +0100
Subject: [PATCH] distro: Use `mirror://' URLs.

* distro/packages/base.scm, distro/packages/bash.scm,
  distro/packages/compression.scm, distro/packages/gawk.scm,
  distro/packages/gperf.scm, distro/packages/guile.scm,
  distro/packages/libsigsegv.scm, distro/packages/libtool.scm,
  distro/packages/libunistring.scm, distro/packages/m4.scm,
  distro/packages/multiprecision.scm, distro/packages/ncurses.scm,
  distro/packages/pth.scm, distro/packages/readline.scm,
  distro/packages/recutils.scm: Use `mirror://gnu' URLs.
* distro/packages/gnupg.scm: Use `mirror://gnupg' URLs.
---
 distro/packages/base.scm           | 24 ++++++++++++------------
 distro/packages/bash.scm           |  2 +-
 distro/packages/compression.scm    |  2 +-
 distro/packages/gawk.scm           |  2 +-
 distro/packages/gnupg.scm          | 13 ++++++-------
 distro/packages/gperf.scm          |  2 +-
 distro/packages/guile.scm          |  4 ++--
 distro/packages/libsigsegv.scm     |  2 +-
 distro/packages/libtool.scm        |  2 +-
 distro/packages/libunistring.scm   |  2 +-
 distro/packages/m4.scm             |  2 +-
 distro/packages/multiprecision.scm |  4 ++--
 distro/packages/ncurses.scm        |  2 +-
 distro/packages/pth.scm            |  2 +-
 distro/packages/readline.scm       |  2 +-
 distro/packages/recutils.scm       |  2 +-
 16 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/distro/packages/base.scm b/distro/packages/base.scm
index 04b1cccedc903d9ae7fdce481fca2f6f2d9be22a..6088c3d9ce5390e8f3f79ae3c674765de9074412 100644
--- a/distro/packages/base.scm
+++ b/distro/packages/base.scm
@@ -47,7 +47,7 @@
    (version "2.8")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/hello/hello-" version
+            (uri (string-append "mirror://gnu/hello/hello-" version
                                 ".tar.gz"))
             (sha256
              (base32 "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"))))
@@ -68,7 +68,7 @@
    (version "2.14")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/grep/grep-"
+            (uri (string-append "mirror://gnu/grep/grep-"
                                 version ".tar.xz"))
             (sha256
              (base32
@@ -88,7 +88,7 @@ lines.")
    (version "4.2.1")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/sed/sed-" version
+            (uri (string-append "mirror://gnu/sed/sed-" version
                                 ".tar.bz2"))
             (sha256
              (base32
@@ -110,7 +110,7 @@ substituting multiple occurrences of a string within a file.")
    (version "1.26")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/tar/tar-"
+            (uri (string-append "mirror://gnu/tar/tar-"
                                 version ".tar.bz2"))
             (sha256
              (base32
@@ -140,7 +140,7 @@ files (as archives).")
    (version "2.6.1")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/patch/patch-"
+            (uri (string-append "mirror://gnu/patch/patch-"
                                 version ".tar.xz"))
             (sha256
              (base32
@@ -166,7 +166,7 @@ producing patched versions.")
    (version "3.2")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/diffutils/diffutils-"
+            (uri (string-append "mirror://gnu/diffutils/diffutils-"
                                 version ".tar.xz"))
             (sha256
              (base32
@@ -211,7 +211,7 @@ You can use the sdiff command to merge two files interactively.")
    (version "4.4.2")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/findutils/findutils-"
+            (uri (string-append "mirror://gnu/findutils/findutils-"
                                 version ".tar.gz"))
             (sha256
              (base32
@@ -253,7 +253,7 @@ The tools supplied with this package are:
    (version "8.19")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/coreutils/coreutils-"
+            (uri (string-append "mirror://gnu/coreutils/coreutils-"
                                 version ".tar.xz"))
             (sha256
              (base32
@@ -279,7 +279,7 @@ are expected to exist on every operating system.")
    (version "3.82")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/make/make-" version
+            (uri (string-append "mirror://gnu/make/make-" version
                                 ".tar.bz2"))
             (sha256
              (base32
@@ -308,7 +308,7 @@ that it is possible to use Make to build and install the program.")
    (version "2.22")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/binutils/binutils-"
+            (uri (string-append "mirror://gnu/binutils/binutils-"
                                 version ".tar.bz2"))
             (sha256
              (base32
@@ -341,7 +341,7 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
      (version "4.7.2")
      (source (origin
               (method url-fetch)
-              (uri (string-append "http://ftp.gnu.org/gnu/gcc/gcc-"
+              (uri (string-append "mirror://gnu/gcc/gcc-"
                                   version "/gcc-" version ".tar.bz2"))
               (sha256
                (base32
@@ -498,7 +498,7 @@ used in the GNU system including the GNU/Linux variant.")
    (version "2.16.0")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/glibc/glibc-"
+            (uri (string-append "mirror://gnu/glibc/glibc-"
                                 version ".tar.xz"))
             (sha256
              (base32
diff --git a/distro/packages/bash.scm b/distro/packages/bash.scm
index 3ee54299f995c8de412af0d38dbd2b13f467f719..7b427debd9d7dcd4973e5f022559b969b0ed39aa 100644
--- a/distro/packages/bash.scm
+++ b/distro/packages/bash.scm
@@ -38,7 +38,7 @@
      (source (origin
               (method url-fetch)
               (uri (string-append
-                    "http://ftp.gnu.org/gnu/bash/bash-" version ".tar.gz"))
+                    "mirror://gnu/bash/bash-" version ".tar.gz"))
               (sha256
                (base32
                 "1n5kbblp5ykbz5q8aq88lsif2z0gnvddg9babk33024wxiwi2ym2"))))
diff --git a/distro/packages/compression.scm b/distro/packages/compression.scm
index d5299f62bb7ac2b6852c5fd1ff248e2822af7c89..2fad81fb6a72d97908f23d4c04d3b0587acde987 100644
--- a/distro/packages/compression.scm
+++ b/distro/packages/compression.scm
@@ -67,7 +67,7 @@ in compression.")
    (version "1.5")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/gzip/gzip-"
+            (uri (string-append "mirror://gnu/gzip/gzip-"
                                 version ".tar.gz"))
             (sha256
              (base32
diff --git a/distro/packages/gawk.scm b/distro/packages/gawk.scm
index 58c1bf1bea362fe1d5702c074a4efebd89cac4e2..102f2acf367625797a8d4f25e4c0b68765e614e3 100644
--- a/distro/packages/gawk.scm
+++ b/distro/packages/gawk.scm
@@ -29,7 +29,7 @@
    (version "4.0.0")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/gawk/gawk-" version
+            (uri (string-append "mirror://gnu/gawk/gawk-" version
                                 ".tar.bz2"))
             (sha256
              (base32 "0sss7rhpvizi2a88h6giv0i7w5h07s2fxkw3s6n1hqvcnhrfgbb0"))))
diff --git a/distro/packages/gnupg.scm b/distro/packages/gnupg.scm
index 7bc3b0c266fe8d4c30988ece4c09a7a66e41cdc5..ca118355d0b29dc3ac7933eb31b96cb1977d9310 100644
--- a/distro/packages/gnupg.scm
+++ b/distro/packages/gnupg.scm
@@ -31,7 +31,7 @@
     (source
      (origin
       (method url-fetch)
-      (uri (string-append "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-"
+      (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-"
                           version ".tar.bz2"))
       (sha256
        (base32
@@ -54,7 +54,7 @@ Daemon and possibly more in the future.")
     (source
      (origin
       (method url-fetch)
-      (uri (string-append "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-"
+      (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
                           version ".tar.bz2"))
       (sha256
        (base32
@@ -80,7 +80,7 @@ functions, random numbers and a lot of supporting functions.")
     (source
      (origin
       (method url-fetch)
-      (uri (string-append "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-"
+      (uri (string-append "mirror://gnupg/libassuan/libassuan-"
                           version ".tar.bz2"))
       (sha256
        (base32
@@ -106,7 +106,7 @@ provided.")
      (origin
       (method url-fetch)
       (uri (string-append
-            "ftp://ftp.gnupg.org/gcrypt/libksba/libksba-"
+            "mirror://gnupg/libksba/libksba-"
             version ".tar.bz2"))
       (sha256
        (base32
@@ -130,9 +130,8 @@ specifications are building blocks of S/MIME and TLS.")
     (source
      (origin
       (method url-fetch)
-      (uri (string-append
-            "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-" version
-            ".tar.bz2"))
+      (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
+                          ".tar.bz2"))
       (sha256
        (base32
         "08n636sfffs5qvg9ppiprvsh00q0dmdw425psg3m3nssja53m8pg"))))
diff --git a/distro/packages/gperf.scm b/distro/packages/gperf.scm
index 099038af691d772c7e783b405ee8ba6155da57b5..cd9b05fa5818903fd587e5a2d8900f0a0d82b8b8 100644
--- a/distro/packages/gperf.scm
+++ b/distro/packages/gperf.scm
@@ -29,7 +29,7 @@
     (source
      (origin
       (method url-fetch)
-      (uri (string-append "ftp://ftp.gnu.org/gnu/gperf/gperf-"
+      (uri (string-append "mirror://gnu/gperf/gperf-"
                           version ".tar.gz"))
       (sha256
        (base32
diff --git a/distro/packages/guile.scm b/distro/packages/guile.scm
index 937be8dd2c5edf90c9d9e04fc439d1176eefb9af..dce6ed863ef9a31cee9a93c41293110f66726264 100644
--- a/distro/packages/guile.scm
+++ b/distro/packages/guile.scm
@@ -44,7 +44,7 @@
    (version "1.8.8")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/guile/guile-" version
+            (uri (string-append "mirror://gnu/guile/guile-" version
                                 ".tar.gz"))
             (sha256
              (base32
@@ -94,7 +94,7 @@ extensible.  It supports many SRFIs.")
    (version "2.0.6")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/guile/guile-" version
+            (uri (string-append "mirror://gnu/guile/guile-" version
                                 ".tar.xz"))
             (sha256
              (base32
diff --git a/distro/packages/libsigsegv.scm b/distro/packages/libsigsegv.scm
index 030557f91843519547debbe367eaaf26a3f7c7d3..f81dffadda9c5c49dbe45a011d0f32c9a0e8b515 100644
--- a/distro/packages/libsigsegv.scm
+++ b/distro/packages/libsigsegv.scm
@@ -29,7 +29,7 @@
    (source (origin
             (method url-fetch)
             (uri (string-append
-                  "http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-"
+                  "mirror://gnu/libsigsegv/libsigsegv-"
                   version ".tar.gz"))
             (sha256
              (base32 "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44"))))
diff --git a/distro/packages/libtool.scm b/distro/packages/libtool.scm
index 63c88cd4cd3729c7bf192d56deeaf8a5a21b529d..7d4f1aabf497101af217a27c7724a611e83b4b44 100644
--- a/distro/packages/libtool.scm
+++ b/distro/packages/libtool.scm
@@ -31,7 +31,7 @@
    (version "2.4.2")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/libtool/libtool-"
+            (uri (string-append "mirror://gnu/libtool/libtool-"
                                 version ".tar.gz"))
             (sha256
              (base32
diff --git a/distro/packages/libunistring.scm b/distro/packages/libunistring.scm
index 0d865645bde84428110eb257bdea8ef5e24bcea3..20133d021f58f7416c75d9c3926968fa5ea24b3b 100644
--- a/distro/packages/libunistring.scm
+++ b/distro/packages/libunistring.scm
@@ -29,7 +29,7 @@
    (source (origin
             (method url-fetch)
             (uri (string-append
-                  "http://ftp.gnu.org/gnu/libunistring/libunistring-"
+                  "mirror://gnu/libunistring/libunistring-"
                   version ".tar.gz"))
             (sha256
              (base32
diff --git a/distro/packages/m4.scm b/distro/packages/m4.scm
index 8517b7383401e18511723978f69c0bb45c9d7c5e..9b94f18db98382e1e108d843625815e5b439fecb 100644
--- a/distro/packages/m4.scm
+++ b/distro/packages/m4.scm
@@ -29,7 +29,7 @@
    (version "1.4.16")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/m4/m4-"
+            (uri (string-append "mirror://gnu/m4/m4-"
                                 version ".tar.bz2"))
             (sha256
              (base32
diff --git a/distro/packages/multiprecision.scm b/distro/packages/multiprecision.scm
index c780e4ce0398a7b97b9d5b81587ee8dcd3300a20..9cfde88c3df7066b6cface62eb59842af26bae0f 100644
--- a/distro/packages/multiprecision.scm
+++ b/distro/packages/multiprecision.scm
@@ -30,7 +30,7 @@
    (version "5.0.5")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/gmp/gmp-" version
+            (uri (string-append "mirror://gnu/gmp/gmp-" version
                                 ".tar.bz2"))
             (sha256
              (base32
@@ -72,7 +72,7 @@ faster algorithms.")
    (version "3.1.1")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/mpfr/mpfr-" version
+            (uri (string-append "mirror://gnu/mpfr/mpfr-" version
                                 ".tar.xz"))
             (sha256 (base32
                      "0ym1ylcq803n52qrggxqmkz66gbn8ncc3ybawal31v5y5p1srma9"))))
diff --git a/distro/packages/ncurses.scm b/distro/packages/ncurses.scm
index b16d4002eee5c07c57d74e9afadda2bf9e00014f..59e627d4e2e6b4031a6362f98d70b637bd857350 100644
--- a/distro/packages/ncurses.scm
+++ b/distro/packages/ncurses.scm
@@ -56,7 +56,7 @@
      (version "5.9")
      (source (origin
               (method url-fetch)
-              (uri (string-append "http://ftp.gnu.org/gnu/ncurses/ncurses-"
+              (uri (string-append "mirror://gnu/ncurses/ncurses-"
                                   version ".tar.gz"))
               (sha256
                (base32
diff --git a/distro/packages/pth.scm b/distro/packages/pth.scm
index bb65c41598ad7398bba692c51e98ee9e52be3f50..4e5c90e2af9cac8d1be2f1ae2f341257290c0480 100644
--- a/distro/packages/pth.scm
+++ b/distro/packages/pth.scm
@@ -28,7 +28,7 @@
     (source
      (origin
       (method url-fetch)
-      (uri (string-append "ftp://ftp.gnu.org/gnu/pth/pth-" version
+      (uri (string-append "mirror://gnu/pth/pth-" version
                           ".tar.gz"))
       (sha256
        (base32
diff --git a/distro/packages/readline.scm b/distro/packages/readline.scm
index 18c149b2c618b4c6a5fedaa37586ea7461c6b7a8..9a780a23aca29f950319d9b9232f803e12419824 100644
--- a/distro/packages/readline.scm
+++ b/distro/packages/readline.scm
@@ -30,7 +30,7 @@
    (version "6.2")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/readline/readline-"
+            (uri (string-append "mirror://gnu/readline/readline-"
                                 version ".tar.gz"))
             (sha256
              (base32
diff --git a/distro/packages/recutils.scm b/distro/packages/recutils.scm
index a03e73b7d641b9246ccf230a7b5f43ae5c292f4c..afeecb5885a6055d588dd0d1944a5357039df9d6 100644
--- a/distro/packages/recutils.scm
+++ b/distro/packages/recutils.scm
@@ -29,7 +29,7 @@
    (version "1.5")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://ftp.gnu.org/gnu/recutils/recutils-"
+            (uri (string-append "mirror://gnu/recutils/recutils-"
                                 version ".tar.gz"))
             (sha256
              (base32