commit 117ce07c0fc54fa1f1f048c9b43080714b47a9c4 Author: David Fifield david@bamsoftware.com Date: Sat Jun 1 16:53:41 2013 -0700

Remove bundle-building files.

Moved to https://git.torproject.org/pluggable-transports/bundle.git. --- doc/Makefile | 205 --------------------------------------------- doc/bundle-gnulinux.txt | 98 ---------------------- doc/bundle-macosx.txt | 83 ------------------ doc/bundle-torrc-gnulinux | 26 ------ doc/bundle-torrc-macosx | 26 ------ doc/bundle-torrc-windows | 26 ------ doc/bundle-windows.txt | 187 ----------------------------------------- 7 files changed, 651 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile deleted file mode 100644 index f4eecd6..0000000 --- a/doc/Makefile +++ /dev/null @@ -1,205 +0,0 @@ -BUNDLE_VERSION = 2.4.12 -BUNDLE_RELEASE = alpha-2 -PT_BUNDLE_RELEASE = pt1 - -PYPTLIB_HOME = $(HOME)/pyptlib -PYPTLIB_WORK = $(WORKDIR)/pyptlib -OBFSPROXY_HOME = $(HOME)/obfsproxy -OBFSPROXY_WORK = $(WORKDIR)/obfsproxy -OBFSPROXY_DIST_WIN32 = $(OBFSPROXY_WORK)/py2exe_bundle/dist -FLASHPROXY_HOME = $(HOME)/flashproxy -FLASHPROXY_WORK = $(WORKDIR)/flashproxy -FLASHPROXY_DISTNAME = flashproxy-client -FLASHPROXY_DIST = $(FLASHPROXY_WORK)/dist/$(FLASHPROXY_DISTNAME) - -MACOSX_BUNDLE_ROOT = $(HOME)/bundle - -PYTHON = python -P7Z = /cygdrive/c/Program Files (x86)/7-Zip/7z -P7ZG = /cygdrive/c/Program Files (x86)/7-Zip/7zg - -WORKDIR = work - -BUNDLE_DIST_URL = https://www.torproject.org/dist/torbrowser - -BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE) -PT_BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE)-$(PT_BUNDLE_RELEASE) - -BUNDLE_WINDOWS = tor-browser-$(BUNDLE_VERSION_STRING)_en-US.exe -BUNDLE_MACOSX_I686 = TorBrowser-$(BUNDLE_VERSION_STRING)-osx-i386-en-US.zip -BUNDLE_GNULINUX_I686 = tor-browser-gnu-linux-i686-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz -BUNDLE_GNULINUX_X86_64 = tor-browser-gnu-linux-x86_64-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz - -PT_BUNDLE_WINDOWS = tor-pluggable-transports-browser-$(PT_BUNDLE_VERSION_STRING)_en-US.exe -PT_BUNDLE_MACOSX_I686 = TorBrowser-Pluggable-Transports-$(BUNDLE_VERSION_STRING)-osx-i386-en-US.zip -PT_BUNDLE_GNULINUX_I686 = tor-pluggable-transports-browser-gnu-linux-i686-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz -PT_BUNDLE_GNULINUX_X86_64 = tor-pluggable-transports-browser-gnu-linux-x86_64-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz - -all: - @echo "Try one of these:" - @echo $$'\tmake fetch-windows' - @echo $$'\tmake fetch-macosx-i686' - @echo $$'\tmake fetch-gnulinux-i686' - @echo $$'\tmake fetch-gnulinux-x86_64' - @echo - @echo $$'\tmake windows' - @echo $$'\tmake macosx-i686' - @echo $$'\tmake gnulinux-i686' - @echo $$'\tmake gnulinux-x86_64' - @echo - @echo "Configure version numbers at the top of this makefile." - -fetch-windows: checksig-$(BUNDLE_WINDOWS) -fetch-macosx-i686: checksig-$(BUNDLE_MACOSX_I686) -fetch-gnulinux-i686: checksig-$(BUNDLE_GNULINUX_I686) -fetch-gnulinux-x86_64: checksig-$(BUNDLE_GNULINUX_X86_64) - -windows: $(PT_BUNDLE_WINDOWS) -macosx-i686: $(PT_BUNDLE_MACOSX_I686) -gnulinux-i686: $(PT_BUNDLE_GNULINUX_I686) -gnulinux-x86_64: $(PT_BUNDLE_GNULINUX_X86_64) - -$(PT_BUNDLE_WINDOWS): WORKDIR = work/windows-$(PT_BUNDLE_VERSION_STRING) - -$(PT_BUNDLE_MACOSX_I686): WORKDIR = work/macosx-$(PT_BUNDLE_VERSION_STRING) - -$(PT_BUNDLE_GNULINUX_I686): WORKDIR = work/gnulinux-i686-$(PT_BUNDLE_VERSION_STRING) -$(PT_BUNDLE_GNULINUX_I686): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_I686) - -$(PT_BUNDLE_GNULINUX_X86_64): WORKDIR = work/gnulinux-x86_64-$(PT_BUNDLE_VERSION_STRING) -$(PT_BUNDLE_GNULINUX_X86_64): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_X86_64) - -$(PT_BUNDLE_WINDOWS): TBBDIR = $(WORKDIR)/Tor Browser -$(PT_BUNDLE_WINDOWS): export PYTHONPATH = $(shell cygpath --absolute --windows "$(PYPTLIB_WORK)"/build) -$(PT_BUNDLE_WINDOWS): - @if [ ! -f "$(BUNDLE_WINDOWS)" ]; then \ - echo "$(BUNDLE_WINDOWS) is missing."; \ - echo "Run "make fetch-windows"."; \ - false; \ - fi - rm -rf "$(WORKDIR)" - mkdir -p "$(WORKDIR)" - "$(P7Z)" x -o"$(WORKDIR)" "$(BUNDLE_WINDOWS)" - - git clone "$(PYPTLIB_HOME)" "$(PYPTLIB_WORK)" - cd "$(PYPTLIB_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build - - git clone "$(OBFSPROXY_HOME)" "$(OBFSPROXY_WORK)" - cd "$(OBFSPROXY_WORK)" && "$(PYTHON)" setup_py2exe.py clean --all py2exe - cp -Rn "$(OBFSPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App - mkdir -p "$(TBBDIR)"/Docs/Obfsproxy - cp "$(OBFSPROXY_WORK)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy - - git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)" - cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist-exe DISTNAME="$(FLASHPROXY_DISTNAME)" - cp -Rn "$(FLASHPROXY_DIST)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App - mkdir -p "$(TBBDIR)"/Docs/FlashProxy - cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy - - cat bundle-torrc-windows >> "$(TBBDIR)"/Data/Tor/torrc - - # 7zg (as opposed to 7z) causes the self-extractor to show a GUI. - cd "$(WORKDIR)" && "$(P7ZG)" a -sfx "$@" "Tor Browser" - mv "$(WORKDIR)/$@" . - -$(PT_BUNDLE_MACOSX_I686): TBBDIR = $(WORKDIR)/TorBrowser_en-US.app -$(PT_BUNDLE_MACOSX_I686): - @if [ ! -f "$(BUNDLE_MACOSX_I686)" ]; then \ - echo "$(BUNDLE_MACOSX_I686) is missing."; \ - echo "Run "make fetch-macosx-i686"."; \ - false; \ - fi - rm -rf "$(WORKDIR)" - mkdir -p "$(WORKDIR)" - unzip "$(BUNDLE_MACOSX_I686)" -d "$(WORKDIR)" - - git clone "$(PYPTLIB_HOME)" "$(PYPTLIB_WORK)" - cd "$(PYPTLIB_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build - cp -RL "$(PYPTLIB_WORK)"/build/pyptlib "$(TBBDIR)"/Contents/MacOS - - git clone "$(OBFSPROXY_HOME)" "$(OBFSPROXY_WORK)" - cd "$(OBFSPROXY_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build - cp -RL "$(OBFSPROXY_WORK)"/build/obfsproxy "$(TBBDIR)"/Contents/MacOs - cp -RL "$(OBFSPROXY_WORK)"/bin/obfsproxy "$(TBBDIR)"/Contents/MacOs/obfsproxy.bin - mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy - cp "$(OBFSPROXY_WORK)"/{LICENSE,README} "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy - cp -RL "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/Crypto "$(TBBDIR)"/Contents/MacOS - cp "$(MACOSX_BUNDLE_ROOT)"/argparse-1.2.1/argparse.py "$(TBBDIR)"/Contents/MacOS - - git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)" - cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist DISTNAME="$(FLASHPROXY_DISTNAME)" - cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/Contents/MacOS - mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy - cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy - cp -RL "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/M2Crypto "$(TBBDIR)"/Contents/MacOS - - find "$(TBBDIR)"/Contents/MacOS -name '*.pyc' -print0 | xargs -0 rm -f - - cat bundle-torrc-macosx >> "$(TBBDIR)"/Library/Vidalia/torrc - - cd "$(WORKDIR)" && zip -r -9 "$@" TorBrowser_en-US.app/ - mv "$(WORKDIR)/$@" . - -# Shared GNU/Linux 32-bit and 64-bit target. -$(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): TBBDIR = $(WORKDIR)/tor-browser_en-US -$(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): - @if [ ! -f "$(BUNDLE_GNULINUX)" ]; then \ - echo "$(BUNDLE_GNULINUX) is missing."; \ - echo "Run "make fetch-gnulinux-i686" or "make fetch gnulinux-x86_64"."; \ - false; \ - fi - rm -rf "$(WORKDIR)" - mkdir -p "$(WORKDIR)" - tar zxf "$(BUNDLE_GNULINUX)" -C "$(WORKDIR)" - - git clone "$(PYPTLIB_HOME)" "$(PYPTLIB_WORK)" - cd "$(PYPTLIB_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build - cp -RL "$(PYPTLIB_WORK)"/build/pyptlib "$(TBBDIR)"/App - - git clone "$(OBFSPROXY_HOME)" "$(OBFSPROXY_WORK)" - cd "$(OBFSPROXY_WORK)" && "$(PYTHON)" setup.py clean --all build --build-lib build - cp -RL "$(OBFSPROXY_WORK)"/build/obfsproxy "$(TBBDIR)"/App - cp -RL "$(OBFSPROXY_WORK)"/bin/obfsproxy "$(TBBDIR)"/App/obfsproxy.bin - mkdir -p "$(TBBDIR)"/Docs/Obfsproxy - cp "$(OBFSPROXY_WORK)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy - cp -RL /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} "$(TBBDIR)"/App - cp -RL /usr/lib/pymodules/python2.6/argparse.py "$(TBBDIR)"/App - - git clone "$(FLASHPROXY_HOME)" "$(FLASHPROXY_WORK)" - cd "$(FLASHPROXY_WORK)" && "$(MAKE)" clean dist DISTNAME="$(FLASHPROXY_DISTNAME)" - cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/App - mkdir -p "$(TBBDIR)"/Docs/FlashProxy - cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy - cp -RL /usr/lib/pymodules/python2.6/M2Crypto "$(TBBDIR)"/App - - find "$(TBBDIR)"/App -name '*.pyc' -print0 | xargs -0 rm -f - - cat bundle-torrc-gnulinux >> "$(TBBDIR)"/Data/Tor/torrc - - tar czf "$@" -C "$(WORKDIR)" tor-browser_en-US - -# Download targets. -$(BUNDLE_WINDOWS) $(BUNDLE_WINDOWS).asc: - rm -f "$@" - wget --no-clobber "$(BUNDLE_DIST_URL)/$@" -$(BUNDLE_MACOSX_I686) $(BUNDLE_MACOSX_I686).asc: - rm -f "$@" - curl -O "$(BUNDLE_DIST_URL)/osx/$@" -$(BUNDLE_GNULINUX_I686) $(BUNDLE_GNULINUX_I686).asc \ -$(BUNDLE_GNULINUX_X86_64) $(BUNDLE_GNULINUX_X86_64).asc: - rm -f "$@" - wget --no-clobber "$(BUNDLE_DIST_URL)/linux/$@" - -checksig-%: % %.asc - gpg --verify "$*".asc "$*" - -clean: - rm -rf "$(WORKDIR)" - rm -rf "$(PT_BUNDLE_WINDOWS)" - rm -rf "$(PT_BUNDLE_MACOSX_I686)" - rm -rf "$(PT_BUNDLE_GNULINUX_I686)" - rm -rf "$(PT_BUNDLE_GNULINUX_X86_64)" - -# Need Bash for certain wildcards. -SHELL = /bin/bash -.PHONY: clean checksig-% windows macosx-i686 gnulinux-i686 gnulinux-x86_64 diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt deleted file mode 100644 index 687a21b..0000000 --- a/doc/bundle-gnulinux.txt +++ /dev/null @@ -1,98 +0,0 @@ -== Creating a Debian VM - -Set up Debian VMs for building bundles. You need one for i386 and one -for amd64. - -http://cdimage.debian.org/debian-cd/6.0.6/i386/iso-cd/debian-6.0.6-i386-neti... -http://cdimage.debian.org/debian-cd/6.0.6/i386/iso-cd/SHA256SUMS -http://cdimage.debian.org/debian-cd/6.0.6/i386/iso-cd/SHA256SUMS.sign - -http://cdimage.debian.org/debian-cd/6.0.6/amd64/iso-cd/debian-6.0.6-amd64-ne... -http://cdimage.debian.org/debian-cd/6.0.6/amd64/iso-cd/SHA256SUMS -http://cdimage.debian.org/debian-cd/6.0.6/amd64/iso-cd/SHA256SUMS.sign - -Verify the digests. - http://www.debian.org/CD/verify -If you are using Debian, you can get the signing key by installing the -debian-keyring package (apt-get install debian-keyring). Add - --keyring /usr/share/keyrings/debian-role-keys.gpg -to the gpg --verify command. - - $ gpg --verify SHA256SUMS.sign SHA256SUMS - - $ sha256sum debian-6.0.6-i386-netinst.iso - 2b4bcd9e782dfd6a5af9cac3e981be375652b2e5579402405eaf84ac4fe3754f debian-6.0.6-i386-netinst.iso - $ grep netinst SHA256SUMS - 2b4bcd9e782dfd6a5af9cac3e981be375652b2e5579402405eaf84ac4fe3754f debian-6.0.6-i386-netinst.iso - - $ sha256sum debian-6.0.6-amd64-netinst.iso - 41d74134bf967b65d0b61a314ee07dfb539e03502ca69d9d3be8ab3b01da02d2 debian-6.0.6-amd64-netinst.iso - $ grep netinst SHA256SUMS - 41d74134bf967b65d0b61a314ee07dfb539e03502ca69d9d3be8ab3b01da02d2 debian-6.0.6-amd64-netinst.iso - -Create the disk images. - - $ qemu-img create -f qcow2 debian-6-i386-bundle.hda 10G - $ qemu-img create -f qcow2 debian-6-amd64-bundle.hda 10G - -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-amd64-bundle.hda -cdrom debian-6.0.6-amd64-netinst.iso - -Choose "Install" when it boots. Here are settings: - - English - United States - American English - Hostname: debian - Domain name: - Root password: - User full name: bundle - User name: bundle - User password: password - Any time zone - Guided - use entire disk - All files in one partition - Any mirror - popularity-contest: no - Software select: uncheck all but "Standard system utilities" - GRUB on MBR: yes - -Packages to install: - - $ sudo apt-get install --no-install-recommends git make python-m2crypto zip - $ sudo apt-get install --no-install-recommends python-setuptools python-crypto python-twisted python-argparse - -== Browser bundle - -Clone pyptlib, obfsproxy, and flashproxy. Set each one to the branch you -want to include in the builds; e.g., "git pull" or "git checkout 1.0". - - $ cd - $ git clone https://git.torproject.org/pluggable-transports/pyptlib.git - $ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git - $ git clone https://git.torproject.org/flashproxy.git - -Update your Debian. - - $ sudo apt-get update - $ sudo apt-get upgrade - -Enter the doc directory and edit the top of Makefile to set the version -numbers you want to use. - BUNDLE_VERSION = ... - BUNDLE_RELEASE = ... - PT_BUNDLE_RELEASE = pt1 -The latest Tor Browser Bundle version number can be found at -https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserbu.... -PT_BUNDLE_RELEASE release should increment each time you build a new -bundle with the same BUNDLE_VERSION and BUNDLE_RELEASE, and be reset to -"pt1" when either of those change. - -Run one of these two commands, depending on the platform: - $ make gnulinux-i686 - $ make gnulinux-x86_64 - -Test running the bundle. diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt deleted file mode 100644 index 17e8fa2..0000000 --- a/doc/bundle-macosx.txt +++ /dev/null @@ -1,83 +0,0 @@ -== Dependencies - -=== SWIG - -This is a prerequisite for building M2Crypto. - -http://www.swig.org/download.html -http://downloads.sourceforge.net/project/swig/swig/swig-2.0.8/swig-2.0.8.tar... - -The sha256sum (shasum -a 256) of the package I used was - -aeeefa20bbe1c03bacf23f0af9e7d6193e8b807b7585470615b71b1ee0c8ca4f swig-2.0.8.tar.gz - -SWIG requires PCRE, but is capable of building PCRE by itself if you -download the source first. Save the PCRE tarball inside the extracted -SWIG directory. - -http://www.pcre.org -http://downloads.sourceforge.net/project/pcre/pcre/8.32/pcre-8.32.tar.bz2 -http://downloads.sourceforge.net/project/pcre/pcre/8.32/pcre-8.32.tar.bz2.si... - - $ rm pcre-8.32.tar.bz2.sig # The next command won't run with this file present. - $ ./Tools/pcre-build.sh - $ ./configure --prefix=~/bundle/usr - $ make - $ make install - -=== M2Crypto - -http://chandlerproject.org/Projects/MeTooCrypto#Downloads -http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz -http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz.asc - - $ python setup.py build_ext --swig ~/bundle/usr/bin/swig - $ mkdir -p ~/usr/lib/python2.7/site-packages/ - $ python setup.py install --root=~/bundle --prefix=/usr - -=== PyCrypto - -https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz -https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz.asc - -Extract and verify the tarball. Then run - - $ python setup.py install --root=~/bundle --prefix=/usr - -=== argparse - -This is included for compatibility with older versions of python. -See https://trac.torproject.org/projects/tor/ticket/8549. - -https://argparse.googlecode.com/files/argparse-1.2.1.tar.gz - -The sha256 sum should be - -ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 argparse-1.2.1.tar.gz - -Extract the tarball into your bundle directory. - -== Browser bundle - -Clone pyptlib, obfsproxy, and flashproxy. Set each one to the branch you -want to include in the builds; e.g., "git pull" or "git checkout 1.0". - - $ cd - $ git clone https://git.torproject.org/pluggable-transports/pyptlib.git - $ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git - $ git clone https://git.torproject.org/flashproxy.git - -Enter the doc directory and edit the top of Makefile to set the version -numbers you want to use. - BUNDLE_VERSION = ... - BUNDLE_RELEASE = ... - PT_BUNDLE_RELEASE = pt1 -The latest Tor Browser Bundle version number can be found at -https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserbu.... -PT_BUNDLE_RELEASE release should increment each time you build a new -bundle with the same BUNDLE_VERSION and BUNDLE_RELEASE, and be reset to -"pt1" when either of those change. - - $ make macosx-i686 - -Test running the bundle. diff --git a/doc/bundle-torrc-gnulinux b/doc/bundle-torrc-gnulinux deleted file mode 100644 index fac4cb5..0000000 --- a/doc/bundle-torrc-gnulinux +++ /dev/null @@ -1,26 +0,0 @@ - -UseBridges 1 -# The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 - -Bridge obfs2 109.163.233.198:1051 -Bridge obfs2 83.212.100.216:47870 -Bridge obfs2 83.212.96.182:46602 -Bridge obfs2 109.105.109.163:46924 -Bridge obfs2 70.182.182.109:54542 -Bridge obfs2 169.229.59.74:32779 -Bridge obfs2 169.229.59.75:47809 -Bridge obfs2 209.141.36.236:60783 -Bridge obfs2 208.79.90.242:55564 -Bridge obfs2 128.31.0.34:1051 -Bridge obfs2 83.212.101.2:45235 - -Bridge obfs3 83.212.101.2:42782 - -LearnCircuitBuildTimeout 0 -CircuitBuildTimeout 60 -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin websocket exec ./App/flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec ./App/obfsproxy.bin managed diff --git a/doc/bundle-torrc-macosx b/doc/bundle-torrc-macosx deleted file mode 100644 index 73e2866..0000000 --- a/doc/bundle-torrc-macosx +++ /dev/null @@ -1,26 +0,0 @@ - -UseBridges 1 -# The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 - -Bridge obfs2 109.163.233.198:1051 -Bridge obfs2 83.212.100.216:47870 -Bridge obfs2 83.212.96.182:46602 -Bridge obfs2 109.105.109.163:46924 -Bridge obfs2 70.182.182.109:54542 -Bridge obfs2 169.229.59.74:32779 -Bridge obfs2 169.229.59.75:47809 -Bridge obfs2 209.141.36.236:60783 -Bridge obfs2 208.79.90.242:55564 -Bridge obfs2 128.31.0.34:1051 -Bridge obfs2 83.212.101.2:45235 - -Bridge obfs3 83.212.101.2:42782 - -LearnCircuitBuildTimeout 0 -CircuitBuildTimeout 60 -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec obfsproxy.bin managed diff --git a/doc/bundle-torrc-windows b/doc/bundle-torrc-windows deleted file mode 100644 index fad5aa2..0000000 --- a/doc/bundle-torrc-windows +++ /dev/null @@ -1,26 +0,0 @@ - -UseBridges 1 -# The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 - -Bridge obfs2 109.163.233.198:1051 -Bridge obfs2 83.212.100.216:47870 -Bridge obfs2 83.212.96.182:46602 -Bridge obfs2 109.105.109.163:46924 -Bridge obfs2 70.182.182.109:54542 -Bridge obfs2 169.229.59.74:32779 -Bridge obfs2 169.229.59.75:47809 -Bridge obfs2 209.141.36.236:60783 -Bridge obfs2 208.79.90.242:55564 -Bridge obfs2 128.31.0.34:1051 -Bridge obfs2 83.212.101.2:45235 - -Bridge obfs3 83.212.101.2:42782 - -LearnCircuitBuildTimeout 0 -CircuitBuildTimeout 60 -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec obfsproxy managed diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt deleted file mode 100644 index c5327f4..0000000 --- a/doc/bundle-windows.txt +++ /dev/null @@ -1,187 +0,0 @@ -== Dependencies - -=== Cygwin - -Cygwin is used to provide a shell environment and other commands. We -don't actually use the Cygwin compatibility layer. - -http://cygwin.com/install.html -http://cygwin.com/setup.exe -http://cygwin.com/setup.exe.sig - -Verify the signature (do it on another machine if you don't already have -GnuPG installed locally). - $ gpg --verify setup.exe.sig -You need to install at least the following packages: - bash - coreutils - gnupg - grep - make - mingw-gcc-core - perl - zip -Don't install the Cygwin python package. Use Python's own Windows -installer as described in the next section. - -=== Python - -Get the latest 32-bit installer in the 2.x series. - -http://python.org/download/ -http://python.org/ftp/python/2.7.3/python-2.7.3.msi -http://python.org/ftp/python/2.7.3/python-2.7.3.msi.asc - -Verify the signature (instructions are on the download page). - $ gpg --verify python-2.7.3.msi.asc -Run the installer. "Install for all users". Disable "Tcl/Tk", -"Documentation", "Utility Scripts", and "Test suite". - -Set the PATH environment variable as described at -http://docs.python.org/2/using/windows.html#configuring-python: - PATH=<existing path>;C:\Python27 -You will have to restart your Cygwin shells to pick up the new PATH. - -=== py2exe - -http://sourceforge.net/projects/py2exe/files/py2exe/ -http://sourceforge.net/projects/py2exe/files/py2exe/0.6.9/py2exe-0.6.9.win32... - -The sha256sum of the package I used was - -610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c py2exe-0.6.9.win32-py2.7.exe - -=== OpenSSL - -https://openssl.org/source/ -https://openssl.org/source/openssl-1.0.1c.tar.gz -https://openssl.org/source/openssl-1.0.1c.tar.gz.asc - -Verify the signature. - $ gpg --verify openssl-1.0.1c.tar.gz.asc -Build OpenSSL from source using Cygwin and MinGW. Install the Cygwin -package mingw-gcc-core if it's not already installed. Run these commands -in the OpenSSL source directory: - CROSS_COMPILE=i686-pc-mingw32- ./Configure shared mingw - make - make install -Then, add C:\cygwin\usr\local\ssl\bin to PATH as you did with Python -above. - -=== SWIG - -This is a prerequisite for building M2Crypto. - -http://www.swig.org/download.html -http://downloads.sourceforge.net/project/swig/swigwin/swigwin-2.0.8/swigwin-... - -The sha256sum of the package I used was - -35bc3013d43e0034677c08bab30bfc94ed6d44fbfffa4c5158f5788d29f4636d swigwin-2.0.8.zip - -Just extract the zip in the same directory in which you will extract -M2Crypto. - -=== M2Crypto - -http://chandlerproject.org/Projects/MeTooCrypto#Downloads -http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz -http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz.asc - -There are binary installers on the M2Crypto page, but it says they are -"provided by volunteers, untested by M2Crypto author." Instead build -from source. - -The distutils build_ext command hardcodes the compiler name "gcc" when -using the "mingw32" compiler. Make a copy of the MinGW compiler with -that name. - $ cp /usr/bin/i686-pc-mingw32-gcc /usr/bin/gcc -Build the package. - $ PATH=$PATH:../swigwin-2.0.8 python setup.py build_ext -c mingw32 --openssl C:\cygwin\usr\local\ssl -L C:\cygwin\usr\local\ssl\bin - $ python setup.py bdist_wininst -This will leave an MSI installer in the dist directory. Double-click it -to install M2Crypto amid the other Python files. - -=== 7-Zip - -This is used to build a self-extracting bundle executable. The p7zip -package from Cywin doesn't work because the self-extracting executables -it produces requrie cygwin1.dll. - -http://7-zip.org/download.html -http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.msi - -The sha256sum of the package I used was - -fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi - -=== PyCrypto - -This is a dependency of obfsproxy and Twisted. - -https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz -https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz.asc - -To install run: - - $ /cygdrive/c/Python27/python.exe setup.py install - -=== setuptools - -This is needed solely to install the zopeinterface egg in the next step. - -http://pypi.python.org/pypi/setuptools -http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2... - -The sha256sum of the package I used was - -676d0add7ece45aaee7dddb6ecb883cb531c68f064f56376f529b47228c467eb setuptools-0.6c11.win32-py2.7.exe - -=== zope.interface - -This is a dependency of Twisted. - -http://pypi.python.org/pypi/zope.interface#download -http://pypi.python.org/packages/2.7/z/zope.interface/zope.interface-4.0.3-py... - -The sha256sum of the package I used was - -3898e9ff89121aae1e8387bf2da75535911d8422dad3a194176d78766573b5d2 zope.interface-4.0.3-py2.7-win32.egg - - $ /cygdrive/c/Python27/Scripts/easy_install zope.interface-4.0.3-py2.7-win32.egg - -=== Twisted - -http://twistedmatrix.com/trac/wiki/Downloads -http://twistedmatrix.com/Releases/Twisted/12.3/Twisted-12.3.0.win32-py2.7.ms... -http://twistedmatrix.com/Releases/twisted-12.3.0-md5sums.txt - - $ gpg --verify twisted-12.3.0-md5sums.txt - $ grep win32-py2\.7\.msi twisted-12.3.0-md5sums.txt - $ md5sum Twisted-12.3.0.win32-py2.7.msi - -== Browser bundle - -Clone pyptlib, obfsproxy, and flashproxy. Set each one to the branch you -want to include in the builds; e.g., "git pull" or "git checkout 1.0". - - $ cd - $ git clone https://git.torproject.org/pluggable-transports/pyptlib.git - $ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git - $ git clone https://git.torproject.org/flashproxy.git - -Enter the doc directory and edit the top of Makefile to set the version -numbers you want to use. - BUNDLE_VERSION = ... - BUNDLE_RELEASE = ... - PT_BUNDLE_RELEASE = pt1 -The latest Tor Browser Bundle version number can be found at -https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserbu.... -PT_BUNDLE_RELEASE release should increment each time you build a new -bundle with the same BUNDLE_VERSION and BUNDLE_RELEASE, and be reset to -"pt1" when either of those change. - - $ make windows PYTHON=/cygdrive/c/Python27/python - -Test running the bundle. Extract into a separate directory, double-click -the icon and "Start Tor Browser.exe".