tor-commits December 2012

tor-commits@lists.torproject.org

17 participants
1600 discussions

r25925: {website} Adding Flash Proxy to the projects table Adding Flash Proxy (website/trunk/getinvolved/en)
by Damian Johnson 03 Dec '12

03 Dec '12

Author: atagar Date: 2012-12-03 02:06:41 +0000 (Mon, 03 Dec 2012) New Revision: 25925 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding Flash Proxy to the projects table Adding Flash Proxy as per dcf's request on... https://trac.torproject.org/7618 Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-12-02 09:28:11 UTC (rev 25924) +++ website/trunk/getinvolved/en/volunteer.wml 2012-12-03 02:06:41 UTC (rev 25925) @@ -213,6 +213,14 @@ </tr> <tr> + <td><a href="#project-flash-proxy">Flash Proxy</a></td> + <td>Client Add-on</td> + <td>Python, JavaScript, Go</td> + <td>Moderate</td> + <td>dcf, aallai, jct</td> + </tr> + + <tr class="alt"> <td>*<a href="#project-thandy">Thandy</a></td> <td>Updater</td> <td>Python</td> @@ -220,7 +228,7 @@ <td>chiiph, Erinn, nickm</td> </tr> - <tr class="alt"> + <tr> <td>*<a href="#project-ooni-probe">Ooni Probe</a></td> <td>Scanner</td> <td>Python</td> @@ -228,7 +236,7 @@ <td>hellais, isis, ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-shadow">Shadow</a></td> <td>Experimentation</td> <td>C, Python</td> @@ -236,7 +244,7 @@ <td>robgjansen</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torctl">TorCtl</a></td> <td>Library</td> <td>Python</td> @@ -244,7 +252,7 @@ <td>aagbsn</td> </tr> - <tr> + <tr class="alt"> <td>*<a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> @@ -252,7 +260,7 @@ <td>atagar, neena</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-tlsdate">Tlsdate</a></td> <td>Utility</td> <td>C</td> @@ -260,7 +268,7 @@ <td>ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-metrics">Metrics</a></td> <td>Client Service</td> <td>Java</td> @@ -268,7 +276,7 @@ <td>karsten</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-atlas">Atlas</a></td> <td>Client Service</td> <td>JavaScript</td> @@ -276,7 +284,7 @@ <td>hellais</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torstatus">TorStatus</a></td> <td>Client Service</td> <td>Python, Django</td> @@ -284,7 +292,7 @@ <td></td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-compass">Compass</a></td> <td>Client Service</td> <td>Python</td> @@ -292,7 +300,7 @@ <td>gsathya, karsten</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-weather">Weather</a></td> <td>Client Service</td> <td>Python</td> @@ -300,7 +308,7 @@ <td>kaner</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> @@ -308,7 +316,7 @@ <td>kaner</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> <td>Python, Perl</td> @@ -316,7 +324,7 @@ <td>ioerror</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-onionoo">Onionoo</a></td> <td>Backend Service</td> <td>Java, Python</td> @@ -324,7 +332,7 @@ <td>karsten, gsathya</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> @@ -332,7 +340,7 @@ <td>kaner, nickm</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torflow">TorFlow</a></td> <td>Backend Service</td> <td>Python</td> @@ -340,7 +348,7 @@ <td>aagbsn</td> </tr> - <tr> + <tr class="alt"> <td>*<a href="#project-torbel">TorBEL</a></td> <td>Backend Service</td> <td>Python</td> @@ -570,6 +578,17 @@ </p> --> + <a id="project-flash-proxy"></a> + <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a + href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + tracker</a>)</h3> + + <p> + Pluggable transport using proxies running in web browsers to defeat + address-based blocking. + </p> + <a id="project-thandy"></a> <h3>Thandy (<a href="https://gitweb.torproject.org/thandy.git">code</a>)</h3>

1 0

[flashproxy/master] Stop ignoring facilitator.log.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 1b149b94fe8705acfd04c1ce5ea6f56535a2a6d9 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 2 17:01:57 2012 -0800 Stop ignoring facilitator.log. --- .gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 3778530..4ee6b0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/facilitator.log *.pyc /dist /pyinstaller-tmp

1 0

