commit 4b34f60505dd05d94af825bd0f17ac07596232f5 Author: David Fifield david@bamsoftware.com Date: Wed Dec 12 13:15:13 2012 -0800
Bundle instruction bugs. --- doc/bundle-gnulinux.txt | 2 +- doc/bundle-macosx.txt | 2 +- doc/bundle-windows.txt | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index 93bdb30..e8d8a35 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -39,7 +39,7 @@ Then boot the VM. You need your normal user to be in the "kvm" group for this to work (sudo usermod -a -G kvm user).
$ kvm -hda debian-6-i386-bundle.hda -cdrom debian-6.0.6-i386-netinst.iso - $ kvm -hda debian-6-x86_64-bundle.hda -cdrom debian-6.0.6-i386-netinst.iso + $ kvm -hda debian-6-amd64-bundle.hda -cdrom debian-6.0.6-amd64-netinst.iso
Choose "Install" when it boots. Here are settings:
diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index fdac6bc..583920f 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -43,7 +43,7 @@ $ python setup.py install --root ~/bundle --prefix=/usr
== Browser bundle
-Run "make-dist" in the flashproxy source directory. +Run "make dist" in the flashproxy source directory.
Download the 32-bit obfsproxy bundle from https://www.torproject.org/projects/obfsproxy. diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index f64eef7..181f2d4 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -15,6 +15,8 @@ fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi
== Browser bundle
+Run "make dist-exe" in the flashproxy source directory. + Download the obfsproxy bundle from https://www.torproject.org/projects/obfsproxy.
@@ -31,9 +33,9 @@ Copy files into the bundle. We could remove obfsproxy here but don't. The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll from being overwritten.
- $ cp -n ~/flashproxy/dist/flashproxy-client-0.9-win32/{*.pyd,*.dll,*.exe,*.manifest} App + $ cp -n ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.manifest} App $ mkdir -p Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-0.9-win32/{doc/*,README,LICENSE} Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE} Docs/FlashProxy
Make the second half of Data/Tor/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff).