December 2012 - tor-commits - lists.torproject.org

[flashproxy/master] Remove the whole dist directory in "make dist-exe".
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit b604485449ff7721babe544c5eef88d0aeea8aba Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 1 21:30:21 2012 -0800 Remove the whole dist directory in "make dist-exe". --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 53a89b8..9168b9e 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ sign: dist/$(DISTNAME).zip DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 dist-exe: $(CLIENT_BIN) flashproxy-client.spec - rm -rf $(DISTDIR_WIN32) + rm -rf dist mkdir -p $(DISTDIR_WIN32) mkdir $(DISTDIR_WIN32)/doc $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build flashproxy-client.spec 2>&1 \

1 0

[flashproxy/master] rm $(PYINSTALLER_TMPDIR) before dist-exe.
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit 78025e6fdfaa0edd6bbd24233f3aae580b3484c9 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 09:54:49 2012 -0800 rm $(PYINSTALLER_TMPDIR) before dist-exe. Error: The output directory "C:\...\flashproxy\pyi\dist" is not empty. Please remove all its contents or use the -y option (remove output directory without confirmation). Makefile:62: recipe for target `dist-exe' failed --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index f154eaa..d747864 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) dist-exe: $(CLIENT_BIN) flashproxy-client.spec - rm -rf dist + rm -rf dist $(PYINSTALLER_TMPDIR) mkdir -p $(DISTDIR_WIN32) mkdir $(DISTDIR_WIN32)/doc $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build flashproxy-client.spec 2>&1 \

1 0

[flashproxy/master] Install txt man pages in win32 dist.
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit 6549112eba8cb7de09e2b8e642d3569469145a5b Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 1 21:33:46 2012 -0800 Install txt man pages in win32 dist. --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 9168b9e..f154eaa 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,7 @@ sign: dist/$(DISTNAME).zip # See doc/windows-deployment-howto.txt. DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 +dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) dist-exe: $(CLIENT_BIN) flashproxy-client.spec rm -rf dist mkdir -p $(DISTDIR_WIN32)

1 0

[flashproxy/master] Override CLIENT_BIN for dist-exe.
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit 7ca852a0789c4851e1f0a538b19aebfd04923556 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:35:46 2012 -0800 Override CLIENT_BIN for dist-exe. This removes special cases, so the body of dist-exe is now the same as that of dist, except for DISTNAME and DISTDIR versus DISTNAME_WIN32 and DISTDIR_WIN32. --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9a02e3b..4922b33 100644 --- a/Makefile +++ b/Makefile @@ -66,13 +66,13 @@ $(PYINSTALLER_TMPDIR)/dist: $(CLIENT_BIN) # See doc/windows-deployment-howto.txt. DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 +dist-exe: CLIENT_BIN := $(PYINSTALLER_TMPDIR)/dist/* dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) dist-exe: $(PYINSTALLER_TMPDIR)/dist flashproxy-client.spec rm -rf dist mkdir -p $(DISTDIR_WIN32) mkdir $(DISTDIR_WIN32)/doc - cp -f $(PYINSTALLER_TMPDIR)/dist/* $(DISTDIR_WIN32) - cp -f README LICENSE torrc $(DISTDIR_WIN32) + cp -f $(CLIENT_DIST_FILES) $(DISTDIR_WIN32) cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR_WIN32)/doc cd dist && zip -q -r -9 $(DISTNAME_WIN32).zip $(DISTNAME_WIN32)

1 0

[flashproxy/master] Break out a sub-target for PyInstaller.
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit e6b5abe132cef7ce77daddb0c15f20f3efc58504 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:30:26 2012 -0800 Break out a sub-target for PyInstaller. --- Makefile | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 009aeb9..9a02e3b 100644 --- a/Makefile +++ b/Makefile @@ -54,23 +54,26 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip +$(PYINSTALLER_TMPDIR)/dist: $(CLIENT_BIN) + rm -rf $(PYINSTALLER_TMPDIR) +# PyInstaller writes "ERROR" to stderr (along with its other messages) when it +# fails to find a hidden import like M2Crypto, but continues anyway and doesn't +# change its error code. Grep for "ERROR" and stop if found. + $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build --log-level=WARN flashproxy-client.spec 2>&1 | tee /dev/tty | grep -q "ERROR"; test $$? == 1 + mv $(PYINSTALLER_TMPDIR)/dist/M2Crypto.__m2crypto.pyd $(PYINSTALLER_TMPDIR)/dist/__m2crypto.pyd + rm -rf logdict*.log + # See doc/windows-deployment-howto.txt. DISTNAME_WIN32 = $(DISTNAME)-win32 DISTDIR_WIN32 = $(DISTDIR)-win32 dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) -dist-exe: $(CLIENT_BIN) flashproxy-client.spec - rm -rf dist $(PYINSTALLER_TMPDIR) +dist-exe: $(PYINSTALLER_TMPDIR)/dist flashproxy-client.spec + rm -rf dist mkdir -p $(DISTDIR_WIN32) mkdir $(DISTDIR_WIN32)/doc -# PyInstaller writes "ERROR" to stderr (along with its other messages) when it -# fails to find a hidden import like M2Crypto, but continues anyway and doesn't -# change its error code. Grep for "ERROR" and stop if found. - $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build --log-level=WARN flashproxy-client.spec 2>&1 | tee /dev/tty | grep -q "ERROR"; test $$? == 1 cp -f $(PYINSTALLER_TMPDIR)/dist/* $(DISTDIR_WIN32) cp -f README LICENSE torrc $(DISTDIR_WIN32) cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR_WIN32)/doc - mv $(DISTDIR_WIN32)/M2Crypto.__m2crypto.pyd $(DISTDIR_WIN32)/__m2crypto.pyd cd dist && zip -q -r -9 $(DISTNAME_WIN32).zip $(DISTNAME_WIN32) - rm -rf logdict* $(PYINSTALLER_TMPDIR) .PHONY: all install clean test dist sign dist-exe

1 0

[flashproxy/master] Longer name for PYINSTALLER_TMPDIR.
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit 51f5806854b5a2b3578b65cdf5da60abdb2ad785 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:58:46 2012 -0800 Longer name for PYINSTALLER_TMPDIR. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 2eb14ae..6723dab 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ MANDIR = $(PREFIX)/share/man PYTHON = python PYINSTALLER_PY = ../pyinstaller-2.0/pyinstaller.py -export PYINSTALLER_TMPDIR = pyi +export PYINSTALLER_TMPDIR = pyinstaller-tmp VERSION = 0.8

1 0

[flashproxy/master] Ignore PyInstaller tmp directory.
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit 585cfc84cd5b7a61177fd42a86282d6c6544100f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:59:57 2012 -0800 Ignore PyInstaller tmp directory. --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 493cc74..3778530 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /facilitator.log *.pyc /dist +/pyinstaller-tmp

1 0

[flashproxy/master] Merge branch 'make_exe'
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit 87a138818030b6230bb2fee8e5dc7064378bfee2 Merge: 7cc090c 9cd99ac Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 16:56:17 2012 -0800 Merge branch 'make_exe' Conflicts: Makefile .gitignore | 1 + LICENSE | 219 +++++++++++ Makefile | 27 ++- doc/LICENSE.GPL | 280 ++++++++++++++ doc/LICENSE.PYTHON | 773 ++++++++++++++++++++++++++++++++++++++ doc/windows-deployment-howto.txt | 134 +++++++ flashproxy-client.spec | 26 ++ 7 files changed, 1457 insertions(+), 3 deletions(-) diff --cc Makefile index 46f621c,6723dab..fbc8a2e --- a/Makefile +++ b/Makefile @@@ -4,6 -2,12 +4,10 @@@ PREFIX = /usr/loca BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/share/man + PYTHON = python + PYINSTALLER_PY = ../pyinstaller-2.0/pyinstaller.py + export PYINSTALLER_TMPDIR = pyinstaller-tmp + -VERSION = 0.8 - CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE torrc @@@ -39,13 -54,20 +44,29 @@@ sign: dist/$(DISTNAME).zi cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip + $(PYINSTALLER_TMPDIR)/dist: $(CLIENT_BIN) + rm -rf $(PYINSTALLER_TMPDIR) + # PyInstaller writes "ERROR" to stderr (along with its other messages) when it + # fails to find a hidden import like M2Crypto, but continues anyway and doesn't + # change its error code. Grep for "ERROR" and stop if found. + $(PYTHON) $(PYINSTALLER_PY) --buildpath=$(PYINSTALLER_TMPDIR)/build --log-level=WARN flashproxy-client.spec 2>&1 | tee /dev/tty | grep -q "ERROR"; test $$? == 1 + mv $(PYINSTALLER_TMPDIR)/dist/M2Crypto.__m2crypto.pyd $(PYINSTALLER_TMPDIR)/dist/__m2crypto.pyd + rm -rf logdict*.log + + # See doc/windows-deployment-howto.txt. + dist-exe: DISTNAME := $(DISTNAME)-win32 + dist-exe: CLIENT_BIN := $(PYINSTALLER_TMPDIR)/dist/* + dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) + # Delegate to the "dist" target using the substitutions above. + dist-exe: $(PYINSTALLER_TMPDIR)/dist flashproxy-client.spec dist + -.PHONY: all install clean test dist sign dist-exe +clean: + rm -f *.pyc - rm -rf dist ++ rm -rf dist $(PYINSTALLER_TMPDIR) + +test: + ./flashproxy-client-test + cd facilitator && ./facilitator-test + cd proxy && ./flashproxy-test.js + - .PHONY: all install dist sign clean test ++.PHONY: all install dist sign dist-exe clean test

1 0

[flashproxy/master] Overhaul windows-deployment-howto.txt.
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit 9cd99acacecfbddc6afbca5147493ceb7ce9c01b Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 16:45:14 2012 -0800 Overhaul windows-deployment-howto.txt. --- doc/windows-deployment-howto.txt | 159 +++++++++++++++++++++++-------------- 1 files changed, 99 insertions(+), 60 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index e348338..2514a1a 100644 --- a/doc/windows-deployment-howto.txt +++ b/doc/windows-deployment-howto.txt @@ -1,95 +1,134 @@ -This document describes the setup required to bundle -the client programs with a Python interpreter, for -deployment on Windows machines without Python installed. +This document describes how to build standalone Windows executables of +the flash proxy client programs. The client programs are written in +Python, so we use a program called PyInstaller that compiles them into +executables. -== Overview +These instructions were last tested in December 2012. Tarball version +numbers were up to date then; check for newer versions. -The client programs are written in Python, an interpreted -language. The Python interpreter does not ship with Windows, -so in order for users to be able to download and run the -programs with no extra setup, it must be included in the -distribution. This is currently done using PyInstaller. -PyInstaller collects the Python interpreter, any libraries -the Python script requires, and converts the script into -a standalone executable. +== Summary -The makefile has an "exe" target which automates the -budling process once all the required dependencies are -installed. It should be run in Cygwin. +Install the below dependencies, run + $ make dist-exe +and a zip containing the executables will end up in the dist directory. == Dependencies -The client programs use a few libraries, which must -be present on the system in order for PyInstaller to -bundle them. Bundling also requires a Windows Python -installation and PyInstaller. +=== Cygwin -1. Python http://python.org/download/ +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 -There are instructions for verifying the signature on the download page. -$ gpg --verify python-2.7.3.msi.asc -Run the installer. "Install for all users". You can disable "Tcl/Tk", +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=...;C:\Python27 -You will have to restart your shells to pick up the new PATH. +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. -1.5 pywin32 http://sourceforge.net/projects/pywin32/files/pywin32/ +=== pywin32 This is a prerequisite for PyInstaller. Enter the directory containing -the latest build number, then download the "win32-py2.7" package. +the latest build number, then download the "win32-py2.7" version of the +package. + +http://sourceforge.net/projects/pywin32/files/pywin32/ +http://downloads.sourceforge.net/project/pywin32/pywin32/Build%20218/pywin32-218.win32-py2.7.exe -The installers don't seem to have signatures. The sha256sum of the -package I downloaded was +The sha256sum of the package I used was -dd665cca88cb059fec960516ed5f29474b33fce50fcb2633d397d4a3aa705c16 *pywin32-218.win32-py2.7.exe +dd665cca88cb059fec960516ed5f29474b33fce50fcb2633d397d4a3aa705c16 pywin32-218.win32-py2.7.exe -2. PyInstaller +=== PyInstaller -The 2.0 release can be found at http://www.pyinstaller.org. -The program is a Python script, there is no installation -required, just extract the archive somehwere. +http://www.pyinstaller.org/#Downloads +https://github.com/downloads/pyinstaller/pyinstaller/pyinstaller-2.0.zip -3. OpenSSL http://www.openssl.org/source/ +The sha256sum of the package I used was -http://openssl.org/source/openssl-1.0.1c.tar.gz -http://openssl.org/source/openssl-1.0.1c.tar.gz.asc -$ gpg --verify openssl-1.0.1c.tar.gz.asc +7f944ff131f6488ebad68e8db4a6f53f2d8054c618b6095d7cbba3ca0f733bab pyinstaller-2.0.zip -Build OpenSSL from source using Cygwin and MinGW. Install the package -mingw-gcc-core. Run these commands in the OpenSSL source directory: +You don't install this package; just unzip it at the same directory +level as the flashproxy source code. (The flashproxy makefile expects to +find PyInstaller at ../pyinstaller-2.0.) -CROSS_COMPILE=i686-pc-mingw32- ./Configure shared mingw -make -make install +=== OpenSSL http://www.openssl.org/source/ -Then, add C:\cygwin\usr\local\ssl\bin to PATH as you did for Python +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. -4. M2Crypto +=== 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-2.0.8.zip + +The sha256sum of the package I used was -There are no official binary distributions of M2Crypto. -The official source along, with several unofficial -binaries, is available at http://chandlerproject.org/Projects/MeTooCrypto. +35bc3013d43e0034677c08bab30bfc94ed6d44fbfffa4c5158f5788d29f4636d swigwin-2.0.8.zip -http://chandlerproject.org/pub/Projects/MeTooCrypto/M2Crypto-0.21.1.win32-py2.7.msi +Just extract the zip in the same directory in which you will extract +M2Crypto. -== Bundling +=== M2Crypto -Once the dependencies are installed, you should be able -to bundle the programs, using the "exe" make target. -Do not install Cygwin Python, make sure you are using the -native Windows version. Add Python and PyInstaller to your -path, then in a Cygwin terminal run: +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 -$ make exe +There are binary installers on the M2Crypto page, but it says they are +"provided by volunteers, untested by M2Crypto author." Instead build +from source. -This will create a dist/flashproxy-client-<version> directory -containing the required binaries. If you encounter any -problems, please report them using https://trac.torproject.org/projects/tor. +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.

1 0

[flashproxy/master] Have dist-exe delegate to dist.
by dcf＠torproject.org 02 Dec '12

02 Dec '12

commit 24d5a7a254fa7f8290d7952aca2d9fe96d3f3429 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 10:48:48 2012 -0800 Have dist-exe delegate to dist. --- Makefile | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 4922b33..2eb14ae 100644 --- a/Makefile +++ b/Makefile @@ -64,16 +64,10 @@ $(PYINSTALLER_TMPDIR)/dist: $(CLIENT_BIN) rm -rf logdict*.log # See doc/windows-deployment-howto.txt. -DISTNAME_WIN32 = $(DISTNAME)-win32 -DISTDIR_WIN32 = $(DISTDIR)-win32 +dist-exe: DISTNAME := $(DISTNAME)-win32 dist-exe: CLIENT_BIN := $(PYINSTALLER_TMPDIR)/dist/* dist-exe: CLIENT_MAN := $(addsuffix .txt,$(CLIENT_MAN)) -dist-exe: $(PYINSTALLER_TMPDIR)/dist flashproxy-client.spec - rm -rf dist - mkdir -p $(DISTDIR_WIN32) - mkdir $(DISTDIR_WIN32)/doc - cp -f $(CLIENT_DIST_FILES) $(DISTDIR_WIN32) - cp -f $(CLIENT_DIST_DOC_FILES) $(DISTDIR_WIN32)/doc - cd dist && zip -q -r -9 $(DISTNAME_WIN32).zip $(DISTNAME_WIN32) +# Delegate to the "dist" target using the substitutions above. +dist-exe: $(PYINSTALLER_TMPDIR)/dist flashproxy-client.spec dist .PHONY: all install clean test dist sign dist-exe

1 0