From 46127387fca75edbe16df79b6e1c184b89ea7b1b Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 11 Nov 2014 14:47:30 +0100 Subject: Update to new upstream - 33.1 --- .gitignore | 2 ++ firefox-duckduckgo.patch | 36 --------------------- firefox.spec | 13 ++++---- mozilla-1042889.patch | 81 ------------------------------------------------ sources | 4 +-- 5 files changed, 10 insertions(+), 126 deletions(-) delete mode 100644 firefox-duckduckgo.patch delete mode 100644 mozilla-1042889.patch diff --git a/.gitignore b/.gitignore index b58b522..32d5107 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,5 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-32.0.2-20140918.tar.xz /firefox-langpacks-33.0-20141014.tar.xz /firefox-33.0.source.tar.bz2 +/firefox-33.1.source.tar.bz2 +/firefox-langpacks-33.1-20141111.tar.xz diff --git a/firefox-duckduckgo.patch b/firefox-duckduckgo.patch deleted file mode 100644 index e747013..0000000 --- a/firefox-duckduckgo.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties.duckduckgo mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties.duckduckgo 2012-10-24 16:32:26.000000000 +0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-07 16:27:04.278857840 +0100 -@@ -9,6 +9,7 @@ browser.search.defaultenginename=Google - browser.search.order.1=Google - browser.search.order.2=Yahoo - browser.search.order.3=Bing -+browser.search.order.4=DuckDuckGo - - # This is the default set of web based feed handlers shown in the reader - # selection UI -diff -up mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml.duckduckgo mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml ---- mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml.duckduckgo 2012-11-07 16:27:04.278857840 +0100 -+++ mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml 2012-11-07 16:27:04.278857840 +0100 -@@ -0,0 +1,11 @@ -+ -+ DuckDuckGo -+ We believe you can get better search and privacy at the same time. -+ UTF-8 -+ data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA== -+ -+ -+ -+ -+ https://duckduckgo.com/ -+ -diff -up mozilla-release/browser/locales/en-US/searchplugins/list.txt.duckduckgo mozilla-release/browser/locales/en-US/searchplugins/list.txt ---- mozilla-release/browser/locales/en-US/searchplugins/list.txt.duckduckgo 2012-10-24 16:32:26.000000000 +0200 -+++ mozilla-release/browser/locales/en-US/searchplugins/list.txt 2012-11-07 16:27:04.279857842 +0100 -@@ -1,5 +1,6 @@ - amazondotcom - bing -+duckduckgo - eBay - google - twitter diff --git a/firefox.spec b/firefox.spec index 387d5e4..a0c99f5 100644 --- a/firefox.spec +++ b/firefox.spec @@ -112,14 +112,14 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 33.0 -Release: 5%{?pre_tag}%{?dist} +Version: 33.1 +Release: 1%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2 %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20141014.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20141111.tar.xz %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -145,14 +145,12 @@ Patch21: firefox-mozstub-build.patch # Unable to install addons from https pages Patch204: rhbz-966424.patch Patch215: firefox-enable-addons.patch -Patch216: firefox-duckduckgo.patch Patch217: firefox-baseline-disable.patch # Upstream patches Patch300: mozilla-858919.patch Patch301: mozilla-858919-2.patch Patch302: mozilla-858919-3.patch -Patch310: mozilla-1042889.patch # Gtk3 upstream patches Patch402: mozilla-gtk3-tab-size.patch @@ -294,7 +292,6 @@ cd %{tarballdir} # Fedora patches %patch204 -p2 -b .966424 %patch215 -p1 -b .addons -%patch216 -p1 -b .duckduckgo # disable baseline JIT on i686 (rhbz#1047079) %ifarch %{ix86} %patch217 -p2 -b .baseline @@ -304,7 +301,6 @@ cd %{tarballdir} %patch300 -p1 -b .858919 %patch301 -p1 -b .858919 %patch302 -p1 -b .858919 -%patch310 -p1 -b .1042889 %if %{toolkit_gtk3} %patch402 -p1 -b .gtk3-tab-size @@ -771,6 +767,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Nov 11 2014 Martin Stransky - 33.0-6 +- Update to 33.1 build 3 + * Mon Nov 10 2014 Martin Stransky - 33.0-5 - Fixed rhbz#1161110 - /usr/bin/firefox should not mess with TMPDIR diff --git a/mozilla-1042889.patch b/mozilla-1042889.patch deleted file mode 100644 index 6061b9b..0000000 --- a/mozilla-1042889.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js ---- a/dom/browser-element/BrowserElementChildPreload.js -+++ b/dom/browser-element/BrowserElementChildPreload.js -@@ -90,16 +90,17 @@ function getErrorClass(errorCode) { - switch (NSPRCode) { - case SEC_ERROR_UNKNOWN_ISSUER: - case SEC_ERROR_UNTRUSTED_ISSUER: - case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: - case SEC_ERROR_UNTRUSTED_CERT: - case SSL_ERROR_BAD_CERT_DOMAIN: - case SEC_ERROR_EXPIRED_CERTIFICATE: - case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED: -+ case SEC_ERROR_CA_CERT_INVALID: - case MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY: - return Ci.nsINSSErrorsService.ERROR_CLASS_BAD_CERT; - default: - return Ci.nsINSSErrorsService.ERROR_CLASS_SSL_PROTOCOL; - } - - return null; - } -diff --git a/security/manager/ssl/src/NSSErrorsService.cpp b/security/manager/ssl/src/NSSErrorsService.cpp ---- a/security/manager/ssl/src/NSSErrorsService.cpp -+++ b/security/manager/ssl/src/NSSErrorsService.cpp -@@ -136,16 +136,17 @@ NSSErrorsService::GetErrorClass(nsresult - // Overridable errors. - case SEC_ERROR_UNKNOWN_ISSUER: - case SEC_ERROR_UNTRUSTED_ISSUER: - case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: - case SEC_ERROR_UNTRUSTED_CERT: - case SSL_ERROR_BAD_CERT_DOMAIN: - case SEC_ERROR_EXPIRED_CERTIFICATE: - case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED: -+ case SEC_ERROR_CA_CERT_INVALID: - case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY: - *aErrorClass = ERROR_CLASS_BAD_CERT; - break; - // Non-overridable errors. - default: - *aErrorClass = ERROR_CLASS_SSL_PROTOCOL; - break; - } -diff --git a/security/manager/ssl/src/SSLServerCertVerification.cpp b/security/manager/ssl/src/SSLServerCertVerification.cpp ---- a/security/manager/ssl/src/SSLServerCertVerification.cpp -+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp -@@ -287,16 +287,17 @@ private: - - // A probe value of 1 means "no error". - uint32_t - MapCertErrorToProbeValue(PRErrorCode errorCode) - { - switch (errorCode) - { - case SEC_ERROR_UNKNOWN_ISSUER: return 2; -+ case SEC_ERROR_CA_CERT_INVALID: return 3; - case SEC_ERROR_UNTRUSTED_ISSUER: return 4; - case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: return 5; - case SEC_ERROR_UNTRUSTED_CERT: return 6; - case SEC_ERROR_INADEQUATE_KEY_USAGE: return 7; - case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED: return 8; - case SSL_ERROR_BAD_CERT_DOMAIN: return 9; - case SEC_ERROR_EXPIRED_CERTIFICATE: return 10; - case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY: return 11; -@@ -321,16 +322,17 @@ DetermineCertOverrideErrors(CERTCertific - MOZ_ASSERT(errorCodeMismatch == 0); - MOZ_ASSERT(errorCodeExpired == 0); - - // Assumes the error prioritization described in mozilla::pkix's - // BuildForward function. Also assumes that CERT_VerifyCertName was only - // called if CertVerifier::VerifyCert succeeded. - switch (defaultErrorCodeToReport) { - case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED: -+ case SEC_ERROR_CA_CERT_INVALID: - case SEC_ERROR_UNKNOWN_ISSUER: - case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY: - { - collectedErrors = nsICertOverrideService::ERROR_UNTRUSTED; - errorCodeTrust = defaultErrorCodeToReport; - - SECCertTimeValidity validity = CERT_CheckCertValidTimes(cert, now, false); - if (validity == secCertTimeUndetermined) { diff --git a/sources b/sources index 638d9d3..b2a38f7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a3d44b545ad9c28183b24ae1675eb99b firefox-langpacks-33.0-20141014.tar.xz -b0e793898bddf4f2bc46e42a331f3383 firefox-33.0.source.tar.bz2 +bd94c6465c53bf315b470259f1b1c896 firefox-33.1.source.tar.bz2 +b0baf9d436259a6f77b15015e993907f firefox-langpacks-33.1-20141111.tar.xz -- cgit