[or-cvs] r13315: Initial attempt at including Polipo into the bundle (in torbrowser/trunk/build-scripts: . config)
sjm217 at seul.org
sjm217 at seul.org
Sun Jan 27 17:19:59 UTC 2008
Author: sjm217
Date: 2008-01-27 12:19:58 -0500 (Sun, 27 Jan 2008)
New Revision: 13315
Added:
torbrowser/trunk/build-scripts/config/polipo.conf
Modified:
torbrowser/trunk/build-scripts/INSTALL
torbrowser/trunk/build-scripts/Makefile
Log:
Initial attempt at including Polipo into the bundle
Modified: torbrowser/trunk/build-scripts/INSTALL
===================================================================
--- torbrowser/trunk/build-scripts/INSTALL 2008-01-27 16:33:41 UTC (rev 13314)
+++ torbrowser/trunk/build-scripts/INSTALL 2008-01-27 17:19:58 UTC (rev 13315)
@@ -12,6 +12,7 @@
- Building Tor Browser Bundle
- Building Vidalia
+- Building Polipo
- Building OpenSSL, zlib, libevent and Tor
- Building Firefox
@@ -22,16 +23,18 @@
To build Tor Browser Bundle, you need to have built:
Vidalia (in /c/build/vidalia by default)
Tor (in /c/build/tor-<version> by default)
+ Polipo (in /c/build/polipo-<version> by default)
and have uncompressed Firefox Portable
FirefoxPortable (in ./FirefoxPortable/ by default)
-Instructions for building Vidalia and Tor are included below.
+Instructions for building Vidalia, Polipo and Tor are included below.
To compress the bundle and build the self-extracting executable you
need to have installed 7zip.
-Vidalia needs to have the BrowserExecutable functionality. Currently
-this is only available in the Vidalia trunk.
+Vidalia needs to have the BrowserExecutable and ProxyExecutable
+options. Currently this is only available in the Vidalia trunk
+revision 2324 and later.
FirefoxPortable can be downloaded from:
http://portableapps.com/apps/internet/firefox_portable
@@ -39,11 +42,21 @@
7zip is needed to compress the bundle can be downloaded from:
http://www.7-zip.org/download.html
+Python or wget are needed to download required Firefox
+extensions. Python can be downloaded from:
+ http://python.org/download/
+Instructions for downloading, compiling and installing wget for MSYS
+can be found at:
+ http://www.mingw.org/MinGWiki/index.php/mingwPORT
+
+
Customization
-------------
The locations of Qt, MinGW32, the Vidalia/Tor build directory, 7zip,
-FirefoxPortable can be altered in Makefile.
+FirefoxPortable can be altered in Makefile. The WGET variable should
+be either set to the location of a wget binary, or a command line for
+executing pyget.py under the installed Python interpreter.
Building the bundle
-------------------
@@ -61,8 +74,6 @@
Building Vidalia
================
-Full instructions are in the Vidalia INSTALL file.
-
Building under MSYS
-------------------
@@ -90,18 +101,32 @@
Patches
-------
-The patch to add the BrowserExecutable option is in:
- ../src/archived-patches/vidalia-startbrowser.patch
-As of Vidalia revision 2207, this patch is now integrated and so no
-longer needs to be applied manually:
- http://trac.vidalia-project.net/changeset/2207
-
A patch to close the Browser when Vidalia exits is in:
../src/current-patches/vidalia-killbrowser.patch
This is not yet useful, since killing FirefoxPortable does not cause
Firefox to exit. This patch has not yet been applied to Vidalia.
+Further information
+-------------------
+Full instructions are in the Vidalia INSTALL file.
+
+
+Building Polipo
+===============
+
+Overwrite the Makefile that comes with Polipo with:
+ https://tor-svn.freehaven.net/svn/tor/trunk/contrib/polipo/Makefile.mingw
+
+Run "make"
+
+Further information
+-------------------
+
+Full instructions in:
+ https://tor-svn.freehaven.net/svn/tor/trunk/contrib/polipo/README
+
+
Building OpenSSL, zlib, libevent and Tor
========================================
Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile 2008-01-27 16:33:41 UTC (rev 13314)
+++ torbrowser/trunk/build-scripts/Makefile 2008-01-27 17:19:58 UTC (rev 13315)
@@ -7,19 +7,28 @@
### $Id$
###
+## Location of required libraries
MING=/c/MinGW/bin
QT=/c/Qt/4.3.2/bin
+
+## Location of bundle components
VIDALIA=/c/build/vidalia
TOR=/c/build/tor-0.2.0.12-alpha
+POLIPO=/c/build/polipo-1.0.4
+FIREFOX_SRC="FirefoxPortable"
+
+## Location of utility applications
SEVENZIP="/c/Program Files/7-Zip/7z.exe"
-WGET=wget
+WGET="/c/Python25/python.exe /c/build/torbrowser/build-scripts/pyget.py"
-FIREFOX_SRC="FirefoxPortable"
+## Location of config files
CONFIG_SRC=config
+## Destination directories for binaries and documentation
BINARIES=binaries
DOCS=docs
+## Destination for bundle
DEST="Tor Browser"
all:
@@ -34,6 +43,7 @@
cp $(QT)/QtCore4.dll $(QT)/QtGui4.dll \
$(QT)/QtNetwork4.dll $(QT)/QtXml4.dll $(BINARIES)
cp $(VIDALIA)/src/vidalia/vidalia.exe $(BINARIES)
+ cp $(POLIPO)/polipo.exe $(BINARIES)
cp $(TOR)/src/or/tor.exe $(TOR)/src/tools/tor-resolve.exe $(BINARIES)
## Collect up license files
@@ -43,10 +53,12 @@
mkdir -p $(DOCS)/tor
mkdir -p $(DOCS)/qt
mkdir -p $(DOCS)/mingw
+ mkdir -p $(DOCS)/polipo
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
+ cp $(POLIPO)/COPYING $(POLIPO)/README $(DOCS)/polipo
TORBUTTON=torbutton-1.1.12-alpha.xpi
$(TORBUTTON):
@@ -67,6 +79,7 @@
mkdir -p $(DEST)/App
mkdir -p $(DEST)/Data/Tor
mkdir -p $(DEST)/Data/Vidalia
+ mkdir -p $(DEST)/Data/Polipo
mkdir -p $(DEST)/Docs
## Copy over Firefox Portable
cp -R $(FIREFOX_SRC) $(DEST)/FirefoxPortable
@@ -78,9 +91,11 @@
cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable
## Configure Vidalia
cp $(CONFIG_SRC)/vidalia.conf $(DEST)/Data/Vidalia
+ ## Configure Polipo
+ cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo/polipo.conf
## Configure Tor
cp $(CONFIG_SRC)/torrc $(DEST)/Data/Tor
- ## Copy over Vidalia and Tor
+ ## Copy over Vidalia, Tor and Polipo
cp -R $(BINARIES)/* $(DEST)/App
## Copy over documentation
cp -R $(DOCS)/* $(DEST)/Docs
Added: torbrowser/trunk/build-scripts/config/polipo.conf
===================================================================
--- torbrowser/trunk/build-scripts/config/polipo.conf (rev 0)
+++ torbrowser/trunk/build-scripts/config/polipo.conf 2008-01-27 17:19:58 UTC (rev 13315)
@@ -0,0 +1,152 @@
+# Sample configuration file for Polipo. -*-sh-*-
+
+# You should not need to use a configuration file; all configuration
+# variables have reasonable defaults. If you want to use one, you
+# can copy this to /etc/polipo/config or to ~/.polipo and modify.
+
+# This file only contains some of the configuration variables; see the
+# list given by ``polipo -v'' and the manual for more.
+
+
+### Basic configuration
+### *******************
+
+# Uncomment one of these if you want to allow remote clients to
+# connect:
+
+# proxyAddress = "::0" # both IPv4 and IPv6
+# proxyAddress = "0.0.0.0" # IPv4 only
+
+# If you do that, you'll want to restrict the set of hosts allowed to
+# connect:
+
+# allowedClients = "127.0.0.1, 134.157.168.57"
+# allowedClients = "127.0.0.1, 134.157.168.0/24"
+
+# Uncomment this if you want your Polipo to identify itself by
+# something else than the host name:
+
+# proxyName = "polipo.example.org"
+
+# Uncomment this if there's only one user using this instance of Polipo:
+
+# cacheIsShared = false
+
+# Uncomment this if you want to use a parent proxy:
+
+# parentProxy = "squid.example.org:3128"
+
+# Uncomment this if you want to use a parent SOCKS proxy:
+
+# socksParentProxy = "localhost:9050"
+# socksProxyType = socks5
+
+
+### Memory
+### ******
+
+# Uncomment this if you want Polipo to use a ridiculously small amount
+# of memory (a hundred C-64 worth or so):
+
+# chunkHighMark = 819200
+# objectHighMark = 128
+
+# Uncomment this if you've got plenty of memory:
+
+# chunkHighMark = 50331648
+# objectHighMark = 16384
+
+
+### On-disk data
+### ************
+
+# Uncomment this if you want to disable the on-disk cache:
+
+# diskCacheRoot = ""
+
+# Uncomment this if you want to put the on-disk cache in a
+# non-standard location:
+
+# diskCacheRoot = "~/.polipo-cache/"
+
+# Uncomment this if you want to disable the local web server:
+
+# localDocumentRoot = ""
+
+# Uncomment this if you want to enable the pages under /polipo/index?
+# and /polipo/servers?. This is a serious privacy leak if your proxy
+# is shared.
+
+# disableIndexing = false
+# disableServersList = false
+
+
+### Domain Name System
+### ******************
+
+# Uncomment this if you want to contact IPv4 hosts only (and make DNS
+# queries somewhat faster):
+
+# dnsQueryIPv6 = no
+
+# Uncomment this if you want Polipo to prefer IPv4 to IPv6 for
+# double-stack hosts:
+
+# dnsQueryIPv6 = reluctantly
+
+# Uncomment this to disable Polipo's DNS resolver and use the system's
+# default resolver instead. If you do that, Polipo will freeze during
+# every DNS query:
+
+# dnsUseGethostbyname = yes
+
+
+### HTTP
+### ****
+
+# Uncomment this if you want to enable detection of proxy loops.
+# This will cause your hostname (or whatever you put into proxyName
+# above) to be included in every request:
+
+# disableVia=false
+
+# Uncomment this if you want to slightly reduce the amount of
+# information that you leak about yourself:
+
+# censoredHeaders = from, accept-language
+# censorReferer = maybe
+
+# Uncomment this if you're paranoid. This will break a lot of sites,
+# though:
+
+# censoredHeaders = set-cookie, cookie, cookie2, from, accept-language
+# censorReferer = true
+
+# Uncomment this if you want to use Poor Man's Multiplexing; increase
+# the sizes if you're on a fast line. They should each amount to a few
+# seconds' worth of transfer; if pmmSize is small, you'll want
+# pmmFirstSize to be larger.
+
+# Note that PMM is somewhat unreliable.
+
+# pmmFirstSize = 16384
+# pmmSize = 8192
+
+# Uncomment this if your user-agent does something reasonable with
+# Warning headers (most don't):
+
+# relaxTransparency = maybe
+
+# Uncomment this if you never want to revalidate instances for which
+# data is available (this is not a good idea):
+
+# relaxTransparency = yes
+
+# Uncomment this if you have no network:
+
+# proxyOffline = yes
+
+# Uncomment this if you want to avoid revalidating instances with a
+# Vary header (this is not a good idea):
+
+# mindlesslyCacheVary = true
More information about the tor-commits
mailing list