diff options
| -rw-r--r-- | firefox.spec | 8 | ||||
| -rw-r--r-- | mozilla-938730.patch | 27 |
2 files changed, 34 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec index 002b32a..5d6286f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -58,7 +58,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 26.0 -Release: 3%{?pre_tag}%{?dist} +Release: 4%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -82,6 +82,7 @@ Patch15: firefox-15.0-enable-addons.patch Patch16: firefox-duckduckgo.patch # Upstream patches +Patch20: mozilla-938730.patch %if %{official_branding} # Required by Mozilla Corporation @@ -127,6 +128,7 @@ cd %{tarballdir} %patch16 -p1 -b .duckduckgo # Upstream patches +%patch20 -p1 -b .938730 %if %{official_branding} # Required by Mozilla Corporation @@ -445,6 +447,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Dec 17 2013 Martin Stransky <stransky@redhat.com> - 26.0-4 +- Added fix for rhbz#1007603 - NSS and cert9 (sql): firefox crash + on exit with https-everywhere installed (edit) + * Fri Dec 13 2013 Martin Stransky <stransky@redhat.com> - 26.0-3 - Build with -Werror=format-security (rhbz#1037063) diff --git a/mozilla-938730.patch b/mozilla-938730.patch new file mode 100644 index 0000000..3b84553 --- /dev/null +++ b/mozilla-938730.patch @@ -0,0 +1,27 @@ +diff -up mozilla-release/storage/src/Makefile.in.938730 mozilla-release/storage/src/Makefile.in +--- mozilla-release/storage/src/Makefile.in.938730 2013-12-09 15:15:44.708527295 +0100 ++++ mozilla-release/storage/src/Makefile.in 2013-12-09 15:17:16.119682503 +0100 +@@ -6,14 +6,23 @@ + # Don't use the jemalloc allocator on Android, because we can't guarantee + # that Gecko will configure sqlite before it is first used (bug 730495). + # ++# Don't use the jemalloc allocator when using system NSS. Linked in libraries ++# (such as NSS) might trigger an initialization of sqlite and allocation ++# of memory using the default allocator, prior to the storage service ++# registering its allocator, causing memory management failures (bug 938730). ++# + # Note: On Windows our sqlite build assumes we use jemalloc. If you disable + # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef + # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in. ++ ++ifndef _USE_SYSTEM_NSS + ifdef MOZ_MEMORY + ifneq ($(OS_TARGET), Android) + DEFINES += -DMOZ_STORAGE_MEMORY + endif + endif ++endif ++ + + # For nsDependentJSString + LOCAL_INCLUDES = \ |