In Steve Jobs parlance, "boom." The Tor osx bundle is now just Tor and
a startup script. This is consistent with every other OS for which we build packages. If you want privoxy and torbutton, use the Vidalia bundle. svn:r15272
This commit is contained in:
Andrew Lewman
parent
c96b15f9bc
commit
8555a768fd
|
|
@ -2,11 +2,8 @@
|
|||
# one from the top-level configure? -RD
|
||||
confdir = $(sysconfdir)/Tor
|
||||
|
||||
EXTRA_DIST = PrivoxyConfDesc.plist PrivoxyConfInfo.plist \
|
||||
ReadMe.rtf StartupParameters.plist Tor TorBundleDesc.plist.in \
|
||||
EXTRA_DIST = ReadMe.rtf StartupParameters.plist Tor TorBundleDesc.plist.in \
|
||||
TorBundleInfo.plist.in TorBundleWelcome.rtf TorDesc.plist.in \
|
||||
TorInfo.plist.in TorStartupDesc.plist.in TorStartupInfo.plist \
|
||||
package.sh privoxy.config TorPostflight addsysuser \
|
||||
Tor_Uninstaller.applescript uninstall_tor_bundle.sh \
|
||||
TorbuttonInfo.plist TorbuttonDesc.plist \
|
||||
package_list.txt tor_logo.gif TorPreFlight
|
||||
package.sh TorPostflight addsysuser Tor_Uninstaller.applescript \
|
||||
uninstall_tor_bundle.sh package_list.txt tor_logo.gif TorPreFlight
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
<?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>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?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>
|
||||
|
|
@ -25,6 +25,7 @@ if [ -x /usr/bin/sw_vers ]; then
|
|||
# the OS version
|
||||
OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
|
||||
case "$OSVER" in
|
||||
"10.6") OS="snowleopard" ARCH="universal";;
|
||||
"10.5") OS="leopard" ARCH="universal";;
|
||||
"10.4") OS="tiger" ARCH="universal";;
|
||||
"10.3") OS="panther" ARCH="ppc";;
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
<key>IFPkgDescriptionDeleteWarning</key>
|
||||
<string></string>
|
||||
<key>IFPkgDescriptionDescription</key>
|
||||
<string>Bundled package of Tor @VERSION@, Privoxy 3.0.6, and Torbutton.</string>
|
||||
<string>Bundled package of Tor @VERSION@.</string>
|
||||
<key>IFPkgDescriptionTitle</key>
|
||||
<string>Tor - Privoxy - Torbutton Bundle</string>
|
||||
<string>Tor Expert Bundle</string>
|
||||
<key>IFPkgDescriptionVersion</key>
|
||||
<string>@VERSION@</string>
|
||||
</dict>
|
||||
|
|
|
|||
|
|
@ -20,30 +20,12 @@
|
|||
<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>
|
||||
<dict>
|
||||
<key>IFPkgFlagPackageLocation</key>
|
||||
<string>torstartup.pkg</string>
|
||||
<key>IFPkgFlagPackageSelection</key>
|
||||
<string>selected</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>IFPkgFlagPackageLocation</key>
|
||||
<string>torbutton.pkg</string>
|
||||
<key>IFPkgFlagPackageSelection</key>
|
||||
<string>selected</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>IFPkgFormatVersion</key>
|
||||
<real>0.10000000149011612</real>
|
||||
|
|
|
|||
|
|
@ -5,14 +5,10 @@
|
|||
\paperw11900\paperh16840\margl1440\margr1440\vieww9000\viewh9000\viewkind0
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
|
||||
|
||||
\f0\fs24 \cf0 Welcome to Tor - Privoxy - Torbutton Bundle installer.\
|
||||
This will install Tor, Privoxy, and Torbutton in your computer.\
|
||||
\f0\fs24 \cf0 Welcome to the Tor Expert installer.\
|
||||
This will install Tor in your computer.\
|
||||
\
|
||||
|
||||
\f1\i Tor, Privoxy, and Torbutton are separate products.\
|
||||
They are packaged together for your convenience.
|
||||
\f2\i0\b \
|
||||
|
||||
\f0\b0 \
|
||||
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
|
||||
|
||||
|
|
@ -22,17 +18,3 @@ others to do so.\
|
|||
\
|
||||
For more information, please visit https://www.torproject.org/\
|
||||
\
|
||||
|
||||
\f2\b Privoxy
|
||||
\f0\b0 stands between your web browser and Tor to make your web surfing experience safer.\
|
||||
\
|
||||
For more information, please visit http://www.privoxy.org/\
|
||||
\
|
||||
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
|
||||
|
||||
\f2\b \cf0 Torbutton
|
||||
\f0\b0 is a 1-click way for Firefox users to enable or disable the browser's use of Tor.
|
||||
\f1\i Torbutton will not install if you do not have Firefox installed.
|
||||
\f0\i0 \
|
||||
\
|
||||
For more information, please visit https://torbutton.torproject.org/}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
# TorPostFlight is distributed under this license
|
||||
#
|
||||
# Copyright (c) 2006 Andrew Lewman
|
||||
# Copyright (c) 2008 The Tor Project
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
|
|
@ -46,7 +47,6 @@ TORGROUP=daemon
|
|||
TARGET=$2/Library/Tor
|
||||
TORDIR=$TARGET/var/lib/tor
|
||||
LOGFILE=/var/log/tor.log
|
||||
TORBUTTON_VERSION="1.2.0rc2"
|
||||
|
||||
# Check defaults for TARGET
|
||||
if [ "$TARGET" == "//Library/Tor" ]; then
|
||||
|
|
@ -97,10 +97,6 @@ cd /usr/share/man/man1
|
|||
MAN1=$TARGET/share/man/man1
|
||||
#ln -sf $MAN1/*.1 .
|
||||
|
||||
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
|
||||
|
|
@ -125,12 +121,3 @@ if [ -d /Library/StartupItems/Tor ]; then
|
|||
rm -f /Library/StartupItems/Tor/Tor.loc
|
||||
echo "$TARGET" > /Library/StartupItems/Tor/Tor.loc
|
||||
fi
|
||||
|
||||
# This only works if the user installing us is an Admin user.
|
||||
# Otherwise, this will silently fail to install torbutton in firefox.
|
||||
if [ -f /Applications/Firefox.app/Contents/MacOS/firefox ]; then
|
||||
if [ -f /Library/Torbutton/torbutton-$TORBUTTON_VERSION.xpi ]; then
|
||||
# Open firefox with a prompt to install the torbutton xpi
|
||||
su $USER open -a /Applications/Firefox.app /Library/Torbutton/torbutton-$TORBUTTON_VERSION.xpi
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
# TorPreFlight is distributed under this license:
|
||||
#
|
||||
# Copyright (c) 2006 Andrew Lewman
|
||||
# Copyright (c) 2008 The Tor Project
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
|
|
@ -44,16 +45,7 @@ else
|
|||
TORPATH="/Library/Tor/"
|
||||
fi
|
||||
|
||||
if [ -f /Library/StartupItems/Privoxy/Privoxy.loc ]; then
|
||||
PRIVOXYPATH=`cat /Library/StartupItems/Privoxy/Privoxy.loc`
|
||||
else
|
||||
PRIVOXYPATH="/Library/Privoxy/"
|
||||
fi
|
||||
|
||||
# Backup all of Tor, just in case
|
||||
if [ -d $TORPATH ]; then
|
||||
cp $TORPATH/torrc $TORPATH/torrc.installer-saved
|
||||
cp $PRIVOXYPATH/config $PRIVOXYPATH/config.installer-saved
|
||||
cp $PRIVOXYPATH/user.action $PRIVOXYPATH/user.action.installer-saved
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
<?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>Torbutton Extension for Firefox</string>
|
||||
<key>IFPkgDescriptionVersion</key>
|
||||
<string>0.1</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?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>Torbutton Extension for Firefox</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>Torbutton configuration for Tor</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>Torbutton 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>
|
||||
|
|
@ -2,14 +2,12 @@
|
|||
# $Id$
|
||||
# Copyright 2004-2005 Nick Mathewson.
|
||||
# Copyright 2005-2007 Andrew Lewman
|
||||
# Copyright 2008 The Tor Project
|
||||
# See LICENSE in Tor distribution for licensing information.
|
||||
|
||||
# This script builds a Macintosh OS X metapackage containing 4 packages:
|
||||
# This script builds a Macintosh OS X metapackage containing 2 packages:
|
||||
# - One for Tor.
|
||||
# - One for Privoxy.
|
||||
# - One for a tor-specific privoxy configuration script.
|
||||
# - One for Startup scripts for Tor.
|
||||
# - One for Torbutton, an extension for FireFox
|
||||
#
|
||||
# This script expects to be run from the toplevel makefile, with VERSION
|
||||
# set to the latest Tor version, and Tor already built.
|
||||
|
|
@ -18,15 +16,6 @@
|
|||
# Read the documentation located in tor/doc/tor-osx-dmg-creation.txt on
|
||||
# how to build Tor for OSX
|
||||
|
||||
# Where have we put the zip file containing Privoxy? Edit this if your
|
||||
# privoxy lives somewhere else.
|
||||
PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip
|
||||
|
||||
# Where have we put the xpi and license for Torbutton? Edit this if your
|
||||
# torbutton and torbutton license live somewhere else.
|
||||
TORBUTTON_PATH=~/tmp/torbutton-1.2.0rc2.xpi
|
||||
TORBUTTON_LIC_PATH=~/tmp/LICENSE
|
||||
|
||||
###
|
||||
# Helpful info on OS X packaging:
|
||||
# http://developer.apple.com/documentation/DeveloperTools/Conceptual/SoftwareDistribution/index.html
|
||||
|
|
@ -72,9 +61,7 @@ sudo rm -rf $BUILD_DIR
|
|||
mkdir $BUILD_DIR || exit 1
|
||||
for subdir in tor_packageroot tor_resources \
|
||||
torstartup_packageroot \
|
||||
privoxyconf_packageroot \
|
||||
torbundle_resources \
|
||||
torbutton_packageroot \
|
||||
output; do
|
||||
mkdir $BUILD_DIR/$subdir
|
||||
done
|
||||
|
|
@ -128,18 +115,6 @@ $PACKAGEMAKER -build \
|
|||
-i contrib/osx/TorInfo.plist \
|
||||
-d contrib/osx/TorDesc.plist
|
||||
|
||||
### Put privoxy configuration package in place.
|
||||
mkdir -p $BUILD_DIR/privoxyconf_packageroot/Library/Privoxy
|
||||
cp contrib/osx/privoxy.config $BUILD_DIR/privoxyconf_packageroot/Library/Privoxy/config
|
||||
|
||||
find $BUILD_DIR/privoxyconf_packageroot -print0 |sudo xargs -0 chown root:wheel
|
||||
|
||||
$PACKAGEMAKER -build \
|
||||
-p $BUILD_DIR/output/privoxyconf.pkg \
|
||||
-f $BUILD_DIR/privoxyconf_packageroot \
|
||||
-i contrib/osx/PrivoxyConfInfo.plist \
|
||||
-d contrib/osx/PrivoxyConfDesc.plist
|
||||
|
||||
### Make Startup Script package
|
||||
|
||||
mkdir -p $BUILD_DIR/torstartup_packageroot/Library/StartupItems/Tor
|
||||
|
|
@ -154,20 +129,6 @@ $PACKAGEMAKER -build \
|
|||
-i contrib/osx/TorStartupInfo.plist \
|
||||
-d contrib/osx/TorStartupDesc.plist
|
||||
|
||||
### Make Torbutton Installation package
|
||||
|
||||
mkdir -p $BUILD_DIR/torbutton_packageroot/Library/Torbutton
|
||||
cp $TORBUTTON_PATH $BUILD_DIR/torbutton_packageroot/Library/Torbutton/
|
||||
cp $TORBUTTON_LIC_PATH $BUILD_DIR/torbutton_packageroot/Library/Torbutton/Torbutton-LICENSE.txt
|
||||
|
||||
find $BUILD_DIR/torbutton_packageroot -print0 | sudo xargs -0 chown root:wheel
|
||||
|
||||
$PACKAGEMAKER -build \
|
||||
-p $BUILD_DIR/output/torbutton.pkg \
|
||||
-f $BUILD_DIR/torbutton_packageroot \
|
||||
-i contrib/osx/TorbuttonInfo.plist \
|
||||
-d contrib/osx/TorbuttonDesc.plist
|
||||
|
||||
### Assemble the metapackage. Packagemaker won't buld metapackages from
|
||||
# the command line, so we need to do it by hand.
|
||||
|
||||
|
|
@ -180,19 +141,14 @@ cp contrib/osx/TorBundleWelcome.rtf "$MPKG/Contents/Resources/Welcome.rtf"
|
|||
cp contrib/osx/TorBundleDesc.plist "$MPKG/Contents/Resources/Description.plist"
|
||||
cp contrib/osx/tor_logo.gif "$MPKG/Contents/Resources/background.gif"
|
||||
|
||||
# Move all the subpackages into place. unzip Privoxy.pkg into place,
|
||||
# and fix its file permissions so we can rm -rf it later.
|
||||
# Move all the subpackages into place.
|
||||
mkdir $BUILD_DIR/output/.contained_packages
|
||||
mv $BUILD_DIR/output/*.pkg $BUILD_DIR/OUTPUT/.contained_packages
|
||||
( cd $BUILD_DIR/output/.contained_packages && unzip $PRIVOXY_PKG_ZIP && find Privoxy.pkg -type d -print0 | xargs -0 chmod u+w )
|
||||
( cd $BUILD_DIR/output/.contained_packages )
|
||||
|
||||
### Copy readmes and licenses into toplevel.
|
||||
PRIVOXY_RESDIR=$BUILD_DIR/output/.contained_packages/Privoxy.pkg/Contents/Resources
|
||||
cp $PRIVOXY_RESDIR/License.html $BUILD_DIR/output/Privoxy\ License.html
|
||||
cp $PRIVOXY_RESDIR/ReadMe.txt $BUILD_DIR/output/Privoxy\ ReadMe.txt
|
||||
cp contrib/osx/ReadMe.rtf $BUILD_DIR/output/Tor\ ReadMe.rtf
|
||||
cp LICENSE $BUILD_DIR/output/Tor\ License.txt
|
||||
cp $TORBUTTON_LIC_PATH $BUILD_DIR/output/Torbutton_LICENSE.txt
|
||||
|
||||
### Package it all into a DMG
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,2 @@
|
|||
Tor
|
||||
Privoxy
|
||||
torstartup
|
||||
privoxyconf
|
||||
Vidalia
|
||||
torbutton
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -7,18 +7,13 @@ OSX builds of tor.
|
|||
Summary:
|
||||
1) Compile and install a static version of the latest release of
|
||||
libevent.
|
||||
2) Acquire privoxyosx_setup_3.0.6.zip.
|
||||
http://downloads.sourceforge.net/ijbswa/privoxyosx_setup_3.0.6.zip?modtime=1164104652&big_mirror=0
|
||||
Remember where you put this file.
|
||||
3) Acquire torbutton xpi and license file.
|
||||
4) Acquire and install your preferred version of tor. Extract.
|
||||
5) Update some variables in contrib/osx/package.sh
|
||||
6) "make dist-osx"
|
||||
7) You now have a dmg from which you can install Tor, Privoxy, and the
|
||||
Torbutton extension for Firefox.
|
||||
2) Acquire and install your preferred version of tor. Extract.
|
||||
3) Update some variables in contrib/osx/package.sh
|
||||
4) "make dist-osx"
|
||||
5) You now have a dmg from which you can install Tor.
|
||||
|
||||
## Universal Binaries for OSX PPC and X86
|
||||
## This method works in OSX 10.4 (Tiger) and 10.5 (Leopard) only.
|
||||
## This method works in OSX 10.4 (Tiger) and newer OSX versions.
|
||||
## See far below if you don't care about cross compiling for PPC and X86.
|
||||
## The single architecture process starts with "###"
|
||||
|
||||
|
|
@ -50,31 +45,10 @@ by default, in /usr/local/lib/.
|
|||
/usr/local/lib/libevent.a (for architecture i386): current ar archive random library
|
||||
/usr/local/lib/libevent.a (for architecture ppc): current ar archive
|
||||
|
||||
## Acquiring privoxy
|
||||
|
||||
6) Download osx privoxy source from
|
||||
http://downloads.sourceforge.net/ijbswa/privoxyosx_setup_3.0.6.zip?modtime=1164104652&big_mirror=0
|
||||
|
||||
7) Place the privoxyosx_setup_3.0.6.zip in a location of your choice.
|
||||
Remember this location.
|
||||
|
||||
8) Get your preferred version of Torbutton from https://torbutton.torproject.org.
|
||||
Place into a location of your choosing, remember this location.
|
||||
|
||||
9) Get the torbutton LICENSE file from https://torbutton.torproject.org.
|
||||
Place into a location of your choosing, remember this location.
|
||||
|
||||
10) Get your preferred version of the tor source from https://www.torproject.org/download.
|
||||
6) Get your preferred version of the tor source from https://www.torproject.org/download.
|
||||
Extract the tarball.
|
||||
|
||||
11) Update three variables in contrib/osx/package.sh:
|
||||
PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip
|
||||
TORBUTTON_PATH=~/tmp/torbutton-1.1.14-alpha.xpi
|
||||
TORBUTTON_LIC_PATH=~/tmp/LICENSE
|
||||
|
||||
Make sure the paths are correct. The build will fail if they are not.
|
||||
|
||||
12) In the top level, this means /path/to/tor/, not tor/contrib/osx,
|
||||
7) In the top level, this means /path/to/tor/, not tor/contrib/osx,
|
||||
do a configure with these parameters:
|
||||
CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
|
||||
LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \
|
||||
|
|
@ -93,12 +67,10 @@ src/or/tor (for architecture ppc): Mach-O executable ppc
|
|||
15) There should exist in the top-level directory a
|
||||
Tor-$VERSION-universal-$OS-Bundle.dmg
|
||||
|
||||
16) Congrats. You have a universal binary. You are now ready to install Tor,
|
||||
Privoxy, and the Torbutton extension for Firefox.
|
||||
|
||||
16) Congrats. You have a universal binary. You are now ready to install Tor.
|
||||
|
||||
### Single Architecture Binaries for PPC or X86, not both.
|
||||
### This method works in all versions of OSX 10.1 through 10.5
|
||||
### This method works in all versions of OSX 10.3 through 10.5
|
||||
|
||||
### Compiling libevent
|
||||
|
||||
|
|
@ -115,37 +87,15 @@ or sudo -s, to complete the "make install".
|
|||
4) If you have previouslly installed libevent, go rm the old libevent.so*
|
||||
files so the linker doesn't get suckered into using them.
|
||||
|
||||
### Acquiring privoxy
|
||||
|
||||
1) Download osx privoxy source from
|
||||
http://downloads.sourceforge.net/ijbswa/privoxyosx_setup_3.0.6.zip?modtime=1164104652&big_mirror=0
|
||||
|
||||
2) Place the privoxyosx_setup_3.0.6.zip in a location of your choice.
|
||||
Remember this location.
|
||||
|
||||
### Compiling Tor
|
||||
|
||||
1) Get your preferred version of Torbutton from
|
||||
https://torbutton.torproject.org.
|
||||
Place into a location of your choosing, remember this location.
|
||||
|
||||
2) Get the torbutton LICENSE file from https://torbutton.torproject.org.
|
||||
Place into a location of your choosing, remember this location.
|
||||
|
||||
3) Get your preferred version of the tor source from https://www.torproject.org. Extract the
|
||||
1) Get your preferred version of the tor source from https://www.torproject.org. Extract the
|
||||
tarball.
|
||||
|
||||
4) Update three variables in contrib/osx/package.sh:
|
||||
PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip
|
||||
TORBUTTON_PATH=~/tmp/torbutton-1.1.14-alpha.xpi
|
||||
TORBUTTON_LIC_PATH=~/tmp/LICENSE
|
||||
|
||||
Make sure the paths are correct. The build will fail if they are not.
|
||||
|
||||
5) In the top level, this means /path/to/tor/, not tor/contrib/osx,
|
||||
2) In the top level, this means /path/to/tor/, not tor/contrib/osx,
|
||||
do a configure with these parameters:
|
||||
CONFDIR=/Library/Tor ./configure --prefix=/Library/Tor \
|
||||
--bindir=/Library/Tor --sysconfdir=/Library
|
||||
|
||||
6) In same top level dir, do a "make dist-osx". There now exists a
|
||||
3) In same top level dir, do a "make dist-osx". There now exists a
|
||||
.dmg file in the same directory. Install from this dmg.
|
||||
|
|
|
|||
Loading…
Reference in New Issue