[or-cvs] r19481: {torbrowser} Merge of trunk to alt-launcher feature branch (r19314-r19480 (in torbrowser/branches/altlauncher: . build-scripts build-scripts/config)
sjm217 at seul.org
sjm217 at seul.org
Fri May 8 14:43:25 UTC 2009
Author: sjm217
Date: 2009-05-08 10:43:25 -0400 (Fri, 08 May 2009)
New Revision: 19481
Added:
torbrowser/branches/altlauncher/README.dev
Modified:
torbrowser/branches/altlauncher/README
torbrowser/branches/altlauncher/build-scripts/INSTALL
torbrowser/branches/altlauncher/build-scripts/Makefile
torbrowser/branches/altlauncher/build-scripts/config/prefs.js
Log:
Merge of trunk to alt-launcher feature branch (r19314-r19480)
Modified: torbrowser/branches/altlauncher/README
===================================================================
--- torbrowser/branches/altlauncher/README 2009-05-08 14:40:03 UTC (rev 19480)
+++ torbrowser/branches/altlauncher/README 2009-05-08 14:43:25 UTC (rev 19481)
@@ -1,50 +1,17 @@
Tor USB project
===============
-Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
-
-Contents
---------
-
-build-scripts: Code for building and customizing a Tor USB bundle
- \___ INSTALL: Installation instructions
- |___ config/: Configuration files for bundle components
-
-docs: Documentation for project
- \___ ToaST-startup: Rough description of ToaST startup procedure
- |___ rationale.txt: Reasoning behind bundle design decisions
- |___ torusb-notes.txt: Experiences from running various other Tor
- USB bundles
-
-src: Source code
- \___ processtest: Qt project for starting Firefox and detecting
- | termination behaviour (see included README for
- | build instructions)
- |___ current-patches: Patches to other applications currently in
- | testing
- |___ archived-patches: Patches to other applications which have
- either been applied upstream or abandoned
-
-Status
-------
-
-Using build-scripts/Makefile it is possible to create a working USB
-Tor bundle. It's limitations include:
- - It uses the FirefoxPortable binaries
-
-Further issues are discussed in TODO.
-
Included applications
---------------------
-Vidalia 0.1.10
-Tor 0.2.1.11-alpha (with libevent-1.4.9, zlib-1.2.3 and openssl-0.9.8j)
+Vidalia 0.1.12
+Tor 0.2.1.14-rc (with libevent-1.4.9, zlib-1.2.3 and openssl-0.9.8k)
Polipo 1.0.4
-FirefoxPortable 3.0.5
- \_ Firefox 3.0.5
- \_ Torbutton 1.2.0
-PidginPortable 2.5.4
- \_ Pidgin 2.5.4
+FirefoxPortable 3.0.10
+ \_ Firefox 3.0.10
+ \_ Torbutton 1.2.1
+PidginPortable 2.5.5
+ \_ Pidgin 2.5.5
\_ OTR 3.2
Usage
@@ -194,12 +161,17 @@
Update Firefox to 3.0.7
Update Pidgin to 2.5.5
-1.1.11:
+1.1.11: Released 2009-03-31
Update Firefox to 3.0.8
Add Italian language bundles
Update Torbutton to 1.2.1
Update Vidalia to 0.1.12
-1.1.12:
+1.1.12: Released 2009-04-12
Update OpenSSL to 0.9.8k
Update Tor to 0.2.1.14-rc
+
+1.1.13:
+ Update Firefox to 3.0.10
+ Update to Qt 4.5.1
+ Update Firefox prefs.js to stop scanning for plugins
Copied: torbrowser/branches/altlauncher/README.dev (from rev 19480, torbrowser/trunk/README.dev)
===================================================================
--- torbrowser/branches/altlauncher/README.dev (rev 0)
+++ torbrowser/branches/altlauncher/README.dev 2009-05-08 14:43:25 UTC (rev 19481)
@@ -0,0 +1,35 @@
+Tor USB project
+===============
+
+Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
+
+Contents
+--------
+
+build-scripts: Code for building and customizing a Tor USB bundle
+ \___ INSTALL: Installation instructions
+ |___ config/: Configuration files for bundle components
+
+docs: Documentation for project
+ \___ ToaST-startup: Rough description of ToaST startup procedure
+ |___ rationale.txt: Reasoning behind bundle design decisions
+ |___ torusb-notes.txt: Experiences from running various other Tor
+ USB bundles
+
+src: Source code
+ \___ processtest: Qt project for starting Firefox and detecting
+ | termination behaviour (see included README for
+ | build instructions)
+ |___ current-patches: Patches to other applications currently in
+ | testing
+ |___ archived-patches: Patches to other applications which have
+ either been applied upstream or abandoned
+
+Status
+------
+
+Using build-scripts/Makefile it is possible to create a working USB
+Tor bundle. It's limitations include:
+ - It uses the FirefoxPortable binaries
+
+Further issues are discussed in TODO.
Modified: torbrowser/branches/altlauncher/build-scripts/INSTALL
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/INSTALL 2009-05-08 14:40:03 UTC (rev 19480)
+++ torbrowser/branches/altlauncher/build-scripts/INSTALL 2009-05-08 14:43:25 UTC (rev 19481)
@@ -219,15 +219,15 @@
Installing Qt
=============
-Download Qt 4.1 or later, we'll use 4.5.0:
+Download Qt 4.1 or later, we'll use 4.5.1:
http://trolltech.com/developer/downloads/qt/windows
Download and run the installer with Windows Explorer:
- ftp://ftp.trolltech.com/qt/source/qt-win-opensource-4.5.0-mingw.exe
+ ftp://ftp.trolltech.com/qt/source/qt-win-opensource-4.5.1-mingw.exe
-When prompted, install Qt into 'C:\Qt\4.5.0'
+When prompted, install Qt into 'C:\Qt\4.5.1'
You will be prompted for the install path for your MinGW directory, enter 'C:\MinGW'
You may have an error about win32api.h being not found. This is not true. You
have win32api.h and Qt is wrong. This is a result of the Qt installer not
@@ -447,13 +447,13 @@
Set a proper environment:
cat << 'EOF' >> /etc/profile
- export QTDIR="C:\Qt\4.5.0"
- export PATH=$PATH:/c/Qt/4.5.0/bin
+ export QTDIR="C:\Qt\4.5.1"
+ export PATH=$PATH:/c/Qt/4.5.1/bin
export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/
export QMAKESPEC=win32-g++
EOF
- export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/:/c/MinGW/bin/:/c/Qt/4.5.0/bin/
+ export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/:/c/MinGW/bin/:/c/Qt/4.5.1/bin/
Create the proper MSYS Makefiles and don't forget the '.' at the end!
@@ -481,7 +481,7 @@
and other libraries with known full path:
- C:/Qt/4.5.0/lib/libQtGui4.a
+ C:/Qt/4.5.1/lib/libQtGui4.a
CMake is adding directories in the second list to the linker search path in
@@ -551,7 +551,7 @@
Download FirefoxPortable:
- http://downloads.sourceforge.net/portableapps/Firefox_Portable_3.0.8_en-us.paf.exe?download
+ http://downloads.sourceforge.net/portableapps/Firefox_Portable_3.0.9_en-us.paf.exe?download
Run the installer and select it into: 'C:\build\FirefoxPortable-<version>>'
@@ -628,7 +628,7 @@
An example to change the Qt Lib version:
From: QT=/c/Qt/4.3.4/bin
- To: QT=/c/Qt/4.5.0/bin
+ To: QT=/c/Qt/4.5.1/bin
And then change the Tor version:
Modified: torbrowser/branches/altlauncher/build-scripts/Makefile
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/Makefile 2009-05-08 14:40:03 UTC (rev 19480)
+++ torbrowser/branches/altlauncher/build-scripts/Makefile 2009-05-08 14:43:25 UTC (rev 19481)
@@ -13,13 +13,13 @@
## Location of required libraries
MING=/c/MinGW/bin
-QT=/c/Qt/4.5.0/bin
+QT=/c/Qt/4.5.1/bin
## Location of bundle components
VIDALIA=/c/build/vidalia-0.1.12
TOR=/c/build/tor-0.2.1.14-rc
POLIPO=/c/build/polipo-1.0.4
-FIREFOX_SRC=/c/build/FirefoxPortable-3.0.8
+FIREFOX_SRC=/c/build/FirefoxPortable-3.0.10
PIDGIN_SRC=/c/build/PidginPortable-2.5.5
## Location of utility applications
@@ -56,17 +56,20 @@
DEFAULT_EXTENSIONS=torbutton.xpi
## Where to download Torbutton from
-TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/file/34698/torbutton-1.2.1-fx.xpi
+TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/file/49457/torbutton-1.2.1-fx.xpi
## Where to download Mozilla language packs
-MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.8/win32/xpi
+MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/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.8-fx.xpi
+FA_LANGPACK=https://addons.mozilla.org/en-US/firefox/downloads/latest/3667/addon-3667-latest.xpi
## Put more extensions here
EXTENSIONS_DIR=extensions
+## Local overrides
+-include local.makefile
+
#############
### Rules ###
#############
@@ -175,6 +178,7 @@
cp $(QT)/../LICENSE.GPL* $(QT)/../LICENSE.LGPL $(DOCSDIR)/Qt
cp $(MING)/../COPYING $(DOCSDIR)/MinGW
cp $(POLIPO)/COPYING $(POLIPO)/README $(DOCSDIR)/Polipo
+ cp ../README $(DOCSDIR)/README-TorBrowserBundle
## Copy over FirefoxPortable
install-firefoxportable:
Modified: torbrowser/branches/altlauncher/build-scripts/config/prefs.js
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/config/prefs.js 2009-05-08 14:40:03 UTC (rev 19480)
+++ torbrowser/branches/altlauncher/build-scripts/config/prefs.js 2009-05-08 14:43:25 UTC (rev 19481)
@@ -36,9 +36,9 @@
user_pref("browser.search.update", 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.9.0.8");
+user_pref("browser.startup.homepage_override.mstone", "rv:1.9.0.10");
user_pref("dom.storage.enabled", false);
-user_pref("extensions.lastAppVersion", "3.0.8");
+user_pref("extensions.lastAppVersion", "3.0.10");
user_pref("extensions.torbutton.fresh_install", false);
user_pref("extensions.torbutton.http_port", 8118);
user_pref("extensions.torbutton.http_proxy", "127.0.0.1");
@@ -85,6 +85,10 @@
user_pref("network.proxy.type", 1);
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("plugin.scan.plid.all", false);
+user_pref("plugin.scan.SunJRE", 99.0);
+user_pref("plugin.scan.WindowsMediaPlayer", 99.0);
+user_pref("plugin.scan.4xPluginFolder", false);
user_pref("security.enable_java", false);
user_pref("signon.rememberSignons", false);
user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1235166825);
More information about the tor-commits
mailing list