From f31baf9268b6dc229323eeb2e707a41d507b327f32a48e8484309f5ff087e32a Mon Sep 17 00:00:00 2001
From: OBS User mrdocs <null@suse.de>
Date: Mon, 28 Feb 2011 21:44:10 +0000
Subject: [PATCH] Accepting request 63029 from home:jnweiger:branches:M17N

reviewed OK. Thanks

OBS-URL: https://build.opensuse.org/request/show/63029
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=42
---
 bug-647375_tt2.ttf | 3 +++
 freetype2.changes  | 6 ++++++
 freetype2.spec     | 4 ++--
 ft2demos.changes   | 5 +++++
 ft2demos.spec      | 8 +++++---
 5 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 bug-647375_tt2.ttf

diff --git a/bug-647375_tt2.ttf b/bug-647375_tt2.ttf
new file mode 100644
index 0000000..1fa7031
--- /dev/null
+++ b/bug-647375_tt2.ttf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecbbe6b4c1fd92e3ce6483d64cb7f6895efcce199486738cf4f395ee9b9a647f
+size 25089
diff --git a/freetype2.changes b/freetype2.changes
index cb8c5f6..afad63b 100644
--- a/freetype2.changes
+++ b/freetype2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 28 16:36:35 UTC 2011 - jw@novell.com
+
+- bnc#647375: CVE-2010-3855.diff already fixed upstream.
+- bnc#647375: CVE-2010-3814.diff already fixed upstream.
+
 -------------------------------------------------------------------
 Tue Dec  7 17:53:52 UTC 2010 - jw@novell.com
 
diff --git a/freetype2.spec b/freetype2.spec
index 7e8aedd..1d24cbc 100644
--- a/freetype2.spec
+++ b/freetype2.spec
@@ -29,7 +29,7 @@ Obsoletes:      freetype2-64bit
 %endif
 #
 Version:        2.4.4
-Release:        2
+Release:        3
 Url:            http://www.freetype.org
 Summary:        A TrueType Font Library
 # CVS repository:
@@ -48,7 +48,7 @@ Patch200:       freetype2-subpixel.patch
 Patch201:       use_unix.diff 
 
 Patch1000:      bnc628213_1797.diff
-Patch1015:	bnc641580_CVE-2010-3311.diff
+Patch1015:      bnc641580_CVE-2010-3311.diff
 Source1015:     bug-641580_CVE-2010-3311.cff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/ft2demos.changes b/ft2demos.changes
index 9f5ef00..445abaa 100644
--- a/ft2demos.changes
+++ b/ft2demos.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 25 12:06:26 UTC 2011 - jw@novell.com
+
+- bnc647375: CVE-2010-3814, regression test added.
+
 -------------------------------------------------------------------
 Tue Dec  7 17:52:34 UTC 2010 - jw@novell.com
 
diff --git a/ft2demos.spec b/ft2demos.spec
index 262c712..5d5df9f 100644
--- a/ft2demos.spec
+++ b/ft2demos.spec
@@ -25,7 +25,7 @@ Group:          Productivity/Publishing/Other
 AutoReqProv:    on
 Supplements:    fonts-config
 Version:        2.4.4
-Release:        2
+Release:        3
 %define freetype_version %{version}
 Url:            http://www.freetype.org
 Summary:        Freetype2 Utilities and Demo Programs
@@ -47,9 +47,10 @@ Patch201:       use_unix.diff
 Patch1000:      bnc628213_1797.diff
 Source1000:     bnc628213_test.otf
 Source1004:     bnc629447_sigsegv31.ttf
-Source1013:	bnc633938_badbdf.0
-Patch1015:	bnc641580_CVE-2010-3311.diff
+Source1013:     bnc633938_badbdf.0
+Patch1015:      bnc641580_CVE-2010-3311.diff
 Source1015:     bug-641580_CVE-2010-3311.cff
+Source1016:     bug-647375_tt2.ttf
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -129,6 +130,7 @@ $RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1000}
 $RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1004} |& grep -v "couldn't load font resource" && echo "should fail"
 $RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1013} |& grep -v "couldn't load font resource" && echo "should fail"
 $RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1015} |& grep -v "couldn't load font resource" && echo "should fail"
+$RPM_BUILD_ROOT/usr/bin/ftbench -c 1 %{S:1016}
 
 %clean