[or-cvs] r18323: {torbrowser} Merge of trunk to alt-launcher feature branch (r18107-r18322 (in torbrowser/branches/altlauncher: . build-scripts build-scripts/config)
sjm217 at seul.org
sjm217 at seul.org
Thu Jan 29 17:45:58 UTC 2009
Author: sjm217
Date: 2009-01-29 12:45:58 -0500 (Thu, 29 Jan 2009)
New Revision: 18323
Modified:
torbrowser/branches/altlauncher/README
torbrowser/branches/altlauncher/build-scripts/DEPLOYMENT
torbrowser/branches/altlauncher/build-scripts/Makefile
torbrowser/branches/altlauncher/build-scripts/config/prefs.js
Log:
Merge of trunk to alt-launcher feature branch (r18107-r18322)
Modified: torbrowser/branches/altlauncher/README
===================================================================
--- torbrowser/branches/altlauncher/README 2009-01-29 15:58:31 UTC (rev 18322)
+++ torbrowser/branches/altlauncher/README 2009-01-29 17:45:58 UTC (rev 18323)
@@ -31,7 +31,6 @@
Using build-scripts/Makefile it is possible to create a working USB
Tor bundle. It's limitations include:
- It uses the FirefoxPortable binaries
- - The starting program doesn't have a pretty icon
Further issues are discussed in TODO.
@@ -39,13 +38,13 @@
---------------------
Vidalia 0.1.10
-Tor 0.2.1.8-alpha (with libevent-1.3e, zlib-1.2.3 and openssl-0.9.8h)
+Tor 0.2.1.11-alpha (with libevent-1.4.9, zlib-1.2.3 and openssl-0.9.8j)
Polipo 1.0.4
-FirefoxPortable 2.0.0.18
- \_ Firefox 2.0.0.18
+FirefoxPortable 3.0.5
+ \_ Firefox 3.0.5
\_ Torbutton 1.2.0
-PidginPortable 2.5.2
- \_ Pidgin 2.5.2
+PidginPortable 2.5.4
+ \_ Pidgin 2.5.4
\_ OTR 3.2
Usage
@@ -178,6 +177,10 @@
Update Tor to 0.2.1.8-alpha
Fix issue with OTR (The Pidgin wasn't in the right directory)
Update INSTALL document to reflect updated version numbers
-1.1.8: Released 200x-xx-xx
- Update Firefox to 2.0.0.20
- Update Pidgin to 2.5.3
\ No newline at end of file
+1.1.8: Released 2009-01-22
+ Update Tor to 0.2.1.11-alpha (security update)
+ Update OpenSSL to 0.9.8j (security update)
+ Update Firefox to 3.0.5
+ Update Pidgin to 2.5.4
+ Update libevent to 1.4.9
+
Modified: torbrowser/branches/altlauncher/build-scripts/DEPLOYMENT
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/DEPLOYMENT 2009-01-29 15:58:31 UTC (rev 18322)
+++ torbrowser/branches/altlauncher/build-scripts/DEPLOYMENT 2009-01-29 17:45:58 UTC (rev 18323)
@@ -93,7 +93,7 @@
or
svn cp \
- svn+ssh://tor-svn.freehaven.net/home/or/svnrepo/torbrowser/trunk
+ svn+ssh://tor-svn.freehaven.net/home/or/svnrepo/torbrowser/trunk \
svn+ssh://tor-svn.freehaven.net/home/or/svnrepo/torbrowser/tags/torbrowser-$NEWVERSION/
Export the source tarball
Modified: torbrowser/branches/altlauncher/build-scripts/Makefile
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/Makefile 2009-01-29 15:58:31 UTC (rev 18322)
+++ torbrowser/branches/altlauncher/build-scripts/Makefile 2009-01-29 17:45:58 UTC (rev 18323)
@@ -17,10 +17,10 @@
## Location of bundle components
VIDALIA=/c/build/vidalia-alt-launcher
-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
@@ -191,7 +194,7 @@
rm $(DEST)/FirefoxPortable/FirefoxPortable.exe
## 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
@@ -228,15 +231,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/branches/altlauncher/build-scripts/config/prefs.js
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/config/prefs.js 2009-01-29 15:58:31 UTC (rev 18322)
+++ torbrowser/branches/altlauncher/build-scripts/config/prefs.js 2009-01-29 17:45:58 UTC (rev 18323)
@@ -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,23 @@
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.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");
@@ -38,6 +46,7 @@
user_pref("extensions.torbutton.https_proxy", "127.0.0.1");
user_pref("extensions.torbutton.locked_mode", true);
user_pref("extensions.torbutton.proxies_applied", true);
+user_pref("extensions.torbutton.restore_tor", true);
user_pref("extensions.torbutton.saved.auto_update", false);
user_pref("extensions.torbutton.saved.share_proxy_settings", false);
user_pref("extensions.torbutton.saved.socks_version", 5);
@@ -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