Update to 1.2.5.

Fixes: CVE-2010-3113 CVE-2010-1814 CVE-2010-1812
Fixes: CVE-2010-1815 CVE-2010-3115 CVE-2010-1807 CVE-2010-3114
Fixes: CVE-2010-3116 CVE-2010-3257 CVE-2010-3259

.cvsignore

@@ -1 +0,0 @@
-webkit-1.1.15.1.tar.gz

.gitignore

@@ -0,0 +1,3 @@
+webkit-1.1.21.tar.gz
+/webkit-1.2.4.tar.gz
+/webkit-1.2.5.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: webkitgtk
-# $Id$
-NAME := webkitgtk
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-e6eb43bb4f75b4a2a09aec95e2f43e91  webkit-1.1.15.1.tar.gz
+09f04985665b9abf6f0d9956f86a6a31  webkit-1.2.5.tar.gz

webkit-1.1.14-nspluginwrapper.patch

@@ -1,9 +1,9 @@
---- webkit-1.1.14/WebCore/plugins/PluginDatabase.cpp.orig	2009-09-14 17:48:44.000000000 +0100
-+++ webkit-1.1.14/WebCore/plugins/PluginDatabase.cpp	2009-09-14 17:50:28.000000000 +0100
-@@ -355,6 +355,9 @@ Vector<String> PluginDatabase::defaultPl
-     paths.append("/usr/lib/netscape/plugins-libc6");
-     paths.append("/usr/lib64/netscape/plugins");
+--- webkit-1.1.17/WebCore/plugins/PluginDatabase.cpp.old	2009-12-01 15:22:10.000000000 +0000
++++ webkit-1.1.17/WebCore/plugins/PluginDatabase.cpp	2009-12-01 15:22:21.000000000 +0000
+@@ -357,6 +357,9 @@ Vector<String> PluginDatabase::defaultPl
      paths.append("/usr/lib64/mozilla/plugins");
+     paths.append("/usr/lib/nsbrowser/plugins");
+     paths.append("/usr/lib64/nsbrowser/plugins");
 +    /* And for nspluginwrapper */
 +    paths.append("/usr/lib64/mozilla/plugins-wrapped");
 +    paths.append("/usr/lib/mozilla/plugins-wrapped");

webkit-1.1.22-icu44.patch

