diff --git a/bnc704612_othersubr.diff b/bnc704612_othersubr.diff deleted file mode 100644 index 1f1f095..0000000 --- a/bnc704612_othersubr.diff +++ /dev/null @@ -1,99 +0,0 @@ ---- freetype-2.4.4/src/psaux/t1decode.c.orig 2011-07-21 16:44:40.000000000 +0000 -+++ freetype-2.4.4/src/psaux/t1decode.c 2011-07-21 17:00:05.000000000 +0000 -@@ -28,6 +28,8 @@ - - #include "psauxerr.h" - -+/* ensure proper sign extension */ -+#define Fix2Int( f ) ( (FT_Int)(FT_Short)( (f) >> 16 ) ) - - /*************************************************************************/ - /* */ -@@ -662,7 +664,7 @@ - if ( large_int ) - FT_TRACE4(( " %ld", value )); - else -- FT_TRACE4(( " %ld", (FT_Int32)( value >> 16 ) )); -+ FT_TRACE4(( " %ld", Fix2Int( value ) )); - #endif - - *top++ = value; -@@ -684,8 +686,8 @@ - - top -= 2; - -- subr_no = (FT_Int)( top[1] >> 16 ); -- arg_cnt = (FT_Int)( top[0] >> 16 ); -+ subr_no = Fix2Int( top[1] ); -+ arg_cnt = Fix2Int( top[0] ); - - /***********************************************************/ - /* */ -@@ -862,7 +864,7 @@ - if ( arg_cnt != 1 || blend == NULL ) - goto Unexpected_OtherSubr; - -- idx = (FT_Int)( top[0] >> 16 ); -+ idx = Fix2Int( top[0] ); - - if ( idx < 0 || - idx + blend->num_designs > decoder->len_buildchar ) -@@ -930,7 +932,7 @@ - if ( arg_cnt != 2 || blend == NULL ) - goto Unexpected_OtherSubr; - -- idx = (FT_Int)( top[1] >> 16 ); -+ idx = Fix2Int( top[1] ); - - if ( idx < 0 || (FT_UInt) idx >= decoder->len_buildchar ) - goto Unexpected_OtherSubr; -@@ -951,7 +953,7 @@ - if ( arg_cnt != 1 || blend == NULL ) - goto Unexpected_OtherSubr; - -- idx = (FT_Int)( top[0] >> 16 ); -+ idx = Fix2Int( top[0] ); - - if ( idx < 0 || (FT_UInt) idx >= decoder->len_buildchar ) - goto Unexpected_OtherSubr; -@@ -1009,11 +1011,15 @@ - break; - - default: -- FT_ERROR(( "t1_decoder_parse_charstrings:" -- " unknown othersubr [%d %d], wish me luck\n", -- arg_cnt, subr_no )); -- unknown_othersubr_result_cnt = arg_cnt; -- break; -+ if ( arg_cnt >= 0 && subr_no >= 0 ) -+ { -+ FT_ERROR(( "t1_decoder_parse_charstrings:" -+ " unknown othersubr [%d %d], wish me luck\n", -+ arg_cnt, subr_no )); -+ unknown_othersubr_result_cnt = arg_cnt; -+ break; -+ } -+ /* fall through */ - - Unexpected_OtherSubr: - FT_ERROR(( "t1_decoder_parse_charstrings:" -@@ -1139,8 +1145,8 @@ - top[0], - top[1], - top[2], -- (FT_Int)( top[3] >> 16 ), -- (FT_Int)( top[4] >> 16 ) ); -+ Fix2Int( top[3] ), -+ Fix2Int( top[4] ) ); - - case op_sbw: - FT_TRACE4(( " sbw" )); -@@ -1324,7 +1330,7 @@ - - FT_TRACE4(( " callsubr" )); - -- idx = (FT_Int)( top[0] >> 16 ); -+ idx = Fix2Int( top[0] ); - if ( idx < 0 || idx >= (FT_Int)decoder->num_subrs ) - { - FT_ERROR(( "t1_decoder_parse_charstrings:" diff --git a/freetype-2.4.5.tar.bz2 b/freetype-2.4.5.tar.bz2 deleted file mode 100644 index fa32818..0000000 --- a/freetype-2.4.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73e835881b3413df8a0653b046048932794df0cfec9c4dd5adf28f64de445af2 -size 1483537 diff --git a/freetype-2.4.6.tar.bz2 b/freetype-2.4.6.tar.bz2 new file mode 100644 index 0000000..1034082 --- /dev/null +++ b/freetype-2.4.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24a4a57f3a6859887e91f90f93f754cfc7bf9ab9246a3a696435a0c6a7a1e92a +size 1487579 diff --git a/freetype-doc-2.4.5.tar.bz2 b/freetype-doc-2.4.5.tar.bz2 deleted file mode 100644 index ff8aca0..0000000 --- a/freetype-doc-2.4.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2dc5dcb35a8c7f51ce885fc908c9c9b164ca65727926d9d5c7bff91fad0d3c9c -size 106683 diff --git a/freetype-doc-2.4.6.tar.bz2 b/freetype-doc-2.4.6.tar.bz2 new file mode 100644 index 0000000..83254e7 --- /dev/null +++ b/freetype-doc-2.4.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e34420cd7706b7b2357a3250ef685cdfbfad1d5284584127148c87ec40ba9524 +size 106666 diff --git a/freetype2.changes b/freetype2.changes index bdbc6b1..93ed0a5 100644 --- a/freetype2.changes +++ b/freetype2.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Jul 29 07:41:28 UTC 2011 - idonmez@novell.com + +- Update to version 2.4.6 + * For TrueType based fonts, the ascender and descender values were + incorrect sometimes (off by a pixel if the ppem value was not a + multiple of 5). Depending on the use you might now experience + a different layout; the change should result in better, more + consistent line spacing. + * Fix CVE-2011-0226 which causes a vulnerability while handling + Type 1 fonts. + * BDF fonts containing glyphs with negative values for ENCODING + were incorrectly rejected. This bug has been introduced in + FreeType version 2.2.0. + * The behaviour of FT_STROKER_LINEJOIN_BEVEL has been corrected. + * A new line join style, FT_STROKER_LINEJOIN_MITER_FIXED, has + been introduced to support PostScript and PDF miter joins. + * FT_STROKER_LINEJOIN_MITER_VARIABLE has been introduced as an + alias for FT_STROKER_LINEJOIN_MITER. + * Various stroking glitches has been fixed + * SFNT bitmap fonts which contain an outline glyph for `.notdef' + only no longer set the FT_FACE_FLAG_SCALABLE flag. +- Drop bnc704612_othersubr.diff, applied upstream + ------------------------------------------------------------------- Fri Jul 22 13:41:02 CEST 2011 - ke@suse.de diff --git a/freetype2.spec b/freetype2.spec index 1b40871..24e885a 100644 --- a/freetype2.spec +++ b/freetype2.spec @@ -27,7 +27,7 @@ BuildRequires: zlib-devel Obsoletes: freetype2-64bit %endif # -Version: 2.4.5 +Version: 2.4.6 Release: 1 Summary: A TrueType Font Library Url: http://www.freetype.org @@ -39,7 +39,6 @@ Patch9: fix-build.patch Patch10: freetype2-no_rpath.patch Patch308961: bugzilla-308961-cmex-workaround.patch Patch200: freetype2-subpixel.patch -Patch1018: bnc704612_othersubr.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -87,9 +86,6 @@ It also contains a small tutorial for using that library. %if %{enable_subpixel_rendering} %patch200 -p 1 -b .subpixel %endif -%patch1018 -p 1 -b .othersubr - -rm docs/reference/.gitignore %build %ifarch arm diff --git a/ft2demos-2.4.5.tar.bz2 b/ft2demos-2.4.5.tar.bz2 deleted file mode 100644 index ed4a8a6..0000000 --- a/ft2demos-2.4.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b305408ef319414b89e387342f440c96736532795272186f02dd0968fb15ae5 -size 162976 diff --git a/ft2demos-2.4.6.tar.bz2 b/ft2demos-2.4.6.tar.bz2 new file mode 100644 index 0000000..bc2f6bc --- /dev/null +++ b/ft2demos-2.4.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e1caebc0e95a610011a6c928533c36d09d1b4811c401988c3b3f50b3d06f381 +size 163000 diff --git a/ft2demos.changes b/ft2demos.changes index d999a5b..8eb1021 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 29 07:44:56 UTC 2011 - idonmez@novell.com + +- Update to version 2.4.6 + * No changes since 2.4.5 + ------------------------------------------------------------------- Fri Jul 22 13:41:52 CEST 2011 - ke@suse.de diff --git a/ft2demos.spec b/ft2demos.spec index cc3ae06..011bc89 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -18,7 +18,7 @@ Name: ft2demos -Version: 2.4.5 +Version: 2.4.6 Release: 1 License: GPLv2+ Summary: Freetype2 Utilities and Demo Programs @@ -39,7 +39,6 @@ Source1004: bnc629447_sigsegv31.ttf Source1013: bnc633938_badbdf.0 Source1015: bug-641580_CVE-2010-3311.cff Source1016: bug-647375_tt2.ttf -Patch1018: bnc704612_othersubr.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,7 +56,6 @@ popd %if %{enable_subpixel_rendering} %patch200 -p 1 -b .subpixel %endif -%patch1018 -p 1 -b .othersubr %build %configure --without-bzip2