diff --git a/.gitignore b/.gitignore index 0f27658..56b64b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/firefox-24.6.0esr.source.tar.bz2 +SOURCES/firefox-24.7.0esr.source.tar.bz2 diff --git a/.xulrunner.metadata b/.xulrunner.metadata index 7447912..81bd3c5 100644 --- a/.xulrunner.metadata +++ b/.xulrunner.metadata @@ -1 +1 @@ -9dfbf8c5cf749a142890011071bd5fbeab60d20d SOURCES/firefox-24.6.0esr.source.tar.bz2 +b7d93b2d8af7028670b6fa17177e4316670d3724 SOURCES/firefox-24.7.0esr.source.tar.bz2 diff --git a/SOURCES/camelia.patch b/SOURCES/camelia.patch deleted file mode 100644 index 0700968..0000000 --- a/SOURCES/camelia.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up mozilla-release/netwerk/base/public/security-prefs.js.camelia mozilla-release/netwerk/base/public/security-prefs.js ---- mozilla-release/netwerk/base/public/security-prefs.js.camelia 2013-09-11 01:15:20.000000000 +0200 -+++ mozilla-release/netwerk/base/public/security-prefs.js 2013-10-10 14:25:45.524000007 +0200 -@@ -18,12 +18,6 @@ pref("security.ssl3.rsa_rc4_128_md5", tr - pref("security.ssl3.rsa_rc4_128_sha", true); - pref("security.ssl3.rsa_fips_des_ede3_sha", true); - pref("security.ssl3.rsa_des_ede3_sha", true); --pref("security.ssl3.dhe_rsa_camellia_256_sha", true); --pref("security.ssl3.dhe_dss_camellia_256_sha", true); --pref("security.ssl3.rsa_camellia_256_sha", true); --pref("security.ssl3.dhe_rsa_camellia_128_sha", true); --pref("security.ssl3.dhe_dss_camellia_128_sha", true); --pref("security.ssl3.rsa_camellia_128_sha", true); - pref("security.ssl3.dhe_rsa_aes_256_sha", true); - pref("security.ssl3.dhe_dss_aes_256_sha", true); - pref("security.ssl3.rsa_aes_256_sha", true); -diff -up mozilla-release/security/manager/ssl/src/nsNSSComponent.cpp.camelia mozilla-release/security/manager/ssl/src/nsNSSComponent.cpp ---- mozilla-release/security/manager/ssl/src/nsNSSComponent.cpp.camelia 2013-09-11 01:15:21.000000000 +0200 -+++ mozilla-release/security/manager/ssl/src/nsNSSComponent.cpp 2013-10-10 14:27:04.388999975 +0200 -@@ -834,9 +834,6 @@ static CipherPref CipherPrefs[] = { - {"security.ssl3.rsa_fips_des_ede3_sha", SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with RSA and a SHA1 MAC (FIPS) - {"security.ssl3.rsa_des_ede3_sha", SSL_RSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with RSA and a SHA1 MAC - /* Extra SSL3/TLS cipher suites */ -- {"security.ssl3.dhe_rsa_camellia_256_sha", TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA}, // 256-bit Camellia encryption with RSA, DHE, and a SHA1 MAC -- {"security.ssl3.dhe_dss_camellia_256_sha", TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA}, // 256-bit Camellia encryption with DSA, DHE, and a SHA1 MAC -- {"security.ssl3.rsa_camellia_256_sha", TLS_RSA_WITH_CAMELLIA_256_CBC_SHA}, // 256-bit Camellia encryption with RSA and a SHA1 MAC - {"security.ssl3.dhe_rsa_aes_256_sha", TLS_DHE_RSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with RSA, DHE, and a SHA1 MAC - {"security.ssl3.dhe_dss_aes_256_sha", TLS_DHE_DSS_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with DSA, DHE, and a SHA1 MAC - {"security.ssl3.rsa_aes_256_sha", TLS_RSA_WITH_AES_256_CBC_SHA}, // 256-bit AES encryption with RSA and a SHA1 MAC -@@ -858,15 +855,11 @@ static CipherPref CipherPrefs[] = { - {"security.ssl3.ecdh_rsa_aes_128_sha", TLS_ECDH_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with ECDH-RSA and a SHA1 MAC - {"security.ssl3.ecdh_rsa_des_ede3_sha", TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with ECDH-RSA and a SHA1 MAC - {"security.ssl3.ecdh_rsa_rc4_128_sha", TLS_ECDH_RSA_WITH_RC4_128_SHA}, // 128-bit RC4 encryption with ECDH-RSA and a SHA1 MAC -- {"security.ssl3.dhe_rsa_camellia_128_sha", TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA}, // 128-bit Camellia encryption with RSA, DHE, and a SHA1 MAC -- {"security.ssl3.dhe_dss_camellia_128_sha", TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA}, // 128-bit Camellia encryption with DSA, DHE, and a SHA1 MAC -- {"security.ssl3.rsa_camellia_128_sha", TLS_RSA_WITH_CAMELLIA_128_CBC_SHA}, // 128-bit Camellia encryption with RSA and a SHA1 MAC - {"security.ssl3.dhe_rsa_aes_128_sha", TLS_DHE_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with RSA, DHE, and a SHA1 MAC - {"security.ssl3.dhe_dss_aes_128_sha", TLS_DHE_DSS_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with DSA, DHE, and a SHA1 MAC - {"security.ssl3.rsa_aes_128_sha", TLS_RSA_WITH_AES_128_CBC_SHA}, // 128-bit AES encryption with RSA and a SHA1 MAC - {"security.ssl3.dhe_rsa_des_ede3_sha", SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with RSA, DHE, and a SHA1 MAC - {"security.ssl3.dhe_dss_des_ede3_sha", SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA}, // 168-bit Triple DES with DSA, DHE, and a SHA1 MAC -- {"security.ssl3.rsa_seed_sha", TLS_RSA_WITH_SEED_CBC_SHA}, // SEED encryption with RSA and a SHA1 MAC - {nullptr, 0} /* end marker */ - }; - diff --git a/SOURCES/firefox-system-nss-3.16.2.patch b/SOURCES/firefox-system-nss-3.16.2.patch new file mode 100644 index 0000000..80a5712 --- /dev/null +++ b/SOURCES/firefox-system-nss-3.16.2.patch @@ -0,0 +1,12 @@ +diff -up firefox-24.3.0/mozilla-esr24/configure.in.nss firefox-24.3.0/mozilla-esr24/configure.in +--- firefox-24.3.0/mozilla-esr24/configure.in.nss 2014-01-30 15:46:38.000000000 +0100 ++++ firefox-24.3.0/mozilla-esr24/configure.in 2014-01-30 17:01:30.614179142 +0100 +@@ -3944,7 +3944,7 @@ MOZ_ARG_WITH_BOOL(system-nss, + _USE_SYSTEM_NSS=1 ) + + if test -n "$_USE_SYSTEM_NSS"; then +- AM_PATH_NSS(3.16.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.15.4, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + + if test -n "$MOZ_NATIVE_NSS"; then diff --git a/SOURCES/mozilla-906754.patch b/SOURCES/mozilla-906754.patch new file mode 100644 index 0000000..baf13d7 --- /dev/null +++ b/SOURCES/mozilla-906754.patch @@ -0,0 +1,204 @@ +diff -up mozilla-esr24/xpcom/ds/TimeStamp.cpp.906754 mozilla-esr24/xpcom/ds/TimeStamp.cpp +--- mozilla-esr24/xpcom/ds/TimeStamp.cpp.906754 2013-12-06 03:21:33.000000000 +0100 ++++ mozilla-esr24/xpcom/ds/TimeStamp.cpp 2013-12-20 16:11:06.607243958 +0100 +@@ -13,15 +13,41 @@ + + namespace mozilla { + +-TimeStamp TimeStamp::sFirstTimeStamp; +-TimeStamp TimeStamp::sProcessCreation; ++/** ++ * Wrapper class used to initialize static data used by the TimeStamp class ++ */ ++struct TimeStampInitialization { ++ /** ++ * First timestamp taken when the class static initializers are run. This ++ * timestamp is used to sanitize timestamps coming from different sources. ++ */ ++ TimeStamp mFirstTimeStamp; ++ ++ /** ++ * Timestamp representing the time when the process was created. This field ++ * is populated lazily the first time this information is required and is ++ * replaced every time the process is restarted. ++ */ ++ TimeStamp mProcessCreation; ++ ++ TimeStampInitialization() { ++ TimeStamp::Startup(); ++ mFirstTimeStamp = TimeStamp::Now(); ++ }; ++ ++ ~TimeStampInitialization() { ++ TimeStamp::Shutdown(); ++ }; ++}; ++ ++static TimeStampInitialization sInitOnce; + + TimeStamp + TimeStamp::ProcessCreation(bool& aIsInconsistent) + { + aIsInconsistent = false; + +- if (sProcessCreation.IsNull()) { ++ if (sInitOnce.mProcessCreation.IsNull()) { + char *mozAppRestart = PR_GetEnv("MOZ_APP_RESTART"); + TimeStamp ts; + +@@ -31,7 +57,7 @@ TimeStamp::ProcessCreation(bool& aIsInco + if (mozAppRestart && (strcmp(mozAppRestart, "") != 0)) { + /* Firefox was restarted, use the first time-stamp we've taken as the new + * process startup time and unset MOZ_APP_RESTART. */ +- ts = sFirstTimeStamp; ++ ts = sInitOnce.mFirstTimeStamp; + PR_SetEnv("MOZ_APP_RESTART="); + } else { + TimeStamp now = Now(); +@@ -39,26 +65,26 @@ TimeStamp::ProcessCreation(bool& aIsInco + + ts = now - TimeDuration::FromMicroseconds(uptime); + +- if ((ts > sFirstTimeStamp) || (uptime == 0)) { ++ if ((ts > sInitOnce.mFirstTimeStamp) || (uptime == 0)) { + /* If the process creation timestamp was inconsistent replace it with + * the first one instead and notify that a telemetry error was + * detected. */ + aIsInconsistent = true; +- ts = sFirstTimeStamp; ++ ts = sInitOnce.mFirstTimeStamp; + } + } + +- sProcessCreation = ts; ++ sInitOnce.mProcessCreation = ts; + } + +- return sProcessCreation; ++ return sInitOnce.mProcessCreation; + } + + void + TimeStamp::RecordProcessRestart() + { + PR_SetEnv("MOZ_APP_RESTART=1"); +- sProcessCreation = TimeStamp(); ++ sInitOnce.mProcessCreation = TimeStamp(); + } + + } // namespace mozilla +diff -up mozilla-esr24/xpcom/ds/TimeStamp_darwin.cpp.906754 mozilla-esr24/xpcom/ds/TimeStamp_darwin.cpp +--- mozilla-esr24/xpcom/ds/TimeStamp_darwin.cpp.906754 2013-12-06 03:21:33.000000000 +0100 ++++ mozilla-esr24/xpcom/ds/TimeStamp_darwin.cpp 2013-12-20 15:58:50.356993425 +0100 +@@ -114,18 +114,6 @@ TimeDuration::Resolution() + return TimeDuration::FromTicks(int64_t(sResolution)); + } + +-struct TimeStampInitialization +-{ +- TimeStampInitialization() { +- TimeStamp::Startup(); +- } +- ~TimeStampInitialization() { +- TimeStamp::Shutdown(); +- } +-}; +- +-static TimeStampInitialization initOnce; +- + nsresult + TimeStamp::Startup() + { +@@ -152,8 +140,6 @@ TimeStamp::Startup() + sResolutionSigDigs *= 10); + + gInitialized = true; +- sFirstTimeStamp = TimeStamp::Now(); +- sProcessCreation = TimeStamp(); + + return NS_OK; + } +diff -up mozilla-esr24/xpcom/ds/TimeStamp.h.906754 mozilla-esr24/xpcom/ds/TimeStamp.h +--- mozilla-esr24/xpcom/ds/TimeStamp.h.906754 2013-12-06 03:21:33.000000000 +0100 ++++ mozilla-esr24/xpcom/ds/TimeStamp.h 2013-12-20 15:58:50.356993425 +0100 +@@ -363,19 +363,6 @@ private: + * When using a system clock, a value is system dependent. + */ + TimeStampValue mValue; +- +- /** +- * First timestamp taken when the class static initializers are run. This +- * timestamp is used to sanitize timestamps coming from different sources. +- */ +- static TimeStamp sFirstTimeStamp; +- +- /** +- * Timestamp representing the time when the process was created. This field +- * is populated lazily the first time this information is required and is +- * replaced every time the process is restarted. +- */ +- static TimeStamp sProcessCreation; + }; + + } +diff -up mozilla-esr24/xpcom/ds/TimeStamp_posix.cpp.906754 mozilla-esr24/xpcom/ds/TimeStamp_posix.cpp +--- mozilla-esr24/xpcom/ds/TimeStamp_posix.cpp.906754 2013-12-06 03:21:33.000000000 +0100 ++++ mozilla-esr24/xpcom/ds/TimeStamp_posix.cpp 2013-12-20 15:58:50.356993425 +0100 +@@ -159,17 +159,6 @@ TimeDuration::Resolution() + return TimeDuration::FromTicks(int64_t(sResolution)); + } + +-struct TimeStampInitialization +-{ +- TimeStampInitialization() { +- TimeStamp::Startup(); +- } +- ~TimeStampInitialization() { +- TimeStamp::Shutdown(); +- } +-}; +- +-static TimeStampInitialization initOnce; + static bool gInitialized = false; + + nsresult +@@ -192,8 +181,6 @@ TimeStamp::Startup() + sResolutionSigDigs *= 10); + + gInitialized = true; +- sFirstTimeStamp = TimeStamp::Now(); +- sProcessCreation = TimeStamp(); + + return NS_OK; + } +diff -up mozilla-esr24/xpcom/ds/TimeStamp_windows.cpp.906754 mozilla-esr24/xpcom/ds/TimeStamp_windows.cpp +--- mozilla-esr24/xpcom/ds/TimeStamp_windows.cpp.906754 2013-12-06 03:21:33.000000000 +0100 ++++ mozilla-esr24/xpcom/ds/TimeStamp_windows.cpp 2013-12-20 15:58:50.357993430 +0100 +@@ -457,18 +457,6 @@ TimeDuration::Resolution() + return TimeDuration::FromTicks(int64_t(sResolution)); + } + +-struct TimeStampInitialization +-{ +- TimeStampInitialization() { +- TimeStamp::Startup(); +- } +- ~TimeStampInitialization() { +- TimeStamp::Shutdown(); +- } +-}; +- +-static TimeStampInitialization initOnce; +- + static bool + HasStableTSC() + { +@@ -534,8 +522,6 @@ TimeStamp::Startup() + + InitThresholds(); + InitResolution(); +- sFirstTimeStamp = TimeStamp::Now(); +- sProcessCreation = TimeStamp(); + + return NS_OK; + } diff --git a/SOURCES/mozilla-build.patch b/SOURCES/mozilla-build.patch deleted file mode 100644 index 1dd29d0..0000000 --- a/SOURCES/mozilla-build.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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= - DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) - DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 - DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 --DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1 - 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 - - DEFINES += \ -- -DNSS_ENABLE_ECC \ - -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ - -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ - $(NULL) diff --git a/SOURCES/rhbz-1032770.patch b/SOURCES/rhbz-1032770.patch new file mode 100644 index 0000000..f9f0895 --- /dev/null +++ b/SOURCES/rhbz-1032770.patch @@ -0,0 +1,25 @@ +diff -up mozilla-esr24/storage/src/Makefile.in.rhbz-1032770 mozilla-esr24/storage/src/Makefile.in +--- mozilla-esr24/storage/src/Makefile.in.rhbz-1032770 2013-10-22 08:19:20.000000000 +0200 ++++ mozilla-esr24/storage/src/Makefile.in 2013-12-02 14:33:43.524479615 +0100 +@@ -22,14 +22,21 @@ endif + # 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 sqlite. 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. + ifdef MOZ_MEMORY ++ifndef MOZ_NATIVE_SQLITE + ifneq ($(OS_TARGET), Android) + DEFINES += -DMOZ_STORAGE_MEMORY + endif + endif ++endif + + # For nsDependentJSString + LOCAL_INCLUDES = \ diff --git a/SOURCES/xulrunner-2.0-chromium-types.patch b/SOURCES/xulrunner-2.0-chromium-types.patch deleted file mode 100644 index a350b41..0000000 --- a/SOURCES/xulrunner-2.0-chromium-types.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h ---- xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types 2011-06-15 23:57:26.000000000 +0200 -+++ xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h 2011-06-29 08:23:46.807314175 +0200 -@@ -61,10 +61,14 @@ typedef PRInt16 int16; - #define ARCH_CPU_ARM_FAMILY 1 - #define ARCH_CPU_ARMEL 1 - #define ARCH_CPU_32_BITS 1 --#elif defined(__ppc__) || defined(__powerpc) || defined(__PPC__) -+#elif defined(__ppc__) || defined(__powerpc__) || defined(__PPC__) - #define ARCH_CPU_PPC_FAMILY 1 - #define ARCH_CPU_PPC 1 - #define ARCH_CPU_32_BITS 1 -+#elif defined(__powerpc64__) -+#define ARCH_CPU_PPC_FAMILY 1 -+#define ARCH_CPU_PPC 1 -+#define ARCH_CPU_64_BITS 1 - #elif defined(__sparc) - #define ARCH_CPU_SPARC_FAMILY 1 - #define ARCH_CPU_SPARC 1 -@@ -73,6 +77,14 @@ typedef PRInt16 int16; - #define ARCH_CPU_SPARC_FAMILY 1 - #define ARCH_CPU_SPARC 1 - #define ARCH_CPU_64_BITS 1 -+#elif defined(__s390__) -+#define ARCH_CPU_S390_FAMILY 1 -+#define ARCH_CPU_S390 1 -+#define ARCH_CPU_32_BITS 1 -+#elif defined(__s390x__) -+#define ARCH_CPU_S390_FAMILY 1 -+#define ARCH_CPU_S390 1 -+#define ARCH_CPU_64_BITS 1 - #else - #warning Please add support for your architecture in chromium_types.h - #endif diff --git a/SOURCES/xulrunner-centos-default-prefs.js b/SOURCES/xulrunner-centos-default-prefs.js deleted file mode 100644 index e470e95..0000000 --- a/SOURCES/xulrunner-centos-default-prefs.js +++ /dev/null @@ -1,15 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.display.use_system_colors", true); -pref("browser.link.open_external", 3); -pref("general.smoothScroll", true); -pref("general.useragent.vendor","CentOS"); -pref("general.useragent.vendorSub", "RPM_VERREL"); -pref("intl.locale.matchOS", true); -pref("network.manage-offline-status", true); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); -pref("toolkit.storage.synchronous", 0); -pref("browser.startup.homepage", "http://www.centos.org"); -pref("startup.homepage_override_url", "http://www.centos.org"); -pref("startup.homepage_welcome_url", "http://www.centos.org"); diff --git a/SOURCES/xulrunner-redhat-default-prefs.js b/SOURCES/xulrunner-redhat-default-prefs.js new file mode 100644 index 0000000..4d15c04 --- /dev/null +++ b/SOURCES/xulrunner-redhat-default-prefs.js @@ -0,0 +1,15 @@ +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); +pref("browser.display.use_system_colors", true); +pref("browser.link.open_external", 3); +pref("general.smoothScroll", true); +pref("general.useragent.vendor", "Red Hat"); +pref("general.useragent.vendorSub", "RPM_VERREL"); +pref("intl.locale.matchOS", true); +pref("network.manage-offline-status", true); +pref("toolkit.networkmanager.disable", false); +pref("offline.autoDetect", true); +pref("toolkit.storage.synchronous", 0); +pref("browser.startup.homepage", "http://www.redhat.com"); +pref("startup.homepage_override_url", "http://www.redhat.com"); +pref("startup.homepage_welcome_url", "http://www.redhat.com"); diff --git a/SOURCES/xulrunner-webrtc-secondarch.patch b/SOURCES/xulrunner-webrtc-secondarch.patch deleted file mode 100644 index f0c4c37..0000000 --- a/SOURCES/xulrunner-webrtc-secondarch.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up xulrunner-17.0/mozilla-esr17/media/webrtc/trunk/src/typedefs.h.old xulrunner-17.0/mozilla-esr17/media/webrtc/trunk/src/typedefs.h ---- xulrunner-17.0/mozilla-esr17/media/webrtc/trunk/webrtc/typedefs.h.old 2012-11-16 20:47:22.000000000 +0100 -+++ xulrunner-17.0/mozilla-esr17/media/webrtc/trunk/webrtc/typedefs.h 2012-11-27 15:24:26.910592024 +0100 -@@ -37,6 +37,30 @@ - #define WEBRTC_ARCH_32_BITS - #define WEBRTC_ARCH_LITTLE_ENDIAN - #define WEBRTC_LITTLE_ENDIAN -+#elif defined(__powerpc64__) -+#define WEBRTC_ARCH_PPC_FAMILY -+#define WEBRTC_ARCH_PPC -+#define WEBRTC_ARCH_64_BITS -+#define WEBRTC_ARCH_BIG_ENDIAN -+#define WEBRTC_BIG_ENDIAN -+#elif defined(__ppc__) || defined(__powerpc__) || defined(__PPC__) -+#define WEBRTC_ARCH_PPC_FAMILY -+#define WEBRTC_ARCH_PPC -+#define WEBRTC_ARCH_32_BITS -+#define WEBRTC_ARCH_BIG_ENDIAN -+#define WEBRTC_BIG_ENDIAN -+#elif defined(__s390x__) -+#define WEBRTC_ARCH_S390_FAMILY -+#define WEBRTC_ARCH_S390 -+#define WEBRTC_ARCH_64_BITS -+#define WEBRTC_ARCH_BIG_ENDIAN -+#define WEBRTC_BIG_ENDIAN -+#elif defined(__s390__) -+#define WEBRTC_ARCH_S390_FAMILY -+#define WEBRTC_ARCH_S390 -+#define WEBRTC_ARCH_32_BITS -+#define WEBRTC_ARCH_BIG_ENDIAN -+#define WEBRTC_BIG_ENDIAN - #elif defined(__ARMEL__) - // TODO(andrew): We'd prefer to control platform defines here, but this is - // currently provided by the Android makefiles. Commented to avoid duplicate diff --git a/SPECS/xulrunner.spec b/SPECS/xulrunner.spec index 790c2c1..c762aef 100644 --- a/SPECS/xulrunner.spec +++ b/SPECS/xulrunner.spec @@ -20,7 +20,7 @@ # Minimal required versions %if %{?system_nss} %global nspr_version 4.10 -%global nss_version 3.15.1 +%global nss_version 3.15.4 %endif %define cairo_version 1.6.0 @@ -70,14 +70,14 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 24.6.0 +Version: 24.7.0 Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{ext_version}%{?pre_version}.source.tar.bz2 Source10: %{name}-mozconfig -Source12: %{name}-centos-default-prefs.js +Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in Source23: %{name}.1 Source100: find-external-requires @@ -85,11 +85,9 @@ Source100: find-external-requires # Xulrunner patches # Build patches Patch0: xulrunner-nspr-version.patch -Patch1: mozilla-build.patch Patch2: xulrunner-install-dir.patch -Patch3: xulrunner-webrtc-secondarch.patch -Patch16: xulrunner-2.0-chromium-types.patch -Patch17: camelia.patch +Patch14: rhbz-1032770.patch +Patch15: firefox-system-nss-3.16.2.patch Patch20: xulrunner-24.0-jemalloc-ppc.patch # RHEL specific patches @@ -102,6 +100,7 @@ Patch55: rhbz-966424.patch Patch100: xulrunner-24.0-gcc47.patch # Upstream patches +Patch300: mozilla-906754.patch # --------------------------------------------------- @@ -220,12 +219,10 @@ cd %{tarballdir} sed -e 's/__RH_NSPR_VERSION__/%{nspr_version}/' %{P:%%PATCH0} > version.patch %{__patch} -p2 -b --suffix .nspr --fuzz=0 < version.patch -%patch1 -p1 -b .build %patch2 -p1 -%patch3 -p2 -b .webrtc-secondarch -%patch16 -p2 -b .chromium-types -%patch17 -p1 -b .camelia +%patch14 -p1 -b .1032770 +%patch15 -p2 -b .nss-3.16.2 %patch20 -p2 -b .jemalloc-ppc %patch51 -p2 -b .pk @@ -234,6 +231,8 @@ sed -e 's/__RH_NSPR_VERSION__/%{nspr_version}/' %{P:%%PATCH0} > version.patch %patch100 -p2 -b .gcc-4.7 +%patch300 -p1 -b .906754 + %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -488,8 +487,8 @@ fi #--------------------------------------------------------------------- %changelog -* Mon Jun 16 2014 Karanbir Singh - 24.6.0-1.el7.centos -- Change prefs to CentOS +* Fri Jul 18 2014 Martin Stransky - 24.7.0-1 +- Update to 24.7.0 ESR * Wed Jun 4 2014 Jan Horak - 24.6.0-1 - Update to 24.6.0 ESR