[or-cvs] r12840: Install Torbutton (update prefs.js accordingly) Add Makefile (in torpedo/trunk: . build-scripts build-scripts/config docs)
sjm217 at seul.org
sjm217 at seul.org
Sun Dec 16 17:50:39 UTC 2007
Author: sjm217
Date: 2007-12-16 12:50:38 -0500 (Sun, 16 Dec 2007)
New Revision: 12840
Modified:
torpedo/trunk/README
torpedo/trunk/build-scripts/Makefile
torpedo/trunk/build-scripts/README
torpedo/trunk/build-scripts/config/prefs.js
torpedo/trunk/docs/TODO
Log:
Install Torbutton (update prefs.js accordingly)
Add Makefile rule for applying prefs.js changes
Update build documentation for new Makefile
Add TODO items
Release version 0.0.3
Modified: torpedo/trunk/README
===================================================================
--- torpedo/trunk/README 2007-12-16 15:59:28 UTC (rev 12839)
+++ torpedo/trunk/README 2007-12-16 17:50:38 UTC (rev 12840)
@@ -24,10 +24,9 @@
Status
------
-Using build-scripts/buildpackage.py it is possible to create a working USB Tor
-bundle. It's limitations include:
+Using build-scripts/Makefile it is possible to create a working USB
+Tor bundle. It's limitations include:
- It uses the PortableTor and FirefoxPortable binaries
- - No extensions are yet installed
- The starting program doesn't have a pretty icon
- Polipo is not included, instead Firefox connects directly to Tor
@@ -40,6 +39,7 @@
Tor 0.2.0.12-alpha (with libevent-1.3e, zlib-1.2.3 and openssl-0.9.8g)
FirefoxPortable 2.0.0.11
\_ Firefox 2.0.0.11
+ \_ Torbutton 1.1.12-alpha
Usage
-----
@@ -59,8 +59,10 @@
---------
0.0.1: Initial revision (2007-12-11)
-0.0.2: Update Vidalia to r2213
+0.0.2: Update Vidalia to r2213 (2007-12-13)
Update Tor to 0.2.0.12-alpha
Add license files
Remove Portable Tor dependency
Add bookmarks to Tor, Torcheck and the hidden wiki
+0.0.3: Move build infrastructure to GNU Make (2007-12-16)
+ Install Torbutton
Modified: torpedo/trunk/build-scripts/Makefile
===================================================================
--- torpedo/trunk/build-scripts/Makefile 2007-12-16 15:59:28 UTC (rev 12839)
+++ torpedo/trunk/build-scripts/Makefile 2007-12-16 17:50:38 UTC (rev 12840)
@@ -4,7 +4,7 @@
### Copyright 2007 Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>
### See LICENSE for licensing information
###
-### $Id:$
+### $Id$
###
MING=/c/MinGW/bin
@@ -21,8 +21,6 @@
DEST="Tor Browser"
-
-
all:
echo "Nothing to do"
@@ -49,7 +47,15 @@
cp $(QT)/../LICENSE.GPL $(DOCS)/qt
cp $(MING)/../COPYING $(DOCS)/mingw
-bundle: install-binaries install-docs
+TORBUTTON=torbutton-1.1.12-alpha.xpi
+$(TORBUTTON):
+ wget http://torbutton.torproject.org/dev/releases/$(TORBUTTON)
+
+## This dummy profile is created just for installing extensions, otherwise Firefox
+## will output files in the default one
+DUMMYPROFILE=$(DEST)/FirefoxPortable/App/DummyProfile
+
+bundle: install-binaries install-docs $(TORBUTTON)
## Build directory structure
rm -fr $(DEST)
mkdir -p $(DEST)/App
@@ -71,9 +77,19 @@
cp -R $(BINARIES)/* $(DEST)/App
## Copy over documentation
cp -R $(DOCS)/* $(DEST)/Docs
+ ## Install torbutton
+ cp -R $(DEST)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE)
+ $(DEST)/FirefoxPortable/App/firefox/firefox.exe \
+ -profile $(DUMMYPROFILE) \
+ -install-global-extension $(TORBUTTON)
+ rm -fr $(DUMMYPROFILE)
## Write out launcher
echo 'start /b .\\App\\vidalia.exe --datadir .\\Data\\Vidalia\\' > $(DEST)/"Tor Browser.bat"
+## Copy Firefox preferences from a run of FirefoxPortable to be the default
+apply-prefs:
+ cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC)
+
compress-bundle:
$(SEVENZIP) a -sfx7z.sfx "Tor Browser.exe" $(DEST)
Modified: torpedo/trunk/build-scripts/README
===================================================================
--- torpedo/trunk/build-scripts/README 2007-12-16 15:59:28 UTC (rev 12839)
+++ torpedo/trunk/build-scripts/README 2007-12-16 17:50:38 UTC (rev 12840)
@@ -1,8 +1,8 @@
Building Tor Browser.exe
========================
-To build Tor Browser.exe, you need:
- Vidalia and Tor (in ./release/ by default)
+To build Tor Browser.exe, you need to have built:
+ Vidalia and Tor (in /c/build/vidalia and /c/build/tor-<version> by default)
FirefoxPortable (in ./FirefoxPortable/ by default)
Vidalia needs to have the BrowserExecutable option enabled (currently in
@@ -13,19 +13,15 @@
Customization
-------------
-The locations of Qt, MinGW32 and the Vidalia/Tor build directory (for "make
-build-release/build-docs") can be altered in Makefile.
+The locations of Qt, MinGW32, the Vidalia/Tor build directory, 7zip,
+FirefoxPortable can be altered in Makefile.
-The locations of 7zip, FirefoxPortable and the Vidalia/Tor release directory
-can be altered in buildpackage.py.
-
Building the bundle
-------------------
-Run "make build-release" and "make build-docs" to place Tor and Vidalia
-binaries and documentation into release and docs.
+Run "make bundle"
-Build the bundle by running "buildpackage.py"
+To compress it, run "make compress-bundle"
Archived code
-------------
Modified: torpedo/trunk/build-scripts/config/prefs.js
===================================================================
--- torpedo/trunk/build-scripts/config/prefs.js 2007-12-16 15:59:28 UTC (rev 12839)
+++ torpedo/trunk/build-scripts/config/prefs.js 2007-12-16 17:50:38 UTC (rev 12840)
@@ -10,26 +10,50 @@
*/
user_pref("app.update.auto", false);
+user_pref("app.update.enabled", false);
user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1197218150);
user_pref("app.update.lastUpdateTime.background-update-timer", 1197218149);
user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1197218150);
user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1197218171);
user_pref("browser.cache.disk.capacity", 0);
user_pref("browser.cache.disk.enable", false);
+user_pref("browser.download.manager.retention", 0);
user_pref("browser.download.useDownloadDir", false);
+user_pref("browser.formfill.enable", false);
user_pref("browser.preferences.advanced.selectedTabIndex", 0);
+user_pref("browser.search.suggest.enabled", false);
+user_pref("browser.search.update", false);
user_pref("browser.shell.checkDefaultBrowser", false);
user_pref("browser.startup.homepage", "http://check.torproject.org/");
user_pref("browser.startup.homepage_override.mstone", "rv:1.8.1.11");
+user_pref("dom.storage.enabled", false);
user_pref("extensions.lastAppVersion", "2.0.0.11");
+user_pref("extensions.torbutton.saved.share_proxy_settings", false);
+user_pref("extensions.torbutton.saved.socks_remote_dns", false);
+user_pref("extensions.torbutton.saved.socks_version", 5);
+user_pref("extensions.torbutton.socks_host", "localhost");
+user_pref("extensions.torbutton.socks_port", 9050);
+user_pref("extensions.torbutton.tor_enabled", true);
+user_pref("extensions.torbutton.use_privoxy", false);
+user_pref("extensions.update.enabled", false);
user_pref("extensions.update.notifyUser", false);
-user_pref("intl.charsetmenu.browser.cache", "UTF-8");
+user_pref("general.appname.override", "Netscape");
+user_pref("general.appversion.override", "5.0 (Windows; en-US)");
+user_pref("general.platform.override", "Win32");
+user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.7) Gecko/20070914 Firefox/2.0.0.7");
+user_pref("general.useragent.vendor", "");
+user_pref("general.useragent.vendorSub", "");
+user_pref("intl.accept_languages", "en-us, en");
+user_pref("intl.charsetmenu.browser.cache", "ISO-8859-1, UTF-8");
+user_pref("network.cookie.lifetimePolicy", 2);
user_pref("network.cookie.prefsMigrated", true);
user_pref("network.proxy.socks", "localhost");
user_pref("network.proxy.socks_port", 9050);
user_pref("network.proxy.socks_remote_dns", true);
user_pref("network.proxy.type", 1);
-user_pref("urlclassifier.tableversion.goog-black-enchash", "1.39838");
-user_pref("urlclassifier.tableversion.goog-black-url", "1.16802");
+user_pref("security.enable_java", false);
+user_pref("signon.rememberSignons", false);
+user_pref("urlclassifier.tableversion.goog-black-enchash", "1.40332");
+user_pref("urlclassifier.tableversion.goog-black-url", "1.16969");
user_pref("urlclassifier.tableversion.goog-white-domain", "1.23");
user_pref("urlclassifier.tableversion.goog-white-url", "1.371");
Modified: torpedo/trunk/docs/TODO
===================================================================
--- torpedo/trunk/docs/TODO 2007-12-16 15:59:28 UTC (rev 12839)
+++ torpedo/trunk/docs/TODO 2007-12-16 17:50:38 UTC (rev 12840)
@@ -121,6 +121,10 @@
by default.
[high priority]
+- Modify Torbutton to prevent user from disabling Tor (easily)
+
+- Restore some/all Firefox settings on exit
+
Questions to ask
----------------
More information about the tor-commits
mailing list