Xulrunner / Firefox 26.0

6 files changed, 79 insertions, 32 deletions

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 = \
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
index 0fed214..f2885f8 100644
--- a/mozilla-build-arm.patch
+++ b/mozilla-build-arm.patch
@@ -1,6 +1,15 @@
-diff -up xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build.arm xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build
---- xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build.arm	2013-10-23 15:52:17.056493264 +0200
-+++ xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build	2013-10-23 16:03:04.496045050 +0200
+--- mozilla-release/gfx/layers/BufferUnrotate.cpp.old	2013-12-05 17:07:31.000000000 +0100
++++ mozilla-release/gfx/layers/BufferUnrotate.cpp	2013-12-10 14:43:25.948164298 +0100
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight,
+                     int aByteStride, int aXBoundary, int aYBoundary)
+--- mozilla-release/gfx/ycbcr/moz.build.arm	2013-10-23 15:52:17.056493264 +0200
++++ mozilla-release/gfx/ycbcr/moz.build	2013-10-23 16:03:04.496045050 +0200
 @@ -61,7 +61,7 @@ else:
          'yuv_row_other.cpp',
      ]
diff --git a/mozilla-build.patch b/mozilla-build.patch
index 1dd29d0..be73cdf 100644
--- a/mozilla-build.patch
+++ b/mozilla-build.patch
@@ -1,6 +1,7 @@
---- mozilla-release/security/build/Makefile.in.build	2013-06-18 13:01:39.000000000 +0200
-+++ mozilla-release/security/build/Makefile.in	2013-06-18 14:01:41.940378194 +0200
-@@ -133,7 +133,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
+diff -up mozilla-release/security/build/Makefile.in.build mozilla-release/security/build/Makefile.in
+--- mozilla-release/security/build/Makefile.in.build	2013-12-05 17:07:53.000000000 +0100
++++ mozilla-release/security/build/Makefile.in	2013-12-09 15:10:17.177970414 +0100
+@@ -128,7 +128,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
  DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
  DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
  DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
@@ -8,11 +9,12 @@
  DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)"
  ifeq ($(OS_ARCH),WINNT)
  DEFAULT_GMAKE_FLAGS += INSTALL="$(NSINSTALL) -t"
---- mozilla-release/security/manager/ssl/src/Makefile.in.build	2013-06-18 13:01:39.000000000 +0200
-+++ mozilla-release/security/manager/ssl/src/Makefile.in	2013-06-18 14:01:18.659377663 +0200
-@@ -86,7 +86,6 @@ endif
- CSRCS += md4.c
+diff -up mozilla-release/security/manager/ssl/src/Makefile.in.build mozilla-release/security/manager/ssl/src/Makefile.in
+--- mozilla-release/security/manager/ssl/src/Makefile.in.build	2013-12-09 15:10:17.177970414 +0100
++++ mozilla-release/security/manager/ssl/src/Makefile.in	2013-12-09 15:11:02.282047401 +0100
+@@ -6,7 +6,6 @@
  
+ EXPORT_LIBRARY	= 1
  DEFINES += \
 -  -DNSS_ENABLE_ECC \
    -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
