[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1341: Move the contents of pkg/osx/bundle/ up a directory, like I (in trunk/pkg: . osx win32)
Author: edmanm
Date: 2006-10-14 15:28:05 -0400 (Sat, 14 Oct 2006)
New Revision: 1341
Added:
trunk/pkg/osx/PrivoxyConfDesc.plist
trunk/pkg/osx/PrivoxyConfInfo.plist
trunk/pkg/osx/PrivoxyConfPostFlight
trunk/pkg/osx/TorPostFlight
trunk/pkg/osx/VidaliaBundleDesc.plist.in
trunk/pkg/osx/VidaliaBundleInfo.plist.in
trunk/pkg/osx/VidaliaBundleWelcome.rtf
trunk/pkg/osx/VidaliaDesc.plist.in
trunk/pkg/osx/VidaliaInfo.plist.in
trunk/pkg/osx/build-bundle.txt
trunk/pkg/osx/buildmpkg.sh.in
trunk/pkg/osx/privoxy.config
Removed:
trunk/pkg/osx/bundle/
Modified:
trunk/pkg/package.sh
trunk/pkg/win32/vidalia_en.nsh
Log:
Move the contents of pkg/osx/bundle/ up a directory, like I did with
pkg/win32/bundle/. I like symmetry and consistency.
Copied: trunk/pkg/osx/PrivoxyConfDesc.plist (from rev 1337, trunk/pkg/osx/bundle/PrivoxyConfDesc.plist)
===================================================================
--- trunk/pkg/osx/PrivoxyConfDesc.plist (rev 0)
+++ trunk/pkg/osx/PrivoxyConfDesc.plist 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>IFPkgDescriptionTitle</key>
+ <string>Privoxy configuration for Tor</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>0.1</string>
+</dict>
+</plist>
Copied: trunk/pkg/osx/PrivoxyConfInfo.plist (from rev 1337, trunk/pkg/osx/bundle/PrivoxyConfInfo.plist)
===================================================================
--- trunk/pkg/osx/PrivoxyConfInfo.plist (rev 0)
+++ trunk/pkg/osx/PrivoxyConfInfo.plist 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>CFBundleIdentifier</key>
+ <string>Privoxy configuration for Tor</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Privoxy configuration for Tor</string>
+ <key>CFBundleName</key>
+ <string>Privoxy configuration for Tor</string>
+ <key>CFBundleSortVersionString</key>
+ <string>0.1</string>
+ <key>IFPkgFlagAuthorizationAction</key>
+ <string>RootAuthorization</string>
+ <key>IFPkgFlagRestartAction</key>
+ <string>RecommendedRestart</string>
+ <key>IFPkgFlagFollowLinks</key>
+ <true/>
+ <key>IFPkgFlagIsRequired</key>
+ <false/>
+</dict>
+</plist>
Copied: trunk/pkg/osx/PrivoxyConfPostFlight (from rev 1337, trunk/pkg/osx/bundle/PrivoxyConfPostFlight)
===================================================================
--- trunk/pkg/osx/PrivoxyConfPostFlight (rev 0)
+++ trunk/pkg/osx/PrivoxyConfPostFlight 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# PrivoxyConfPostFlight gets invoked after any install or upgrade.
+
+TARGET=$2/Library/Privoxy
+LOG='Privoxy-postflight-log.txt'
+
+# If Privoxy was running, kill it before starting a new one
+PID=`ps -ax | grep privoxy | grep -v grep | awk '{ print $1 }'`
+if [ x$PID != x ]
+then
+ sudo kill $PID 2>&1 > $TARGET/$LOG
+fi
+
+# Start Privoxy, so it's using the new config
+$TARGET/StartPrivoxy.command 2>&1 > $TARGET/$LOG
+
Copied: trunk/pkg/osx/TorPostFlight (from rev 1337, trunk/pkg/osx/bundle/TorPostFlight)
===================================================================
--- trunk/pkg/osx/TorPostFlight (rev 0)
+++ trunk/pkg/osx/TorPostFlight 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# TorPostflight gets invoked after any install or upgrade.
+
+TARGET=$2/Library/Tor
+TORDIR=$TARGET/var/lib/tor
+LOGDIR=$TARGET/var/log/tor
+
+# Create the tor directory, if it doesn't exist.
+if [ ! -d $TORDIR ]; then
+ mkdir -p $TORDIR
+fi
+if [ ! -d $LOGDIR ]; then
+ mkdir -p $LOGDIR
+fi
+# Check its permissions.
+chmod 770 $TORDIR
+chmod 770 $LOGDIR
+
+# Create the configuration file only if there wan't one already.
+if [ ! -f $TARGET/torrc ]; then
+ cp $TARGET/torrc.sample $TARGET/torrc
+ chmod 660 $TARGET/torrc
+fi
+
+# Ensure symbolic links
+cd /usr/bin
+if [ -e /usr/bin/tor -a ! -L /usr/bin/tor ]; then
+ mv tor tor_old
+fi
+if [ -e /usr/bin/tor-resolve -a ! -L /usr/bin/tor-resolve ]; then
+ mv tor-resolve tor-resolve_old
+fi
+ln -sf $TARGET/tor .
+ln -sf $TARGET/tor-resolve .
+
+cd /usr/share/man/man1
+MAN1=$TARGET/man/man1
+ln -sf $MAN1/*.1 .
+
+if [ ! -e /var/log/tor -o -L /var/log/tor ]; then
+ cd /var/log
+ rm -f tor
+ ln -sf $LOGDIR tor
+fi
+
+if [ -d /Library/StartupItems/Privoxy ]; then
+ find /Library/StartupItems/Privoxy -print0 | xargs -0 chown root:wheel
+fi
+
+# Copy Documentation
+if [ -d $PACKAGE_PATH/Contents/Resources/documents ];then
+ cp -r $PACKAGE_PATH/Contents/Resources/documents $TARGET/documents
+fi
+
Copied: trunk/pkg/osx/VidaliaBundleDesc.plist.in (from rev 1337, trunk/pkg/osx/bundle/VidaliaBundleDesc.plist.in)
===================================================================
--- trunk/pkg/osx/VidaliaBundleDesc.plist.in (rev 0)
+++ trunk/pkg/osx/VidaliaBundleDesc.plist.in 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>IFPkgDescriptionDeleteWarning</key>
+ <string></string>
+ <key>IFPkgDescriptionDescription</key>
+ <string>Bundled package of Vidalia, Tor, and Privoxy.</string>
+ <key>IFPkgDescriptionTitle</key>
+ <string>Vidalia - Tor - Privoxy Bundle</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>@VERSION@</string>
+</dict>
+</plist>
Copied: trunk/pkg/osx/VidaliaBundleInfo.plist.in (from rev 1337, trunk/pkg/osx/bundle/VidaliaBundleInfo.plist.in)
===================================================================
--- trunk/pkg/osx/VidaliaBundleInfo.plist.in (rev 0)
+++ trunk/pkg/osx/VidaliaBundleInfo.plist.in 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>CFBundleName</key>
+ <string>Vidalia Bundle</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Vidalia Bundle @VERSION@</string>
+ <key>CFBundleIdentifier</key>
+ <string>net.vidalia-project.vidaliabundle</string>
+ <key>CFBundleSortVersionString</key>
+ <string>@VERSION@</string>
+ <key>IFPkgFlagComponentDirectory</key>
+ <string>../.contained_packages</string>
+ <key>IFPkgFlagPackageList</key>
+ <array>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>Vidalia.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>required</string>
+ </dict>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>Tor.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>required</string>
+ </dict>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>Privoxy.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>selected</string>
+ </dict>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>PrivoxyConf.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>selected</string>
+ </dict>
+ </array>
+ <key>IFPkgFormatVersion</key>
+ <real>0.10000000149011612</real>
+</dict>
+</plist>
Copied: trunk/pkg/osx/VidaliaBundleWelcome.rtf (from rev 1337, trunk/pkg/osx/bundle/VidaliaBundleWelcome.rtf)
===================================================================
--- trunk/pkg/osx/VidaliaBundleWelcome.rtf (rev 0)
+++ trunk/pkg/osx/VidaliaBundleWelcome.rtf 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,49 @@
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410
+{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+\f3\fswiss\fcharset77 Helvetica-BoldOblique;}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10200\viewh10740\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\b\fs28 \cf0 Welcome to the Vidalia Bundle Installer!
+\f1\b0\fs24 \
+\
+This will install Vidalia, Tor, and Privoxy on your computer,\
+pre-configured to work seamlessly together.\
+\
+
+\f0\b Vidalia
+\f1\b0 is a GUI for Tor, allowing you to control, monitor,\
+and configure your Tor installation.\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f2\i \cf0 (http://www.vidalia-project.net/
+\f1\i0 ) \
+\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\b \cf0 Tor
+\f1\b0 is a system for using the Internet anonymously,\
+helping you anonymize Web browsing and publishing, \
+instant messaging, IRC, SSH, and more.\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f2\i \cf0 (http://tor.eff.org/)
+\f1\i0 \
+\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\b \cf0 Privoxy
+\f1\b0 is a filtering web proxy that integrates well with\
+Tor, protecting your privacy as well as removing ads,\
+banners, and popups.\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f2\i \cf0 (http://www.privoxy.org/
+\f1\i0 )\
+\
+
+\f3\i\b Note
+\f2\b0 :
+\f1\i0 If you have previously installed an old Tor/Privoxy-only \
+bundle, we recommend that you remove it before continuing.}
\ No newline at end of file
Copied: trunk/pkg/osx/VidaliaDesc.plist.in (from rev 1337, trunk/pkg/osx/bundle/VidaliaDesc.plist.in)
===================================================================
--- trunk/pkg/osx/VidaliaDesc.plist.in (rev 0)
+++ trunk/pkg/osx/VidaliaDesc.plist.in 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>IFPkgDescriptionTitle</key>
+ <string>Vidalia</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>@VERSION@</string>
+</dict>
+</plist>
Copied: trunk/pkg/osx/VidaliaInfo.plist.in (from rev 1337, trunk/pkg/osx/bundle/VidaliaInfo.plist.in)
===================================================================
--- trunk/pkg/osx/VidaliaInfo.plist.in (rev 0)
+++ trunk/pkg/osx/VidaliaInfo.plist.in 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>CFBundleIdentifier</key>
+ <string>Vidalia @VERSION@</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Vidalia @VERSION@</string>
+ <key>CFBundleName</key>
+ <string>Vidalia</string>
+ <key>CFBundleSortVersionString</key>
+ <string>@VERSION@</string>
+ <key>IFPkgFlagAllowBackRev</key>
+ <true/>
+ <key>IFPkgFlagFollowLinks</key>
+ <true/>
+ <key>IFPkgFlagIsRequired</key>
+ <true/>
+ <key>IFPkgFlagRootVolumeOnly</key>
+ <true/>
+ <key>IfPkgFlagBackgroundScaling</key>
+ <string>proportional</string>
+ <key>IFPkgFlagBackgroundAlignment</key>
+ <string>bottomleft</string>
+</dict>
+</plist>
Copied: trunk/pkg/osx/build-bundle.txt (from rev 1337, trunk/pkg/osx/bundle/build-bundle.txt)
===================================================================
--- trunk/pkg/osx/build-bundle.txt (rev 0)
+++ trunk/pkg/osx/build-bundle.txt 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,81 @@
+ Building the Vidalia/Tor/Privoxy OS X Bundle
+
+Libevent
+1. Download and extract the latest libevent source from
+ http://www.monkey.org/~provos/libevent/
+
+2. Configure libevent with the following:
+ ./configure --enable-static --disable-shared
+
+3. Build and install libevent as follows:
+ make && make install
+
+ You will need to be root to `make install`
+
+ NOTE: If you have previously installed a Libevent that was not configured with
+ the options above, you must remove those before building Tor, otherwise Tor
+ will link to the wrong Libevent.
+
+
+Qt
+4. Download and extract the open source version of Qt 4.1 or higher from
+ Trolltech at the following address:
+ http://www.trolltech.com/developer/downloads/qt/mac
+
+5. Configure Qt with the following:
+ ./configure -static -release -qt-libjpeg
+
+6. Build and install Qt as follows:
+ make && make install
+
+
+Privoxy
+7. Download the OS X Privoxy package from
+ http://prdownloads.sourceforge.net/ijbswa/privoxyosx_setup_3.0.3.zip?download
+
+ Note the location in which you save this .zip file, because you will need
+ to specify it in Step 8.
+
+
+Tor
+8. Download and extract the latest Tor source from
+ http://tor.eff.org
+
+ Note the location in which you extract Tor's source, because you will need
+ to specify it in Step 8.
+
+9. Configure Tor with the following:
+ ./configure --prefix=/Library/Tor --bindir=/Library/Tor \
+ --sysconfdir=/Library --enable-static --disable-shared
+
+
+Vidalia
+10. Configure Vidalia with the following:
+ ./configure --disable-debug
+
+ The Vidalia binary on OS X links to Qt statically, so you will need to have
+ your Qt installation configured appropriately.
+
+11. Run `make` to build Vidalia.
+
+
+Finish
+12. From Vidalia's pkg/ directory in Vidalia's source, run the following:
+ ./package.sh osx-bundle <path-to-tor> <privoxy-package.zip>
+
+ Example:
+ ./package.sh osx-bundle ~/tor-0.1.1.19-rc ~/privoxyosx_setup_3.0.3.zip
+
+ The script that builds the .mpkg (pkg/osx/bundle/buildmpkg.sh) gets Tor's
+ version number from the directory name, so it should be named appropriately,
+ as in the example above.
+
+The resulting .dmg containg the .mpkg and necessary licenses will be placed in
+the 'pkg' directory under Vidalia's source.
+
+NOTE: Steps 1-6 only need to be done once initially, unless you need to change the
+packaged version of Libevent or Qt. Step 7 also only needs to be done once,
+unless Privoxy ever gets updated. Steps 8-9 need to be repeated when the
+bundled version of Tor changes. Steps 10-11 need to be repeated when the
+bundled version of Vidalia changes.
+
Copied: trunk/pkg/osx/buildmpkg.sh.in (from rev 1337, trunk/pkg/osx/bundle/buildmpkg.sh.in)
===================================================================
--- trunk/pkg/osx/buildmpkg.sh.in (rev 0)
+++ trunk/pkg/osx/buildmpkg.sh.in 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,257 @@
+#!/bin/sh
+# $Id: Vidalia.pro 834 2006-05-14 00:12:18Z edmanm $
+#
+# Vidalia is distributed under the following license:
+#
+# Copyright (C) 2006, Matt Edman, Justin Hipple
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# * * * * * *
+#
+# This file is derived from contrib/osx/package.sh from Tor
+# (http://tor.eff.org), licensed as follows:
+#
+# Copyright (c) 2001-2004, Roger Dingledine
+# Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#
+# * Neither the names of the copyright owners nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#########################################################################
+
+
+# This script builds a Macintosh OS X metapackage containing 4 packages:
+# - One for Vidalia.
+# - One for Tor.
+# - One for Privoxy.
+# - One for a Tor-specific Privoxy configuration script.
+#
+
+if [ $# -ne 2 ]
+then
+ echo "usage: package.sh <path-to-tor> <path-to-privoxy.zip>"
+ exit 1
+fi
+
+# Determine OSX Version and map version to name
+if [ -x /usr/bin/sw_vers ]
+then
+ # This is poor, yet functional. We don't care about the 3rd number in
+ # the OS version
+ OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
+ case "$OSVER" in
+ "10.5") OS="leopard";;
+ "10.4") OS="tiger";;
+ "10.3") OS="panther";;
+ "10.2") OS="jaguar";;
+ "10.1") OS="puma";;
+ "10.0") OS="cheetah";;
+ *) OS="unknown";;
+ esac
+else
+ OS="unknown"
+fi
+
+# Get the location of Vidalia
+VID_DIR="../../"
+# Get the location of Tor
+TOR_DIR="$1"
+# Get the location of the Privoxy package zip file
+PRIVOXY_PKG="$2"
+# Vidalia's version string
+VIDALIAVERSION="@VERSION@"
+# Tor's version string
+TORVERSION=`echo "$TOR_DIR" | sed -e "s/.*\///" | sed -e "s/tor-//"`
+# Name of the output bundle
+BUNDLE="vidalia-bundle-$TORVERSION-$VIDALIAVERSION-$OS"
+# Set the location of the temporary files
+BUILD_DIR=/tmp/vidalia-osx-$$
+# Set the location of the .mpkg
+MPKG_DIR="$BUILD_DIR/output"
+# Set the location where sub-packages will be placed
+PKG_DIR="$MPKG_DIR/.contained_packages"
+# Set the location of the resulting .dmg file
+OUT_DIR="$VID_DIR/pkg"
+# Path to PackageMaker
+PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
+
+
+umask 022
+echo I might ask you for your password now, so you can sudo.
+sudo rm -rf $BUILD_DIR
+mkdir $BUILD_DIR || exit 1
+for subdir in tor_packageroot \
+ tor_resources \
+ privoxyconf_packageroot \
+ privoxyconf_resources \
+ vidalia_packageroot \
+ vidaliabundle_resources \
+ output; do
+ mkdir $BUILD_DIR/$subdir
+done
+mkdir $PKG_DIR
+
+##
+# Assemble the Vidalia package
+##
+echo "** Building Vidalia.pkg **"
+mkdir -p $BUILD_DIR/vidalia_packageroot/Applications/Vidalia.app
+mkdir -p $BUILD_DIR/vidalia_packageroot/Library/Vidalia
+cp -r $VID_DIR/Vidalia.app $BUILD_DIR/vidalia_packageroot/Applications/
+cp $VID_DIR/AUTHORS $VID_DIR/CHANGELOG $VID_DIR/README $BUILD_DIR/vidalia_packageroot/Library/Vidalia
+
+find $BUILD_DIR/vidalia_packageroot \( -type d -or -perm +111 \) -print0 | sudo xargs -0 chmod 775
+find $BUILD_DIR/vidalia_packageroot -type f \! \( -perm +111 \) -print0 | sudo xargs -0 chmod 664
+find $BUILD_DIR/vidalia_packageroot -print0 | sudo xargs -0 chown root:admin
+
+$PACKAGEMAKER -build \
+ -p $PKG_DIR/Vidalia.pkg \
+ -f $BUILD_DIR/vidalia_packageroot \
+ -i VidaliaInfo.plist \
+ -d VidaliaDesc.plist
+
+##
+# Assemble the Tor package
+##
+echo "** Building Tor.pkg **"
+pushd $TOR_DIR
+make install DESTDIR=$BUILD_DIR/tor_packageroot
+popd
+chmod 755 TorPostFlight
+cp TorPostflight $BUILD_DIR/tor_resources/postflight
+
+# Tor's documentation
+DOC=$BUILD_DIR/tor_resources/documents
+mkdir $DOC
+mkdir $DOC/howto
+cp $TOR_DIR/doc/website/stylesheet.css $TOR_DIR/doc/website/tor-doc-osx.html.* $DOC/howto
+cp $TOR_DIR/doc/website/tor-doc-server.html.* $DOC/howto
+cp $TOR_DIR/doc/website/tor-hidden-service.html.* $DOC/howto
+cp $TOR_DIR/doc/website/tor-switchproxy.html.* $DOC/howto
+cp $TOR_DIR/AUTHORS $DOC/AUTHORS.txt
+groff $TOR_DIR/doc/tor.1.in -T ps -m man | pstopdf -i -o $DOC/tor-reference.pdf
+groff $TOR_DIR/doc/tor-resolve.1 -T ps -m man | pstopdf -i -o $DOC/tor-resolve.pdf
+mkdir $DOC/Advanced
+cp $TOR_DIR/doc/tor-spec.txt \
+ $TOR_DIR/doc/rend-spec.txt \
+ $TOR_DIR/doc/control-spec.txt \
+ $TOR_DIR/doc/socks-extensions.txt \
+ $TOR_DIR/doc/version-spec.txt \
+ $DOC/Advanced
+cp $TOR_DIR/doc/HACKING $DOC/Advanced/HACKING.txt
+cp $TOR_DIR/ChangeLog $DOC/Advanced/ChangeLog.txt
+
+find $BUILD_DIR/tor_packageroot \( -type d -or -perm +111 \) -print0 | sudo xargs -0 chmod 775
+find $BUILD_DIR/tor_packageroot -type f \! \( -perm +111 \) -print0 | sudo xargs -0 chmod 664
+find $BUILD_DIR/tor_packageroot -print0 | sudo xargs -0 chown root:admin
+
+$PACKAGEMAKER -build \
+ -p $PKG_DIR/Tor.pkg \
+ -f $BUILD_DIR/tor_packageroot \
+ -r $BUILD_DIR/tor_resources \
+ -i $TOR_DIR/contrib/osx/TorInfo.plist \
+ -d $TOR_DIR/contrib/osx/TorDesc.plist
+
+
+##
+# Unzip the Privoxy.pkg and move it into place
+##
+echo "** Extracting Privoxy.pkg **"
+unzip $PRIVOXY_PKG -d $PKG_DIR/
+find $PKG_DIR/Privoxy.pkg -type d -print0 | xargs -0 chmod u+w
+
+
+##
+# Build the Privoxy configuration package
+##
+echo "** Building PrivoxyConf.pkg **"
+mkdir -p $BUILD_DIR/privoxyconf_packageroot/Library/Privoxy
+cp privoxy.config $BUILD_DIR/privoxyconf_packageroot/Library/Privoxy/config
+chmod 755 PrivoxyConfPostFlight
+cp PrivoxyConfPostFlight $BUILD_DIR/privoxyconf_resources/postflight
+
+find $BUILD_DIR/privoxyconf_packageroot -print0 | sudo xargs -0 chown root:wheel
+
+$PACKAGEMAKER -build \
+ -p $PKG_DIR/PrivoxyConf.pkg \
+ -f $BUILD_DIR/privoxyconf_packageroot \
+ -r $BUILD_DIR/privoxyconf_resources \
+ -i PrivoxyConfInfo.plist \
+ -d PrivoxyConfDesc.plist
+
+
+##
+# Build the metapackage
+##
+echo "** Building the bundle metapackage **"
+MPKG=$MPKG_DIR/$BUNDLE.mpkg
+mkdir -p "$MPKG/Contents/Resources"
+echo -n "pmkrpkg1" > "$MPKG/Contents/PkgInfo"
+cp VidaliaBundleWelcome.rtf "$MPKG/Contents/Resources/Welcome.rtf"
+cp VidaliaBundleInfo.plist "$MPKG/Contents/Info.plist"
+cp VidaliaBundleDesc.plist "$MPKG/Contents/Resources/Description.plist"
+
+### Copy readmes and licenses into toplevel.
+PRIVOXY_RESDIR=$PKG_DIR/Privoxy.pkg/Contents/Resources
+cp $PRIVOXY_RESDIR/License.html $MPKG_DIR/Privoxy\ License.html
+cp $PRIVOXY_RESDIR/ReadMe.txt $MPKG_DIR/Privoxy\ ReadMe.txt
+cp $TOR_DIR/LICENSE $MPKG_DIR/Tor\ License.txt
+cp $VID_DIR/LICENSE $MPKG_DIR/Vidalia\ License.txt
+cp $VID_DIR/COPYING $MPKG_DIR/GNU\ GPL.txt
+
+
+##
+# Put the metapackage into a dmg
+##
+echo "** Building $BUNDLE.dmg **"
+find $MPKG_DIR -print0 | sudo xargs -0 chown root:wheel
+mv $MPKG_DIR "$BUILD_DIR/$BUNDLE"
+rm -f "$BUNDLE.dmg"
+USER="`whoami`"
+sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/$BUNDLE" "$OUT_DIR/$BUNDLE.dmg"
+sudo chown "$USER" "$OUT_DIR/$BUNDLE.dmg"
+
+
+##
+# Clean up and finish
+##
+sudo rm -rf $BUILD_DIR
+
Copied: trunk/pkg/osx/privoxy.config (from rev 1337, trunk/pkg/osx/bundle/privoxy.config)
===================================================================
--- trunk/pkg/osx/privoxy.config (rev 0)
+++ trunk/pkg/osx/privoxy.config 2006-10-14 19:28:05 UTC (rev 1341)
@@ -0,0 +1,1073 @@
+# Sample Configuration File for Privoxy v3.0.x
+#
+# Copyright (C) 2001-2004 Privoxy Developers http://privoxy.org
+#
+# $Id: privoxy.config,v 1.4 2005/09/24 20:49:45 phobos Exp $
+#
+####################################################################
+# #
+# Table of Contents #
+# #
+# I. INTRODUCTION #
+# II. FORMAT OF THE CONFIGURATION FILE #
+# #
+# 1. CONFIGURATION AND LOG FILE LOCATIONS #
+# 2. LOCAL SET-UP DOCUMENTATION #
+# 3. DEBUGGING #
+# 4. ACCESS CONTROL AND SECURITY #
+# 5. FORWARDING #
+# 6. WINDOWS GUI OPTIONS #
+# #
+####################################################################
+#
+#
+# I. INTRODUCTION
+# ===============
+#
+# This file holds the Privoxy configuration. If you modify this file,
+# you will need to send a couple of requests to the proxy before any
+# changes take effect.
+#
+# When starting Privoxy on Unix systems, give the name of this file as
+# an argument. On Windows systems, Privoxy will look for this file
+# with the name 'config.txt' in the same directory where Privoxy
+# is installed.
+#
+#
+# II. FORMAT OF THE CONFIGURATION FILE
+# ====================================
+#
+# Configuration lines consist of an initial keyword followed by a
+# list of values, all separated by whitespace (any number of spaces
+# or tabs). For example,
+#
+# actionsfile default.action
+#
+# Indicates that the actionsfile is named 'default.action'.
+#
+# The '#' indicates a comment. Any part of a line following a '#'
+# is ignored, except if the '#' is preceded by a '\'.
+#
+# Thus, by placing a # at the start of an existing configuration line,
+# you can make it a comment and it will be treated as if it weren't
+# there. This is called "commenting out" an option and can be useful.
+#
+# Note that commenting out and option and leaving it at its default
+# are two completely different things! Most options behave very
+# differently when unset. See the the "Effect if unset" explanation
+# in each option's description for details.
+#
+# Long lines can be continued on the next line by using a `\' as the
+# last character.
+#
+
+#
+# 1. CONFIGURATION AND LOG FILE LOCATIONS
+# =======================================
+#
+# Privoxy can (and normally does) use a number of other files for
+# additional configuration, help and logging. This section of the
+# configuration file tells Privoxy where to find those other files.
+#
+# The user running Privoxy, must have read permission for all
+# configuration files, and write permission to any files that would
+# be modified, such as log files and actions files.
+#
+
+#
+# 1.1. confdir
+# ============
+#
+# Specifies:
+#
+# The directory where the other configuration files are located
+#
+# Type of value:
+#
+# Path name
+#
+# Default value:
+#
+# /etc/privoxy (Unix) or Privoxy installation dir (Windows)
+#
+# Effect if unset:
+#
+# Mandatory
+#
+# Notes:
+#
+# No trailing "/", please
+#
+# When development goes modular and multi-user, the blocker,
+# filter, and per-user config will be stored in subdirectories of
+# "confdir". For now, the configuration directory structure is
+# flat, except for confdir/templates, where the HTML templates
+# for CGI output reside (e.g. Privoxy's 404 error page).
+#
+confdir .
+
+#
+# 1.2. logdir
+# ===========
+#
+# Specifies:
+#
+# The directory where all logging takes place (i.e. where logfile
+# and jarfile are located)
+#
+# Type of value:
+#
+# Path name
+#
+# Default value:
+#
+# /var/log/privoxy (Unix) or Privoxy installation dir (Windows)
+#
+# Effect if unset:
+#
+# Mandatory
+#
+# Notes:
+#
+# No trailing "/", please
+#
+logdir .
+
+#
+# 1.3. actionsfile
+# ================
+#
+# Specifies:
+#
+# The actions file(s) to use
+#
+# Type of value:
+#
+# File name, relative to confdir, without the .action suffix
+#
+# Default values:
+#
+# standard # Internal purposes, no editing recommended
+#
+# default # Main actions file
+#
+# user # User customizations
+#
+# Effect if unset:
+#
+# No actions are taken at all. Simple neutral proxying.
+#
+# Notes:
+#
+# Multiple actionsfile lines are permitted, and are in fact
+# recommended!
+#
+# The default values include standard.action, which is used
+# for internal purposes and should be loaded, default.action,
+# which is the "main" actions file maintained by the developers,
+# and user.action, where you can make your personal additions.
+#
+# Actions files are where all the per site and per URL
+# configuration is done for ad blocking, cookie management,
+# privacy considerations, etc. There is no point in using Privoxy
+# without at least one actions file.
+#
+actionsfile standard # Internal purpose, recommended
+actionsfile default # Main actions file
+actionsfile user # User customizations
+
+#
+# 1.4. filterfile
+# ===============
+#
+# Specifies:
+#
+# The filter file to use
+#
+# Type of value:
+#
+# File name, relative to confdir
+#
+# Default value:
+#
+# default.filter (Unix) or default.filter.txt (Windows)
+#
+# Effect if unset:
+#
+# No textual content filtering takes place, i.e. all +filter{name}
+# actions in the actions files are turned neutral.
+#
+# Notes:
+#
+# The filter file contains content modification rules that use
+# regular expressions. These rules permit powerful changes on the
+# content of Web pages, e.g., you could disable your favorite
+# JavaScript annoyances, re-write the actual displayed text,
+# or just have some fun replacing "Microsoft" with "MicroSuck"
+# wherever it appears on a Web page.
+#
+# The +filter{name} actions rely on the relevant filter (name)
+# to be defined in the filter file!
+#
+# A pre-defined filter file called default.filter that contains
+# a bunch of handy filters for common problems is included in the
+# distribution. See the section on the filter action for a list.
+#
+filterfile default.filter
+
+#
+# 1.5. logfile
+# ============
+#
+# Specifies:
+#
+# The log file to use
+#
+# Type of value:
+#
+# File name, relative to logdir
+#
+# Default value:
+#
+# logfile (Unix) or privoxy.log (Windows)
+#
+# Effect if unset:
+#
+# No log file is used, all log messages go to the console (STDERR).
+#
+# Notes:
+#
+# The windows version will additionally log to the console.
+#
+# The logfile is where all logging and error messages are
+# written. The level of detail and number of messages are set with
+# the debug option (see below). The logfile can be useful for
+# tracking down a problem with Privoxy (e.g., it's not blocking
+# an ad you think it should block) but in most cases you probably
+# will never look at it.
+#
+# Your logfile will grow indefinitely, and you will probably
+# want to periodically remove it. On Unix systems, you can do
+# this with a cron job (see "man cron"). For Red Hat, a logrotate
+# script has been included.
+#
+# On SuSE Linux systems, you can place a line like
+# "/var/log/privoxy.* +1024k 644 nobody.nogroup" in /etc/logfiles,
+# with the effect that cron.daily will automatically archive,
+# gzip, and empty the log, when it exceeds 1M size.
+#
+# Any log files must be writable by whatever user Privoxy is
+# being run as (default on UNIX, user id is "privoxy").
+#
+#logfile logfile
+
+#
+# 1.6. jarfile
+# ============
+#
+# Specifies:
+#
+# The file to store intercepted cookies in
+#
+# Type of value:
+#
+# File name, relative to logdir
+#
+# Default value:
+#
+# jarfile (Unix) or privoxy.jar (Windows)
+#
+# Effect if unset:
+#
+# Intercepted cookies are not stored at all.
+#
+# Notes:
+#
+# The jarfile may grow to ridiculous sizes over time.
+#
+#jarfile jarfile
+
+#
+# 1.7. trustfile
+# ==============
+#
+# Specifies:
+#
+# The trust file to use
+#
+# Type of value:
+#
+# File name, relative to confdir
+#
+# Default value:
+#
+# Unset (commented out). When activated: trust (Unix) or trust.txt
+# (Windows)
+#
+# Effect if unset:
+#
+# The entire trust mechanism is turned off.
+#
+# Notes:
+#
+# The trust mechanism is an experimental feature for building
+# white-lists and should be used with care. It is NOT recommended
+# for the casual user.
+#
+# If you specify a trust file, Privoxy will only allow access to
+# sites that are specified in the trustfile. Sites can be listed
+# in one of two ways:
+#
+# Prepending a ~ character limits access to this site only (and
+# any sub-paths within this site), e.g. ~www.example.com.
+#
+# Or, you can designate sites as trusted referrers, by prepending
+# the name with a + character. The effect is that access to
+# untrusted sites will be granted -- but only if a link from this
+# trusted referrer was used. The link target will then be added
+# to the "trustfile" so that future, direct accesses will be
+# granted. Sites added via this mechanism do not become trusted
+# referrers themselves (i.e. they are added with a ~ designation).
+#
+# If you use the + operator in the trust file, it may grow
+# considerably over time.
+#
+# It is recommended that Privoxy be compiled with the
+# --disable-force, --disable-toggle and --disable-editor options,
+# if this feature is to be used.
+#
+# Possible applications include limiting Internet access for
+# children.
+#
+#trustfile trust
+
+#
+# 2. LOCAL SET-UP DOCUMENTATION
+# =============================
+#
+# If you intend to operate Privoxy for more users than just yourself,
+# it might be a good idea to let them know how to reach you, what
+# you block and why you do that, your policies, etc.
+#
+
+#
+# 2.1. user-manual
+# ================
+#
+# Specifies:
+#
+# Location of the Privoxy User Manual.
+#
+# Type of value:
+#
+# A fully qualified URI
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# http://www.privoxy.org/version/user-manual/ will be used,
+# where version is the Privoxy version.
+#
+# Notes:
+#
+# The User Manual URI is used for help links from some of the
+# internal CGI pages. The manual itself is normally packaged
+# with the binary distributions, so you probably want to set this
+# to a locally installed copy. For multi-user setups, you could
+# provide a copy on a local webserver for all your users and use
+# the corresponding URL here.
+#
+# Examples:
+#
+# Unix, in local filesystem:
+#
+# user-manual file:///usr/share/doc/privoxy-3.0.1/user-manual/index.html
+#
+# Windows, in local filesystem, must use forward slash notation,
+# and %20 to denote spaces in path names:
+#
+# user-manual file:///c:/some%20dir/privoxy/user-manual/index.html
+#
+# Windows, UNC notation (forward slashes required again):
+#
+# user-manual file://///some-server/some-path/privoxy/user-manual/index.html
+#
+# Any platform, on local webserver (called "local-webserver"):
+#
+# user-manual http://local-webserver/privoxy-user-manual/
+#
+# WARNING!!!
+#
+# If set, this option should be the first option in the config
+# file, because it is used while the config file is being read.
+#
+#user-manual http://www.privoxy.org/user-manual/
+
+#
+# 2.2. trust-info-url
+# ===================
+#
+# Specifies:
+#
+# A URL to be displayed in the error page that users will see if
+# access to an untrusted page is denied.
+#
+# Type of value:
+#
+# URL
+#
+# Default value:
+#
+# Two example URL are provided
+#
+# Effect if unset:
+#
+# No links are displayed on the "untrusted" error page.
+#
+# Notes:
+#
+# The value of this option only matters if the experimental trust
+# mechanism has been activated. (See trustfile above.)
+#
+# If you use the trust mechanism, it is a good idea to write
+# up some on-line documentation about your trust policy and to
+# specify the URL(s) here. Use multiple times for multiple URLs.
+#
+# The URL(s) should be added to the trustfile as well, so users
+# don't end up locked out from the information on why they were
+# locked out in the first place!
+#
+trust-info-url http://www.example.com/why_we_block.html
+trust-info-url http://www.example.com/what_we_allow.html
+
+#
+# 2.3. admin-address
+# ==================
+#
+# Specifies:
+#
+# An email address to reach the proxy administrator.
+#
+# Type of value:
+#
+# Email address
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# No email address is displayed on error pages and the CGI user
+# interface.
+#
+# Notes:
+#
+# If both admin-address and proxy-info-url are unset, the whole
+# "Local Privoxy Support" box on all generated pages will not
+# be shown.
+#
+#admin-address privoxy-admin@xxxxxxxxxxx
+
+#
+# 2.4. proxy-info-url
+# ===================
+#
+# Specifies:
+#
+# A URL to documentation about the local Privoxy setup,
+# configuration or policies.
+#
+# Type of value:
+#
+# URL
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# No link to local documentation is displayed on error pages and
+# the CGI user interface.
+#
+# Notes:
+#
+# If both admin-address and proxy-info-url are unset, the whole
+# "Local Privoxy Support" box on all generated pages will not
+# be shown.
+#
+# This URL shouldn't be blocked ;-)
+#
+#proxy-info-url http://www.example.com/proxy-service.html
+
+#
+# 3. DEBUGGING
+# ============
+#
+# These options are mainly useful when tracing a problem. Note that
+# you might also want to invoke Privoxy with the --no-daemon command
+# line option when debugging.
+#
+
+#
+# 3.1. debug
+# ==========
+#
+# Specifies:
+#
+# Key values that determine what information gets logged to
+# the logfile.
+#
+# Type of value:
+#
+# Integer values
+#
+# Default value:
+#
+# 12289 (i.e.: URLs plus informational and warning messages)
+#
+# Effect if unset:
+#
+# Nothing gets logged.
+#
+# Notes:
+#
+# The available debug levels are:
+#
+# debug 1 # show each GET/POST/CONNECT request
+# debug 2 # show each connection status
+# debug 4 # show I/O status
+# debug 8 # show header parsing
+# debug 16 # log all data into the logfile
+# debug 32 # debug force feature
+# debug 64 # debug regular expression filter
+# debug 128 # debug fast redirects
+# debug 256 # debug GIF de-animation
+# debug 512 # Common Log Format
+# debug 1024 # debug kill pop-ups
+# debug 2048 # CGI user interface
+# debug 4096 # Startup banner and warnings.
+# debug 8192 # Non-fatal errors
+#
+# To select multiple debug levels, you can either add them or
+# use multiple debug lines.
+#
+# A debug level of 1 is informative because it will show you each
+# request as it happens. 1, 4096 and 8192 are highly recommended
+# so that you will notice when things go wrong. The other levels
+# are probably only of interest if you are hunting down a specific
+# problem. They can produce a hell of an output (especially 16).
+#
+# The reporting of fatal errors (i.e. ones which crash Privoxy)
+# is always on and cannot be disabled.
+#
+# If you want to use CLF (Common Log Format), you should set
+# "debug 512" ONLY and not enable anything else.
+#
+#debug 1 # show each GET/POST/CONNECT request
+debug 4096 # Startup banner and warnings
+debug 8192 # Errors - *we highly recommended enabling this*
+
+#
+# 3.2. single-threaded
+# ====================
+#
+# Specifies:
+#
+# Whether to run only one server thread
+#
+# Type of value:
+#
+# None
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Multi-threaded (or, where unavailable: forked) operation,
+# i.e. the ability to serve multiple requests simultaneously.
+#
+# Notes:
+#
+# This option is only there for debug purposes and you should
+# never need to use it. It will drastically reduce performance.
+#
+#single-threaded
+
+#
+# 4. ACCESS CONTROL AND SECURITY
+# ==============================
+#
+# This section of the config file controls the security-relevant
+# aspects of Privoxy's configuration.
+#
+
+#
+# 4.1. listen-address
+# ===================
+#
+# Specifies:
+#
+# The IP address and TCP port on which Privoxy will listen for
+# client requests.
+#
+# Type of value:
+#
+# [IP-Address]:Port
+#
+# Default value:
+#
+# 127.0.0.1:8118
+#
+# Effect if unset:
+#
+# Bind to 127.0.0.1 (localhost), port 8118. This is suitable and
+# recommended for home users who run Privoxy on the same machine
+# as their browser.
+#
+# Notes:
+#
+# You will need to configure your browser(s) to this proxy address
+# and port.
+#
+# If you already have another service running on port 8118, or
+# if you want to serve requests from other machines (e.g. on your
+# local network) as well, you will need to override the default.
+#
+# If you leave out the IP address, Privoxy will bind to all
+# interfaces (addresses) on your machine and may become reachable
+# from the Internet. In that case, consider using access control
+# lists (ACL's, see below), and/or a firewall.
+#
+# If you open Privoxy to untrusted users, you will also want
+# to turn off the enable-edit-actions and enable-remote-toggle
+# options!
+#
+# Example:
+#
+# Suppose you are running Privoxy on a machine which has the
+# address 192.168.0.1 on your local private network (192.168.0.0)
+# and has another outside connection with a different address. You
+# want it to serve requests from inside only:
+#
+# listen-address 192.168.0.1:8118
+#
+listen-address 127.0.0.1:8118
+
+#
+# 4.2. toggle
+# ===========
+#
+# Specifies:
+#
+# Initial state of "toggle" status
+#
+# Type of value:
+#
+# 1 or 0
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# Act as if toggled on
+#
+# Notes:
+#
+# If set to 0, Privoxy will start in "toggled off" mode,
+# i.e. behave like a normal, content-neutral proxy where all ad
+# blocking, filtering, etc are disabled. See enable-remote-toggle
+# below. This is not really useful anymore, since toggling is
+# much easier via the web interface than via editing the conf file.
+#
+# The windows version will only display the toggle icon in the
+# system tray if this option is present.
+#
+toggle 1
+
+#
+# 4.3. enable-remote-toggle
+# =========================
+#
+# Specifies:
+#
+# Whether or not the web-based toggle feature may be used
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# The web-based toggle feature is disabled.
+#
+# Notes:
+#
+# When toggled off, Privoxy acts like a normal, content-neutral
+# proxy, i.e. it acts as if none of the actions applied to
+# any URL.
+#
+# For the time being, access to the toggle feature can not be
+# controlled separately by "ACLs" or HTTP authentication, so that
+# everybody who can access Privoxy (see "ACLs" and listen-address
+# above) can toggle it for all users. So this option is not
+# recommended for multi-user environments with untrusted users.
+#
+# Note that you must have compiled Privoxy with support for this
+# feature, otherwise this option has no effect.
+#
+enable-remote-toggle 1
+
+#
+# 4.4. enable-edit-actions
+# ========================
+#
+# Specifies:
+#
+# Whether or not the web-based actions file editor may be used
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# The web-based actions file editor is disabled.
+#
+# Notes:
+#
+# For the time being, access to the editor can not be controlled
+# separately by "ACLs" or HTTP authentication, so that everybody
+# who can access Privoxy (see "ACLs" and listen-address above)
+# can modify its configuration for all users. So this option is
+# not recommended for multi-user environments with untrusted users.
+#
+# Note that you must have compiled Privoxy with support for this
+# feature, otherwise this option has no effect.
+#
+enable-edit-actions 1
+
+#
+# 4.5. ACLs: permit-access and deny-access
+# ========================================
+#
+# Specifies:
+#
+# Who can access what.
+#
+# Type of value:
+#
+# src_addr[/src_masklen] [dst_addr[/dst_masklen]]
+#
+# Where src_addr and dst_addr are IP addresses in dotted decimal
+# notation or valid DNS names, and src_masklen and dst_masklen are
+# subnet masks in CIDR notation, i.e. integer values from 2 to 30
+# representing the length (in bits) of the network address. The
+# masks and the whole destination part are optional.
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't restrict access further than implied by listen-address
+#
+# Notes:
+#
+# Access controls are included at the request of ISPs and systems
+# administrators, and are not usually needed by individual
+# users. For a typical home user, it will normally suffice to
+# ensure that Privoxy only listens on the localhost (127.0.0.1)
+# or internal (home) network address by means of the listen-address
+# option.
+#
+# Please see the warnings in the FAQ that this proxy is not
+# intended to be a substitute for a firewall or to encourage
+# anyone to defer addressing basic security weaknesses.
+#
+# Multiple ACL lines are OK. If any ACLs are specified, then
+# the Privoxy talks only to IP addresses that match at least one
+# permit-access line and don't match any subsequent deny-access
+# line. In other words, the last match wins, with the default
+# being deny-access.
+#
+# If Privoxy is using a forwarder (see forward below) for a
+# particular destination URL, the dst_addr that is examined is
+# the address of the forwarder and NOT the address of the ultimate
+# target. This is necessary because it may be impossible for the
+# local Privoxy to determine the IP address of the ultimate target
+# (that's often what gateways are used for).
+#
+# You should prefer using IP addresses over DNS names, because
+# the address lookups take time. All DNS names must resolve! You
+# can not use domain patterns like "*.org" or partial domain
+# names. If a DNS name resolves to multiple IP addresses, only
+# the first one is used.
+#
+# Denying access to particular sites by ACL may have undesired
+# side effects if the site in question is hosted on a machine
+# which also hosts other sites.
+#
+# Examples:
+#
+# Explicitly define the default behavior if no ACL and
+# listen-address are set: "localhost" is OK. The absence of a
+# dst_addr implies that all destination addresses are OK:
+#
+# permit-access localhost
+#
+# Allow any host on the same class C subnet as www.privoxy.org
+# access to nothing but www.example.com:
+#
+# permit-access www.privoxy.org/24 www.example.com/32
+#
+# Allow access from any host on the 26-bit subnet 192.168.45.64
+# to anywhere, with the exception that 192.168.45.73 may not
+# access www.dirty-stuff.example.com:
+#
+# permit-access 192.168.45.64/26
+# deny-access 192.168.45.73 www.dirty-stuff.example.com
+#
+
+#
+# 4.6. buffer-limit
+# =================
+#
+# Specifies:
+#
+# Maximum size of the buffer for content filtering.
+#
+# Type of value:
+#
+# Size in Kbytes
+#
+# Default value:
+#
+# 4096
+#
+# Effect if unset:
+#
+# Use a 4MB (4096 KB) limit.
+#
+# Notes:
+#
+# For content filtering, i.e. the +filter and +deanimate-gif
+# actions, it is necessary that Privoxy buffers the entire document
+# body. This can be potentially dangerous, since a server could
+# just keep sending data indefinitely and wait for your RAM to
+# exhaust -- with nasty consequences. Hence this option.
+#
+# When a document buffer size reaches the buffer-limit, it is
+# flushed to the client unfiltered and no further attempt to filter
+# the rest of the document is made. Remember that there may be
+# multiple threads running, which might require up to buffer-limit
+# Kbytes each, unless you have enabled "single-threaded" above.
+#
+buffer-limit 4096
+
+#
+# 5. FORWARDING
+# =============
+#
+# This feature allows routing of HTTP requests through a chain
+# of multiple proxies. It can be used to better protect privacy
+# and confidentiality when accessing specific domains by routing
+# requests to those domains through an anonymous public proxy (see
+# e.g. http://www.multiproxy.org/anon_list.htm) Or to use a caching
+# proxy to speed up browsing. Or chaining to a parent proxy may be
+# necessary because the machine that Privoxy runs on has no direct
+# Internet access.
+#
+# Also specified here are SOCKS proxies. Privoxy supports the SOCKS
+# 4 and SOCKS 4A protocols.
+#
+
+#
+# 5.1. forward
+# ============
+#
+# Specifies:
+#
+# To which parent HTTP proxy specific requests should be routed.
+#
+# Type of value:
+#
+# target_pattern http_parent[:port]
+#
+# where target_pattern is a URL pattern that specifies to which
+# requests (i.e. URLs) this forward rule shall apply. Use /
+# to denote "all URLs". http_parent[:port] is the DNS name or
+# IP address of the parent HTTP proxy through which the requests
+# should be forwarded, optionally followed by its listening port
+# (default: 8080). Use a single dot (.) to denote "no forwarding".
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't use parent HTTP proxies.
+#
+# Notes:
+#
+# If http_parent is ".", then requests are not forwarded to
+# another HTTP proxy but are made directly to the web servers.
+#
+# Multiple lines are OK, they are checked in sequence, and the
+# last match wins.
+#
+# Examples:
+#
+# Everything goes to an example anonymizing proxy, except SSL on
+# port 443 (which it doesn't handle):
+#
+# forward / anon-proxy.example.org:8080
+# forward :443 .
+#
+# Everything goes to our example ISP's caching proxy, except for
+# requests to that ISP's sites:
+#
+# forward / caching-proxy.example-isp.net:8000
+# forward .example-isp.net .
+#
+
+#
+# 5.2. forward-socks4 and forward-socks4a
+# =======================================
+#
+# Specifies:
+#
+# Through which SOCKS proxy (and to which parent HTTP proxy)
+# specific requests should be routed.
+#
+# Type of value:
+#
+# target_pattern socks_proxy[:port] http_parent[:port]
+#
+# where target_pattern is a URL pattern that specifies to which
+# requests (i.e. URLs) this forward rule shall apply. Use / to
+# denote "all URLs". http_parent and socks_proxy are IP addresses
+# in dotted decimal notation or valid DNS names (http_parent may
+# be "." to denote "no HTTP forwarding"), and the optional port
+# parameters are TCP ports, i.e. integer values from 1 to 64535
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't use SOCKS proxies.
+#
+# Notes:
+#
+# Multiple lines are OK, they are checked in sequence, and the
+# last match wins.
+#
+# The difference between forward-socks4 and forward-socks4a
+# is that in the SOCKS 4A protocol, the DNS resolution of the
+# target hostname happens on the SOCKS server, while in SOCKS 4
+# it happens locally.
+#
+# If http_parent is ".", then requests are not forwarded to another
+# HTTP proxy but are made (HTTP-wise) directly to the web servers,
+# albeit through a SOCKS proxy.
+#
+# Examples:
+#
+# From the company example.com, direct connections are made to all
+# "internal" domains, but everything outbound goes through their
+# ISP's proxy by way of example.com's corporate SOCKS 4A gateway
+# to the Internet.
+#
+# forward-socks4a / socks-gw.example.com:1080 www-cache.example-isp.net:8080
+# forward .example.com .
+#
+# A rule that uses a SOCKS 4 gateway for all destinations but no
+# HTTP parent looks like this:
+#
+# forward-socks4 / socks-gw.example.com:1080 .
+#
+forward-socks4a / localhost:9050 .
+
+#
+# 6. WINDOWS GUI OPTIONS
+# ======================
+#
+# Privoxy has a number of options specific to the Windows GUI
+# interface:
+#
+
+# If "activity-animation" is set to 1, the Privoxy icon will animate
+# when "Privoxy" is active. To turn off, set to 0.
+#
+#activity-animation 1
+
+# If "log-messages" is set to 1, Privoxy will log messages to the
+# console window:
+#
+#log-messages 1
+
+# If "log-buffer-size" is set to 1, the size of the log buffer,
+# i.e. the amount of memory used for the log messages displayed in
+# the console window, will be limited to "log-max-lines" (see below).
+#
+# Warning: Setting this to 0 will result in the buffer to grow
+# infinitely and eat up all your memory!
+#
+#log-buffer-size 1
+
+# log-max-lines is the maximum number of lines held in the log
+# buffer. See above.
+#
+#log-max-lines 200
+
+# If "log-highlight-messages" is set to 1, Privoxy will highlight
+# portions of the log messages with a bold-faced font:
+#
+#log-highlight-messages 1
+
+# The font used in the console window:
+#
+#log-font-name Comic Sans MS
+
+# Font size used in the console window:
+#
+#log-font-size 8
+
+# "show-on-task-bar" controls whether or not Privoxy will appear as
+# a button on the Task bar when minimized:
+#
+#show-on-task-bar 0
+
+# If "close-button-minimizes" is set to 1, the Windows close button
+# will minimize Privoxy instead of closing the program (close with
+# the exit option on the File menu).
+#
+#close-button-minimizes 1
+
+# The "hide-console" option is specific to the MS-Win console version
+# of Privoxy. If this option is used, Privoxy will disconnect from
+# and hide the command console.
+#
+#hide-console
+
+#
Modified: trunk/pkg/package.sh
===================================================================
--- trunk/pkg/package.sh 2006-10-14 16:11:06 UTC (rev 1340)
+++ trunk/pkg/package.sh 2006-10-14 19:28:05 UTC (rev 1341)
@@ -76,7 +76,7 @@
torpath="$2"
privoxy="$3"
- pushd "osx/bundle"
+ pushd "osx"
./buildmpkg.sh "$torpath" "$privoxy"
popd
;;
Modified: trunk/pkg/win32/vidalia_en.nsh
===================================================================
--- trunk/pkg/win32/vidalia_en.nsh 2006-10-14 16:11:06 UTC (rev 1340)
+++ trunk/pkg/win32/vidalia_en.nsh 2006-10-14 19:28:05 UTC (rev 1341)
@@ -4,7 +4,26 @@
;;
;; All translations should be derived from this file.
;;
+;; To translate this file:
+;;
+;; 1) Copy this file (vidalia_en.nsh), creating a new file with "en"
+;; replaced by the two-letter language code of your translated language.
+;; For example, if you are creating a German translation, your new file
+;; would be named "vidalia_de.nsh".
+;;
+;; 2) Replace all ${LANG_ENGLISH} tags with whatever language you are
+;; translating this file into. For example, if you are creating a German
+;; translation, all ${LANG_ENGLISH} tags would become ${LANG_GERMAN}.
+;;
+;; 3) Translate the quoted strings. You can move string replacement tags
+;; (e.g., ${BUNDLE_NAME}) around within the quoted strings, but you
+;; should not alter the tags themselves.
+;;
+;; Your resulting file should use a non-Unicode character encoding, since NSIS
+;; does not support Unicode.
+;;
+
; Bundle
LangString BundleSetupCaption ${LANG_ENGLISH} "${BUNDLE_NAME} setup"
LangString BundleWelcomeText ${LANG_ENGLISH} "This wizard will guide you through the installation of:\r\n\tTor\t${TOR_APPVERSION}\r\n\tVidalia\t${VIDALIA_APPVERSION}\r\n\tPrivoxy\t${PRIVOXY_APPVERSION}\r\n\r\nIf you have previously installed Tor, Vidalia, or Privoxy, please make sure they are not running before continuing this installation.\r\n\r\n$_CLICK"