02/05: gnu: icecat: Add more fixes from upstream mozilla-esr52.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit 52009dc3bd98ea0b3dc0cedaddf4c1a9cf18a2f3
Author: Mark H Weaver <address@hidden>
Date:   Wed Jan 24 02:25:23 2018 -0500

    gnu: icecat: Add more fixes from upstream mozilla-esr52.
    
    Includes fixes for CVE-2018-5104, CVE-2018-5097, CVE-2018-5099, and the
    remaining 7 out of 21 changesets for CVE-2018-5089.
    
    * gnu/packages/gnuzilla.scm (icecat)[source]: Add selected fixes from the
    upstream mozilla-esr52 repository.  Remove the local spectre mitigation 
patch
    in favor of the (identical) changeset from upstream.
    * gnu/packages/patches/icecat-bug-1427870-spectre-mitigation.patch: Delete.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/gnuzilla.scm                          | 17 +++++++-
 .../icecat-bug-1427870-spectre-mitigation.patch    | 49 ----------------------
 3 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index b72c586..e86e7da 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -759,7 +759,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/icecat-bug-1415133.patch                        \
   %D%/packages/patches/icecat-bug-1414945.patch                        \
   %D%/packages/patches/icecat-bug-1424373-pt2.patch            \
-  %D%/packages/patches/icecat-bug-1427870-spectre-mitigation.patch     \
   %D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \
   %D%/packages/patches/icu4c-CVE-2017-14952.patch              \
   %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 02e7f2c..7d98a61 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -514,7 +514,22 @@ security standards.")
         (mozilla-patch "icecat-CVE-2018-5089-pt14.patch" "c2945f1249eb" 
"18p0344w6grpyfiz8dczfw977p0qy37iqv95whgnrjli2ab51kji")
         (mozilla-patch "icecat-CVE-2018-5117-pt1.patch"  "263165eacc54" 
"0518xnd9f4qkn7l0z73kldm9dr33y6hf054ril4f8r2j8s9fy33i")
         (mozilla-patch "icecat-CVE-2018-5117-pt2.patch"  "58e87d9cc44e" 
"0j9qwjm25bmhw0sj426yl4fqaa6zknf5cjk0yisdd3895652n5i4")
-        (search-patch  "icecat-bug-1427870-spectre-mitigation.patch")))
+        (mozilla-patch "icecat-CVE-2018-5089-pt15.patch" "aa4b11615431" 
"0whfvwaj3dmk89ah2kbv7zz7a8ckqa0xajf5fl12bgl7q8c8ndnm")
+        (mozilla-patch "icecat-CVE-2018-5104.patch"      "66761c5bfbe1" 
"076128pxc7ik1zq2v0d5m6vd7nls2030jzdc4w0ggy8hd5yyb8g9")
+        (mozilla-patch "icecat-bug-1408631.patch"        "6f5c8df1925d" 
"1hgr18p5dwhlsan6jxlj3ay7cbfyywk40bpbnjc8gqmq6y25cn48")
+        (mozilla-patch "icecat-bug-1422735.patch"        "b88ef76f5687" 
"0rzpxfrhddc0238rq3r1b02j95g0rdplk1fjmk85m51xvggh9086")
+        (mozilla-patch "icecat-bug-1261963.patch"        "d0c98f5b6c12" 
"1z9jn19hnwjand9c0ifc39gq71nz17jjqy2s5fqr2z06y8qys62h")
+        (mozilla-patch "icecat-CVE-2018-5089-pt16.patch" "f7865afb1fe6" 
"0i7ydmcr1g0ih3myyxaxjq6wfg3rvq5j4893kjqksqihfqrkzs4j")
+        (mozilla-patch "icecat-CVE-2018-5097.patch"      "9fb7614319df" 
"1xirahk06w8pyw4pdh64f4pg3qcb7c8x8frrmad2895fagy14g4k")
+        (mozilla-patch "icecat-mitigate-spectre.patch"   "81d6465bd7c2" 
"1za5l249pb5x7f283vrimy0ankjzvwa99hfql3v4fm5a4grjkj9n")
+        (mozilla-patch "icecat-CVE-2018-5089-pt17.patch" "5f753161df25" 
"1k2mpwagz08wzxfzwy2b4a0pz0hkhdqby6n11i7pasx3ary670km")
+        (mozilla-patch "icecat-CVE-2018-5099.patch"      "b95d654de120" 
"1cv7nz2gsyjjigw6wv4xagh8q6bcg0971md8b6xjvz5m26aynlaw")
+        (mozilla-patch "icecat-bug-1408631.patch"        "3b1faddc0e5f" 
"0817x5mrdyjj0gc9yi19m6d78d18ypc9nbld64d2axhc8v9bz3xf")
+        (mozilla-patch "icecat-glibc-2.26.patch"         "57d4fae4dffe" 
"1sv7kp7m4i7n31ny8k7cpjsrqpxh5y5jm27sh2cgpj7fhi5kqsj2")
+        (mozilla-patch "icecat-CVE-2018-5089-pt18.patch" "fe271a2b9503" 
"11wr8mdxw01dlmzkq55hf0qd52cwmx4vk96cff66d4kkl1dbj6qn")
+        (mozilla-patch "icecat-CVE-2018-5089-pt19.patch" "410da936a1e8" 
"14dvaysz0svlh50kdabjhd2s5avz6p93sbyqhwik5rlvcg5ax5zp")
+        (mozilla-patch "icecat-CVE-2018-5089-pt20.patch" "8368a9a379e3" 
"0fqq01ms7m4kb9b10n8gy5n9n4x43crz2gn1r6c4ny52wzgm3j6f")
+        (mozilla-patch "icecat-CVE-2018-5089-pt21.patch" "a7c8e85285e2" 
"1caa2w5r8rqb1qrk4mgf2vw1k592idvqmgs8qfz2dp2744kk6z98")))
       (modules '((guix build utils)))
       (snippet
        '(begin
diff --git a/gnu/packages/patches/icecat-bug-1427870-spectre-mitigation.patch 
b/gnu/packages/patches/icecat-bug-1427870-spectre-mitigation.patch
deleted file mode 100644
index 6b08828..0000000
--- a/gnu/packages/patches/icecat-bug-1427870-spectre-mitigation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Mitigate Spectre by reducing the resolution of performance.now() to 20
-microseconds.  Based on:
-
-  https://hg.mozilla.org/releases/mozilla-release/rev/afa87f9be3a8
-
-For more details, see:
-
-  
https://blog.mozilla.org/security/2018/01/03/mitigations-landing-new-class-timing-attack/
-
-This patch was modified to apply cleanly to GNU IceCat.
-
-
-# HG changeset patch
-# User Tom Ritter <address@hidden>
-# Date 1514660820 21600
-# Node ID afa87f9be3a8852da3a30f286b15ae599c7874f6
-# Parent  6caa457ebedc915b43dc1d054b8fe22e82ca7447
-Bug 1427870 - Change resolution of .now() to 20us. r=bkelly, a=lizzard
-
-The comment about workers was introduced in Bug 1186489 but became obsolete 
some time after that
-(definitely by Bug 1278838)
-
-diff --git a/dom/performance/Performance.cpp b/dom/performance/Performance.cpp
---- a/dom/performance/Performance.cpp
-+++ b/dom/performance/Performance.cpp
-@@ -234,20 +234,19 @@ Performance::ClearResourceTimings()
- {
-   MOZ_ASSERT(NS_IsMainThread());
-   mResourceEntries.Clear();
- }
- 
- DOMHighResTimeStamp
- Performance::RoundTime(double aTime) const
- {
--  // Round down to the nearest 5us, because if the timer is too accurate 
people
--  // can do nasty timing attacks with it.  See similar code in the worker
--  // Performance implementation.
--  const double maxResolutionMs = 0.005;
-+  // Round down to the nearest 20us, because if the timer is too accurate 
people
-+  // can do nasty timing attacks with it.
-+  const double maxResolutionMs = 0.020;
-   return floor(aTime / maxResolutionMs) * maxResolutionMs;
- }
- 
- 
- void
- Performance::Mark(const nsAString& aName, ErrorResult& aRv)
- {
-   // Don't add the entry if the buffer is full. XXX should be removed by bug 
1159003.