diff --git a/xulrunner-24.0-gcc47.patch b/xulrunner-24.0-gcc47.patch
index a6bff8e..28de75f 100644
--- a/xulrunner-24.0-gcc47.patch
+++ b/xulrunner-24.0-gcc47.patch
@@ -1,9 +1,9 @@
-diff -up xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47 xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in
---- xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47	2013-09-11 01:15:24.000000000 +0200
-+++ xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in	2013-09-13 13:33:49.866875578 +0200
-@@ -60,6 +60,9 @@ $(DIST)/bin/crashreporter.crt: $(topsrcd
- 	$(PYTHON) $(srcdir)/certdata2pem.py < $< > $@
- endif
+diff -up mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-release/toolkit/crashreporter/client/Makefile.in
+--- mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47	2013-12-09 15:12:50.659231760 +0100
++++ mozilla-release/toolkit/crashreporter/client/Makefile.in	2013-12-09 15:13:45.448324783 +0100
+@@ -42,6 +42,9 @@ endif
+ 
+ ifdef MOZ_WIDGET_GTK
  
 +# Needed for moz_free
 +LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
diff --git a/xulrunner-install-dir.patch b/xulrunner-install-dir.patch
index ba95923..c547aa8 100644
--- a/xulrunner-install-dir.patch
+++ b/xulrunner-install-dir.patch
@@ -1,8 +1,7 @@
-diff -up mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir mozilla-aurora-7676a9a06403/config/baseconfig.mk
---- mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir	2012-09-13 14:18:35.000000000 +0200
-+++ mozilla-aurora-7676a9a06403/config/baseconfig.mk	2012-09-26 10:13:45.258240426 +0200
-@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1
- 
+diff -up mozilla-release/config/baseconfig.mk.orig mozilla-release/config/baseconfig.mk
+--- mozilla-release/config/baseconfig.mk.orig	2013-12-09 15:07:53.357724904 +0100
++++ mozilla-release/config/baseconfig.mk	2013-12-09 15:08:35.819797392 +0100
+@@ -1,6 +1,6 @@
  includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -10,12 +9,10 @@ diff -up mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir mozilla-aurora-767
  sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
  DIST = $(DEPTH)/dist
  
-diff -up mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk.dir mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk
---- mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk.dir	2012-09-13 14:18:35.000000000 +0200
-+++ mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk	2012-09-26 10:14:07.353351833 +0200
-@@ -1,6 +1,6 @@
- INCLUDED_AUTOCONF_MK = 1
- 
+diff -up mozilla-release/js/src/config/baseconfig.mk.orig mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release/js/src/config/baseconfig.mk.orig	2013-12-09 15:07:53.357724904 +0100
++++ mozilla-release/js/src/config/baseconfig.mk	2013-12-09 15:09:06.906850462 +0100
+@@ -1,4 +1,4 @@
 -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 +installdir = $(libdir)/$(MOZ_APP_NAME)-last
  sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
diff --git a/xulrunner.spec b/xulrunner.spec
index 208bdaa..cc08634 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -1,5 +1,5 @@
 # Use system nspr/nss?
-%if 0%{?fedora} < 99
+%if 0%{?fedora} < 21
 %define system_nss        0
 %else
 %define system_nss        1
@@ -90,7 +90,7 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           %{shortname}-last
-Version:        25.0.1
+Version:        26.0
 Release:        1%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -119,6 +119,7 @@ Patch204:       rhbz-966424.patch
 
 # Upstream patches
 Patch300:       mozilla-837563.patch
+Patch301:       mozilla-938730.patch
 
 # ---------------------------------------------------
 
@@ -277,10 +278,10 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 cd %{tarballdir}
 
 %patch1  -p1
-%patch2  -p1 -b .build
-%patch3  -p2 -b .arm
+%patch2  -p1 -b .bld
+%patch3  -p1 -b .arm
 %patch14 -p2 -b .chromium-types
-%patch17 -p2 -b .gcc47
+%patch17 -p1 -b .gcc47
 %patch18 -p2 -b .jemalloc-ppc
 %patch19 -p2 -b .s390-inlines
 %patch20 -p1 -b .885002
@@ -289,6 +290,7 @@ cd %{tarballdir}
 %patch204 -p1 -b .966424
 
 %patch300 -p1 -b .837563
+%patch301 -p1 -b .938730
 
 %{__rm} -f .mozconfig
 %{__cat} %{SOURCE10} \
@@ -605,6 +607,16 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Dec 10 2013 Remi Collet <RPMS@FamilleCollet.com> - 26.0-1
+- sync with rawhide, update to 26.0 Build 2
+
+* Mon Dec 9 2013 Martin Stransky <stransky@redhat.com> - 26.0-1
+- Update to 26.0 Build 2
+
+ Thu Nov 21 2013 Martin Stransky <stransky@redhat.com> - 25.0-5
+- Fixed rhbz#1007603 - NSS and cert9 (sql): firefox crash on exit
+  with https-everywhere installed
+
 * Sat Nov 16 2013 Remi Collet <RPMS@FamilleCollet.com> - 25.0.1-1
 - sync with rawhide, update to 25.0.1