@@ -0,0 +1,141 @@
+2010-03-22  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        TextBreakIteratorICU.cpp is incompatible with new UBreakIterator type in ICU 4.4
+        https://bugs.webkit.org/show_bug.cgi?id=36381
+
+        * platform/text/TextBreakIteratorICU.cpp:
+        (WebCore::setUpIterator): Use reinterpret_cast instead of static_cast or relying
+        on conversion to void*.
+        (WebCore::textBreakFirst): Ditto.
+        (WebCore::textBreakLast): Ditto.
+        (WebCore::textBreakNext): Ditto.
+        (WebCore::textBreakPrevious): Ditto.
+        (WebCore::textBreakPreceding): Ditto.
+        (WebCore::textBreakFollowing): Ditto.
+        (WebCore::textBreakCurrent): Ditto.
+        (WebCore::isTextBreak): Ditto.
+        (WebCore::setUpIteratorWithRules): Ditto.
+
+ 2010-03-22  Eric Carlson  <eric.carlson@apple.com>
+ 
+Index: /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp
+===================================================================
+--- /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 50977)
++++ /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 56345)
+@@ -25,5 +25,4 @@
+ #include "PlatformString.h"
+ #include "TextBreakIteratorInternalICU.h"
+-
+ #include <unicode/ubrk.h>
+ #include <wtf/Assertions.h>
+@@ -39,5 +38,5 @@
+     if (!createdIterator) {
+         UErrorCode openStatus = U_ZERO_ERROR;
+-        iterator = static_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
++        iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
+         createdIterator = true;
+         ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
+@@ -47,5 +46,5 @@
+ 
+     UErrorCode setTextStatus = U_ZERO_ERROR;
+-    ubrk_setText(iterator, string, length, &setTextStatus);
++    ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
+     if (U_FAILURE(setTextStatus))
+         return 0;
+@@ -86,42 +85,42 @@
+ }
+ 
+-int textBreakFirst(TextBreakIterator* bi)
+-{
+-    return ubrk_first(bi);
+-}
+-
+-int textBreakLast(TextBreakIterator* bi)
+-{
+-    return ubrk_last(bi);
+-}
+-
+-int textBreakNext(TextBreakIterator* bi)
+-{
+-    return ubrk_next(bi);
+-}
+-
+-int textBreakPrevious(TextBreakIterator* bi)
+-{
+-    return ubrk_previous(bi);
+-}
+-
+-int textBreakPreceding(TextBreakIterator* bi, int pos)
+-{
+-    return ubrk_preceding(bi, pos);
+-}
+-
+-int textBreakFollowing(TextBreakIterator* bi, int pos)
+-{
+-    return ubrk_following(bi, pos);
+-}
+-
+-int textBreakCurrent(TextBreakIterator* bi)
+-{
+-    return ubrk_current(bi);
+-}
+-
+-bool isTextBreak(TextBreakIterator* bi, int pos)
+-{
+-    return ubrk_isBoundary(bi, pos);
++int textBreakFirst(TextBreakIterator* iterator)
++{
++    return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
++}
++
++int textBreakLast(TextBreakIterator* iterator)
++{
++    return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
++}
++
++int textBreakNext(TextBreakIterator* iterator)
++{
++    return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
++}
++
++int textBreakPrevious(TextBreakIterator* iterator)
++{
++    return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
++}
++
++int textBreakPreceding(TextBreakIterator* iterator, int pos)
++{
++    return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
++}
++
++int textBreakFollowing(TextBreakIterator* iterator, int pos)
++{
++    return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
++}
++
++int textBreakCurrent(TextBreakIterator* iterator)
++{
++    return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
++}
++
++bool isTextBreak(TextBreakIterator* iterator, int position)
++{
++    return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
+ }
+ 
+@@ -137,5 +136,5 @@
+         UErrorCode openStatus = U_ZERO_ERROR;
+         String rules(breakRules);
+-        iterator = static_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
++        iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
+         createdIterator = true;
+         ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
+@@ -145,5 +144,5 @@
+ 
+     UErrorCode setTextStatus = U_ZERO_ERROR;
+-    ubrk_setText(iterator, string, length, &setTextStatus);
++    ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
+     if (U_FAILURE(setTextStatus))
+         return 0;

webkit-1.1.22-s390.patch

@@ -0,0 +1,30 @@
+diff -up webkit-1.1.22/JavaScriptCore/wtf/Platform.h.s390 webkit-1.1.22/JavaScriptCore/wtf/Platform.h
+--- webkit-1.1.22/JavaScriptCore/wtf/Platform.h.s390	2010-03-31 15:07:04.000000000 +0200
++++ webkit-1.1.22/JavaScriptCore/wtf/Platform.h	2010-03-31 15:09:00.000000000 +0200
+@@ -145,6 +145,18 @@
+ #define WTF_CPU_SPARC
+ #endif
+ 
++/* CPU(S390X) - S390 64-bit */
++#if defined(__s390x__)
++#define WTF_CPU_S390X 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
++/* CPU(S390) - S390 32-bit */
++#if defined(__s390__)
++#define WTF_CPU_S390 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if   defined(__i386__) \
+     || defined(i386)     \
+@@ -831,6 +843,7 @@
+ #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
+     || CPU(IA64)  \
+     || CPU(ALPHA) \
++    || CPU(S390X) \
+     || CPU(SPARC64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)

webkit-1.1.22-sparc.patch

@@ -0,0 +1,15 @@
+diff -up webkit-1.1.22/JavaScriptCore/wtf/Platform.h.sparc webkit-1.1.22/JavaScriptCore/wtf/Platform.h
+--- webkit-1.1.22/JavaScriptCore/wtf/Platform.h.sparc	2010-03-23 08:14:24.378618143 -0400
++++ webkit-1.1.22/JavaScriptCore/wtf/Platform.h	2010-03-23 08:14:29.871502920 -0400
+@@ -828,7 +828,10 @@
+ #endif
+ 
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) || CPU(IA64) || CPU(ALPHA)
++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
++    || CPU(IA64)  \
++    || CPU(ALPHA) \
++    || CPU(SPARC64)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1

webkitgtk.spec

@@ -34,8 +34,8 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.1.15.1
-Release:	3%{?dist}
+Version:	1.2.5
+Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -47,8 +47,6 @@ URL:		http://www.webkitgtk.org/
 
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
-#Patch0: 	webkit-1.1.14-atomic-word.patch
-
 ## See: https://bugzilla.redhat.com/show_bug.cgi?id=516057
 ## FIXME: We forcibly disable the JIT compiler for the time being.
 ## This is a temporary workaround which causes a slight performance hit on
