update patch

This commit is contained in:
Matthias Clasen 2009-08-25 13:46:42 +00:00
parent 4917157ef4
commit d45ccd2bd0
4 changed files with 21 additions and 6 deletions

View File

@ -1 +1 @@
webkit-1.1.12.tar.gz
webkit-1.1.13.tar.gz

View File

@ -1 +1 @@
1a10c117a0dd3717c2bcaa7a115cf218 webkit-1.1.12.tar.gz
627d5ac4b2c7a967e5a5ccb175e459ea webkit-1.1.13.tar.gz

View File

@ -0,0 +1,12 @@
diff -up webkit-1.1.13/JavaScriptCore/wtf/Platform.h.no-execmem webkit-1.1.13/JavaScriptCore/wtf/Platform.h
--- webkit-1.1.13/JavaScriptCore/wtf/Platform.h.no-execmem 2009-08-25 09:27:08.517026703 -0400
+++ webkit-1.1.13/JavaScriptCore/wtf/Platform.h 2009-08-25 09:42:35.222265742 -0400
@@ -724,7 +724,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(IPHONE)
+#if PLATFORM(IPHONE) || PLATFORM(X86) || PLATFORM(X86_64)
#define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
#else
#define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0

View File

@ -34,8 +34,8 @@
%bcond_with wml
Name: webkitgtk
Version: 1.1.12
Release: 2%{?dist}
Version: 1.1.13
Release: 1%{?dist}
Summary: GTK+ Web content engine library
Provides: WebKit-gtk = %{version}-%{release}
@ -48,7 +48,7 @@ URL: http://www.webkitgtk.org/
Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
Patch0: webkit-1.1.12-atomic-word.patch
Patch1: webkit-1.1.12-no-execmem.patch
Patch1: webkit-1.1.13-no-execmem.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -112,7 +112,7 @@ LICENSE, README, and AUTHORS files.
%prep
%setup -qn "webkit-%{version}"
%patch0 -p1
%patch1 -b .no-execmem
%patch1 -p1 -b .no-execmem
%build
%configure \
@ -189,6 +189,9 @@ rm -rf %{buildroot}
%changelog
* Tue Aug 25 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.13-1
- Update to 1.1.13
* Sat Aug 22 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.12-2
- Add patch to forcibly disable RWX memory in the x86/x86-64 assembler.
+ no-execmem.patch