[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1359: The Vidalia/Tor/Privoxy bundle is now a Vidalia/Tor/Privoxy/ (trunk/pkg/win32)
Author: edmanm
Date: 2006-10-20 01:24:44 -0400 (Fri, 20 Oct 2006)
New Revision: 1359
Modified:
trunk/pkg/win32/BUNDLE_LICENSE
trunk/pkg/win32/build-bundle.txt
trunk/pkg/win32/vidalia-bundle.nsi
trunk/pkg/win32/vidalia_de.nsh
trunk/pkg/win32/vidalia_en.nsh
trunk/pkg/win32/vidalia_fi.nsh
trunk/pkg/win32/vidalia_ru.nsh
Log:
The Vidalia/Tor/Privoxy bundle is now a Vidalia/Tor/Privoxy/Torbutton bundle.
Modified: trunk/pkg/win32/BUNDLE_LICENSE
===================================================================
--- trunk/pkg/win32/BUNDLE_LICENSE 2006-10-19 06:58:12 UTC (rev 1358)
+++ trunk/pkg/win32/BUNDLE_LICENSE 2006-10-20 05:24:44 UTC (rev 1359)
@@ -489,3 +489,61 @@
The original, unmodified version of config.txt has been
retained in the package and can be found as config.orig.txt
+=====================================================
+Torbutton is distributed under the following license:
+
+Copyright (c) 2006 Scott Squires, Oleg Ivanov
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+--------------------------------------------------------------------------------
+
+Date: Fri, 3 Mar 2006 03:16:21 +0200
+From: Oleg Ivanov
+To: Scott Squires
+Subject: Re: ProxyButton licensing question
+
+Hello Scott,
+
+I'm glad to support your project so you can use the Proxybutton in any way you
+need under any open source license as it's stated in mozdev's copyright
+policy.
+I'll just ask you to put in the Tor or it's source code any credits with
+references to me and the original Proxybutton. Feel free to ask if you have
+any questions regarding the extension - I'll be glad to help you.
+
+On Thursday 02 March 2006 05:01, you wrote:
+> Hello,
+>
+> I am a volunteer for the Tor project, which is a network proxy with strong
+> anonymnity. We would like to make it easier for users to install and
+> configure the software, and would like a firefox button to enable/disable
+> Tor. Your extension is very close to what we need, our version would just
+> set the proxy for the user instead of the user needing to enter the
+> information. So I was wondering what license your software is released
+> under
+> and whether we can use it as a base for this extension.
+>
+> Thanks!
+> --Scott
+
+--
+Oleg Ivanov
+=====================================================
+
Modified: trunk/pkg/win32/build-bundle.txt
===================================================================
--- trunk/pkg/win32/build-bundle.txt 2006-10-19 06:58:12 UTC (rev 1358)
+++ trunk/pkg/win32/build-bundle.txt 2006-10-20 05:24:44 UTC (rev 1359)
@@ -1,4 +1,4 @@
- Building the Vidalia/Tor/Privoxy Bundle
+ Building the Vidalia/Tor/Privoxy/Torbutton Bundle
1. Create a base directory under which the necessary sources will be extracted
@@ -16,36 +16,40 @@
C:\bundle\privoxy\
C:\bundle\tor\
C:\bundle\vidalia\
+ C:\bundle\torbutton\
-3. Modify the appropriate version values (VIDALIA_APPVERSION, TOR_APPVERSION, and
-PRIVOXY_APPVERSION) at the top of vidalia-bundle.nsi.
+3. Modify the appropriate version values (VIDALIA_APPVERSION, TOR_APPVERSION,
+PRIVOXY_APPVERSION, and TORBUTTON_APPVERSION) at the top of vidalia-bundle.nsi.
4. Create directories for the appropriate versions of each component.
C:\bundle\privoxy\3.0.3\
C:\bundle\tor\0.1.1.20\
C:\bundle\vidalia\0.0.6\
+ C:\bundle\torbutton\1.0.4-fx+tb\
-5. Install Vidalia, Tor, and Privoxy to the directories you created for them.
+5. Install Vidalia, Tor, and Privoxy to the directories you created for them
+in Step 4. Remember that you may need to grab the torrc.sample file from
+%APPDATA%\Tor that was created by Tor's installer and place it in the directory
+for the bundle's version of Tor.
-6. Modify Privoxy's config.txt file as follows:
+6. Place the Torbutton Firefox extension (.xpi) in the directory you created
+for it in Step 4.
+7. Modify Privoxy's config.txt file as follows:
+
* Add "forward-socks4a / localhost:9050 ." (without quotes) to the top
* Comment out "logfile privoxy.log" in Section 1.5
* Comment out "jarfile jar.log" in Section 1.6
* Uncomment "log-messages 1" in Section 6 and change the '1' to a '0'
-7. Install Tor to the directory you created for its version. Remember that you
-may need to grab the torrc.sample file from %APPDATA%\Tor that was created by
-the installer and place it in the directory for the bundle's version of Tor.
-
8. Run the vidalia-bundle.nsi script. The bundle will be named according the
the versions you specified in Step 4 and placed in the base directory created
in Step 1.
--------------------------------------------------------------------------------
-For each additional release of some component of the bundle, follow Steps 4-9.
+For each additional release of some component of the bundle, follow Steps 4-8.
If the version of some component didn't change, you can skip its step. For
-example, if the version of Privoxy didn't change then you can skip Step 6.
+example, if the version of Privoxy didn't change then you can skip Step 7.
Modified: trunk/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi 2006-10-19 06:58:12 UTC (rev 1358)
+++ trunk/pkg/win32/vidalia-bundle.nsi 2006-10-20 05:24:44 UTC (rev 1359)
@@ -11,6 +11,9 @@
;---------------------------------
; Global definitions
+!define SF_SELECTED 1
+!define SECTION_OFF 0xFFFFFFFE
+
!define VIDALIA_NAME "Vidalia"
!define VIDALIA_EXEC "vidalia.exe"
!define VIDALIA_APPVERSION "0.0.8"
@@ -29,6 +32,10 @@
!define PRIVOXY_DESC "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
!define PRIVOXY_UNINST "privoxy_uninstall.exe"
+!define TORBUTTON_NAME "Torbutton"
+!define TORBUTTON_APPVERSION "1.0.4-fx+tb"
+!define TORBUTTON_DESC "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
+
!define OPENSSL_NAME "OpenSSL"
!define OPENSSL_APPVERSION "0.9.8a"
!define OPENSSL_DESC "${OPENSSL_NAME} ${OPENSSL_APPVERSION}"
@@ -103,12 +110,8 @@
;InstType /COMPONENTSONLYONCUSTOM
!endif
-;--------------------------------
-; Functions
-Function .onInit
- !insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
+
;--------------------------------
; Tor
Var configdir
@@ -321,6 +324,50 @@
SectionEnd
SectionGroupEnd
+;--------------------------------
+; Torbutton
+SectionGroup "${TORBUTTON_DESC}" TorbuttonGroup
+ Section "${TORBUTTON_NAME}" Torbutton
+ SectionIn 1 2
+ SetOutPath "$INSTDIR\Torbutton"
+ File torbutton\${TORBUTTON_APPVERSION}\torbutton-${TORBUTTON_APPVERSION}.xpi
+ SectionEnd
+
+ Section "$(TorbuttonAddToFirefox)" TorbuttonAddToFirefox
+ SectionIn 1 2
+ ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
+ StrCmp $1 "" FirefoxNotFound 0 ; if Path is empty or null, then skip to an error, otherwise proceed
+ Exec '"$1firefox.exe" -install-global-extension "$INSTDIR\Torbutton\torbutton-${TORBUTTON_APPVERSION}.xpi"'
+ Goto TorbuttonInstalled
+ FirefoxNotFound:
+ MessageBox MB_OK|MB_ICONSTOP "$(TorbuttonFirefoxNotFound)"
+ TorbuttonInstalled:
+ SectionEnd
+SectionGroupEnd
+
+;--------------------------------
+; Functions
+Function .onInit
+ !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+Function .onSelChange
+ Push $0
+
+ ; Check if the Torbutton option was unchecked
+ SectionGetFlags ${Torbutton} $0
+ IntOp $0 $0 & ${SF_SELECTED}
+ IntCmp $0 0 0 SelChangeDone SelChangeDone
+
+ ; Uncheck the "Add to Firefox" box
+ SectionGetFlags ${TorbuttonAddToFirefox} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${TorbuttonAddToFirefox} $0
+
+ SelChangeDone:
+ Pop $0
+FunctionEnd
+
Function CustomFinishFn
IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
run_vidalia:
@@ -355,6 +402,10 @@
!insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyGroup} "$(PrivoxyGroupDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyStartup} "$(PrivoxyStartupDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyShortcuts} "$(PrivoxyShortcutsDesc)"
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${Torbutton} "$(TorbuttonAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonGroup} "$(TorbuttonGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonAddToFirefox} "$(TorbuttonAddToFirefoxDesc)"
!insertmacro MUI_FUNCTION_DESCRIPTION_END
Function StrRep
Modified: trunk/pkg/win32/vidalia_de.nsh
===================================================================
--- trunk/pkg/win32/vidalia_de.nsh 2006-10-19 06:58:12 UTC (rev 1358)
+++ trunk/pkg/win32/vidalia_de.nsh 2006-10-20 05:24:44 UTC (rev 1359)
@@ -46,3 +46,10 @@
LangString PrivoxyStartup ${LANG_GERMAN} "Beim Systemstart ausführen"
LangString PrivoxyStartupDesc ${LANG_GERMAN} "${PRIVOXY_NAME} beim Systemstart automatisch ausführen."
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_GERMAN} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_GERMAN} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_GERMAN} "Add to Firefox"
+LangString TorbuttonAddToFirefoxDesc ${LANG_GERMAN} "Add the ${TORBUTTON_DESC} extension to Firefox."
+LangString TorbuttonFirefoxNotFound ${LANG_GERMAN} "Firefox was not found on your system. Not installing Torbutton."
+
Modified: trunk/pkg/win32/vidalia_en.nsh
===================================================================
--- trunk/pkg/win32/vidalia_en.nsh 2006-10-19 06:58:12 UTC (rev 1358)
+++ trunk/pkg/win32/vidalia_en.nsh 2006-10-20 05:24:44 UTC (rev 1359)
@@ -26,10 +26,10 @@
; 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"
+LangString BundleWelcomeText ${LANG_ENGLISH} "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\r\n\r\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\r\n\r\n$_CLICK"
LangString BundleWelcomeTitle ${LANG_ENGLISH} "Welcome to the ${BUNDLE_NAME} Setup Wizard"
LangString BundleLinkText ${LANG_ENGLISH} "${TOR_NAME} installation documentation"
-LangString BundleFinishText ${LANG_ENGLISH} "Installation is complete.\r\nPlease see http://tor.eff.org/docs/tor-doc-win32.html to learn how to configure your applications to use Tor.\r\n"
+LangString BundleFinishText ${LANG_ENGLISH} "Installation is complete.\r\nPlease see http://tor.eff.org/docs/tor-doc-win32.html to learn how to configure your applications to use Tor.\r\n\r\nIf you installed Torbutton, you will need to restart Firefox."
LangString BundleRunNow ${LANG_ENGLISH} "Run installed components now"
@@ -67,3 +67,10 @@
LangString PrivoxyStartup ${LANG_ENGLISH} "Run At Startup"
LangString PrivoxyStartupDesc ${LANG_ENGLISH} "Automatically run ${PRIVOXY_NAME} at startup."
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_ENGLISH} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_ENGLISH} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_ENGLISH} "Add to Firefox"
+LangString TorbuttonAddToFirefoxDesc ${LANG_ENGLISH} "Add the ${TORBUTTON_DESC} extension to Firefox."
+LangString TorbuttonFirefoxNotFound ${LANG_ENGLISH} "Firefox was not found on your system. Not installing Torbutton."
+
Modified: trunk/pkg/win32/vidalia_fi.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fi.nsh 2006-10-19 06:58:12 UTC (rev 1358)
+++ trunk/pkg/win32/vidalia_fi.nsh 2006-10-20 05:24:44 UTC (rev 1359)
@@ -48,3 +48,10 @@
LangString PrivoxyStartup ${LANG_FINNISH} "Käynnistä Windowssin käynnistyessä"
LangString PrivoxyStartupDesc ${LANG_FINNISH} "Käynnistä automaattisesti ${PRIVOXY_NAME} Windowssin käynnistyessä."
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_FINNISH} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_FINNISH} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_FINNISH} "Add to Firefox"
+LangString TorbuttonAddToFirefoxDesc ${LANG_FINNISH} "Add the ${TORBUTTON_DESC} extension to Firefox."
+LangString TorbuttonFirefoxNotFound ${LANG_FINNISH} "Firefox was not found on your system. Not installing Torbutton."
+
Modified: trunk/pkg/win32/vidalia_ru.nsh
===================================================================
--- trunk/pkg/win32/vidalia_ru.nsh 2006-10-19 06:58:12 UTC (rev 1358)
+++ trunk/pkg/win32/vidalia_ru.nsh 2006-10-20 05:24:44 UTC (rev 1359)
@@ -1,4 +1,4 @@
-;; $Id: $
+;; $Id$
;;
;; Vidalia installer and bundle Russian translation
;;
@@ -47,3 +47,10 @@
LangString PrivoxyStartup ${LANG_RUSSIAN} "Àâòîçàïóñê"
LangString PrivoxyStartupDesc ${LANG_RUSSIAN} "Àâòîìàòè÷åñêè çàïóñêàòü ${PRIVOXY_NAME} ïðè çàãðóçêå ñèñòåìû."
+; Torbutton
+LangString TorbuttonGroupDesc ${LANG_RUSSIAN} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonAppDesc ${LANG_RUSSIAN} "Install ${TORBUTTON_DESC}."
+LangString TorbuttonAddToFirefox ${LANG_RUSSIAN} "Add to Firefox"
+LangString TorbuttonAddToFirefoxDesc ${LANG_RUSSIAN} "Add the ${TORBUTTON_DESC} extension to Firefox."
+LangString TorbuttonFirefoxNotFound ${LANG_RUSSIAN} "Firefox was not found on your system. Not installing Torbutton."
+