01/02: gnu: icecat: Relabel patches to reflect CVE assignments.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit d2cebbf694a820997b8e0a3f77dd1ec110add3a5
Author: Mark H Weaver <address@hidden>
Date:   Fri May 11 03:53:51 2018 -0400

    gnu: icecat: Relabel patches to reflect CVE assignments.
    
    Document the fact that we include fixes for CVE-2018-5154, CVE-2018-5155,
    CVE-2018-5157, CVE-2018-5158, CVE-2018-5159, CVE-2018-5168, CVE-2018-5178,
    and 9/10 changesets for CVE-2018-5150.
    
    * gnu/packages/gnuzilla.scm (icecat)[source]: Relabel patches to reflect CVE
    assignments.
    * gnu/packages/patches/icecat-bug-1452075.patch: Rename to...
    * gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch: 
...this.
    * gnu/local.mk (dist_patch_DATA): Rename it.
---
 gnu/local.mk                                       |  2 +-
 gnu/packages/gnuzilla.scm                          | 30 +++++++++++-----------
 ...> icecat-CVE-2018-5157-and-CVE-2018-5158.patch} |  0
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 789e97f..3ca7d45 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -784,7 +784,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch        \
   %D%/packages/patches/hydra-disable-darcs-test.patch          \
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch    \
-  %D%/packages/patches/icecat-bug-1452075.patch                        \
+  %D%/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch    \
   %D%/packages/patches/icecat-use-system-graphite2.patch       \
   %D%/packages/patches/icecat-use-system-harfbuzz.patch                \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch                      \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 1b36544..d32dbc7 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -454,25 +454,25 @@ security standards.")
         (mozilla-patch "icecat-CVE-2018-5146.patch"      "494e5d5278ba" 
"1yb4lxjw499ppwhk31vz0vzl0cfqvj9d4jwqag7ayj53ybwsqgjr")
         (mozilla-patch "icecat-CVE-2018-5147.patch"      "5cd5586a2f48" 
"10s774pwvj6xfk3kk6ivnhp2acc8x9sqq6na8z47nkhgwl2712i5")
         (mozilla-patch "icecat-CVE-2018-5148.patch"      "c3e447e07077" 
"0gmwy631f8ip4gr1mpbjk8bx1n1748wdls5zq4y8hpmpnq5g1wyx")
-        (mozilla-patch "icecat-bug-1443891.patch"        "17201199b18d" 
"1d0hcim1fwh0bklwpmnal1mv9d9kmyif1m15aj1nqkf1n3x4xc37")
+        (mozilla-patch "icecat-CVE-2018-5178.patch"      "17201199b18d" 
"1d0hcim1fwh0bklwpmnal1mv9d9kmyif1m15aj1nqkf1n3x4xc37")
         (mozilla-patch "icecat-bug-1361699.patch"        "a07d6c3ff262" 
"1z8mjg2487r8pxi0x951v6fwwr696q84f6hlzimc3r7bn5ds9r83")
-        (mozilla-patch "icecat-bug-1433609.patch"        "7127ccf8f88c" 
"0m4my7aflpp0wlqilr2m4axd7k2fyrs7jqdcz2rrz5pwivz1anvd")
+        (mozilla-patch "icecat-CVE-2018-5150-pt01.patch" "7127ccf8f88c" 
"0m4my7aflpp0wlqilr2m4axd7k2fyrs7jqdcz2rrz5pwivz1anvd")
         (mozilla-patch "icecat-bug-1444231.patch"        "57bd35fa8618" 
"0pl6x5amc5x6nhwl7qnmnff3jjjxmbs8r365bfzj58g7q5ihqwvf")
-        (mozilla-patch "icecat-bug-1409440.patch"        "2f3e1ccf1661" 
"0azl8g81kpc0w2xpjpgm1154ll12g0a8n6i7bl3s9nnrk2i26n74")
-        (mozilla-patch "icecat-bug-1441941.patch"        "8ff2c4d68e36" 
"0kz1rqhnz8ca4z20hnpcafidhsrwhnm0h2gmlgchni33h8pisr1f")
-        (mozilla-patch "icecat-bug-1443092.patch"        "b8c430253efd" 
"1arjcaps9axhxh5ff84n9bydhhzrihn7hbq7v69nvqwqrjp3lgg9")
-        (mozilla-patch "icecat-bug-1448774.patch"        "05cadfa3ac39" 
"0q0vh7vy7x0l8jp6376fn10qljfp4mnp4m9zfn90j4m19pfl86a0")
-        (mozilla-patch "icecat-bug-1449548.patch"        "48a678d7cb81" 
"1yfh7kxxxvqck2hpn98pwag4splyc6c9brc5haq28fp8x9r9qvlk")
-        (mozilla-patch "icecat-bug-1448705.patch"        "112032576872" 
"1x1hxyggbxlnlj0n9cbp03hjnfvm6cq8nqj0jizrd8cfyd5aig8p")
-        (mozilla-patch "icecat-bug-1388020.patch"        "ad9a885b0df4" 
"1hrk1q9mk59jww55g4lqmaflznk87x3vvjn2mxfgfbbjs8l1cyz4")
+        (mozilla-patch "icecat-CVE-2018-5150-pt02.patch" "2f3e1ccf1661" 
"0azl8g81kpc0w2xpjpgm1154ll12g0a8n6i7bl3s9nnrk2i26n74")
+        (mozilla-patch "icecat-CVE-2018-5159.patch"      "8ff2c4d68e36" 
"0kz1rqhnz8ca4z20hnpcafidhsrwhnm0h2gmlgchni33h8pisr1f")
+        (mozilla-patch "icecat-CVE-2018-5154.patch"      "b8c430253efd" 
"1arjcaps9axhxh5ff84n9bydhhzrihn7hbq7v69nvqwqrjp3lgg9")
+        (mozilla-patch "icecat-CVE-2018-5155.patch"      "05cadfa3ac39" 
"0q0vh7vy7x0l8jp6376fn10qljfp4mnp4m9zfn90j4m19pfl86a0")
+        (mozilla-patch "icecat-CVE-2018-5168.patch"      "48a678d7cb81" 
"1yfh7kxxxvqck2hpn98pwag4splyc6c9brc5haq28fp8x9r9qvlk")
+        (mozilla-patch "icecat-CVE-2018-5150-pt03.patch" "112032576872" 
"1x1hxyggbxlnlj0n9cbp03hjnfvm6cq8nqj0jizrd8cfyd5aig8p")
+        (mozilla-patch "icecat-CVE-2018-5150-pt04.patch" "ad9a885b0df4" 
"1hrk1q9mk59jww55g4lqmaflznk87x3vvjn2mxfgfbbjs8l1cyz4")
         (mozilla-patch "icecat-bug-1452416.patch"        "f89ab96a2532" 
"1dqchxdyznhgyxhfq0hm0vg1p597hjqflfzigc7j3s5vxf9rg2nv")
-        (mozilla-patch "icecat-bug-1451376.patch"        "af885a1bd293" 
"1wfpqhm2dp4fsx6zbrncngsqz7g2x09b625zcighixrbpvybyww3")
-        (mozilla-patch "icecat-bug-1444668.patch"        "666fc84ec72d" 
"0lml2wqd4yqidhi364x8r90f78397k2y0kq5z5bv8l8j4bhcnb9v")
-        (search-patch  "icecat-bug-1452075.patch")
-        (mozilla-patch "icecat-bug-1393367.patch"        "1ab40761a856" 
"1kgwypy7k5b33jwkni4025za4kcnv5m6klsx4wsswlixmljmkbc7")
+        (mozilla-patch "icecat-CVE-2018-5150-pt05.patch" "af885a1bd293" 
"1wfpqhm2dp4fsx6zbrncngsqz7g2x09b625zcighixrbpvybyww3")
+        (mozilla-patch "icecat-CVE-2018-5150-pt06.patch" "666fc84ec72d" 
"0lml2wqd4yqidhi364x8r90f78397k2y0kq5z5bv8l8j4bhcnb9v")
+        (search-patch  "icecat-CVE-2018-5157-and-CVE-2018-5158.patch")
+        (mozilla-patch "icecat-CVE-2018-5150-pt07.patch" "1ab40761a856" 
"1kgwypy7k5b33jwkni4025za4kcnv5m6klsx4wsswlixmljmkbc7")
         (mozilla-patch "icecat-bug-1453339.patch"        "0edb8dca7087" 
"0b30pipqryh311sc97rcmwnx9n8qdlbbz90b2hkybjnprmbhfxrm")
-        (mozilla-patch "icecat-bug-1452202.patch"        "134c728799c1" 
"16hbwx6fx1hrddsyjjbd3z954ql3pg348xs13h9riyblq8crzmam")
-        (mozilla-patch "icecat-bug-1411415.patch"        "14eab155eaa8" 
"0wr4xgblxzk4c2gvlnpl7ic1196mrhry1hgwdl1jivq0ji5cbvbd")
+        (mozilla-patch "icecat-CVE-2018-5150-pt08.patch" "134c728799c1" 
"16hbwx6fx1hrddsyjjbd3z954ql3pg348xs13h9riyblq8crzmam")
+        (mozilla-patch "icecat-CVE-2018-5150-pt09.patch" "14eab155eaa8" 
"0wr4xgblxzk4c2gvlnpl7ic1196mrhry1hgwdl1jivq0ji5cbvbd")
         (mozilla-patch "icecat-bug-1452619.patch"        "2b75d55ccf0e" 
"1g87aybw6ggv6hyk385bplv0lx63n020gwyq0d6d4pqld48hsm1i")
         (mozilla-patch "icecat-bug-1453127.patch"        "89857f35df29" 
"0gzi47svrw5ajdlm3i12193psm702zx70x5h1rwp4gb7gxh4m4d9")))
       (modules '((guix build utils)))
diff --git a/gnu/packages/patches/icecat-bug-1452075.patch 
b/gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch
similarity index 100%
rename from gnu/packages/patches/icecat-bug-1452075.patch
rename to gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch