From patchwork Sun May 28 14:23:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 767895 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wbMYz1Qxzz9s7M for ; Mon, 29 May 2017 00:24:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A73B286922; Sun, 28 May 2017 14:24:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VFlXYBW9k8GA; Sun, 28 May 2017 14:24:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4E205858D3; Sun, 28 May 2017 14:24:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D6B631C0574 for ; Sun, 28 May 2017 14:23:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D1C7C8673A for ; Sun, 28 May 2017 14:23:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s-R60+-P7vym for ; Sun, 28 May 2017 14:23:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by hemlock.osuosl.org (Postfix) with ESMTPS id E9AF0866E0 for ; Sun, 28 May 2017 14:23:57 +0000 (UTC) Received: from fwd31.aul.t-online.de (fwd31.aul.t-online.de [172.20.26.136]) by mailout01.t-online.de (Postfix) with SMTP id 3086D4328D59 for ; Sun, 28 May 2017 16:23:56 +0200 (CEST) Received: from fli4l.lan.fli4l (EST5tBZa8h7DEVaDoy8wPxa78muoUen3QMSd7Mo1bpBmD2rp42Hlz3D8fcEG5iqgbo@[79.228.25.228]) by fwd31.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1dEz6p-1Ri4FU0; Sun, 28 May 2017 16:23:55 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:33620 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.89) (envelope-from ) id 1dEz6o-0007m6-2e for buildroot@buildroot.org; Sun, 28 May 2017 16:23:54 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 28 May 2017 16:23:54 +0200 Message-Id: <20170528142354.29368-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 X-ID: EST5tBZa8h7DEVaDoy8wPxa78muoUen3QMSd7Mo1bpBmD2rp42Hlz3D8fcEG5iqgbo X-TOI-MSGID: c702a3c9-472e-45a4-bbc9-77efde1d57b8 Subject: [Buildroot] [PATCH 1/1] package/freetype: bump version to 2.8 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Added md5 & sha1 hashes supplied by sourceforge mirror. Removed patches applied upstream: 0001-psaux-Better-protect-flex-handling.patch http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3774fc08b502c3e685afca098b6e8a195aded6a0 Signed-off-by: Bernd Kuhls --- .../0001-psaux-Better-protect-flex-handling.patch | 47 ---------------------- ...sobjs.c-t1_builder_close_contour-Add-safe.patch | 35 ---------------- package/freetype/freetype.hash | 5 ++- package/freetype/freetype.mk | 2 +- 4 files changed, 5 insertions(+), 84 deletions(-) delete mode 100644 package/freetype/0001-psaux-Better-protect-flex-handling.patch delete mode 100644 package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch diff --git a/package/freetype/0001-psaux-Better-protect-flex-handling.patch b/package/freetype/0001-psaux-Better-protect-flex-handling.patch deleted file mode 100644 index a59f5b34f..000000000 --- a/package/freetype/0001-psaux-Better-protect-flex-handling.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Fri, 24 Mar 2017 09:15:10 +0100 -Subject: [PATCH] [psaux] Better protect `flex' handling. - -Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935 - -* src/psaux/t1decode.c (t1_decoder_parse_charstrings) -: Since there is not a single flex operator but a -series of subroutine calls, malformed fonts can call arbitrary other -operators after the start of a flex, possibly adding points. For -this reason we have to check the available number of points before -inserting a point. - -Fixes CVE-2017-8105 - -Signed-off-by: Peter Korsgaard ---- -diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c -index af7b465e..7dd45135 100644 ---- a/src/psaux/t1decode.c -+++ b/src/psaux/t1decode.c -@@ -780,10 +780,19 @@ - /* point without adding any point to the outline */ - idx = decoder->num_flex_vectors++; - if ( idx > 0 && idx < 7 ) -+ { -+ /* in malformed fonts it is possible to have other */ -+ /* opcodes in the middle of a flex (which don't */ -+ /* increase `num_flex_vectors'); we thus have to */ -+ /* check whether we can add a point */ -+ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) ) -+ goto Syntax_Error; -+ - t1_builder_add_point( builder, - x, - y, - (FT_Byte)( idx == 3 || idx == 6 ) ); -+ } - } - break; - --- -2.11.0 - diff --git a/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch b/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch deleted file mode 100644 index 1b9d90a7d..000000000 --- a/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Sun, 26 Mar 2017 08:32:09 +0200 -Subject: [PATCH] * src/psaux/psobjs.c (t1_builder_close_contour): Add safety - guard. - -Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941 - -Fixes CVE-2017-8287 - -Signed-off-by: Peter Korsgaard -diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c -index d18e821a..0baf8368 100644 ---- a/src/psaux/psobjs.c -+++ b/src/psaux/psobjs.c -@@ -1718,6 +1718,14 @@ - first = outline->n_contours <= 1 - ? 0 : outline->contours[outline->n_contours - 2] + 1; - -+ /* in malformed fonts it can happen that a contour was started */ -+ /* but no points were added */ -+ if ( outline->n_contours && first == outline->n_points ) -+ { -+ outline->n_contours--; -+ return; -+ } -+ - /* We must not include the last point in the path if it */ - /* is located on the first point. */ - if ( outline->n_points > 1 ) --- -2.11.0 - diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index b2cec04d3..beff85846 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,2 +1,5 @@ +# From https://sourceforge.net/projects/freetype/files/freetype2/2.8/ +md5 2413ac3eaf508ada019c63959ea81a92 freetype-2.8.tar.bz2 +sha1 42c6b1f733fe13a3eba135f5025b22cb68450f91 freetype-2.8.tar.bz2 # Locally calculated after checking pgp signature -sha256 3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88 freetype-2.7.1.tar.bz2 +sha256 a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b freetype-2.8.tar.bz2 diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 57f9b2048..9a98b4068 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.7.1 +FREETYPE_VERSION = 2.8 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES