[maemo-commits] [maemo-commits] r14957 - in projects/haf/trunk/freetype: . debian

[From: subversion at stage.maemo.org]

Author: risun
Date: 2007-12-13 16:34:25 +0200 (Thu, 13 Dec 2007)
New Revision: 14957

Added:
   projects/haf/trunk/freetype/freetype-2.3.5.tar.bz2
Removed:
   projects/haf/trunk/freetype/CVE-2006-3467_pcf-strlen.patch
   projects/haf/trunk/freetype/freetype-2.2.1.tar.bz2
Modified:
   projects/haf/trunk/freetype/debian/changelog
   projects/haf/trunk/freetype/debian/rules
Log:

  * Updated: Upstream update from 2.2.1 to 2.3.5
  * Fixes: NB#57670
  * Removed: patch for CVE-2006-3467, which is already merged to
    upstream.



Deleted: projects/haf/trunk/freetype/CVE-2006-3467_pcf-strlen.patch
===================================================================
--- projects/haf/trunk/freetype/CVE-2006-3467_pcf-strlen.patch	2007-12-13 13:37:44 UTC (rev 14956)
+++ projects/haf/trunk/freetype/CVE-2006-3467_pcf-strlen.patch	2007-12-13 14:34:25 UTC (rev 14957)
@@ -1,35 +0,0 @@
-Index: freetype-2.2.1/src/pcf/pcfread.c
-===================================================================
---- freetype-2.2.1.orig/src/pcf/pcfread.c       2006-07-26 12:59:30.000000000 +0200
-+++ freetype-2.2.1/src/pcf/pcfread.c    2006-07-26 12:59:46.000000000 +0200
-@@ -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;
-

Modified: projects/haf/trunk/freetype/debian/changelog
===================================================================
--- projects/haf/trunk/freetype/debian/changelog	2007-12-13 13:37:44 UTC (rev 14956)
+++ projects/haf/trunk/freetype/debian/changelog	2007-12-13 14:34:25 UTC (rev 14957)
@@ -1,3 +1,12 @@
+freetype (2.3.5-1osso1) unstable; urgency=low
+
+  * Updated: Upstream update from 2.2.1 to 2.3.5
+  * Fixes: NB#57670
+  * Removed: patch for CVE-2006-3467, which is already merged to
+    upstream. 
+
+ -- Richard Sun <richard.sun at nokia.com>  Thu, 13 Dec 2007 15:55:37 +0200
+
 freetype (2.2.1-1osso3) unstable; urgency=low
 
   * Fixes: NB#46810 

Modified: projects/haf/trunk/freetype/debian/rules
===================================================================
--- projects/haf/trunk/freetype/debian/rules	2007-12-13 13:37:44 UTC (rev 14956)
+++ projects/haf/trunk/freetype/debian/rules	2007-12-13 14:34:25 UTC (rev 14957)
@@ -27,23 +27,23 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	tar -xjf freetype-2.2.1.tar.bz2
-	patch -p0 < CVE-2006-3467_pcf-strlen.patch
-	cd freetype-2.2.1 && ./configure --prefix=/usr --sysconfdir=/etc
+	tar -xjf freetype-2.3.5.tar.bz2
+	# patch -p0 < CVE-2006-3467_pcf-strlen.patch
+	cd freetype-2.3.5 && ./configure --prefix=/usr --sysconfdir=/etc
 	touch configure-stamp
 
 
 build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE) -C freetype-2.2.1
+	$(MAKE) -C freetype-2.3.5
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	rm -rf freetype-2.2.1
+	rm -rf freetype-2.3.5
 	rm -fr objs/.libs
 	dh_clean
 
@@ -52,7 +52,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) -C freetype-2.2.1 install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C freetype-2.3.5 install DESTDIR=$(CURDIR)/debian/tmp
 	
 
 binary-indep: build install

Deleted: projects/haf/trunk/freetype/freetype-2.2.1.tar.bz2
===================================================================
(Binary files differ)

Added: projects/haf/trunk/freetype/freetype-2.3.5.tar.bz2
===================================================================
(Binary files differ)


Property changes on: projects/haf/trunk/freetype/freetype-2.3.5.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream