[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r12793: Add software licenses Add bookmarks to Firefox Update build (in torpedo/trunk: . build-scripts build-scripts/config docs)
Author: sjm217
Date: 2007-12-12 19:03:50 -0500 (Wed, 12 Dec 2007)
New Revision: 12793
Added:
torpedo/trunk/build-scripts/config/bookmarks.html
Modified:
torpedo/trunk/README
torpedo/trunk/build-scripts/Makefile
torpedo/trunk/build-scripts/README
torpedo/trunk/build-scripts/buildpackage.py
torpedo/trunk/docs/build-instructions.txt
Log:
Add software licenses
Add bookmarks to Firefox
Update build instructions
Modified: torpedo/trunk/README
===================================================================
--- torpedo/trunk/README 2007-12-13 00:01:49 UTC (rev 12792)
+++ torpedo/trunk/README 2007-12-13 00:03:50 UTC (rev 12793)
@@ -1,62 +1,66 @@
-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
- \___ README: Further documentation
-
-docs: Documentation for project
- \___ TODO: Pending tasks and commentary
- |___ ToaST-startup: Rough description of ToaST startup procedure
- |___ build-instructions.txt: Notes on building Vidalia and other
- bundle components
-
-src: Source code
- \___ processtest: Qt project for starting Firefox and detecting
- | termination behaviour (see included README for
- | build instructions)
- |___ old: Previous work from Shishir Nagaraja
-
-Status
-------
-
-Using build-scripts/buildpackage.py 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
-
-Further issues are discussed in docs/TODO.
-
-Included applications
----------------------
-
-Vidalia (svn trunk revision 2213)
-Tor 0.1.2.18
-FirefoxPortable 2.0.0.11
- \_ Firefox 2.0.0.11
-
-Usage
------
-
-Tor Browser.exe is a 7zip self extracting archive. To extract the bundle, run
-this and point it to the install location. It will create a folder called "Tor
-Browser". This may be the hard disk, but is more likely the currently mounted
-USB drive. The install process needs only be performed once.
-
-Once the bundle is extracted, open the newly created folder and click "Tor
-Browser.bat" (may appear as simply "Tor Browser"). This will start Vidalia. Once
-Tor has successfully opened a circuit, Firefox will automatically be opened.
-
-To exit, close Firefox. Vidalia will automatically clean up and exit.
-
-Changelog
----------
-
-0.0.1: Initial revision (2007-12-11)
-0.0.2: Update Vidalia to r2213
+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
+ \___ README: Further documentation
+
+docs: Documentation for project
+ \___ TODO: Pending tasks and commentary
+ |___ ToaST-startup: Rough description of ToaST startup procedure
+ |___ build-instructions.txt: Notes on building Vidalia and other
+ bundle components
+
+src: Source code
+ \___ processtest: Qt project for starting Firefox and detecting
+ | termination behaviour (see included README for
+ | build instructions)
+ |___ old: Previous work from Shishir Nagaraja
+
+Status
+------
+
+Using build-scripts/buildpackage.py 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
+
+Further issues are discussed in docs/TODO.
+
+Included applications
+---------------------
+
+Vidalia (svn trunk revision 2213)
+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
+
+Usage
+-----
+
+Tor Browser.exe is a 7zip self extracting archive. To extract the bundle, run
+this and point it to the install location. It will create a folder called "Tor
+Browser". This may be the hard disk, but is more likely the currently mounted
+USB drive. The install process needs only be performed once.
+
+Once the bundle is extracted, open the newly created folder and click "Tor
+Browser.bat" (may appear as simply "Tor Browser"). This will start Vidalia. Once
+Tor has successfully opened a circuit, Firefox will automatically be opened.
+
+To exit, close Firefox. Vidalia will automatically clean up and exit.
+
+Changelog
+---------
+
+0.0.1: Initial revision (2007-12-11)
+0.0.2: Update Vidalia to r2213
+ Update Tor to 0.2.0.12-alpha
+ Add license files
+ Remove Portable Tor dependency
+ Add bookmarks to Tor, Torcheck and the hidden wiki
Modified: torpedo/trunk/build-scripts/Makefile
===================================================================
--- torpedo/trunk/build-scripts/Makefile 2007-12-13 00:01:49 UTC (rev 12792)
+++ torpedo/trunk/build-scripts/Makefile 2007-12-13 00:03:50 UTC (rev 12793)
@@ -9,6 +9,7 @@
TOR=/c/build/tor-0.2.0.12-alpha
SEVENZIP="/c/Program Files/7-Zip/7z.exe"
DEST=release
+DOCS=docs
all:
echo "Nothing to do"
@@ -25,5 +26,15 @@
cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(DEST)
touch build-release.stamp
+build-docs:
+ mkdir -p $(DOCS)/vidalia
+ mkdir -p $(DOCS)/tor
+ mkdir -p $(DOCS)/qt
+ mkdir -p $(DOCS)/mingw
+ cp $(VIDALIA)/LICENSE $(VIDALIA)/COPYING $(VIDALIA)/AUTHORS $(QT)/../LICENSE.GPL $(DOCS)/vidalia
+ cp $(TOR)/LICENSE $(TOR)/AUTHORS $(DOCS)/tor
+ cp $(QT)/../LICENSE.GPL $(DOCS)/qt
+ cp $(MING)/../COPYING $(DOCS)/mingw
+
package:
cd release; $(SEVENZIP) a -sfx7z.sfx "Package.exe" .
Modified: torpedo/trunk/build-scripts/README
===================================================================
--- torpedo/trunk/build-scripts/README 2007-12-13 00:01:49 UTC (rev 12792)
+++ torpedo/trunk/build-scripts/README 2007-12-13 00:03:50 UTC (rev 12793)
@@ -1,36 +1,34 @@
-Building Tor Browser.exe
-========================
-
-To build Tor Browser.exe, you need:
- Vidalia (in ./release/ by default)
- PortableTor (in ./PortableTor/ by default)
- FirefoxPortable (in ./FirefoxPortable/ by default)
-
-Vidalia needs to have the BrowserExecutable option enabled (currently in
-trunk). Running "make build-release" will take the necessary files from the Qt
-and Vidalia build directories and put them into ./release.
-
-PortableTor can be downloaded from http://portabletor.sourceforge.net/
-
-FirefoxPortable can be downloaded from http://portableapps.com/apps/internet/firefox_portable
-
-Customization
--------------
-
-The locations of Qt, MinGW32 and the Vidalia build directory (for "make
-build-release") can be altered in Makefile.
-
-The locations of 7zip, FirefoxPortable, PortableTor and the Vidalia release
-directory can be altered in buildpackage.py.
-
-Building the bundle
--------------------
-
-Once the above steps are complete, build the bundle by running
-"buildpackage.py"
-
-Archived code
--------------
-
-The patch to Vidalia can be found in archive/. This has now been
-applied to the Vidalia trunk, so is no longer needed.
+Building Tor Browser.exe
+========================
+
+To build Tor Browser.exe, you need:
+ Vidalia and Tor (in ./release/ by default)
+ FirefoxPortable (in ./FirefoxPortable/ by default)
+
+Vidalia needs to have the BrowserExecutable option enabled (currently in
+trunk).
+
+FirefoxPortable can be downloaded from http://portableapps.com/apps/internet/firefox_portable
+
+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 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.
+
+Build the bundle by running "buildpackage.py"
+
+Archived code
+-------------
+
+The patch to Vidalia can be found in archive/. This has now been
+applied to the Vidalia trunk, so is no longer needed.
Modified: torpedo/trunk/build-scripts/buildpackage.py
===================================================================
--- torpedo/trunk/build-scripts/buildpackage.py 2007-12-13 00:01:49 UTC (rev 12792)
+++ torpedo/trunk/build-scripts/buildpackage.py 2007-12-13 00:03:50 UTC (rev 12793)
@@ -17,6 +17,7 @@
## Extracted directories containing FirefoxPortable, Vidalia/Tor
fp_src = "FirefoxPortable"
vi_src = "release"
+docs_src = "docs"
## Location of config files
conf_src = "config"
@@ -51,6 +52,9 @@
os.rename(prefs_fn, oldprefs_fn)
shutil.copyfile(os.path.join(conf_src, "prefs.js"), prefs_fn)
+## Apply bookmarks
+shutil.copyfile(os.path.join(conf_src, "bookmarks.html"), os.path.join(dest, "FirefoxPortable", "App", "DefaultData", "profile", "bookmarks.html"))
+
## Apply .ini file
shutil.copyfile(os.path.join(conf_src, "FirefoxPortable.ini"), os.path.join(dest, "FirefoxPortable", "FirefoxPortable.ini"))
@@ -67,6 +71,11 @@
## Add Vidalia and Tor
for fn in os.listdir(vi_src):
shutil.copyfile(os.path.join(vi_src, fn), os.path.join(dest, "App", fn))
+
+##
+## Documentation
+##
+shutil.copytree(docs_src, os.path.join(dest, "Documentation"))
## Write launcher
fh = file(os.path.join(dest, "Tor Browser.bat"), "wt")
@@ -74,4 +83,4 @@
fh.close()
## Compress it all
-#subprocess.call([sevenzip, "a", "-sfx7z.sfx", "Tor Browser.exe", dest], shell=False)
+subprocess.call([sevenzip, "a", "-sfx7z.sfx", "Tor Browser.exe", dest], shell=False)
Added: torpedo/trunk/build-scripts/config/bookmarks.html
===================================================================
--- torpedo/trunk/build-scripts/config/bookmarks.html (rev 0)
+++ torpedo/trunk/build-scripts/config/bookmarks.html 2007-12-13 00:03:50 UTC (rev 12793)
@@ -0,0 +1,18 @@
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<!-- This is an automatically generated file.
+ It will be read and overwritten.
+ DO NOT EDIT! -->
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<TITLE>Bookmarks</TITLE>
+<H1 LAST_MODIFIED="1197503485">Bookmarks</H1>
+
+<DL><p>
+ <DT><H3 LAST_MODIFIED="1197503547" PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3>
+<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
+ <DL><p>
+ <DT><A HREF="https://www.torproject.org/"; ADD_DATE="1197503328" LAST_VISIT="1197503334" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">About Tor</A>
+ <DT><A HREF="http://624eb2rznzhtq2cz.onion/"; ADD_DATE="1197503468" LAST_VISIT="1197503474" LAST_MODIFIED="1197503496" LAST_CHARSET="UTF-8" ID="rdf:#$1gnTO1">Tor hidden wiki</A>
+ <DT><A HREF="https://torcheck.xenobite.eu/"; ADD_DATE="1197503547" LAST_VISIT="1197503551" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADc3Nz/rrGs/8PPvf/P3Mj/xtS+/7bWpf+YxYH/c51c/2KnPf9DcCn/Kzog/yEiG/9HRh7/TU4p/1JTQf+IiIf/OVso/22nT/93oGH/bplX/4K4Zv92ulP/XYtE/2KtO/9epzn/VII7/1F3O/9eYlT/dGpc/zQ3Af80NwH/LS4E/zeaBf8vZxD/OosR/zZ+Ef/CqbL/tY+h/8Oks/+zjJ//v5+u/8equP+4k6X/uJKk/7aYpP80OQH/NDoB/0NHFP8nbQL/MY8C/yVlA/81mQL/grli/2CuOP9UjDj/XK00/4uucP94ll7/XJ45/05qPf9CWzP/LS8B/zQ+Af9DShT/JmoD/zKRAv9Whjz/oc6L/6LPjP9yt1D/Pnse/47FdP+82K7/iqt3/0yfIf9edVD/l6eN/5maif9QXCX/N0MF/zOTAf8wiwL/z9DN/6Buhv+ea4T/6OLk/9jd2P+gp6v/foWK/4x0gP/V1dL/59/k/55rhP+vhZn/s7mh/zRFAf80mQH/NJkB/9rk1P97NVb/ezRV/+PW3f+brbD/sM7R/5u0uP9hP1L/c0Vb/+HU2/97NFX/j1Rw/7rBqf80SgH/NJkB/zSZAf/b6NT/ezVW/3s0Vf/JvMT/qcXJ/7vb3/+lv8X/c15v/4JIZP+/srr/ezRV/49Ub//DyrX/NlEE/zOUAf80mQH/2+jU/3s1Vv97NFX/4dTb/5+0t/+/3+P/rcjN/4x2hv+CXXD/5dzi/3s0Vf+BPl3/18LN/5enfv8scAj/bLVJ/+Xt4P97NVb/ezRV/+XY3//Z2dz/q8DE/7DIzv+ago//z8zO/+Tv3/+QVXH/ezRV/5hhe/+rupj/lcV9/9O8yP+5lKb/ezRV/3s0Vf+uhJn/yKy6/+zq7f+NlZz/3uHc/2mzRP9ekT7/4Nja/6d5j/+0jaD/pbmQ/7XZpf+ldYz/ezRV/3s0Vf97NFX/ezRV/49TcP/y8PP/hLKi/9np4f9trUv/LnsC/0p2Kv+Xr3//oLqJ/0p6Hf+w1p3/yKy7/6t/lP+rf5T/q3+U/6t/lP+6lqj/0+bJ/97u6v+Y1cD/6fLv/3K3UP8qRwL/NncD/zl3B/84dAb/R4om/4fBaf+OxXP/jsVz/47Fc/+OuXT/isNu/0eiGf+pzJf/7vXx//n6+/+u0Zv/SWQj/2OcPf9rn0b/XpQ1/3V2dP82YCD/OpIO/zmbB/83mgX/N5oF/ziSCP89nQz/QpEZ/26sS/+626r/mbuC/7HLn/+92K3/ssqj/4iTgf//////6urq/8DCv/+vxKP/p8yU/6bRkP+r1Zf/udun/8ngvf/c69P/6vTl//P28P/2+vX/9PXz/+zs7P/5+fn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$2gnTO1">TorCheck at Xenobite.eu - HTTPS-Mode (SSL)</A>
+ </DL><p>
+ <HR>
+</DL><p>
Modified: torpedo/trunk/docs/build-instructions.txt
===================================================================
--- torpedo/trunk/docs/build-instructions.txt 2007-12-13 00:01:49 UTC (rev 12792)
+++ torpedo/trunk/docs/build-instructions.txt 2007-12-13 00:03:50 UTC (rev 12793)
@@ -90,3 +90,5 @@
libevent 1.4.0 is newer but untested.
It is tor-resolve, not tor_resolve.exe
+
+Autoconf 2.56 appears to work fine (2.59 is mentioned in the instructions)