2011-11-29 Rohini S <
[email protected]>
* patches/Python26-22-audio.diff: Fixes CVE-2010-1634
* specs/SUNWPython26.spec: Fixes CR 7085446
--- mozilla/other-licenses/branding/firefox/locales/browserconfig.properties.old 2008-05-21 11:38:22.743492000 +0800
+++ mozilla/other-licenses/branding/firefox/locales/browserconfig.properties 2008-05-21 11:38:47.665715000 +0800
@@ -1,3 +1,3 @@
# Do NOT localize or otherwise change these values
-#expand browser.startup.homepage=http://__AB_CD__.start3.mozilla.com/firefox?client=firefox-a&rls=__MOZ_DISTRIBUTION_ID_UNQUOTED__:__AB_CD__:official
-#expand browser.startup.homepage_reset=http://__AB_CD__.start3.mozilla.com/firefox?client=firefox-a&rls=__MOZ_DISTRIBUTION_ID_UNQUOTED__:__AB_CD__:official
+#expand browser.startup.homepage=file:///usr/share/doc/os-welcome/html/index.html
+#expand browser.startup.homepage_reset=file:///usr/share/doc/os-welcome/html/index.html
--- mozilla/browser/components/nsBrowserContentHandler.js.old 2008-05-21 11:40:31.973367000 +0800
+++ mozilla/browser/components/nsBrowserContentHandler.js 2008-05-21 11:41:01.889129000 +0800
@@ -123,6 +123,7 @@
* OVERRIDE_NONE otherwise.
*/
function needHomepageOverride(prefb) {
+ return OVERRIDE_NONE;
var savedmstone = null;
try {
savedmstone = prefb.getCharPref("browser.startup.homepage_override.mstone");
diff -riuN mozilla-1.9.2.orig/other-licenses/branding/firefox/pref/firefox-branding.js mozilla-1.9.2/other-licenses/branding/firefox/pref/firefox-branding.js
--- mozilla-1.9.2.orig/other-licenses/branding/firefox/pref/firefox-branding.js 2010-01-16 20:04:28.244082872 +0000
+++ mozilla-1.9.2/other-licenses/branding/firefox/pref/firefox-branding.js 2010-01-16 20:06:21.057853386 +0000
@@ -1,5 +1,5 @@
-pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/whatsnew/");
-pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/firstrun/");
+pref("startup.homepage_override_url","file:///usr/share/doc/os-welcome/html/index.html");
+pref("startup.homepage_welcome_url","file:///usr/share/doc/os-welcome/html/index.html");
// Interval: Time between checks for a new version (in seconds)
// nightly=6 hours, official=24 hours
pref("app.update.interval", 86400);