[flashproxy/master] Removed line using undefined variable.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 59022683b9c12ab43915318bce50df2f77b0f980 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Nov 15 15:21:24 2012 -0800 Removed line using undefined variable. The previous commit was a modification of another version of the makefile. The modifications introduced some errors, which are now fixed. --- Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c195ece..337602d 100644 --- a/Makefile +++ b/Makefile @@ -50,14 +50,14 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip exe: $(CLIENT_BIN) - rm -Rf $(DISTDIR) + rm -rf $(DISTDIR) mkdir -p $(DISTDIR) for file in $(CLIENT_BIN); \ do \ - python $(PYINSTALLER_PATH) --onedir $$file; \ - cp -Rf dist/$$file/* $(DISTDIR); \ - $$(cygpath -aw $$(which pyinstaller.py)); \ - rm -Rf dist/$$file; \ + python $$(cygpath -aw $$(which pyinstaller.py)) --onedir $$file; \ + cp dist/$$file/* $(DISTDIR); \ + mv $(DISTDIR)/$$file.exe $(DISTDIR)/$$file; \ + rm -rf dist/$$file; \ done mv $(DISTDIR)/M2Crypto.__m2crypto.pyd $(DISTDIR)/__m2crypto.pyd

1 0

[flashproxy/master] Adding desc. of steps for Windows deployment.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 45924cf0f36a1ef073380765ed6c1273a5b345af Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sat Nov 17 13:11:35 2012 -0500 Adding desc. of steps for Windows deployment. Adding windows-deployment-howto.txt, a description of the flashproxy client dependencies and how to bundle them into a standalone executable for Windows deployment. Inspired by the facilitator-howto.txt document. --- doc/windows-deployment-howto.txt | 63 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt new file mode 100644 index 0000000..0d7e71b --- /dev/null +++ b/doc/windows-deployment-howto.txt @@ -0,0 +1,63 @@ +This document describes the setup required to bundle +the client programs with a Python interpreter, for +deployment on Windows machines without Python installed. + +== Overview + +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. + +The makefile has an "exe" target which automates the +budling process once all the required dependencies are +installed. It should be run in Cygwin. + +== 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. + +1. Python + +The official 2.7.3 Windows binary can be found at +http://www.python.org/download/. + +2. 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. + +3. OpenSSL + +There are no official binary distributions of OpenSSL. +The source is available at http://www.openssl.org/source/. +This page provides links to unofficial binary distributions, +http://www.openssl.org/related/binaries.html. + +4. M2Crypto + +There are no official binary distributions of M2Crypto. +The official source along, with several unofficial +binaries, is available at http://chandlerproject.org/Projects/MeTooCrypto. + +== Bundling + +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: + +$ make exe + +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.

1 0

[flashproxy/master] Merge branch 'make_exe' of https://github.com/aallai/flashproxy into make_exe
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 45a9555ebc91eb145363f5b7ce007e56b30bd2ec Merge: 45924cf 5902268 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sat Nov 17 13:16:33 2012 -0500 Merge branch 'make_exe' of https://github.com/aallai/flashproxy into make_exe Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

[flashproxy/master] Added exe target to makefile.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit cd65471ebc555b072d01995fc9591e671f6d4248 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Nov 15 16:42:04 2012 -0500 Added exe target to makefile. Added make exe target that bundles client programs and an interpreter for deployment. It should work on Cygwin. It assumes flashproxy dependencies (OpenSSL, M2Crypto..) and pyinstaller are already installed. --- Makefile | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index a4682cd..c195ece 100644 --- a/Makefile +++ b/Makefile @@ -49,4 +49,16 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip -.PHONY: all install clean test dist sign +exe: $(CLIENT_BIN) + rm -Rf $(DISTDIR) + mkdir -p $(DISTDIR) + for file in $(CLIENT_BIN); \ + do \ + python $(PYINSTALLER_PATH) --onedir $$file; \ + cp -Rf dist/$$file/* $(DISTDIR); \ + $$(cygpath -aw $$(which pyinstaller.py)); \ + rm -Rf dist/$$file; \ + done + mv $(DISTDIR)/M2Crypto.__m2crypto.pyd $(DISTDIR)/__m2crypto.pyd + +.PHONY: all install clean test dist sign exe

1 0

[flashproxy/master] Adding desc. of steps for Windows deployment.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit afe856aceb08e79f1f77d695673031b84daa3093 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sat Nov 17 13:11:35 2012 -0500 Adding desc. of steps for Windows deployment. Adding windows-deployment-howto.txt, a description of the flashproxy client dependencies and how to bundle them into a standalone executable for Windows deployment. Inspired by the facilitator-howto.txt document. --- doc/windows-deployment-howto.txt | 63 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt new file mode 100644 index 0000000..0d7e71b --- /dev/null +++ b/doc/windows-deployment-howto.txt @@ -0,0 +1,63 @@ +This document describes the setup required to bundle +the client programs with a Python interpreter, for +deployment on Windows machines without Python installed. + +== Overview + +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. + +The makefile has an "exe" target which automates the +budling process once all the required dependencies are +installed. It should be run in Cygwin. + +== 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. + +1. Python + +The official 2.7.3 Windows binary can be found at +http://www.python.org/download/. + +2. 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. + +3. OpenSSL + +There are no official binary distributions of OpenSSL. +The source is available at http://www.openssl.org/source/. +This page provides links to unofficial binary distributions, +http://www.openssl.org/related/binaries.html. + +4. M2Crypto + +There are no official binary distributions of M2Crypto. +The official source along, with several unofficial +binaries, is available at http://chandlerproject.org/Projects/MeTooCrypto. + +== Bundling + +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: + +$ make exe + +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.

1 0

[flashproxy/master] Removed line using undefined variable.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 24e943f40226c8b2e84267ab0fe9cc44dd33e25e Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Nov 15 15:21:24 2012 -0800 Removed line using undefined variable. The previous commit was a modification of another version of the makefile. The modifications introduced some errors, which are now fixed. --- Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c195ece..337602d 100644 --- a/Makefile +++ b/Makefile @@ -50,14 +50,14 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip exe: $(CLIENT_BIN) - rm -Rf $(DISTDIR) + rm -rf $(DISTDIR) mkdir -p $(DISTDIR) for file in $(CLIENT_BIN); \ do \ - python $(PYINSTALLER_PATH) --onedir $$file; \ - cp -Rf dist/$$file/* $(DISTDIR); \ - $$(cygpath -aw $$(which pyinstaller.py)); \ - rm -Rf dist/$$file; \ + python $$(cygpath -aw $$(which pyinstaller.py)) --onedir $$file; \ + cp dist/$$file/* $(DISTDIR); \ + mv $(DISTDIR)/$$file.exe $(DISTDIR)/$$file; \ + rm -rf dist/$$file; \ done mv $(DISTDIR)/M2Crypto.__m2crypto.pyd $(DISTDIR)/__m2crypto.pyd

1 0

[flashproxy/master] Fuller documentation on installing Python.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 9fdf4e657d89ad2dcd13f58aa3789a5172c45086 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 24 00:49:32 2012 -0800 Fuller documentation on installing Python. --- doc/windows-deployment-howto.txt | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index 3573aaf..5c0e22c 100644 --- a/doc/windows-deployment-howto.txt +++ b/doc/windows-deployment-howto.txt @@ -24,10 +24,21 @@ be present on the system in order for PyInstaller to bundle them. Bundling also requires a Windows Python installation and PyInstaller. -1. Python +1. Python http://python.org/download/ -The official 2.7.3 Windows binary can be found at -http://www.python.org/download/. +Get the latest 32-bit installer in the 2.x series. +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", +"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. 1.5 pywin32 http://sourceforge.net/projects/pywin32/files/pywin32/

1 0

[flashproxy/master] Document pywin32.
by dcf＠torproject.org 03 Dec '12

03 Dec '12

commit 2c21c0fa3fbf6dcd42b1bda6a9314c3b4b1bca64 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 24 00:17:49 2012 -0800 Document pywin32. --- doc/windows-deployment-howto.txt | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index 0d7e71b..3573aaf 100644 --- a/doc/windows-deployment-howto.txt +++ b/doc/windows-deployment-howto.txt @@ -29,6 +29,16 @@ installation and PyInstaller. The official 2.7.3 Windows binary can be found at http://www.python.org/download/. +1.5 pywin32 http://sourceforge.net/projects/pywin32/files/pywin32/ + +This is a prerequisite for PyInstaller. Enter the directory containing +the latest build number, then download the "win32-py2.7" package. + +The installers don't seem to have signatures. The sha256sum of the +package I downloaded was + +dd665cca88cb059fec960516ed5f29474b33fce50fcb2633d397d4a3aa705c16 *pywin32-218.win32-py2.7.exe + 2. PyInstaller The 2.0 release can be found at http://www.pyinstaller.org.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2012