02/02: gnu: t1lib: Change how patched CVEs are listed.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 9c2d2c13ce1f080dd8cff6a451625883fe6abab3
Author: Efraim Flashner <address@hidden>
Date:   Thu Nov 30 23:46:55 2017 +0200

    gnu: t1lib: Change how patched CVEs are listed.
    
    * gnu/packages/fontutils.scm (t1lib)[source]: Change patch name.
    [properties]: New field, register patched CVEs.
    * gnu/packages/patches/CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch:
    Rename to CVE-2011-1552+.patch.
    * gnu/local.mk (dist_patch_DATA): Change patch name.
---
 gnu/local.mk                                                      | 2 +-
 gnu/packages/fontutils.scm                                        | 8 ++++++--
 ...E-2011-1553+CVE-2011-1554.patch => t1lib-CVE-2011-1552+.patch} | 0
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 22f2a8f..13ad483 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1071,7 +1071,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch     \
   %D%/packages/patches/t1lib-CVE-2010-2642.patch               \
   %D%/packages/patches/t1lib-CVE-2011-0764.patch               \
-  %D%/packages/patches/t1lib-CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch   
        \
+  %D%/packages/patches/t1lib-CVE-2011-1552+.patch              \
   %D%/packages/patches/tar-CVE-2016-6321.patch                 \
   %D%/packages/patches/tar-skip-unreliable-tests.patch         \
   %D%/packages/patches/tcl-mkindex-deterministic.patch         \
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index f20eb45..19d5171 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -303,9 +303,13 @@ high quality, anti-aliased and subpixel rendered text on a 
display.")
             (sha256 (base32
                      "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"))
             (patches (search-patches
-                       "t1lib-CVE-2010-2642.patch"
+                       "t1lib-CVE-2010-2642.patch" ; 2011-0443, 2011-5244
                        "t1lib-CVE-2011-0764.patch"
-                       
"t1lib-CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch"))))
+                       "t1lib-CVE-2011-1552+.patch")))) ; 2011-1553, 2011-1554
+   (properties `((lint-hidden-cve . ("CVE-2011-0433"
+                                     "CVE-2011-1553"
+                                     "CVE-2011-1554"
+                                     "CVE-2011-5244"))))
    (build-system gnu-build-system)
    (arguments
     ;; Making the documentation requires latex, but t1lib is also an input
diff --git 
a/gnu/packages/patches/t1lib-CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch 
b/gnu/packages/patches/t1lib-CVE-2011-1552+.patch
similarity index 100%
rename from 
gnu/packages/patches/t1lib-CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch
rename to gnu/packages/patches/t1lib-CVE-2011-1552+.patch