01/01: gnu: glibc/linux: Fix source URL and remove patch.

[Ricardo Wurmus]

rekado pushed a commit to branch rhel6
in repository guix.

commit a3c7a1ff1f7d08fe175045cc57aae4d115123f5e
Author: Ricardo Wurmus <address@hidden>
Date:   Fri Mar 23 11:07:16 2018 +0100

    gnu: glibc/linux: Fix source URL and remove patch.
    
    This is a follow-up to d0e4598fb722519aca8272b918daf0e9d4b59da7.
    
    * gnu/packages/base.scm (glibc/linux)[source]: Download from GNU mirror;
    remove "glibc-CVE-2017-15670-15671.patch".
---
 gnu/packages/base.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index e4f2763..84b4cf5 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -535,9 +535,8 @@ store.")
    (version "2.25")
    (source (origin
             (method url-fetch)
-            (uri (string-append "https://alpha.gnu.org/gnu/guix/mirror/";
-                                "glibc-" (version-major+minor version) "-"
-                                (caddr (string-split version #\.)) ".tar.xz"))
+            (uri (string-append "mirror://gnu/glibc/glibc-"
+                                version ".tar.xz"))
             (sha256
              (base32
               "1813dzkgw6v8q8q1m4v96yfis7vjqc9pslqib6j9mrwh6fxxjyq6"))
@@ -554,7 +553,6 @@ store.")
                                      "glibc-o-largefile.patch"
                                      "glibc-memchr-overflow-i686.patch"
                                      "glibc-vectorized-strcspn-guards.patch"
-                                     "glibc-CVE-2017-15670-15671.patch"
                                      "glibc-CVE-2017-1000366-pt1.patch"
                                      "glibc-CVE-2017-1000366-pt2.patch"
                                      "glibc-CVE-2017-1000366-pt3.patch"))))