From patchwork Thu Jan 28 18:43:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3828 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DRTrH6Plyz3wxm for ; Thu, 28 Jan 2021 18:43:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DRTrG6Htdz1Wl; Thu, 28 Jan 2021 18:43:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DRTrG4jC4z2xmx; Thu, 28 Jan 2021 18:43:26 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DRTrF35Kcz2xX3 for ; Thu, 28 Jan 2021 18:43:25 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4DRTrD1yc1zty for ; Thu, 28 Jan 2021 18:43:23 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1611859404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mXeQ0qUfbmavQPo5nfh+ON6PHc1vULCTLKngTb7Dgno=; b=pAMp4tKZ2wTXUv30fe2SJdrDNDeEER+BEeyLahsyL1MBtg7cdTi2QclEfM8S3FdObju6yd MplFau6yarnW7NCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1611859404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mXeQ0qUfbmavQPo5nfh+ON6PHc1vULCTLKngTb7Dgno=; b=tXbBs+ImhPCCx/w/2hORiLnsI/eIGfpF1wgyRNQ5AG3E6zxDDDT9P4x8jxZFXn6KEbAO1R kz9lLheXlcpfpqC9VLCCd2DpszZ4vYZwmzMSvW6Uw1GRYR3LxCGn8BrY7N6OUQpeigaM72 qoQeQR1TFZ7w5BYpVnp4otFD/Dafhjl7APeKkeoSdYXY3mipqttFOtFNlmdYO8VHW5n85O Y2M1AUDjWNWwXXC/LifC9/J5+OoTzZnHnTn0D8hUQEvKw2tr+lVhop8o947WQva5p7ipsE Ys4F9n0lKxHmGksiRy7EKt6sESA3/IQ+BYFlfeEEIdj9GnzM/pRuigPY8v+BSA== To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] freetype: update to 2.10.4 Message-ID: Date: Thu, 28 Jan 2021 19:43:22 +0100 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This fixes a heap buffer overflow in the handling of embedded PNG bitmaps (CVE-2020-15999). Further information is available at https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ . Signed-off-by: Peter Müller --- config/rootfiles/common/freetype | 10 ++++------ lfs/freetype | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype index 4d72ec357..194253601 100644 --- a/config/rootfiles/common/freetype +++ b/config/rootfiles/common/freetype @@ -7,15 +7,16 @@ #usr/include/freetype2/freetype/config/ftmodule.h #usr/include/freetype2/freetype/config/ftoption.h #usr/include/freetype2/freetype/config/ftstdlib.h +#usr/include/freetype2/freetype/config/integer-types.h +#usr/include/freetype2/freetype/config/mac-support.h +#usr/include/freetype2/freetype/config/public-macros.h #usr/include/freetype2/freetype/freetype.h #usr/include/freetype2/freetype/ftadvanc.h -#usr/include/freetype2/freetype/ftautoh.h #usr/include/freetype2/freetype/ftbbox.h #usr/include/freetype2/freetype/ftbdf.h #usr/include/freetype2/freetype/ftbitmap.h #usr/include/freetype2/freetype/ftbzip2.h #usr/include/freetype2/freetype/ftcache.h -#usr/include/freetype2/freetype/ftcffdrv.h #usr/include/freetype2/freetype/ftchapters.h #usr/include/freetype2/freetype/ftcid.h #usr/include/freetype2/freetype/ftcolor.h @@ -47,20 +48,17 @@ #usr/include/freetype2/freetype/ftsynth.h #usr/include/freetype2/freetype/ftsystem.h #usr/include/freetype2/freetype/fttrigon.h -#usr/include/freetype2/freetype/ftttdrv.h #usr/include/freetype2/freetype/fttypes.h #usr/include/freetype2/freetype/ftwinfnt.h #usr/include/freetype2/freetype/t1tables.h #usr/include/freetype2/freetype/ttnameid.h #usr/include/freetype2/freetype/tttables.h #usr/include/freetype2/freetype/tttags.h -#usr/include/freetype2/freetype/ttunpat.h #usr/include/freetype2/ft2build.h -#usr/lib/libfreetype.a #usr/lib/libfreetype.la #usr/lib/libfreetype.so usr/lib/libfreetype.so.6 -usr/lib/libfreetype.so.6.17.2 +usr/lib/libfreetype.so.6.17.4 #usr/lib/pkgconfig/freetype2.pc #usr/share/aclocal/freetype2.m4 #usr/share/man/man1/freetype-config.1 diff --git a/lfs/freetype b/lfs/freetype index 4106d22ee..b9a385d88 100644 --- a/lfs/freetype +++ b/lfs/freetype @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2021 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.10.2 +VER = 2.10.4 THISAPP = freetype-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7c0d5a39f232d7eb9f9d7da76bf08074 +$(DL_FILE)_MD5 = 0e6c0e9b218be3ba3e26e1d23b1c80dd install : $(TARGET)