rpms/webkitgtk/devel webkit-1.1.12-no-execmem.patch, NONE, 1.1 webkitgtk.spec, 1.15, 1.16

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20038

Modified Files:
	webkitgtk.spec 
Added Files:
	webkit-1.1.12-no-execmem.patch 
Log Message:
Fix bugs #516057 (gets whacked by selinux execmem check) and #518639 (webkitgtk-doc package effectively empty). Bump min libsoup required version.

webkit-1.1.12-no-execmem.patch:
 Platform.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE webkit-1.1.12-no-execmem.patch ---
diff -up ./JavaScriptCore/wtf/Platform.h.old ./JavaScriptCore/wtf/Platform.h
--- ./JavaScriptCore/wtf/Platform.h.old	2009-08-22 15:00:39.306173267 -0700
+++ ./JavaScriptCore/wtf/Platform.h	2009-08-22 15:03:40.551182842 -0700
@@ -675,7 +675,7 @@
 #endif
 /* Setting this flag prevents the assembler from using RWX memory; this may improve
    security but currectly comes at a significant performance cost. */
-#if PLATFORM(ARM)
+#if PLATFORM(ARM) || PLATFORM(X86) || PLATFORM(X86_64)
 #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
 #else
 #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- webkitgtk.spec	29 Jul 2009 15:24:57 -0000	1.15
+++ webkitgtk.spec	23 Aug 2009 01:07:07 -0000	1.16
@@ -35,7 +35,7 @@
 
 Name:		webkitgtk
 Version:	1.1.12
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -46,7 +46,9 @@ License:	LGPLv2+ and BSD
 URL:		http://www.webkitgtk.org/
 
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
-Patch0:         webkit-1.1.12-atomic-word.patch
+
+Patch0: 	webkit-1.1.12-atomic-word.patch
+Patch1: 	webkit-1.1.12-no-execmem.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,7 +63,7 @@ BuildRequires:	gnome-keyring-devel
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-base-devel
 BuildRequires:	gtk2-devel
-BuildRequires:	libsoup-devel >= 2.25.91
+BuildRequires:	libsoup-devel >= 2.27.4
 BuildRequires:	libicu-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libxslt-devel
@@ -110,6 +112,7 @@ LICENSE, README, and AUTHORS files.
 %prep
 %setup -qn "webkit-%{version}"
 %patch0 -p1
+%patch1 -b .no-execmem
 
 %build
 %configure							\
@@ -154,6 +157,8 @@ install -m 755 Programs/GtkLauncher %{bu
 
 %add_to_doc_files JavaScriptCore/THANKS
 
+%add_to_doc_files WebKit/gtk/NEWS
+
 
 %clean
 rm -rf %{buildroot}
@@ -166,7 +171,6 @@ rm -rf %{buildroot}
 
 %files -f webkit.lang
 %defattr(-,root,root,-)
-%doc WebKit/gtk/NEWS
 %exclude %{_libdir}/*.la
 %{_libdir}/libwebkit-1.0.so.*
 %{_libexecdir}/%{name}/
@@ -185,6 +189,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 22 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.12-2
+- Add patch to forcibly disable RWX memory in the x86/x86-64 assembler.
+  + no-execmem.patch
+- Use %%add_to_doc_files to add the gtk/NEWS file instead of %%doc, which
+  clobbered the doc files before they could be properly installed to the -doc
+  subpackage.
+- Resolves: #516057 (gets whacked by selinux execmem check) and #516057
+  (webkitgtk-doc package effectively empty).
+- Update minimum required libsoup version.
+
 * Tue Jul 28 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.12-1
 - Update to 1.1.12