[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2088: Add torbutton to the vidalia bundle (trunk/pkg/osx)
Author: phobos
Date: 2007-10-24 21:15:25 -0400 (Wed, 24 Oct 2007)
New Revision: 2088
Added:
trunk/pkg/osx/TorbuttonDesc.plist
trunk/pkg/osx/TorbuttonInfo.plist
Modified:
trunk/pkg/osx/TorPostFlight
trunk/pkg/osx/VidaliaBundleDesc.plist.in
trunk/pkg/osx/VidaliaBundleInfo.plist.in
trunk/pkg/osx/VidaliaBundleWelcome.rtf
trunk/pkg/osx/buildmpkg.sh.in
Log:
Add torbutton to the vidalia bundle
Modified: trunk/pkg/osx/TorPostFlight
===================================================================
--- trunk/pkg/osx/TorPostFlight 2007-10-25 00:32:31 UTC (rev 2087)
+++ trunk/pkg/osx/TorPostFlight 2007-10-25 01:15:25 UTC (rev 2088)
@@ -4,19 +4,30 @@
TARGET=$2/Library/Tor
TORDIR=$TARGET/var/lib/tor
-LOGDIR=$TARGET/var/log/tor
+LOGFILE=/var/log/tor.log
+TORBUTTON_VERSION="1.1.9.1-alpha"
+# Check defaults for TARGET
+if [ "$TARGET" == "//Library/Tor" ]; then
+ TARGET=/Library/Tor
+fi
+
# 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
+# Check the logfile and make sure it exists.
+if [ ! -f $LOGFILE ]; then
+ touch $LOGFILE
+ chown $TORUSER $LOGFILE
+ chgrp daemon $LOGFILE
+ chmod 660 $LOGFILE
+fi
+
# Create the configuration file only if there wan't one already.
if [ ! -f $TARGET/torrc ]; then
cp $TARGET/torrc.sample $TARGET/torrc
@@ -41,7 +52,6 @@
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
@@ -53,3 +63,18 @@
cp -r $PACKAGE_PATH/Contents/Resources/documents $TARGET/documents
fi
+if [ -f /Applications/Firefox.app/Contents/MacOS/firefox ]; then
+ if [ -f /Library/Torbutton/torbutton-$TORBUTTON_VERSION.xpi ]; then
+ /Applications/Firefox.app/Contents/MacOS/firefox -install-global-extension /Library/Torbutton/torbutton-$TORBUTTON_VERSION.xpi
+# The following is a kludge to get around the fact that the installer
+# runs as root. This means the Torbutton extension will install with
+# root permissions; thereby making uninstalling Torbutton from inside
+# Firefox impossible. The user will be caught in an endless loop of
+# uninstall -> automatic re-installation of Torbutton. The OSX
+# installer doesn't tell you the owner of Firefox, therefore we have to
+# parse it.
+ USR=`ls -alrt /Applications/Firefox.app/Contents/MacOS/extensions/ | tail -1 | awk '{print $3}'`
+ GRP=`ls -alrt /Applications/Firefox.app/Contents/MacOS/extensions/ | tail -1 | awk '{print $4}'`
+ chown -R $USR:$GRP /Applications/Firefox.app/Contents/MacOS/extensions/
+ fi
+fi
Added: trunk/pkg/osx/TorbuttonDesc.plist
===================================================================
--- trunk/pkg/osx/TorbuttonDesc.plist (rev 0)
+++ trunk/pkg/osx/TorbuttonDesc.plist 2007-10-25 01:15:25 UTC (rev 2088)
@@ -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>Torbutton Extension for Firefox</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>0.1</string>
+</dict>
+</plist>
Added: trunk/pkg/osx/TorbuttonInfo.plist
===================================================================
--- trunk/pkg/osx/TorbuttonInfo.plist (rev 0)
+++ trunk/pkg/osx/TorbuttonInfo.plist 2007-10-25 01:15:25 UTC (rev 2088)
@@ -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>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>
Modified: trunk/pkg/osx/VidaliaBundleDesc.plist.in
===================================================================
--- trunk/pkg/osx/VidaliaBundleDesc.plist.in 2007-10-25 00:32:31 UTC (rev 2087)
+++ trunk/pkg/osx/VidaliaBundleDesc.plist.in 2007-10-25 01:15:25 UTC (rev 2088)
@@ -5,9 +5,9 @@
<key>IFPkgDescriptionDeleteWarning</key>
<string></string>
<key>IFPkgDescriptionDescription</key>
- <string>Bundled package of Vidalia, Tor, and Privoxy.</string>
+ <string>Bundled package of Vidalia, Tor, Privoxy, and Torbutton.</string>
<key>IFPkgDescriptionTitle</key>
- <string>Vidalia - Tor - Privoxy Bundle</string>
+ <string>Vidalia - Tor - Privoxy - Torbutton Bundle</string>
<key>IFPkgDescriptionVersion</key>
<string>@VERSION@</string>
</dict>
Modified: trunk/pkg/osx/VidaliaBundleInfo.plist.in
===================================================================
--- trunk/pkg/osx/VidaliaBundleInfo.plist.in 2007-10-25 00:32:31 UTC (rev 2087)
+++ trunk/pkg/osx/VidaliaBundleInfo.plist.in 2007-10-25 01:15:25 UTC (rev 2088)
@@ -38,6 +38,12 @@
<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>
Modified: trunk/pkg/osx/VidaliaBundleWelcome.rtf
===================================================================
--- trunk/pkg/osx/VidaliaBundleWelcome.rtf 2007-10-25 00:32:31 UTC (rev 2087)
+++ trunk/pkg/osx/VidaliaBundleWelcome.rtf 2007-10-25 01:15:25 UTC (rev 2088)
@@ -1,49 +1,88 @@
-{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf420
{\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
+\paperw11900\paperh16840\margl1440\margr1440\vieww18220\viewh14340\viewkind0
+\deftab720
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\f0\b\fs28 \cf0 Welcome to the Vidalia Bundle Installer!
-\f1\b0\fs24 \
+\f0\b\fs28 \cf0 Welcome to the Vidalia Bundle Installer!\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
+
+\f1\b0\fs24 \cf0 \
+This will install Vidalia, Tor, Privoxy, and Torbutton on your computer.\
+They are pre-configured to work seamlessly together.\
\
-This will install Vidalia, Tor, and Privoxy on your computer,\
-pre-configured to work seamlessly together.\
+Vidalia, Tor, Privoxy, and Torbutton are separate products. They are packaged together for your convenience.\
\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\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
+\f0\b \cf0 Vidalia
+\f1\b0 is a GUI for Tor, allowing you to control, monitor,
+\f0\b \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\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
+\f1\b0 \cf0 and configure your Tor installation.\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
+\f2\i \cf0 ({\field{\*\fldinst{HYPERLINK "http://www.vidalia-project.net/"}}{\fldrslt http://www.vidalia-project.net/}}
+\f1\i0 )
+\f0\b \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
+
+\f1\b0 \cf0 \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
+
\f0\b \cf0 Tor
-\f1\b0 is a system for using the Internet anonymously,\
-helping you anonymize Web browsing and publishing, \
+\f1\b0 is a system for using the Internet anonymously,
+\f0\b \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
+
+\f1\b0 \cf0 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
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\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
+\f2\i \cf0 ({\field{\*\fldinst{HYPERLINK "https://www.torproject.org"}}{\fldrslt https://www.torproject.org}})
+\f1\i0
+\f0\b \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
+\f1\b0 \cf0 \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\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,\
+\f1\b0 is a filtering web proxy that integrates well with
+\f0\b \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
+
+\f1\b0 \cf0 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
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\f2\i \cf0 (http://www.privoxy.org/
-\f1\i0 )\
-\
+\f2\i \cf0 ({\field{\*\fldinst{HYPERLINK "http://www.privoxy.org/"}}{\fldrslt http://www.privoxy.org/}}
+\f1\i0 )
+\f0\b \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
+\cf0 \
+Torbutton
+\f1\b0 is a 1-click way for Firefox users to enable or disable the browser's use of Tor. \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
-\f3\i\b Note
+\f2\i \cf0 Torbutton will not install if you do not have Firefox installed.
+\f0\i0\b \
+
+\f2\i\b0 ({\field{\*\fldinst{HYPERLINK "https://torbutton.torproject.org/"}}{\fldrslt https://torbutton.torproject.org/}})
+\f0\i0\b \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
+
+\f1\b0 \cf0 \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardeftab720\ql\qnatural
+
+\f3\i\b \cf0 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
+\f1\i0 If you have previously installed an old Tor/Privoxy-only
+\f0\b \
+\pard\pardeftab720\ql\qnatural
+
+\f1\b0 \cf0 bundle, we recommend that you remove it before continuing.\
+}
\ No newline at end of file
Modified: trunk/pkg/osx/buildmpkg.sh.in
===================================================================
--- trunk/pkg/osx/buildmpkg.sh.in 2007-10-25 00:32:31 UTC (rev 2087)
+++ trunk/pkg/osx/buildmpkg.sh.in 2007-10-25 01:15:25 UTC (rev 2088)
@@ -112,14 +112,18 @@
OUT_DIR="$VID_DIR/pkg"
# Path to PackageMaker
PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
+# 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.1.9.1-alpha.xpi
+TORBUTTON_LIC_PATH=~/tmp/LICENSE
-
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 \
+ torbutton_packageroot \
privoxyconf_packageroot \
privoxyconf_resources \
vidalia_packageroot \
@@ -195,7 +199,24 @@
-i $TOR_DIR/contrib/osx/TorInfo.plist \
-d $TOR_DIR/contrib/osx/TorDesc.plist
+##
+# Make Torbutton Installation package
+##
+echo "** Building Torbutton 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 \( -type d -or -perm +111 \) -print0 | sudo xargs -0 chmod 775
+find $BUILD_DIR/torbutton_packageroot -type f \! \( -perm +111 \) -print0 | sudo xargs -0 chmod 664
+find $BUILD_DIR/torbutton_packageroot -print0 | sudo xargs -0 chown root:admin
+
+$PACKAGEMAKER -build \
+ -p $PKG_DIR/torbutton.pkg \
+ -f $BUILD_DIR/torbutton_packageroot \
+ -i TorbuttonInfo.plist \
+ -d TorbuttonDesc.plist
+
##
# Unzip the Privoxy.pkg and move it into place
##
@@ -242,6 +263,7 @@
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
+cp $TORBUTTON_LIC_PATH $MPKG_DIR/Torbutton-LICENSE.txt
##