rpms/WebKit/devel .cvsignore, 1.4, 1.5 WebKit-gcc43.patch, 1.1, 1.2 WebKit.spec, 1.7, 1.8 sources, 1.4, 1.5

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20343/WebKit/devel

Modified Files:
	.cvsignore WebKit-gcc43.patch WebKit.spec sources 
Log Message:
Update to new upstream SVN snapshot for security fixes.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Mar 2008 08:07:18 -0000	1.4
+++ .cvsignore	12 Apr 2008 23:53:13 -0000	1.5
@@ -1 +1 @@
-WebKit-r30667.tar.bz2
+WebKit-r31787.tar.bz2

WebKit-gcc43.patch:

Index: WebKit-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebKit-gcc43.patch	1 Mar 2008 08:07:18 -0000	1.1
+++ WebKit-gcc43.patch	12 Apr 2008 23:53:13 -0000	1.2
@@ -31,15 +31,4 @@
 +#include <cstdio>
  #include "config.h"
  #include "Selection.h"
- 
-diff -up ./WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp.old ./WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
---- ./WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp.old	2008-02-29 14:04:05.000000000 -0800
-+++ ./WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp	2008-02-29 14:04:47.000000000 -0800
-@@ -22,6 +22,7 @@
- 
- #include <JavaScriptCore/JSStringRef.h>
- #include <webkit/webkit.h>
-+#include <cstring>
- 
- // Returns a newly allocated UTF-8 character buffer which must be freed with g_free()
- static gchar* JSStringCopyUTF8CString(JSStringRef jsString)
+ 
\ No newline at end of file


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WebKit.spec	5 Mar 2008 17:31:01 -0000	1.7
+++ WebKit.spec	12 Apr 2008 23:53:13 -0000	1.8
@@ -3,11 +3,11 @@
 	cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
 	echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
 
-%define		svn_revision	30667
+%define		svn_revision	31787
 
 Name:		WebKit
 Version:	1.0.0
-Release:	0.7.svn%{svn_revision}%{?dist}
+Release:	0.8.svn%{svn_revision}%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
@@ -25,8 +25,11 @@
 BuildRequires:	flex
 BuildRequires:	gperf
 BuildRequires:	gtk2-devel
-BuildRequires:	libicu-devel
+BuildRequires:	libicu-devel	
+BuildRequires:	libtool
 BuildRequires:	libxslt-devel
+BuildRequires:	pango-devel
+BuildRequires:	pcre-devel
 ## Necessary for qmake and friends.
 BuildRequires:	qt4-devel
 BuildRequires:	sqlite-devel
@@ -104,20 +107,11 @@
 chmod a-x WebCore/dom/Clipboard.cpp
 
 ## Build the GTK+ port...
-install -d build-gtk
+mkdir build-gtk
+cp -a $(echo * | sed -e 's/build-gtk //') build-gtk
 pushd build-gtk
-	%{_qt4_qmake} -r 				\
-		OUTPUT_DIR="$PWD"			\
-		QMAKE_STRIP=/bin/true			\
-		QMAKE_RPATH=				\
-		QMAKE_CFLAGS="%{optflags}"		\
-		QMAKE_CXXFLAGS="%{optflags}"		\
-		VERSION=%{version}			\
-		CONFIG-=qt				\
-		CONFIG+=gtk-port			\
-		WEBKIT_INC_DIR=%{_includedir}/webkit	\
-		WEBKIT_LIB_DIR=%{_libdir}		\
-		../WebKit.pro
+	./autogen.sh
+	%configure --with-font-backend=pango --enable-icon-database
 	make %{?_smp_mflags}
 popd
 
@@ -143,9 +137,11 @@
 %install
 rm -rf %{buildroot}
 
-make -C build-gtk install INSTALL_ROOT=%{buildroot}
+make -C build-gtk install DESTDIR=%{buildroot}
 install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
-install -m 755 build-gtk/WebKitTools/GtkLauncher/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
+install -m 755 build-gtk/Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
+
+
 
 make -C build-qt install INSTALL_ROOT=%{buildroot}
 install -m 755 build-qt/bin/QtLauncher %{buildroot}%{_libexecdir}/%{name}
@@ -154,14 +150,12 @@
 
 ## Cleanup the pkgconfig files a bit...
 pushd %{buildroot}%{_libdir}/pkgconfig/
-	for WEBKIT_LIB in QtWebKit WebKitGtk; do
+	for WEBKIT_LIB in QtWebKit; do
 		sed -i -e 's!prefix=.*!prefix=%{_prefix}!' ${WEBKIT_LIB}.pc
 		## We don't need linkage that the WebKit DSOs already ensure.
 		sed -i -e  "s/^Libs:.*$/Libs: -L\${libdir} -l${WEBKIT_LIB}/" ${WEBKIT_LIB}.pc
 	done
 popd
-## The WebKitGtk pkgconfig data should depend on gtk+-2.0 for its cflags/libs.
-echo 'Requires: gtk+-2.0' >> %{buildroot}%{_libdir}/pkgconfig/WebKitGtk.pc 
 
 ## Finally, copy over and rename the various files for %%doc inclusion.
 rm -f docfiles.list
@@ -199,18 +193,16 @@
 %files	gtk
 %defattr(-,root,root,-)
 %doc
-%{_libdir}/libWebKitGtk.so.*
+%{_libdir}/libwebkit-1.0.so.*
 %dir %{_libexecdir}/WebKit/
 %{_libexecdir}/WebKit/GtkLauncher
 
 %files	gtk-devel
 %defattr(-,root,root,-)
-## The .prl file stores information only on how the library was built, and is
-## not needed for linking. 
-%exclude %{_libdir}/libWebKitGtk.prl
-%{_includedir}/webkit
-%{_libdir}/libWebKitGtk.so
-%{_libdir}/pkgconfig/WebKitGtk.pc
+%exclude %{_libdir}/*.la
+%{_includedir}/webkit-1.0
+%{_libdir}/libwebkit-1.0.so
+%{_libdir}/pkgconfig/webkit-1.0.pc
 
 %files	qt
 %defattr(-,root,root,-)
@@ -233,6 +225,12 @@
 
 
 %changelog
+* Sat Apr 12 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.8.svn31787
+- Update to new upstream snapshot (SVN 31787).
+- Resolves: CVE-2008-1010 (bug 438532: Arbitrary code execution) and
+  CVE-2008-1011 (bug 438531: Cross-Site Scripting).
+- Switch to using autotools for building the GTK+ port.
+
 * Wed Mar 05 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.7.svn30667
 - Fix the WebKitGtk pkgconfig data (should depend on gtk+-2.0). Resolves
   bug 436073 (Requires: gtk+-2.0 missing from WebKitGtk.pc).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Mar 2008 08:07:18 -0000	1.4
+++ sources	12 Apr 2008 23:53:13 -0000	1.5
@@ -1 +1 @@
-d5047727add37bdbba6a4642b0a9c0f4  WebKit-r30667.tar.bz2
+786a8fc7c9fd8755c8c75e93ae4b7bc2  WebKit-r31787.tar.bz2