summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@fedoraproject.org>2008-01-08 10:43:50 +0000
committerMartin Stransky <stransky@fedoraproject.org>2008-01-08 10:43:50 +0000
commita5b09ea0a416c1e1ff629f17a8209e2f72a75258 (patch)
treea1bc774140bd0f7121a1e088ea754b6e16b55e9a
parentadded ssl exception patch (mozbz #411037) (diff)
downloadlibrewolf-fedora-ff-a5b09ea0a416c1e1ff629f17a8209e2f72a75258.tar.gz
librewolf-fedora-ff-a5b09ea0a416c1e1ff629f17a8209e2f72a75258.tar.bz2
librewolf-fedora-ff-a5b09ea0a416c1e1ff629f17a8209e2f72a75258.zip
added the ssl patch
-rw-r--r--firefox-ssl-exception.patch31
-rw-r--r--firefox.spec4
2 files changed, 35 insertions, 0 deletions
diff --git a/firefox-ssl-exception.patch b/firefox-ssl-exception.patch
new file mode 100644
index 0000000..31ce3ab
--- /dev/null
+++ b/firefox-ssl-exception.patch
@@ -0,0 +1,31 @@
+Index: browser/locales/jar.mn
+===================================================================
+RCS file: /cvsroot/mozilla/browser/locales/jar.mn,v
+retrieving revision 1.73
+diff -p -u -8 -r1.73 jar.mn
+--- browser/locales/jar.mn 29 Oct 2007 18:29:15 -0000 1.73
++++ browser/locales/jar.mn 7 Jan 2008 11:51:25 -0000
+@@ -80,17 +80,20 @@
+ locale/browser/help/using_firebird.xhtml (%chrome/help/using_firebird.xhtml)
+ locale/browser/help/customization.xhtml (%chrome/help/customization.xhtml)
+ locale/browser/help/firefox_welcome.xhtml (%chrome/help/firefox_welcome.xhtml)
+ locale/browser/help/download_manager.xhtml (%chrome/help/download_manager.xhtml)
+ locale/browser/help/platformStrings.dtd (%chrome/help/platformStrings.dtd)
+ locale/browser/help/tabbed_browsing.xhtml (%chrome/help/tabbed_browsing.xhtml)
+ locale/browser/help/glossary.xhtml (%chrome/help/glossary.xhtml)
+ # the following files are browser-specific overrides
+-* locale/@AB_CD@/global/netError.dtd (%chrome/overrides/netError.dtd)
+-* locale/@AB_CD@/global/appstrings.properties (%chrome/overrides/appstrings.properties)
+-* locale/@AB_CD@/mozapps/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd)
++* locale/browser/netError.dtd (%chrome/overrides/netError.dtd)
++* locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties)
++* locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd)
++% override chrome://global/locale/netErrorApp.dtd chrome://browser/locale/netError.dtd
++% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
++% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
+ #ifdef MOZ_USE_GENERIC_BRANDING
+ % locale branding @AB_CD@ %locale/branding/
+ locale/branding/brand.dtd (%chrome/branding/brand.dtd)
+ locale/branding/brand.properties (%chrome/branding/brand.properties)
+ #endif
+ #includesubst @LOCALE_SRCDIR@/extra-jar.mn
diff --git a/firefox.spec b/firefox.spec
index dd21a42..992a4a5 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -36,6 +36,8 @@ Source100: find-external-requires
# build patches
Patch43: firefox-2.0-getstartpage.patch
+Patch100: firefox-ssl-exception.patch
+
%if %{official_branding}
# Required by Mozilla Corporation
@@ -85,6 +87,8 @@ compliance, performance and portability.
%patch43 -p1 -b .getstartpage
+%patch100 -p0 -b .ssl
+
# For branding specific patches.
%if %{official_branding}
bgstack15