diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-06-13 14:53:55 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-06-13 14:59:37 +0200 |
| commit | c9c5c29e3af0c3fead59ec5aa80b21992f6d656d (patch) | |
| tree | d56e9f7c8dcc050889f012317cb6d2c0fc5e86f7 /main/freetype | |
| parent | 7a7493c33286ca7e43c8171cd6fad02bd13574c8 (diff) | |
| download | aports-c9c5c29e3af0c3fead59ec5aa80b21992f6d656d.tar.bz2 aports-c9c5c29e3af0c3fead59ec5aa80b21992f6d656d.tar.xz | |
main/freetype: upgrade to 2.9.1
This is in accordance with the discussion on #alpine-devel:
> 14:41 < nmeum> ncopa: is there any reason against just pushing the CVE fix for now [...]?
> 14:42 <@ncopa> will make it more difficult to upgrade to a future 2.9.2 security upgrade
freetype-config was made optional in 2.9.1 but we still enable it since
we don't know for sure if there are any packages out there which
actually use it.
Diffstat (limited to 'main/freetype')
| -rw-r--r-- | main/freetype/APKBUILD | 11 | ||||
| -rw-r--r-- | main/freetype/CVE-2018-6942.patch | 38 |
2 files changed, 5 insertions, 44 deletions
diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD index 9c55e1ac00..2b3dc8c7b3 100644 --- a/main/freetype/APKBUILD +++ b/main/freetype/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=freetype -pkgver=2.9 -pkgrel=1 +pkgver=2.9.1 +pkgrel=0 pkgdesc="TrueType font rendering library" url="https://www.freetype.org/" arch="all" @@ -17,7 +17,6 @@ source="http://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar. 0001-Enable-table-validation-modules.patch 0003-Enable-infinality-subpixel-hinting.patch 0004-Enable-long-PCF-family-names.patch - CVE-2018-6942.patch freetype-profile.sh " @@ -42,7 +41,8 @@ build() { --infodir=/usr/share/info \ --disable-static \ --with-bzip2 \ - --with-png + --with-png \ + --enable-freetype-config make } @@ -54,10 +54,9 @@ package() { "$pkgdir"/etc/profile.d/freetype.sh } -sha512sums="28465f3453baf9a187529432118389de8f1b85273c9fb787d2c8f0feee8ab64b387ddd936b4e67ec58dcf71e33884e7e25f01169b737824221ab143839a9161a freetype-2.9.tar.bz2 +sha512sums="856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708 freetype-2.9.1.tar.bz2 9981be8a3ea6f2cf856860b87a4e895e4610c9d5ea4beb611815e757e6080e060f6853ace02dd8ea55e5888cdf4bae5ad5eadd2d8a123754bb3c0bfe7ef41dea 40-memcpy-fix.patch 41a84be2631b53072a76b78c582575aa48b650ee7b00017d018381002bc25df10cf33da4954c95ef50db39f1fa566678e3b4ae9bfee1dfd705423fb53e53e494 0001-Enable-table-validation-modules.patch 7b52a3d67750d59b2c98e83dab4e0a0ab263142c2ca7bd5f8be5f8fe9cd1dc1f4debad44111c7886665329d8d2a3163756455618a6615df8f85d82bb0372d4dd 0003-Enable-infinality-subpixel-hinting.patch 64c20fbcbf48372ea35fe2e0dae8fec4be8c601c899a4a71913060c6ea4082a2f41d69701da511e09fee126bf198d560986469e2356bd088d2dd5961f437df63 0004-Enable-long-PCF-family-names.patch -26978105a1f69917778712ed24170a6d17c0ca2bfda8c179238a8f2534b197d0c65c648605a5433870c8d27e8211abf5ae9120d1fe9663148554f2e038603e75 CVE-2018-6942.patch 829dff39fc98e341cf88433758d9288fe9f824c1a1644ac7777ed274133df0fd0ee65606b7dab69acdb12ebf516d89da063df8850114e0c4e16a28bcc5de215d freetype-profile.sh" diff --git a/main/freetype/CVE-2018-6942.patch b/main/freetype/CVE-2018-6942.patch deleted file mode 100644 index 266bf00440..0000000000 --- a/main/freetype/CVE-2018-6942.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 29c759284e305ec428703c9a5831d0b1fc3497ef Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Sat, 27 Jan 2018 14:43:43 +0100 -Subject: * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL reference. - -Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5736 ---- - src/truetype/ttinterp.c | 12 ++++++++++-- - 2 files changed, 18 insertions(+), 2 deletions(-) - -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; -+ } - } - - --- -cgit v1.0-41-gc330 - |