[arch-commits] Commit in freetype2/repos (32 files)
Jan de Groot
jgc at archlinux.org
Fri May 5 21:29:19 UTC 2017
Date: Friday, May 5, 2017 @ 21:29:19
Author: jgc
Revision: 295345
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
freetype2/repos/extra-i686/0001-Enable-table-validation-modules.patch
(from rev 295344, freetype2/trunk/0001-Enable-table-validation-modules.patch)
freetype2/repos/extra-i686/0002-Enable-subpixel-rendering.patch
(from rev 295344, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
freetype2/repos/extra-i686/0003-Enable-infinality-subpixel-hinting.patch
(from rev 295344, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
freetype2/repos/extra-i686/0005-freetype-2.5.2-more-demos.patch
(from rev 295344, freetype2/trunk/0005-freetype-2.5.2-more-demos.patch)
freetype2/repos/extra-i686/CVE-2017-8105.patch
(from rev 295344, freetype2/trunk/CVE-2017-8105.patch)
freetype2/repos/extra-i686/CVE-2017-8287.patch
(from rev 295344, freetype2/trunk/CVE-2017-8287.patch)
freetype2/repos/extra-i686/PKGBUILD
(from rev 295344, freetype2/trunk/PKGBUILD)
freetype2/repos/extra-i686/freetype2.install
(from rev 295344, freetype2/trunk/freetype2.install)
freetype2/repos/extra-i686/freetype2.sh
(from rev 295344, freetype2/trunk/freetype2.sh)
freetype2/repos/extra-x86_64/0001-Enable-table-validation-modules.patch
(from rev 295344, freetype2/trunk/0001-Enable-table-validation-modules.patch)
freetype2/repos/extra-x86_64/0002-Enable-subpixel-rendering.patch
(from rev 295344, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
freetype2/repos/extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch
(from rev 295344, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
freetype2/repos/extra-x86_64/0005-freetype-2.5.2-more-demos.patch
(from rev 295344, freetype2/trunk/0005-freetype-2.5.2-more-demos.patch)
freetype2/repos/extra-x86_64/CVE-2017-8105.patch
(from rev 295344, freetype2/trunk/CVE-2017-8105.patch)
freetype2/repos/extra-x86_64/CVE-2017-8287.patch
(from rev 295344, freetype2/trunk/CVE-2017-8287.patch)
freetype2/repos/extra-x86_64/PKGBUILD
(from rev 295344, freetype2/trunk/PKGBUILD)
freetype2/repos/extra-x86_64/freetype2.install
(from rev 295344, freetype2/trunk/freetype2.install)
freetype2/repos/extra-x86_64/freetype2.sh
(from rev 295344, freetype2/trunk/freetype2.sh)
Deleted:
freetype2/repos/extra-i686/0001-Enable-table-validation-modules.patch
freetype2/repos/extra-i686/0002-Enable-subpixel-rendering.patch
freetype2/repos/extra-i686/0003-Enable-infinality-subpixel-hinting.patch
freetype2/repos/extra-i686/0005-freetype-2.5.2-more-demos.patch
freetype2/repos/extra-i686/PKGBUILD
freetype2/repos/extra-i686/freetype2.install
freetype2/repos/extra-i686/freetype2.sh
freetype2/repos/extra-x86_64/0001-Enable-table-validation-modules.patch
freetype2/repos/extra-x86_64/0002-Enable-subpixel-rendering.patch
freetype2/repos/extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch
freetype2/repos/extra-x86_64/0005-freetype-2.5.2-more-demos.patch
freetype2/repos/extra-x86_64/PKGBUILD
freetype2/repos/extra-x86_64/freetype2.install
freetype2/repos/extra-x86_64/freetype2.sh
------------------------------------------------------------+
/0001-Enable-table-validation-modules.patch | 68 +++
/0002-Enable-subpixel-rendering.patch | 50 ++
/0003-Enable-infinality-subpixel-hinting.patch | 54 ++
/0005-freetype-2.5.2-more-demos.patch | 34 +
/PKGBUILD | 204 +++++++++++
/freetype2.install | 16
/freetype2.sh | 24 +
extra-i686/0001-Enable-table-validation-modules.patch | 34 -
extra-i686/0002-Enable-subpixel-rendering.patch | 25 -
extra-i686/0003-Enable-infinality-subpixel-hinting.patch | 27 -
extra-i686/0005-freetype-2.5.2-more-demos.patch | 17
extra-i686/CVE-2017-8105.patch | 47 ++
extra-i686/CVE-2017-8287.patch | 35 +
extra-i686/PKGBUILD | 95 -----
extra-i686/freetype2.install | 8
extra-i686/freetype2.sh | 12
extra-x86_64/0001-Enable-table-validation-modules.patch | 34 -
extra-x86_64/0002-Enable-subpixel-rendering.patch | 25 -
extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch | 27 -
extra-x86_64/0005-freetype-2.5.2-more-demos.patch | 17
extra-x86_64/CVE-2017-8105.patch | 47 ++
extra-x86_64/CVE-2017-8287.patch | 35 +
extra-x86_64/PKGBUILD | 95 -----
extra-x86_64/freetype2.install | 8
extra-x86_64/freetype2.sh | 12
25 files changed, 614 insertions(+), 436 deletions(-)
Deleted: extra-i686/0001-Enable-table-validation-modules.patch
===================================================================
--- extra-i686/0001-Enable-table-validation-modules.patch 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-i686/0001-Enable-table-validation-modules.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,34 +0,0 @@
-From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 23 Jun 2015 08:40:29 +0200
-Subject: [PATCH 1/3] Enable table validation modules
-
----
- modules.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.cfg b/modules.cfg
-index f30049c38cc45159..7b8e50fe1b34584a 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -120,7 +120,7 @@ AUX_MODULES += cache
- # TrueType GX/AAT table validation. Needs ftgxval.c below.
- #
- # No FT_CONFIG_OPTION_PIC support.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
-
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
- # OpenType table validation. Needs ftotval.c below.
- #
- # No FT_CONFIG_OPTION_PIC support.
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
-
- # Auxiliary PostScript driver component to share common code.
- #
---
-2.9.3
-
Copied: freetype2/repos/extra-i686/0001-Enable-table-validation-modules.patch (from rev 295344, freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- extra-i686/0001-Enable-table-validation-modules.patch (rev 0)
+++ extra-i686/0001-Enable-table-validation-modules.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,34 @@
+From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+Subject: [PATCH 1/3] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index f30049c38cc45159..7b8e50fe1b34584a 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -120,7 +120,7 @@ AUX_MODULES += cache
+ # TrueType GX/AAT table validation. Needs ftgxval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
+ # OpenType table validation. Needs ftotval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
+--
+2.9.3
+
Deleted: extra-i686/0002-Enable-subpixel-rendering.patch
===================================================================
--- extra-i686/0002-Enable-subpixel-rendering.patch 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-i686/0002-Enable-subpixel-rendering.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,25 +0,0 @@
-From 96f09f08417887b2618c177bccfb6da2906568d9 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 23 Jun 2015 08:43:07 +0200
-Subject: [PATCH 2/3] Enable subpixel rendering
-
----
- include/freetype/config/ftoption.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 90c123ef93e9ea04..67a361dd41e0b026 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
- /* This is done to allow FreeType clients to run unmodified, forcing */
- /* them to display normal gray-level anti-aliased glyphs. */
- /* */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-
- /*************************************************************************/
---
-2.9.3
-
Copied: freetype2/repos/extra-i686/0002-Enable-subpixel-rendering.patch (from rev 295344, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
===================================================================
--- extra-i686/0002-Enable-subpixel-rendering.patch (rev 0)
+++ extra-i686/0002-Enable-subpixel-rendering.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,25 @@
+From 96f09f08417887b2618c177bccfb6da2906568d9 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:43:07 +0200
+Subject: [PATCH 2/3] Enable subpixel rendering
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 90c123ef93e9ea04..67a361dd41e0b026 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
+ /* This is done to allow FreeType clients to run unmodified, forcing */
+ /* them to display normal gray-level anti-aliased glyphs. */
+ /* */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+ /*************************************************************************/
+--
+2.9.3
+
Deleted: extra-i686/0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- extra-i686/0003-Enable-infinality-subpixel-hinting.patch 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-i686/0003-Enable-infinality-subpixel-hinting.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,27 +0,0 @@
-From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH 3/3] Enable infinality subpixel hinting
-
----
- include/freetype/config/ftoption.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 67a361dd41e0b026..c4812862518b66a6 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -675,8 +675,8 @@ FT_BEGIN_HEADER
- /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
- /* */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
--#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
-
-
- /*************************************************************************/
---
-2.9.3
-
Copied: freetype2/repos/extra-i686/0003-Enable-infinality-subpixel-hinting.patch (from rev 295344, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- extra-i686/0003-Enable-infinality-subpixel-hinting.patch (rev 0)
+++ extra-i686/0003-Enable-infinality-subpixel-hinting.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,27 @@
+From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH 3/3] Enable infinality subpixel hinting
+
+---
+ include/freetype/config/ftoption.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 67a361dd41e0b026..c4812862518b66a6 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -675,8 +675,8 @@ FT_BEGIN_HEADER
+ /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
+ /* */
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
+-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
+
+
+ /*************************************************************************/
+--
+2.9.3
+
Deleted: extra-i686/0005-freetype-2.5.2-more-demos.patch
===================================================================
--- extra-i686/0005-freetype-2.5.2-more-demos.patch 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-i686/0005-freetype-2.5.2-more-demos.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,17 +0,0 @@
---- ft2demos-2.5.2/Makefile
-+++ ft2demos-2.5.2/Makefile
-@@ -296,10 +296,10 @@ else
- # The following programs are not compiled automatically; either comment
- # out the affected line or use the program name as a Makefile target.
- #
-- # EXES += ftchkwd
-- # EXES += ftmemchk
-- # EXES += ftpatchk
-- # EXES += fttimer
-+ EXES += ftchkwd
-+ EXES += ftmemchk
-+ EXES += ftpatchk
-+ EXES += fttimer
- # EXES += testname
-
- exes: $(EXES:%=$(BIN_DIR_2)/%$E)
Copied: freetype2/repos/extra-i686/0005-freetype-2.5.2-more-demos.patch (from rev 295344, freetype2/trunk/0005-freetype-2.5.2-more-demos.patch)
===================================================================
--- extra-i686/0005-freetype-2.5.2-more-demos.patch (rev 0)
+++ extra-i686/0005-freetype-2.5.2-more-demos.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,17 @@
+--- ft2demos-2.5.2/Makefile
++++ ft2demos-2.5.2/Makefile
+@@ -296,10 +296,10 @@ else
+ # The following programs are not compiled automatically; either comment
+ # out the affected line or use the program name as a Makefile target.
+ #
+- # EXES += ftchkwd
+- # EXES += ftmemchk
+- # EXES += ftpatchk
+- # EXES += fttimer
++ EXES += ftchkwd
++ EXES += ftmemchk
++ EXES += ftpatchk
++ EXES += fttimer
+ # EXES += testname
+
+ exes: $(EXES:%=$(BIN_DIR_2)/%$E)
Copied: freetype2/repos/extra-i686/CVE-2017-8105.patch (from rev 295344, freetype2/trunk/CVE-2017-8105.patch)
===================================================================
--- extra-i686/CVE-2017-8105.patch (rev 0)
+++ extra-i686/CVE-2017-8105.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,47 @@
+From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl at gnu.org>
+Date: Fri, 24 Mar 2017 09:15:10 +0100
+Subject: [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)
+<callothersubr>: 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.
+---
+ ChangeLog | 15 +++++++++++++++
+ src/psaux/t1decode.c | 9 +++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
+index af7b465..7dd4513 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;
+
+--
+cgit v1.0-41-gc330
+
Copied: freetype2/repos/extra-i686/CVE-2017-8287.patch (from rev 295344, freetype2/trunk/CVE-2017-8287.patch)
===================================================================
--- extra-i686/CVE-2017-8287.patch (rev 0)
+++ extra-i686/CVE-2017-8287.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,35 @@
+From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl at gnu.org>
+Date: Sun, 26 Mar 2017 08:32:09 +0200
+Subject: * src/psaux/psobjs.c (t1_builder_close_contour): Add safety guard.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941
+---
+ ChangeLog | 8 ++++++++
+ src/psaux/psobjs.c | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
+index d18e821..0baf836 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 )
+--
+cgit v1.0-41-gc330
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-i686/PKGBUILD 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,95 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=freetype2
-pkgname=('freetype2' 'freetype2-demos')
-pkgver=2.7.1
-pkgrel=1
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.freetype.org/"
-# adding harfbuzz for improved OpenType features auto-hinting
-# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
-makedepends=('libx11' 'zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
-source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
- https://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
- https://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
- 0001-Enable-table-validation-modules.patch
- 0002-Enable-subpixel-rendering.patch
- 0003-Enable-infinality-subpixel-hinting.patch
- 0005-freetype-2.5.2-more-demos.patch
- freetype2.sh)
-sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789'
- 'SKIP'
- 'd8ce472cd775b8ce50d127689acab59181e72ecf'
- 'SKIP'
- '2ebe93df13eb45dac8515c5ed0216ef694c33f18'
- 'SKIP'
- 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
- 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
- '41d27140fd590945e22e012c9dce62de3d6f11e6'
- '72cfecbe738085eec475e012617661ad0cc9b76f'
- 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
-validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
-
-prepare() {
- # Rename source dir to allow building the demos
- mv freetype-${pkgver} freetype2
-
- cd freetype2
- patch -Np1 -i ../0001-Enable-table-validation-modules.patch
- patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
- patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
-
- cd ../ft2demos-${pkgver}
- # enable more demos
- patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
-
- # Suppress RPATH
- sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
-}
-
-build() {
- cd freetype2
- ./configure --prefix=/usr --disable-static
- make
-
- # Build demos
- cd ../ft2demos-${pkgver}
- make
-}
-
-check() {
- cd freetype2
- make -k check
-}
-
-package_freetype2() {
- pkgdesc="TrueType font rendering library"
- depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
- provides=('libfreetype.so')
- install=freetype2.install
- backup=('etc/profile.d/freetype2.sh')
-
- cd freetype2
- make DESTDIR="${pkgdir}" install
- install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
-
- # Package docs
- install -dm755 "${pkgdir}/usr/share/doc"
- cp -a docs "${pkgdir}/usr/share/doc/${pkgname}"
-
- cd ../ft2demos-${pkgver}
- mkdir -p $srcdir/ft-demos
- for _i in bin/{f,t}t*; do
- libtool --mode=install install $_i "$srcdir/ft-demos"
- done
-}
-
-package_freetype2-demos() {
- pkgdesc="Freetype tools and demos"
- depends=('freetype2' 'libx11')
-
- install -dm755 "${pkgdir}/usr/bin"
- cp -a $srcdir/ft-demos/* "${pkgdir}/usr/bin"
-}
Copied: freetype2/repos/extra-i686/PKGBUILD (from rev 295344, freetype2/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=freetype2
+pkgname=('freetype2' 'freetype2-demos')
+pkgver=2.7.1
+pkgrel=2
+arch=(i686 x86_64)
+license=('GPL')
+url="http://www.freetype.org/"
+# adding harfbuzz for improved OpenType features auto-hinting
+# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+makedepends=('libx11' 'zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+ https://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
+ https://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
+ 0001-Enable-table-validation-modules.patch
+ 0002-Enable-subpixel-rendering.patch
+ 0003-Enable-infinality-subpixel-hinting.patch
+ 0005-freetype-2.5.2-more-demos.patch
+ CVE-2017-8105.patch
+ CVE-2017-8287.patch
+ freetype2.sh)
+sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789'
+ 'SKIP'
+ 'd8ce472cd775b8ce50d127689acab59181e72ecf'
+ 'SKIP'
+ '2ebe93df13eb45dac8515c5ed0216ef694c33f18'
+ 'SKIP'
+ 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
+ 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
+ '41d27140fd590945e22e012c9dce62de3d6f11e6'
+ '72cfecbe738085eec475e012617661ad0cc9b76f'
+ '9ff76b0d0a079872279a62300af7806b15b6a51a'
+ '049ed3cb4471596396660896a8ccd95288001d8f'
+ 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+prepare() {
+ # Rename source dir to allow building the demos
+ mv freetype-${pkgver} freetype2
+
+ cd freetype2
+ patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+ patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+ patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
+
+ patch -Np1 -i ../CVE-2017-8105.patch
+ patch -Np1 -i ../CVE-2017-8287.patch
+
+ cd ../ft2demos-${pkgver}
+ # enable more demos
+ patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
+
+ # Suppress RPATH
+ sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+}
+
+build() {
+ cd freetype2
+ ./configure --prefix=/usr --disable-static
+ make
+
+ # Build demos
+ cd ../ft2demos-${pkgver}
+ make
+}
+
+check() {
+ cd freetype2
+ make -k check
+}
+
+package_freetype2() {
+ pkgdesc="TrueType font rendering library"
+ depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+ provides=('libfreetype.so')
+ install=freetype2.install
+ backup=('etc/profile.d/freetype2.sh')
+
+ cd freetype2
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
+
+ # Package docs
+ install -dm755 "${pkgdir}/usr/share/doc"
+ cp -a docs "${pkgdir}/usr/share/doc/${pkgname}"
+
+ cd ../ft2demos-${pkgver}
+ mkdir -p $srcdir/ft-demos
+ for _i in bin/{f,t}t*; do
+ libtool --mode=install install $_i "$srcdir/ft-demos"
+ done
+}
+
+package_freetype2-demos() {
+ pkgdesc="Freetype tools and demos"
+ depends=('freetype2' 'libx11')
+
+ install -dm755 "${pkgdir}/usr/bin"
+ cp -a $srcdir/ft-demos/* "${pkgdir}/usr/bin"
+}
Deleted: extra-i686/freetype2.install
===================================================================
--- extra-i686/freetype2.install 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-i686/freetype2.install 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,8 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.7-1) < 0 )); then
- cat <<MSG
- The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
- Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
-MSG
- fi
-}
Copied: freetype2/repos/extra-i686/freetype2.install (from rev 295344, freetype2/trunk/freetype2.install)
===================================================================
--- extra-i686/freetype2.install (rev 0)
+++ extra-i686/freetype2.install 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,8 @@
+post_upgrade() {
+ if (( $(vercmp $2 2.7-1) < 0 )); then
+ cat <<MSG
+ The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
+ Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
+MSG
+ fi
+}
Deleted: extra-i686/freetype2.sh
===================================================================
--- extra-i686/freetype2.sh 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-i686/freetype2.sh 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,12 +0,0 @@
-# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
-# version. The available settings are:
-#
-# truetype:interpreter-version=35 # Classic mode (default in 2.6)
-# truetype:interpreter-version=38 # Infinality mode
-# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
-#
-# There are more properties that can be set, separated by whitespace. Please
-# refer to the FreeType documentation for details.
-
-# Uncomment and configure below
-#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
Copied: freetype2/repos/extra-i686/freetype2.sh (from rev 295344, freetype2/trunk/freetype2.sh)
===================================================================
--- extra-i686/freetype2.sh (rev 0)
+++ extra-i686/freetype2.sh 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,12 @@
+# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
+# version. The available settings are:
+#
+# truetype:interpreter-version=35 # Classic mode (default in 2.6)
+# truetype:interpreter-version=38 # Infinality mode
+# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
+#
+# There are more properties that can be set, separated by whitespace. Please
+# refer to the FreeType documentation for details.
+
+# Uncomment and configure below
+#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
Deleted: extra-x86_64/0001-Enable-table-validation-modules.patch
===================================================================
--- extra-x86_64/0001-Enable-table-validation-modules.patch 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-x86_64/0001-Enable-table-validation-modules.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,34 +0,0 @@
-From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 23 Jun 2015 08:40:29 +0200
-Subject: [PATCH 1/3] Enable table validation modules
-
----
- modules.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.cfg b/modules.cfg
-index f30049c38cc45159..7b8e50fe1b34584a 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -120,7 +120,7 @@ AUX_MODULES += cache
- # TrueType GX/AAT table validation. Needs ftgxval.c below.
- #
- # No FT_CONFIG_OPTION_PIC support.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
-
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
- # OpenType table validation. Needs ftotval.c below.
- #
- # No FT_CONFIG_OPTION_PIC support.
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
-
- # Auxiliary PostScript driver component to share common code.
- #
---
-2.9.3
-
Copied: freetype2/repos/extra-x86_64/0001-Enable-table-validation-modules.patch (from rev 295344, freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- extra-x86_64/0001-Enable-table-validation-modules.patch (rev 0)
+++ extra-x86_64/0001-Enable-table-validation-modules.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,34 @@
+From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+Subject: [PATCH 1/3] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index f30049c38cc45159..7b8e50fe1b34584a 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -120,7 +120,7 @@ AUX_MODULES += cache
+ # TrueType GX/AAT table validation. Needs ftgxval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
+ # OpenType table validation. Needs ftotval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
+--
+2.9.3
+
Deleted: extra-x86_64/0002-Enable-subpixel-rendering.patch
===================================================================
--- extra-x86_64/0002-Enable-subpixel-rendering.patch 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-x86_64/0002-Enable-subpixel-rendering.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,25 +0,0 @@
-From 96f09f08417887b2618c177bccfb6da2906568d9 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 23 Jun 2015 08:43:07 +0200
-Subject: [PATCH 2/3] Enable subpixel rendering
-
----
- include/freetype/config/ftoption.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 90c123ef93e9ea04..67a361dd41e0b026 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
- /* This is done to allow FreeType clients to run unmodified, forcing */
- /* them to display normal gray-level anti-aliased glyphs. */
- /* */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-
- /*************************************************************************/
---
-2.9.3
-
Copied: freetype2/repos/extra-x86_64/0002-Enable-subpixel-rendering.patch (from rev 295344, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
===================================================================
--- extra-x86_64/0002-Enable-subpixel-rendering.patch (rev 0)
+++ extra-x86_64/0002-Enable-subpixel-rendering.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,25 @@
+From 96f09f08417887b2618c177bccfb6da2906568d9 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:43:07 +0200
+Subject: [PATCH 2/3] Enable subpixel rendering
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 90c123ef93e9ea04..67a361dd41e0b026 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
+ /* This is done to allow FreeType clients to run unmodified, forcing */
+ /* them to display normal gray-level anti-aliased glyphs. */
+ /* */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+ /*************************************************************************/
+--
+2.9.3
+
Deleted: extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,27 +0,0 @@
-From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH 3/3] Enable infinality subpixel hinting
-
----
- include/freetype/config/ftoption.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 67a361dd41e0b026..c4812862518b66a6 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -675,8 +675,8 @@ FT_BEGIN_HEADER
- /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
- /* */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
--#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
-
-
- /*************************************************************************/
---
-2.9.3
-
Copied: freetype2/repos/extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch (from rev 295344, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch (rev 0)
+++ extra-x86_64/0003-Enable-infinality-subpixel-hinting.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,27 @@
+From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH 3/3] Enable infinality subpixel hinting
+
+---
+ include/freetype/config/ftoption.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 67a361dd41e0b026..c4812862518b66a6 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -675,8 +675,8 @@ FT_BEGIN_HEADER
+ /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
+ /* */
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
+-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
+
+
+ /*************************************************************************/
+--
+2.9.3
+
Deleted: extra-x86_64/0005-freetype-2.5.2-more-demos.patch
===================================================================
--- extra-x86_64/0005-freetype-2.5.2-more-demos.patch 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-x86_64/0005-freetype-2.5.2-more-demos.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,17 +0,0 @@
---- ft2demos-2.5.2/Makefile
-+++ ft2demos-2.5.2/Makefile
-@@ -296,10 +296,10 @@ else
- # The following programs are not compiled automatically; either comment
- # out the affected line or use the program name as a Makefile target.
- #
-- # EXES += ftchkwd
-- # EXES += ftmemchk
-- # EXES += ftpatchk
-- # EXES += fttimer
-+ EXES += ftchkwd
-+ EXES += ftmemchk
-+ EXES += ftpatchk
-+ EXES += fttimer
- # EXES += testname
-
- exes: $(EXES:%=$(BIN_DIR_2)/%$E)
Copied: freetype2/repos/extra-x86_64/0005-freetype-2.5.2-more-demos.patch (from rev 295344, freetype2/trunk/0005-freetype-2.5.2-more-demos.patch)
===================================================================
--- extra-x86_64/0005-freetype-2.5.2-more-demos.patch (rev 0)
+++ extra-x86_64/0005-freetype-2.5.2-more-demos.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,17 @@
+--- ft2demos-2.5.2/Makefile
++++ ft2demos-2.5.2/Makefile
+@@ -296,10 +296,10 @@ else
+ # The following programs are not compiled automatically; either comment
+ # out the affected line or use the program name as a Makefile target.
+ #
+- # EXES += ftchkwd
+- # EXES += ftmemchk
+- # EXES += ftpatchk
+- # EXES += fttimer
++ EXES += ftchkwd
++ EXES += ftmemchk
++ EXES += ftpatchk
++ EXES += fttimer
+ # EXES += testname
+
+ exes: $(EXES:%=$(BIN_DIR_2)/%$E)
Copied: freetype2/repos/extra-x86_64/CVE-2017-8105.patch (from rev 295344, freetype2/trunk/CVE-2017-8105.patch)
===================================================================
--- extra-x86_64/CVE-2017-8105.patch (rev 0)
+++ extra-x86_64/CVE-2017-8105.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,47 @@
+From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl at gnu.org>
+Date: Fri, 24 Mar 2017 09:15:10 +0100
+Subject: [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)
+<callothersubr>: 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.
+---
+ ChangeLog | 15 +++++++++++++++
+ src/psaux/t1decode.c | 9 +++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
+index af7b465..7dd4513 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;
+
+--
+cgit v1.0-41-gc330
+
Copied: freetype2/repos/extra-x86_64/CVE-2017-8287.patch (from rev 295344, freetype2/trunk/CVE-2017-8287.patch)
===================================================================
--- extra-x86_64/CVE-2017-8287.patch (rev 0)
+++ extra-x86_64/CVE-2017-8287.patch 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,35 @@
+From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl at gnu.org>
+Date: Sun, 26 Mar 2017 08:32:09 +0200
+Subject: * src/psaux/psobjs.c (t1_builder_close_contour): Add safety guard.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941
+---
+ ChangeLog | 8 ++++++++
+ src/psaux/psobjs.c | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
+index d18e821..0baf836 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 )
+--
+cgit v1.0-41-gc330
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-x86_64/PKGBUILD 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,95 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=freetype2
-pkgname=('freetype2' 'freetype2-demos')
-pkgver=2.7.1
-pkgrel=1
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.freetype.org/"
-# adding harfbuzz for improved OpenType features auto-hinting
-# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
-makedepends=('libx11' 'zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
-source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
- https://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
- https://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
- 0001-Enable-table-validation-modules.patch
- 0002-Enable-subpixel-rendering.patch
- 0003-Enable-infinality-subpixel-hinting.patch
- 0005-freetype-2.5.2-more-demos.patch
- freetype2.sh)
-sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789'
- 'SKIP'
- 'd8ce472cd775b8ce50d127689acab59181e72ecf'
- 'SKIP'
- '2ebe93df13eb45dac8515c5ed0216ef694c33f18'
- 'SKIP'
- 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
- 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
- '41d27140fd590945e22e012c9dce62de3d6f11e6'
- '72cfecbe738085eec475e012617661ad0cc9b76f'
- 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
-validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
-
-prepare() {
- # Rename source dir to allow building the demos
- mv freetype-${pkgver} freetype2
-
- cd freetype2
- patch -Np1 -i ../0001-Enable-table-validation-modules.patch
- patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
- patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
-
- cd ../ft2demos-${pkgver}
- # enable more demos
- patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
-
- # Suppress RPATH
- sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
-}
-
-build() {
- cd freetype2
- ./configure --prefix=/usr --disable-static
- make
-
- # Build demos
- cd ../ft2demos-${pkgver}
- make
-}
-
-check() {
- cd freetype2
- make -k check
-}
-
-package_freetype2() {
- pkgdesc="TrueType font rendering library"
- depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
- provides=('libfreetype.so')
- install=freetype2.install
- backup=('etc/profile.d/freetype2.sh')
-
- cd freetype2
- make DESTDIR="${pkgdir}" install
- install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
-
- # Package docs
- install -dm755 "${pkgdir}/usr/share/doc"
- cp -a docs "${pkgdir}/usr/share/doc/${pkgname}"
-
- cd ../ft2demos-${pkgver}
- mkdir -p $srcdir/ft-demos
- for _i in bin/{f,t}t*; do
- libtool --mode=install install $_i "$srcdir/ft-demos"
- done
-}
-
-package_freetype2-demos() {
- pkgdesc="Freetype tools and demos"
- depends=('freetype2' 'libx11')
-
- install -dm755 "${pkgdir}/usr/bin"
- cp -a $srcdir/ft-demos/* "${pkgdir}/usr/bin"
-}
Copied: freetype2/repos/extra-x86_64/PKGBUILD (from rev 295344, freetype2/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=freetype2
+pkgname=('freetype2' 'freetype2-demos')
+pkgver=2.7.1
+pkgrel=2
+arch=(i686 x86_64)
+license=('GPL')
+url="http://www.freetype.org/"
+# adding harfbuzz for improved OpenType features auto-hinting
+# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+makedepends=('libx11' 'zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+ https://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
+ https://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
+ 0001-Enable-table-validation-modules.patch
+ 0002-Enable-subpixel-rendering.patch
+ 0003-Enable-infinality-subpixel-hinting.patch
+ 0005-freetype-2.5.2-more-demos.patch
+ CVE-2017-8105.patch
+ CVE-2017-8287.patch
+ freetype2.sh)
+sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789'
+ 'SKIP'
+ 'd8ce472cd775b8ce50d127689acab59181e72ecf'
+ 'SKIP'
+ '2ebe93df13eb45dac8515c5ed0216ef694c33f18'
+ 'SKIP'
+ 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
+ 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
+ '41d27140fd590945e22e012c9dce62de3d6f11e6'
+ '72cfecbe738085eec475e012617661ad0cc9b76f'
+ '9ff76b0d0a079872279a62300af7806b15b6a51a'
+ '049ed3cb4471596396660896a8ccd95288001d8f'
+ 'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+prepare() {
+ # Rename source dir to allow building the demos
+ mv freetype-${pkgver} freetype2
+
+ cd freetype2
+ patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+ patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+ patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
+
+ patch -Np1 -i ../CVE-2017-8105.patch
+ patch -Np1 -i ../CVE-2017-8287.patch
+
+ cd ../ft2demos-${pkgver}
+ # enable more demos
+ patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
+
+ # Suppress RPATH
+ sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+}
+
+build() {
+ cd freetype2
+ ./configure --prefix=/usr --disable-static
+ make
+
+ # Build demos
+ cd ../ft2demos-${pkgver}
+ make
+}
+
+check() {
+ cd freetype2
+ make -k check
+}
+
+package_freetype2() {
+ pkgdesc="TrueType font rendering library"
+ depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+ provides=('libfreetype.so')
+ install=freetype2.install
+ backup=('etc/profile.d/freetype2.sh')
+
+ cd freetype2
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
+
+ # Package docs
+ install -dm755 "${pkgdir}/usr/share/doc"
+ cp -a docs "${pkgdir}/usr/share/doc/${pkgname}"
+
+ cd ../ft2demos-${pkgver}
+ mkdir -p $srcdir/ft-demos
+ for _i in bin/{f,t}t*; do
+ libtool --mode=install install $_i "$srcdir/ft-demos"
+ done
+}
+
+package_freetype2-demos() {
+ pkgdesc="Freetype tools and demos"
+ depends=('freetype2' 'libx11')
+
+ install -dm755 "${pkgdir}/usr/bin"
+ cp -a $srcdir/ft-demos/* "${pkgdir}/usr/bin"
+}
Deleted: extra-x86_64/freetype2.install
===================================================================
--- extra-x86_64/freetype2.install 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-x86_64/freetype2.install 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,8 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.7-1) < 0 )); then
- cat <<MSG
- The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
- Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
-MSG
- fi
-}
Copied: freetype2/repos/extra-x86_64/freetype2.install (from rev 295344, freetype2/trunk/freetype2.install)
===================================================================
--- extra-x86_64/freetype2.install (rev 0)
+++ extra-x86_64/freetype2.install 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,8 @@
+post_upgrade() {
+ if (( $(vercmp $2 2.7-1) < 0 )); then
+ cat <<MSG
+ The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
+ Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
+MSG
+ fi
+}
Deleted: extra-x86_64/freetype2.sh
===================================================================
--- extra-x86_64/freetype2.sh 2017-05-05 21:29:09 UTC (rev 295344)
+++ extra-x86_64/freetype2.sh 2017-05-05 21:29:19 UTC (rev 295345)
@@ -1,12 +0,0 @@
-# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
-# version. The available settings are:
-#
-# truetype:interpreter-version=35 # Classic mode (default in 2.6)
-# truetype:interpreter-version=38 # Infinality mode
-# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
-#
-# There are more properties that can be set, separated by whitespace. Please
-# refer to the FreeType documentation for details.
-
-# Uncomment and configure below
-#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
Copied: freetype2/repos/extra-x86_64/freetype2.sh (from rev 295344, freetype2/trunk/freetype2.sh)
===================================================================
--- extra-x86_64/freetype2.sh (rev 0)
+++ extra-x86_64/freetype2.sh 2017-05-05 21:29:19 UTC (rev 295345)
@@ -0,0 +1,12 @@
+# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
+# version. The available settings are:
+#
+# truetype:interpreter-version=35 # Classic mode (default in 2.6)
+# truetype:interpreter-version=38 # Infinality mode
+# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
+#
+# There are more properties that can be set, separated by whitespace. Please
+# refer to the FreeType documentation for details.
+
+# Uncomment and configure below
+#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
More information about the arch-commits
mailing list