[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/17: gnu: freetype: Update to 2.9.1.
From: |
Tobias Geerinckx-Rice |
Subject: |
07/17: gnu: freetype: Update to 2.9.1. |
Date: |
Tue, 12 Jun 2018 09:30:31 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit eb5d2792a0c32dd4e087359920c0375fb7486509
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Mon Jun 11 13:35:26 2018 +0200
gnu: freetype: Update to 2.9.1.
* gnu/packages/fontutils.scm (freetype): Update to 2.9.1.
[source]: Remove patch...
* gnu/packages/patches/freetype-CVE-2018-6942.patch: ...delete...
* gnu/local.mk (dist_patch_DATA): ...and remove it.
---
gnu/local.mk | 1 -
gnu/packages/fontutils.scm | 5 ++--
gnu/packages/patches/freetype-CVE-2018-6942.patch | 31 -----------------------
3 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index f901f21..5b6fe71 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -678,7 +678,6 @@ dist_patch_DATA =
\
%D%/packages/patches/freeimage-CVE-2016-5684.patch \
%D%/packages/patches/freeimage-fix-build-with-gcc-5.patch \
%D%/packages/patches/freeimage-unbundle.patch \
- %D%/packages/patches/freetype-CVE-2018-6942.patch \
%D%/packages/patches/fuse-overlapping-headers.patch
\
%D%/packages/patches/gawk-shell.patch \
%D%/packages/patches/gcc-arm-bug-71399.patch \
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index f7dc2e7..cf18b55 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -54,14 +54,13 @@
(define-public freetype
(package
(name "freetype")
- (version "2.9")
+ (version "2.9.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/freetype/freetype-"
version ".tar.bz2"))
(sha256 (base32
- "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6"))
- (patches (search-patches "freetype-CVE-2018-6942.patch"))))
+ "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/patches/freetype-CVE-2018-6942.patch
b/gnu/packages/patches/freetype-CVE-2018-6942.patch
deleted file mode 100644
index 680f357..0000000
--- a/gnu/packages/patches/freetype-CVE-2018-6942.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix CVE-2018-6942:
-
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6942
-https://people.canonical.com/~ubuntu-security/cve/2018/CVE-2018-6942.html
-
-Copied from upstream (ChangeLog section removed):
-https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=29c759284e305ec428703c9a5831d0b1fc3497ef
-
-diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
-index d855aaa..551f14a 100644
---- a/src/truetype/ttinterp.c
-+++ b/src/truetype/ttinterp.c
-@@ -7532,8 +7532,16 @@
- return;
- }
-
-- for ( i = 0; i < num_axes; i++ )
-- args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
-+ if ( coords )
-+ {
-+ for ( i = 0; i < num_axes; i++ )
-+ args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */
-+ }
-+ else
-+ {
-+ for ( i = 0; i < num_axes; i++ )
-+ args[i] = 0;
-+ }
- }
-
-
- branch core-updates updated (4dd91df -> d30e9e6), Tobias Geerinckx-Rice, 2018/06/12
- 05/17: gnu: isl: Update to 0.19., Tobias Geerinckx-Rice, 2018/06/12
- 02/17: gnu: shared-mime-info: Update to 1.9., Tobias Geerinckx-Rice, 2018/06/12
- 14/17: gnu: linux-pam: Update to 1.3.1., Tobias Geerinckx-Rice, 2018/06/12
- 03/17: gnu: cups, cups-minimal: Update to 2.2.8., Tobias Geerinckx-Rice, 2018/06/12
- 04/17: gnu: mit-krb5: Update to 1.16.1., Tobias Geerinckx-Rice, 2018/06/12
- 08/17: gnu: libdrm: Update to 2.4.92., Tobias Geerinckx-Rice, 2018/06/12
- 10/17: gnu: wayland-protocols: Update to 1.14., Tobias Geerinckx-Rice, 2018/06/12
- 17/17: gnu: sqlite: Update to 3.24.0., Tobias Geerinckx-Rice, 2018/06/12
- 07/17: gnu: freetype: Update to 2.9.1.,
Tobias Geerinckx-Rice <=
- 12/17: gnu: jansson: Update to 2.11., Tobias Geerinckx-Rice, 2018/06/12
- 09/17: gnu: libunistring: Update to 0.9.10., Tobias Geerinckx-Rice, 2018/06/12
- 15/17: gnu: cmake: Update to 3.11.3., Tobias Geerinckx-Rice, 2018/06/12
- 11/17: gnu: libidn: Update to 1.35., Tobias Geerinckx-Rice, 2018/06/12
- 06/17: gnu: bison: Update to 3.0.5., Tobias Geerinckx-Rice, 2018/06/12
- 16/17: gnu: perl: Ungraft version 5.26.2., Tobias Geerinckx-Rice, 2018/06/12
- 01/17: gnu: fribidi: Update to 1.0.4., Tobias Geerinckx-Rice, 2018/06/12
- 13/17: gnu: nghttp2: Update to 1.32.0., Tobias Geerinckx-Rice, 2018/06/12