[or-cvs] r18215: {torbrowser} Update Makefile with new version of applications (including (in torbrowser/trunk/build-scripts: . config)

sjm217 at seul.org sjm217 at seul.org
Wed Jan 21 22:20:24 UTC 2009


Author: sjm217
Date: 2009-01-21 17:20:24 -0500 (Wed, 21 Jan 2009)
New Revision: 18215

Modified:
   torbrowser/trunk/build-scripts/Makefile
   torbrowser/trunk/build-scripts/config/prefs.js
Log:
Update Makefile with new version of applications (including Firefox 3)
Update prefs.js for Firefox 3

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2009-01-21 20:07:05 UTC (rev 18214)
+++ torbrowser/trunk/build-scripts/Makefile	2009-01-21 22:20:24 UTC (rev 18215)
@@ -17,10 +17,10 @@
 
 ## Location of bundle components
 VIDALIA=/c/build/vidalia-0.1.10
-TOR=/c/build/tor-0.2.1.8-alpha
+TOR=/c/build/tor-0.2.1.11-alpha
 POLIPO=/c/build/polipo-1.0.4
-FIREFOX_SRC=/c/build/FirefoxPortable-2.0.0.20
-PIDGIN_SRC=/c/build/PidginPortable-2.5.3
+FIREFOX_SRC=/c/build/FirefoxPortable-3.0.5
+PIDGIN_SRC=/c/build/PidginPortable-2.5.4
 
 ## Location of utility applications
 SEVENZIP="/c/Program Files/7-Zip/7z.exe"
@@ -59,8 +59,11 @@
 TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/file/34698/torbutton-1.2.0-fx.xpi
 
 ## Where to download Mozilla language packs
-MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.17/win32/xpi
+MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.5/win32/xpi
 
+## Where Farsi Language Pack can be downloaded from
+FA_LANGPACK=https://addons.mozilla.org/en-US/firefox/downloads/file/31181/persian_language_pack-3.0.2-fx.xpi
+
 ## Put more extensions here
 EXTENSIONS_DIR=extensions
 
@@ -188,7 +191,7 @@
 	cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/
 	## Configure FirefoxPortable
 	cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable
-	cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable
+	cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable/Data/settings
 	## Configure PidginPortable
 ifeq ($(USE_PIDGIN),1)
 	cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable
@@ -225,15 +228,11 @@
 	$(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
 ## Persian isn't a supported language by Firefox yet
 langpack_fa-IR.xpi:
-	$(WGET) -O $@ https://addons.mozilla.org/en-US/firefox/downloads/file/18157/persian_language_pack-2.0.0.6-fx.xpi
+	$(WGET) -O $@ $(FA_LANGPACK)
 ## English comes as default
 langpack_en-US.xpi:
 	touch $@
 
-## Download Quick Locale Switcher
-quick_locale_switcher.xpi:
-	$(WGET) -O $@ https://addons.mozilla.org/en-US/firefox/downloads/file/20672/quick_locale_switcher-1.6.3.7-fx+mz+tb+sb+nvu+ns+sm+fl.xpi
-
 ##
 ## Customize the bundle
 ##

Modified: torbrowser/trunk/build-scripts/config/prefs.js
===================================================================
--- torbrowser/trunk/build-scripts/config/prefs.js	2009-01-21 20:07:05 UTC (rev 18214)
+++ torbrowser/trunk/build-scripts/config/prefs.js	2009-01-21 22:20:24 UTC (rev 18215)
@@ -14,6 +14,7 @@
 user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538);
 user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535);
 user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538);
+user_pref("app.update.lastUpdateTime.microsummary-generator-update-timer", 1232574822);
 user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539);
 user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000);
 user_pref("browser.cache.disk.capacity", 0);
@@ -21,16 +22,24 @@
 user_pref("browser.download.manager.retention", 0);
 user_pref("browser.download.useDownloadDir", false);
 user_pref("browser.formfill.enable", false);
+user_pref("browser.migration.version", 1);
+user_pref("browser.places.importBookmarksHTML", false);
+user_pref("browser.places.importDefaults", false);
+user_pref("browser.places.leftPaneFolderId", -1);
+user_pref("browser.places.migratePostDataAnnotations", false);
+user_pref("browser.places.smartBookmarksVersion", 1);
+user_pref("browser.places.updateRecentTagsUri", false);
 user_pref("browser.preferences.advanced.selectedTabIndex", 0);
+user_pref("browser.rights.3.shown", true);
 user_pref("browser.safebrowsing.enabled", false);
 user_pref("browser.search.suggest.enabled", false);
 user_pref("browser.search.update", false);
-user_pref("browser.send_pings", false);
 user_pref("browser.shell.checkDefaultBrowser", false);
 user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLELOCALE&small=1");
-user_pref("browser.startup.homepage_override.mstone", "rv:1.8.1.20");
+user_pref("browser.startup.homepage_override.mstone", "rv:1.9.0.5");
 user_pref("dom.storage.enabled", false);
-user_pref("extensions.lastAppVersion", "2.0.0.20");
+user_pref("extensions.enabledItems", "langpack-de at firefox.mozilla.org:3.0.5,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.0,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.0.5");
+user_pref("extensions.lastAppVersion", "3.0.5");
 user_pref("extensions.torbutton.fresh_install", false);
 user_pref("extensions.torbutton.http_port", 8118);
 user_pref("extensions.torbutton.http_proxy", "127.0.0.1");
@@ -77,11 +86,8 @@
 user_pref("network.security.ports.banned", "8118,8123,9050,9051");
 user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm");
 user_pref("security.enable_java", false);
-user_pref("security.warn_entering_secure", false);
-user_pref("security.warn_entering_secure.show_once", false);
-user_pref("security.warn_leaving_secure", false);
-user_pref("security.warn_leaving_secure.show_once", false);
 user_pref("signon.rememberSignons", false);
+user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1235166825);
 user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536");
 user_pref("urlclassifier.tableversion.goog-black-url", "1.23256");
 user_pref("urlclassifier.tableversion.goog-white-domain", "1.481");



More information about the tor-commits mailing list