@@ -58,8 +56,6 @@ Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 #Patch1: 	webkit-1.1.13-no-execmem.patch
 Patch2: 	webkit-1.1.14-nspluginwrapper.patch
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:	bison
 BuildRequires:	chrpath
 BuildRequires:	enchant-devel
@@ -118,7 +114,6 @@ LICENSE, README, and AUTHORS files.
 
 %prep
 %setup -qn "webkit-%{version}"
-# %patch0 -p1 -b .atomic-word
 # %patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
 
@@ -133,8 +128,9 @@ CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGE
 %{?with_svg:		--enable-svg-filters		}	\
 %{?with_wml:		--enable-wml			}
 
-make %{?_smp_mflags}
+mkdir -p DerivedSources/
 
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -197,6 +193,58 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 04 2010 Kevin Fenzi <kevin@tummy.com> - 1.2.5-1
+- Update to 1.2.5. 
+- Fixes: CVE-2010-3113 CVE-2010-1814 CVE-2010-1812
+- Fixes: CVE-2010-1815 CVE-2010-3115 CVE-2010-1807 CVE-2010-3114
+- Fixes: CVE-2010-3116 CVE-2010-3257 CVE-2010-3259
+
+* Wed Sep 08 2010 Kevin Fenzi <kevin@tummy.com> - 1.2.4-1
+- Update to 1.2.4 which fixes: 
+- Fixes: CVE-2010-1780 CVE-2010-1782 CVE-2010-1784 CVE-2010-1785
+- Fixes: CVE-2010-1786 CVE-2010-1787 CVE-2010-1788 CVE-2010-1790
+- Fixes: CVE-2010-1792 CVE-2010-1793 CVE-2010-2648
+- Update to 1.2.3 which fixes: 
+- Fixes: CVE-2010-1386 CVE-2010-1392 CVE-2010-1405 CVE-2010-1407
+- Fixes: CVE-2010-1416 CVE-2010-1417 CVE-2010-1665 CVE-2010-1418
+- Fixes: CVE-2010-1421 CVE-2010-1422 CVE-2010-1501 CVE-2010-1767
+- Fixes: CVE-2010-1664 CVE-2010-1758 CVE-2010-1759 CVE-2010-1760
+- Fixes: CVE-2010-1761 CVE-2010-1762 CVE-2010-1770 CVE-2010-1771
+- Fixes: CVE-2010-1772 CVE-2010-1773 CVE-2010-1774 CVE-2010-2264
+- Fixes bugs: 606303 606304 615728 615729 631583
+
+* Sun Apr 11 2010 Matthias Clasen <mclasen@redhat.com> 1.2.0-1
+- Update to 1.2.0
+
+* Fri Apr 02 2010 Caolán McNamara <caolanm@redhat.com> 1.1.22-3
+- rebuild for icu 4.4
+
+* Tue Mar 23 2010 Tom "spot" Callaway <tcallawa@redhat.com> 1.1.22-2
+- apply upstream fix for sparc
+
+* Mon Feb 22 2010 Matthias Clasen <mclasen@redhat.com> 1.1.22-1
+- Update to 1.1.22
+
+* Wed Feb 10 2010 Bastien Nocera <bnocera@redhat.com> 1.1.21-1
+- Update to 1.1.21
+
+* Tue Jan 26 2010 Matthias Clasen <mclasen@redhat.com> 1.1.19-1
+- Update to 1.1.19
+
+* Sun Jan 17 2010 Matthias Clasen <mclasen@redhat.com> 1.1.18-1
+- Update to 1.1.18
+
+* Tue Dec 01 2009 Bastien Nocera <bnocera@redhat.com> 1.1.17-1
+- Update to 1.1.17
+
+* Sat Oct 31 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.15.3-1
+- Update to 1.1.15.3, more crash fixes and important media player fixes
+- See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000047.html
+
+* Thu Oct 15 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.15.2-1
+- Update to 1.1.15.2, which has multiple crash and other fixes
+- See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000040.html
+
 * Thu Sep 24 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.15.1-3
 - Forcibly disable JIT until we can properly resolve the execmem-caused
   segfaulting. (Temporary workaround until bug #516057 can be properly fixed.)