[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3812: Sync() with Debian pkgs (in vidalia/trunk/debian: . patches po)
Author: dererk
Date: 2009-06-02 12:25:02 -0400 (Tue, 02 Jun 2009)
New Revision: 3812
Added:
vidalia/trunk/debian/FAQ
vidalia/trunk/debian/README.source
vidalia/trunk/debian/po/zh_TW.po
vidalia/trunk/debian/vidalia.install
Removed:
vidalia/trunk/debian/faq
Modified:
vidalia/trunk/debian/changelog
vidalia/trunk/debian/config
vidalia/trunk/debian/control
vidalia/trunk/debian/copyright
vidalia/trunk/debian/docs
vidalia/trunk/debian/patches/debians-tor-binary-path.patch
vidalia/trunk/debian/po/zh_CN.po
vidalia/trunk/debian/postinst
vidalia/trunk/debian/rules
vidalia/trunk/debian/vidalia.desktop
vidalia/trunk/debian/watch
Log:
Sync() with Debian pkgs
Added: vidalia/trunk/debian/FAQ
===================================================================
--- vidalia/trunk/debian/FAQ (rev 0)
+++ vidalia/trunk/debian/FAQ 2009-06-02 16:25:02 UTC (rev 3812)
@@ -0,0 +1,116 @@
+Frequently Asked Questions
+==========================
+
+ 1. General
+ 1. What is Vidalia?
+ 2. Does Vidalia run on my operating system?
+ 3. How can I find out when new Vidalia releases are available?
+ 4. Where can I get additional support for Vidalia?
+ 2. Running
+ 1. I installed Vidalia/Tor/Privoxy. Now what?
+ 2. Can I run Vidalia from a USB drive?
+ 3. Can Vidalia "attach" to an existing Tor process?
+ 4. Why do I see connections to geoip.vidalia-project.net in my network map?
+ 5. Can I run a relay without worrying about abuse complaints?
+ 3. Common problems
+ 1. When I try to start Tor I get an error message in Vidalia's message log ...
+
+
+1.General
+=========
+
+1.1 What is Vidalia?
+--------------------
+
+Vidalia is a GUI for Tor, making it easy for you to run, monitor, and configure your installation of Tor. It lets you start and stop Tor, as well as letting you know when things go wrong. Vidalia also lets you see how much bandwidth Tor is using and can even help you set up your own Tor server.
+
+
+1.2 Does Vidalia run on my operating system?
+-------------------------------------------
+
+Vidalia is a cross-platform GUI built using the Qt GUI toolkit. Vidalia should run on any platform supported by Qt, which includes (but is not necessarily limited to):
+
+ * Windows 95/98/Me, NT4, 2000, XP, and Vista
+ * Mac OS X Panther (10.3), Tiger (10.4), and Leopard (10.5)
+ * Linux or other Unix variants running the X Window system.
+
+
+1.3 How can I find out when new Vidalia releases are available?
+---------------------------------------------------------------
+
+Vidalia is still under active development and we tend to put out a new release approximately every 1-2 months. You can subscribe to our Trac RSS feed to learn when we have put out a new release. We also announce new releases on our homepage and on our download page.
+
+
+1.4 Where can I get additional support for Vidalia?
+---------------------------------------------------
+
+First, read through this FAQ and also search the documentation on our wiki. If you prefer IRC, you can find us in #vidalia on irc.oftc.net. Otherwise, we have a vidalia-users mailing list set up for Vidalia users to help out and answer each others' questions.
+
+
+2 Running
+=========
+
+2.1 I installed Vidalia/Tor/Privoxy. Now what?
+----------------------------------------------
+
+Now you need to configure your applications to send their traffic through Tor. Scott Squires has created an extension for Firefox called Torbutton that lets you easily toggle your browser's use of Tor. You might also check out FoxTor for a similar Firefox extension.
+
+See the Torify How-To for information on configuring several other applications to use Tor. The Tor documentation for Windows, Mac OS X, or Linux/BSD/Unix might be useful for you, as well.
+
+
+2.2 Can I run Vidalia from a USB drive?
+---------------------------------------
+
+Yes! You can run Vidalia from a USB drive, perhaps for a portable Tor/Vidalia/Polipo or Tor/Vidalia/Privoxy combination, by using Vidalia's -datadir command-line argument. The -datadir argument tells Vidalia where you would like it to store all of its configuration and application data. For example, you might have a batch file on your USB drive that starts Vidalia as follows:
+
+vidalia -datadir "."
+
+The above line would tell Vidalia to use the current working directory as its data directory. You can also configure Vidalia to look for a Tor executable and configuration file (torrc) on your USB drive using Vidalia's Settings dialog or editing Vidalia's configuration file (vidalia.conf).
+
+If you want to run the Windows version of Vidalia from a USB drive, you may also need to copy mingwm10.dll from a Vidalia or MinGW package onto your USB drive in the same directory as vidalia.exe.
+
+
+2.3 Can Vidalia "attach" to an existing Tor process?
+----------------------------------------------------
+
+Yes. Before Vidalia starts its own Tor process, it always first checks to see if it can connect to the control port of an existing Tor process. All you need to do is enable a control port on the Tor you already have running, and Vidalia will connect to it instead of starting its own Tor process. You first need to open your `torrc` in a text editor. Then, add the following line on a line by itself anywhere in your torrc:
+
+ ControlPort 9051
+
+You will also likely want to set a password for your control port to limit what applications are allowed to connect to it. To do so, you first need to open up a terminal or command prompt and run the following command (you may need to cd to the location of your Tor executable):
+
+# tor --hash-password mypassword
+
+Replace "mypassword" with whatever password you would like to use for your control port. The last line of output from the above command will contain a string that starts with "16:" and is followed by a long string letters and numbers. This string is a hash of the password you supplied as an argument to the --hash-password command above. Copy this entire string, and then add a HashedControlPassword line to your torrc similar to the following:
+
+ "HashedControlPassword 16:816172DEB125A9CA603A6A8A5C16D0642DA4556E4EC417E6B9AAC9AF0D"
+
+Save your torrc changes and either restart or "HUP" your Tor process to reload your configuration. Then you can click 'Start Tor' in Vidalia, which will connect to your Tor process and then prompt you to enter your original control password ("mypassword" in the example above).
+
+
+
+2.4 Why do I see connections to geoip.vidalia-project.net in my network map?
+----------------------------------------------------------------------------
+
+Vidalia 0.0.5 added a network map feature that lets you see where in the world your traffic is going. To be able to map Tor relay IP addresses to approximate geographic locations, we use the GeoLite City database from MaxMind. Unfortunately, the database is around 24MB and shipping it alongside the Vidalia binary would be unreasonable. Consequently, we host the database on our servers and created a small perl script interface to it, allowing Vidalia clients to query the database via standard HTTP GET or POST requests.
+
+All communication between Vidalia and our servers is done over Tor, so our servers do not know who is making the requests. Additionally, no identifying information is included in the requests. Of course, you can verify this by looking at the source code, such as geoipresolver.cpp and torsocket.cpp. We also have a specification for the format of our geographic information requests and responses.
+
+
+2.5 Can I run a relay without worrying about abuse complaints?
+--------------------------------------------------------------
+
+Tor relay operators can specify which services and/or ports clients are allowed to access from their relay. From Vidalia's Exit Policies tab, you can select what services you want to allow clients to access from your relay. Vidalia's help documentation explains what each exit policy option means. By default, Tor relays allow access to many popular services, but restricts some (such as port 25) due to the potential for abuse. Tor's FAQ has more information for relay operators on how to avoid abuse complaints.
+
+Rather than running a normal, public Tor relay, you might also consider running a bridge relay. Some Internet Service Providers (ISPs) attempt to prevent users from accessing the Tor network by blocking connections to known Tor relays. Bridge relays (or bridges for short) are relays that help these censored users access the Tor network. Unlike other Tor relays, bridges are not listed in the same public directories as normal relays. Since there is no complete public list of them, even if your ISP is filtering connections to all the known Tor relays, they probably won't be able to block all the bridges.
+
+
+3 Common problems
+=================
+
+3.1 When I try to start Tor I get an error message in Vidalia's message log that says, "Failed to parse/validate config: Failed to bind one of the listener ports." What's that mean?
+-----------------------
+
+This error message typically means you already have a Tor process running that does not have an open control port. When Vidalia tried to start its own Tor process, Vidalia's Tor process conflicted with your existing Tor process. On Windows, you can look in your Task Manager for a process called tor.exe, select it, and then click "End Process" to terminate your Tor process. On most other operating systems, the ps and kill commands can help you find and terminate your existing Tor process. Then you can simply click 'Start Tor' in Vidalia, and Vidalia will start a new Tor process with the necessary arguments that allow Vidalia to communicate with and control Tor.
+
+If you would like Vidalia to connect to your existing Tor instead of starting a new Tor process, see the FAQ entry above on configuring a control port and password for your existing Tor process.
Added: vidalia/trunk/debian/README.source
===================================================================
--- vidalia/trunk/debian/README.source (rev 0)
+++ vidalia/trunk/debian/README.source 2009-06-02 16:25:02 UTC (rev 3812)
@@ -0,0 +1,34 @@
+#
+# getting the upstream sources
+#
+New upstream tarballs are located here http://www.torproject.org/vidalia/dist/vidalia-0.1.13.tar.gz
+
+#
+# Debian specific patches
+#
+Debian specific patches reside in debian/patches/ and are applied with quilt.
+
+#
+# using pbuilder
+#
+tar -zxf vidalia-0.1.13.tar.gz
+cd vidalia-0.1.13/
+pbuilder
+
+Here a small readme in order to use the upstream tarballs:
+
+I'm used to this pbuilderrc to ease my life:
+ MIRRORSITE="http://mirrors.163.com/debian/";
+ DEBBUILDOPTS="-i.git -si"
+ DEBOOTSTRAP="debootstrap"
+ APTCACHE="/var/cache/apt/archives"
+ DEBIAN_FRONTEND="readline"
+ AUTO_DEBSIGN=yes
+
+So for building this package go to vidalia-0.1.13/ and call there e.g.:
+ % ln -sf ../vidalia-0.1.13.tar.gz vidalia_0.1.13.orig.tar.gz
+ % dch -i
+ % pdebuild
+
+the resulting files are found in /var/cache/pbuilder/result/
+
Modified: vidalia/trunk/debian/changelog
===================================================================
--- vidalia/trunk/debian/changelog 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/changelog 2009-06-02 16:25:02 UTC (rev 3812)
@@ -1,18 +1,50 @@
-vidalia (0.1.10-2) unstable; urgency=low
+vidalia (0.1.13-1) unstable; urgency=low
- * DQT_LRELEASE_EXECUTABLE and QT_LUPDATE_EXECUTABLE pointing to qt4 libs
- avoids building conflicts if alternatives are pointing to qt3 ones.
- * Patch to default Tor Executable path to Debian Tor's package binary path.
+ [ Vern Sun ]
+ * New upstream release.
+ * Add Debconf zh_TW.po.
- -- Ulises Vitulli <uvitulli@xxxxxxxxx> Wed, 14 Jan 2009 14:02:06 -0200
+ [ Ulises Vitulli ]
+ * Minor changes on debconf files.
-vidalia (0.1.10-1) unstable; urgency=low
+ -- Ulises Vitulli <uvitulli@xxxxxxxxx> Tue, 02 Jun 2009 13:07:54 -0300
+vidalia (0.1.12-1) unstable; urgency=low
+
+ [ Vern Sun ]
+ * New upstream release
+
+ [ Ulises Vitulli ]
+ * debian/watch: avoid evaluating development releases.
+ * debian/control: updated to 3.8.1 Policy.
+
+ -- Ulises Vitulli <uvitulli@xxxxxxxxx> Sat, 11 Apr 2009 11:00:18 -0300
+
+vidalia (0.1.11-1) unstable; urgency=low
+
* New upstream release.
+ * Added README.source.
+
+ -- Vern Sun <s5unty@xxxxxxxxx> Wed, 25 Feb 2009 11:55:46 +0800
+
+vidalia (0.1.10-1) unstable; urgency=low
+
+ [ Vern Sun ]
+ * New upstream release.
* Debconf translations:
- - Swedish (Closes #508751).
+ - Swedish (Closes: #508751)
+
+ [ Ulises Vitulli ]
+ * DQT_LRELEASE_EXECUTABLE and QT_LUPDATE_EXECUTABLE pointing to qt4 libs
+ avoids building conflicts if alternatives are pointing to qt3 ones.
+ * Applying temporal patch pointing to default Debian Tor's binary.
+ * Little pkg modifications:
+ - Added Vidalia's FAQ licence
+ - Moved .xpm and .desktop to vidalia.install.
+ - Added Description on quilt patch
+ - Remove 'Encoding' field on vidalia.desktop
- -- Vern Sun <s5unty@xxxxxxxxx> Mon, 05 Jan 2009 16:59:04 +0800
+ -- Ulises Vitulli <uvitulli@xxxxxxxxx> Wed, 14 Jan 2009 14:02:06 -0200
vidalia (0.1.9-3) unstable; urgency=low
Modified: vidalia/trunk/debian/config
===================================================================
--- vidalia/trunk/debian/config 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/config 2009-06-02 16:25:02 UTC (rev 3812)
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/bash
+set -e
+
#DEBHELPER#
. /usr/share/debconf/confmodule
Modified: vidalia/trunk/debian/control
===================================================================
--- vidalia/trunk/debian/control 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/control 2009-06-02 16:25:02 UTC (rev 3812)
@@ -4,7 +4,7 @@
Maintainer: Vern Sun <s5unty@xxxxxxxxx>
Uploaders: Ulises Vitulli <uvitulli@xxxxxxxxx>
Build-Depends: debhelper (>= 5), autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g), quilt
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://www.vidalia-project.net
Package: vidalia
Modified: vidalia/trunk/debian/copyright
===================================================================
--- vidalia/trunk/debian/copyright 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/copyright 2009-06-02 16:25:02 UTC (rev 3812)
@@ -2,9 +2,9 @@
software.
Original source has been downloaded from:
-
- http://www.vidalia-project.net/dist/vidalia-0.1.9.tar.gz
+ http://www.torproject.org/vidalia/dist/vidalia-0.1.13.tar.gz
+
The following copyright notices apply to most of the program. Some modules are
under different licenses, or in the public domain.
@@ -74,23 +74,6 @@
Exception" from your distribution.
===================================================================
-trayicon_x11.cpp is derived from systemtray.cpp from QMPDClient, licensed
-as follows:
-
-QMPDClient - An MPD client written in Qt 4.
-Copyright (C) 2005 Håvard Tautra Knutsen <havtknut@xxxxxxxxxx>
-
-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.
-===================================================================
-
Some of the help documentation text used in Vidalia is derived from the TorFAQ
Wiki <http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ>. It is licensed
under the MIT license as follows:
@@ -503,6 +486,12 @@
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
==============================================================================
+Some of the help documentation text used in this package was copied from the
+Vidalia FAQ Wiki <http://trac.vidalia-project.net/wiki/FAQ>.
+It's content is licensed under the Creative Commons Attribution-Share Alike 3.0.
+ Copyright (C) 2006-2008, Matt Edman <edmanm@xxxxxxxxxxxxxxxxxxx>
+==============================================================================
+
On Debian systems, the complete text of the GNU General Public Licenses can be
found in `/usr/share/common-licenses/'.
Modified: vidalia/trunk/debian/docs
===================================================================
--- vidalia/trunk/debian/docs 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/docs 2009-06-02 16:25:02 UTC (rev 3812)
@@ -1,3 +1,2 @@
-README
CREDITS
-debian/faq
+debian/FAQ
Modified: vidalia/trunk/debian/patches/debians-tor-binary-path.patch
===================================================================
--- vidalia/trunk/debian/patches/debians-tor-binary-path.patch 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/patches/debians-tor-binary-path.patch 2009-06-02 16:25:02 UTC (rev 3812)
@@ -1,6 +1,8 @@
+Author: dererk
+Description: Even though upstream has implemented a block of code to perform this check, as Tor's binary is located in /usr/sbin path, regular users are likely to lack that path in their PATH enviroment variable. This patch purpose is setting it to the right Debian's Tor package.
--- old/src/vidalia/config/torsettings.cpp 2009-01-14 13:56:54.000000000 -0200
+++ new/src/vidalia/config/torsettings.cpp 2009-01-14 14:42:46.000000000 -0200
-@@ -67,7 +67,8 @@
+@@ -65,7 +65,8 @@
else
setDefault(SETTING_TOR_EXECUTABLE, programFiles + "\\Tor\\tor.exe");
#else
Modified: vidalia/trunk/debian/po/zh_CN.po
===================================================================
--- vidalia/trunk/debian/po/zh_CN.po 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/po/zh_CN.po 2009-06-02 16:25:02 UTC (rev 3812)
@@ -1,10 +1,8 @@
-# Copyright (C) 2008 Vern Sun
# This file is distributed under the same license as the Vidalia package.
-# Vern Sun <s5unty@xxxxxxxxx>, 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: Vidalia 0.1.0\n"
+"Project-Id-Version: Vidalia 0.1.13\n"
"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
"POT-Creation-Date: 2008-09-18 00:31-0300\n"
"PO-Revision-Date: 2008-05-21 21:26+0800\n"
Added: vidalia/trunk/debian/po/zh_TW.po
===================================================================
--- vidalia/trunk/debian/po/zh_TW.po (rev 0)
+++ vidalia/trunk/debian/po/zh_TW.po 2009-06-02 16:25:02 UTC (rev 3812)
@@ -0,0 +1,45 @@
+# This file is distributed under the same license as the Vidalia package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia 0.1.13\n"
+"Report-Msgid-Bugs-To: vidalia@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-09-18 00:31-0300\n"
+"PO-Revision-Date: 2009-06-01 14:26+0800\n"
+"Last-Translator: Vern Sun <s5unty@xxxxxxxxx>\n"
+"Language-Team: Traditional Chinese <debian-chinese-big5@xxxxxxxxxxxxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Do you want to stop the existing Tor process and let Vidalia start Tor?"
+msgstr "您希望停止正在運行的 Tor 進程並且讓 Vidalia 啟動 Tor 嗎？"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"It looks like there is a Tor process already running. If you want to start "
+"Tor using Vidalia, you might have to stop the existing Tor process. "
+"Otherwise you will have to enable 'ControlPort' option into Tor as explained "
+"in the documentation carried with this package ('/usr/share/doc/vidalia/"
+"README.Debian')."
+msgstr ""
+"看起來這裏已經有一個 Tor 程序正在運行。如果您想用 Vidalia 啟動 Tor，您或許要"
+"停止當前正在運行的 Tor 程序。否則您應該像本軟件包提供的説明('/usr/share/doc/"
+"vidalia/README.Debian')那樣啟用 Tor 的 'ControlPort' 選項。"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Note that if you choose to let Vidalia start Tor, you will have to manually "
+"disable Tor starting automatically on every reboot (See 'README.Debian')."
+msgstr ""
+"請注意如果您選擇讓 Vidalia 啟動 Tor，那麼您應該手工禁止 Tor 在每次計算機重啓"
+"時自動運行 (請參考 'README.Debian')。"
+
Modified: vidalia/trunk/debian/postinst
===================================================================
--- vidalia/trunk/debian/postinst 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/postinst 2009-06-02 16:25:02 UTC (rev 3812)
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/bash
+set -e
+
#DEBHELPER#
. /usr/share/debconf/confmodule
Modified: vidalia/trunk/debian/rules
===================================================================
--- vidalia/trunk/debian/rules 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/rules 2009-06-02 16:25:02 UTC (rev 3812)
@@ -60,8 +60,6 @@
# Install the package
cd debian/build; \
make install DESTDIR=$(CURDIR)/debian/vidalia
- dh_install debian/vidalia.xpm usr/share/pixmaps
- dh_install debian/vidalia.desktop usr/share/applications
# Build architecture-independent files here.
binary-indep: build install
@@ -71,6 +69,7 @@
binary-arch: build install
dh_testdir
dh_testroot
+ dh_install
dh_installdocs
dh_installchangelogs CHANGELOG
dh_installman doc/vidalia.1
Modified: vidalia/trunk/debian/vidalia.desktop
===================================================================
--- vidalia/trunk/debian/vidalia.desktop 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/vidalia.desktop 2009-06-02 16:25:02 UTC (rev 3812)
@@ -1,6 +1,5 @@
[Desktop Entry]
Version=1.0
-Encoding=UTF-8
Name=Vidalia
GenericName=GUI controller for Tor Onion Routing Network
Comment=GUI controller for Tor Onion Routing Network
Added: vidalia/trunk/debian/vidalia.install
===================================================================
--- vidalia/trunk/debian/vidalia.install (rev 0)
+++ vidalia/trunk/debian/vidalia.install 2009-06-02 16:25:02 UTC (rev 3812)
@@ -0,0 +1,2 @@
+debian/vidalia.xpm usr/share/pixmaps
+debian/vidalia.desktop usr/share/applications
Modified: vidalia/trunk/debian/watch
===================================================================
--- vidalia/trunk/debian/watch 2009-06-01 07:03:24 UTC (rev 3811)
+++ vidalia/trunk/debian/watch 2009-06-02 16:25:02 UTC (rev 3812)
@@ -1,3 +1,4 @@
version=3
-
-http://vidalia-project.net:8001/vidalia/vidalia-(.*)\.tar\.gz
+# avoid evaluating development releases (0.2.x branches)
+opts=uversionmangle=s/0\.2\./~pre/ \
+ http://vidalia-project.net:8001/vidalia/vidalia-(.*)\.tar\.gz