Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory
sc8-pr-cvs17:/tmp/cvs-serv13282/10.3/unstable/main/finkinfo/graphics
Modified Files:
freetype219.info freetype219.patch
Log Message:
Update Debian's patches, including a security fix, CVE-2007-2754.
See also: [fink-core] Security issue of freetype219.
Index: freetype219.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/freetype219.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freetype219.info 9 Dec 2006 06:34:47 -0000 1.7
+++ freetype219.info 26 Aug 2007 15:42:00 -0000 1.8
@@ -1,13 +1,26 @@
Package: freetype219
Version: 2.2.1
-Revision: 3
+Revision: 4
Depends: %N-shlibs (= %v-%r)
Conflicts: freetype219-hinting
Replaces: freetype219-hinting
BuildDependsOnly: True
Source: mirror:sourceforge:freetype/freetype-%v.tar.bz2
Source-MD5: 5b2f827082c544392a7701f7423f0781
+Source2: mirror:debian:pool/main/f/freetype/freetype_%v-5+etch1.diff.gz
+Source2-MD5: 83f454db44bdb8929e0f0381143dc5db
Patch: %n.patch
+PatchScript: <<
+ gzip -dc ../freetype_%v-5+etch1.diff.gz | patch -p1
+ patch -p0 < debian/patches-freetype/freetype-bytecode-interpreter.patch
+ patch -p0 < debian/patches-freetype/freetype-2.1.7-backwards.compat.patch
+ patch -p0 < debian/patches-freetype/freetype-bdflib-large-encodings.patch
+ patch -p1 < debian/patches-freetype/331-hmtx-no-shorts.diff
+ patch -p1 < debian/patches-freetype/enable-full-bytecode-interpreter
+ patch -p1 < debian/patches-freetype/374902-composite-glyphs
+ patch -p1 < debian/patches-freetype/CVE-2007-2754_ttgload
+ patch -p1 < debian/patches-freetype/CVE-2006-3467_pcf-strlen
+<<
NoSetCPPFLAGS: true
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
Index: freetype219.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/freetype219.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freetype219.patch 9 Dec 2006 06:34:47 -0000 1.5
+++ freetype219.patch 26 Aug 2007 15:42:00 -0000 1.6
@@ -1,15 +1,3 @@
-diff -uNr freetype-2.2.1/include/freetype/config/ftoption.h
freetype-2.2.1-new/include/freetype/config/ftoption.h
---- freetype-2.2.1/include/freetype/config/ftoption.h 2006-05-11
14:05:49.000000000 -0400
-+++ freetype-2.2.1-new/include/freetype/config/ftoption.h 2006-11-09
17:36:43.000000000 -0500
-@@ -448,7 +448,7 @@
- /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook */
- /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally activated. */
- /* */
--#define TT_CONFIG_OPTION_UNPATENTED_HINTING
-+/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */
-
-
- /*************************************************************************/
diff -uNr freetype-2.2.1/include/freetype/freetype.h
freetype-2.2.1-new/include/freetype/freetype.h
--- freetype-2.2.1/include/freetype/freetype.h 2006-05-12 09:52:24.000000000
-0400
+++ freetype-2.2.1-new/include/freetype/freetype.h 2006-11-09
17:30:21.000000000 -0500
@@ -26,126 +14,6 @@
#endif
-diff -uNr freetype-2.2.1/src/base/ftapi.c freetype-2.2.1-new/src/base/ftapi.c
---- freetype-2.2.1/src/base/ftapi.c 2002-03-30 08:16:33.000000000 -0500
-+++ freetype-2.2.1-new/src/base/ftapi.c 2006-11-09 17:30:21.000000000
-0500
-@@ -117,5 +117,17 @@
- FT_Stream_ExitFrame( stream );
- }
-
-+ FT_BASE_DEF( FT_Short )
-+ FT_Get_Short( FT_Stream stream )
-+ {
-+ return FT_GET_SHORT();
-+ }
-+
-+
-+ FT_BASE_DEF( FT_Long )
-+ FT_Get_Long( FT_Stream stream )
-+ {
-+ return FT_GET_LONG();
-+ }
-
- /* END */
-diff -uNr freetype-2.2.1/src/base/ftbase.c freetype-2.2.1-new/src/base/ftbase.c
---- freetype-2.2.1/src/base/ftbase.c 2004-02-25 07:58:54.000000000 -0500
-+++ freetype-2.2.1-new/src/base/ftbase.c 2006-11-09 17:30:21.000000000
-0500
-@@ -30,6 +30,7 @@
- #include "ftobjs.c"
- #include "ftnames.c"
- #include "ftrfork.c"
-+#include "ftapi.c"
-
- #if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
- #include "ftmac.c"
-diff -uNr freetype-2.2.1/src/bdf/bdflib.c freetype-2.2.1-new/src/bdf/bdflib.c
---- freetype-2.2.1/src/bdf/bdflib.c 2006-03-26 01:34:41.000000000 -0500
-+++ freetype-2.2.1-new/src/bdf/bdflib.c 2006-11-09 17:30:21.000000000
-0500
-@@ -1570,6 +1570,14 @@
- goto Exit;
- }
-
-+ /* Check that the encoding is in the range [0, 65535] because */
-+ /* otherwise p->have (a bitmap with static size) overflows. */
-+ if ( p->glyph_enc >= sizeof(p->have) * 8 )
-+ {
-+ error = BDF_Err_Invalid_File_Format; /* Not the ideal error code */
-+ goto Exit;
-+ }
-+
- /* Check to see whether this encoding has already been encountered. */
- /* If it has then change it to unencoded so it gets added if */
- /* indicated. */
-diff -uNr freetype-2.2.1/src/pcf/pcfread.c freetype-2.2.1-new/src/pcf/pcfread.c
---- freetype-2.2.1/src/pcf/pcfread.c 2006-01-23 11:35:18.000000000 -0500
-+++ freetype-2.2.1-new/src/pcf/pcfread.c 2006-11-09 17:32:22.000000000
-0500
-@@ -439,6 +439,14 @@
-
- for ( i = 0; i < nprops; i++ )
- {
-+ /* 2006:0500 (mbarnes) - Detect invalid string length.
-+ * XXX Is this is best error code to return? */
-+ if ( props[i].name < 0 )
-+ {
-+ error = FT_Err_Invalid_File_Format;
-+ goto Bail;
-+ }
-+
- /* XXX: make atom */
- if ( FT_NEW_ARRAY( properties[i].name,
- ft_strlen( strings + props[i].name ) + 1 ) )
-@@ -451,6 +459,14 @@
-
- if ( props[i].isString )
- {
-+ /* 2006:0500 (mbarnes) - Detect invalid string length.
-+ * XXX Is this the best error code to return? */
-+ if ( props[i].value < 0 )
-+ {
-+ error = FT_Err_Invalid_File_Format;
-+ goto Bail;
-+ }
-+
- if ( FT_NEW_ARRAY( properties[i].value.atom,
- ft_strlen( strings + props[i].value ) + 1 ) )
- goto Bail;
-diff -uNr freetype-2.2.1/src/sfnt/ttmtx.c freetype-2.2.1-new/src/sfnt/ttmtx.c
---- freetype-2.2.1/src/sfnt/ttmtx.c 2006-03-20 08:34:23.000000000 -0500
-+++ freetype-2.2.1-new/src/sfnt/ttmtx.c 2006-11-09 17:30:21.000000000
-0500
-@@ -169,7 +169,7 @@
- }
-
- if ( FT_QNEW_ARRAY( *longs, num_longs ) ||
-- FT_QNEW_ARRAY( *shorts, num_shorts ) )
-+ (num_shorts > 0 && FT_QNEW_ARRAY( *shorts, num_shorts ) ) )
- goto Fail;
-
- if ( FT_FRAME_ENTER( table_len ) )
-diff -uNr freetype-2.2.1/src/truetype/ttgload.c
freetype-2.2.1-new/src/truetype/ttgload.c
---- freetype-2.2.1/src/truetype/ttgload.c 2006-02-14 15:44:56.000000000
-0500
-+++ freetype-2.2.1-new/src/truetype/ttgload.c 2006-11-09 17:35:53.000000000
-0500
-@@ -932,7 +932,7 @@
- {
- FT_Error error;
- FT_Outline* outline;
--
-+ int i;
-
- outline = &loader->gloader->base.outline;
-
-@@ -989,6 +989,12 @@
-
- tt_prepare_zone( &loader->zone, &loader->gloader->base,
- start_point, start_contour );
-+ /* Some points are likely touched during execution of
-+ * instructions on components. So let's untouch them.
-+ */
-+ for (i = 0; i < loader->zone.n_points; i++)
-+ loader->zone.tags[i] &= ~(FT_CURVE_TAG_TOUCH_X |
FT_CURVE_TAG_TOUCH_Y);
-+
- loader->zone.n_points += 4;
-
- return TT_Hint_Glyph( loader, 1 );
Index: src/base/ftmac.c
===================================================================
RCS file: /sources/freetype/freetype2/src/base/ftmac.c,v
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
