[Pkg-privacy-commits] [vidalia] 51/160: Renaming old branch-based directories and apply fixes for #623203 and #623309.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:14:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository vidalia.
commit 78fe6f5109f0a20058cf97342c5ad9edbcb872ac
Author: Dererk <dererk at madap.com.ar>
Date: Tue Apr 19 12:20:23 2011 -0300
Renaming old branch-based directories and apply fixes for #623203 and #623309.
---
{debian/0.2.x => current}/FAQ | 0
{debian/0.2.x => current}/README.Debian | 77 +++++++++++++---------
{debian/0.2.x => current}/changelog | 0
{debian/0.2.x => current}/compat | 0
{debian/0.2.x => current}/config | 2 +-
{debian/0.2.x => current}/control | 0
{debian/0.2.x => current}/copyright | 0
{debian/0.2.x => current}/default.tor-off | 0
{debian/0.2.x => current}/default.tor-on | 0
{debian/0.2.x => current}/docs | 0
{debian/0.2.x => current}/menu | 0
.../patches/debians-tor-binary-path.patch | 0
{debian/0.2.x => current}/patches/series | 0
{debian/0.2.x => current}/po/POTFILES.in | 0
{debian/0.2.x => current}/po/ca.po | 0
{debian/0.2.x => current}/po/cs.po | 0
{debian/0.2.x => current}/po/da.po | 0
{debian/0.2.x => current}/po/de.po | 0
{debian/0.2.x => current}/po/es.po | 0
{debian/0.2.x => current}/po/fi.po | 0
{debian/0.2.x => current}/po/fr.po | 0
{debian/0.2.x => current}/po/it.po | 0
{debian/0.2.x => current}/po/pt.po | 0
{debian/0.2.x => current}/po/ru.po | 0
{debian/0.2.x => current}/po/sv.po | 0
{debian/0.2.x => current}/po/templates.pot | 0
{debian/0.2.x => current}/po/vi.po | 0
{debian/0.2.x => current}/po/zh_CN.po | 0
{debian/0.2.x => current}/po/zh_TW.po | 0
{debian/0.2.x => current}/postinst | 0
{debian/0.2.x => current}/postrm | 0
{debian/0.2.x => current}/rules | 0
{debian/0.2.x => current}/source/format | 0
{debian/0.2.x => current}/templates | 0
{debian/0.2.x => current}/vidalia.desktop | 0
{debian/0.2.x => current}/vidalia.install | 0
.../0.2.x => current}/vidalia.lintian-overrides | 0
{debian/0.2.x => current}/vidalia.xpm | 0
{debian/0.2.x => current}/watch | 0
39 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/debian/0.2.x/FAQ b/current/FAQ
similarity index 100%
rename from debian/0.2.x/FAQ
rename to current/FAQ
diff --git a/debian/0.2.x/README.Debian b/current/README.Debian
similarity index 61%
rename from debian/0.2.x/README.Debian
rename to current/README.Debian
index 284851d..0909d70 100644
--- a/debian/0.2.x/README.Debian
+++ b/current/README.Debian
@@ -7,10 +7,12 @@ Vidalia for Debian
There are three ways of running Vidalia:
1. (Re)Configure Vidalia not to let Tor start, and simply start Vidalia.
-2. Enable CookieAuthentication in Tor's config, and grab
- /var/lib/tor/control_auth_cookie (RECOMMENDED for greater security)
-3. Enable ControlPort and use HashedControlPassword from
- 'tor --hash-password'.
+2. Enable Tor's ControlPort and enable CookieAuthentication in Tor's config,
+ then grab the cookie file from /var/lib/tor/control_auth_cookie, profit!
+ (RECOMMENDED for greater security)
+3. Enable Tor's ControlPort, get a hashed password at 'tor --hash-password',
+ load back the output into the HashedControlPassword Tor's config field,
+ profit!
@@ -19,22 +21,26 @@ There are three ways of running Vidalia:
-----------------------------
Vidalia provides a graphical graphical user interface to configure
-various aspects of the Tor Network, check its status at a glance,
-monitor its bandwidth usage, or just view logs. This means that
-Vidalia needs to talk to the Tor daemon.
+different aspects of the Tor Network, check its status at a glance,
+monitor its bandwidth usage or maybe just view Tor's event logs.
+This means that Vidalia needs to talk to the Tor daemon.
+
Vidalia supports three different ways of talking to Tor:
1. Let Vidalia start the Tor process on its own.
---------------------------------------------
+
------> "I want it, and I want it NOW!"
+
This option is the simplest, but not usable on a multi-user system.
Debconf offers this as the default option, but it can be easily
reconfigured at any time by running 'dpkg-reconfigure vidalia'.
+
*********************** FOR PARANOIDS ONLY ***************************
| |
| |
@@ -56,8 +62,9 @@ Vidalia supports three different ways of talking to Tor:
-2. Enable Tor to use CookieAuthentication to communicate with Vidalia.
- -------------------------------------------------------------------
+
+2. Enable Tor to use a control cookie to communicate with Vidalia.
+ ---------------------------------------------------------------
* The best password is the one you don't have to know about *
@@ -66,16 +73,19 @@ Vidalia supports three different ways of talking to Tor:
very important and *SECRET* file from your disc, called "Auth Cookie".
To enable this profile, edit Tor's configuration file, by default at
- '/etc/tor/torrc', and add or uncomment the 'CookieAuthentication'
- value, setting it to 1.
+ '/etc/tor/torrc', add or uncomment both the 'ControlPort' and the
+ 'CookieAuthentication' options, setting the last one to 1.
You will end up having something like this:
-# grep Cookie /etc/tor/torrc
-CookieAuthentication 1
+ # egrep '(ControlPort|Auth)' /etc/tor/torrc
+ ControlPort 9051
+ CookieAuthentication 1
+
- Now start/restart the Tor daemon, and start Vidalia (as a regular X
+ Now start/reload/restart the Tor daemon, and start Vidalia (as a regular X
user). Vidalia will ask you for a "cookie file" at the next run:
+
------------------------------------------------------------------------
You will have to fetch the "cookie file" from your local filesystem,
@@ -84,6 +94,7 @@ CookieAuthentication 1
DO NOT share this file with anyone, Tor depends on it!
------------------------------------------------------------------------
+
This option might be simpler than all the others, but will require you
to grab a different cookie file every time you restart the Tor process,
in contrast to the next methods.
@@ -93,32 +104,34 @@ CookieAuthentication 1
-3. Enable Tor to use a control port to communicate with Vidalia.
- -------------------------------------------------------------
+3. Enable Tor to use a control passowrd to communicate with Vidalia.
+ -----------------------------------------------------------------
Edit the Tor configuration file, by default '/etc/tor/torrc', add or
- uncomment the 'ControlPort 9051' option, and add the output you get
- from Tor to 'HashedControlPassword', as shown here:
-
-# tor --hash-password SOME_PASSWORD_HERE
-Sep 17 18:48:49.421 [notice] Tor v0.2.0.30 (r15956). This is experimental
-software. Do not rely on it for strong anonymity. (Running on Linux x86_64)
+ uncomment both the 'ControlPort' and 'HashedControlPassword' options
+ and load 'tor --hash-password' hash got from the output into it,
+ as shown below:
+
-16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
+ # tor --hash-password SOME_PASSWORD_HERE
+ Sep 17 18:48:49.421 [notice] Tor v0.2.0.30 (r15956). This is experimental
+ software. Do not rely on it for strong anonymity. (Running on Linux x86_64)
+
+ 16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
You will end up with something like this:
-# grep Control /etc/tor/torrc
-ControlPort 9051
-HashedControlPassword 16:167F667A98F...4ACF029
+ # grep Control /etc/tor/torrc
+ ControlPort 9051
+ HashedControlPassword 16:167F667A98F...4ACF029
+
- Now start/restart the Tor daemon, and start Vidalia (as a regular X
- user). Vidalia will ask you for that password at the next run (the
- phrase you passed it with --hash-password, not the hash - in the
- example, 'SOME_PASSWORD_HERE'), and will start a secure
- authentication. That's all!
+ Now start/reload/restart the Tor daemon, and start Vidalia (as a regular X
+ user). Vidalia will ask you for the set password ('SOME_PASSWORD_HERE'
+ as for the example) at the next run and it will start using a secure
+ authentication.
- -- Ulises Vitulli <dererk at debian.org> Thu, 14 Oct 2010 19:58:20 -0300
+ -- Ulises Vitulli <dererk at debian.org> Tue, 19 Apr 2011 10:08:00 -0300
diff --git a/debian/0.2.x/changelog b/current/changelog
similarity index 100%
rename from debian/0.2.x/changelog
rename to current/changelog
diff --git a/debian/0.2.x/compat b/current/compat
similarity index 100%
rename from debian/0.2.x/compat
rename to current/compat
diff --git a/debian/0.2.x/config b/current/config
similarity index 94%
rename from debian/0.2.x/config
rename to current/config
index dc061e5..d7c5054 100644
--- a/debian/0.2.x/config
+++ b/current/config
@@ -44,7 +44,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
# still running?? (e.g. chroot)
if [ "$seen" = "false" ]; then
askuser
- if [ "$RET" = "nothing" ] || [ "$RET" = "one-off" ]; then
+ if [ "$RET" = "one-off" ] || [ "$RET" = "permanent" ]; then
echo -n "Stopping tor daemon: "
pkill -x tor > /dev/null && echo "tor." || echo 'Failed!'
fi
diff --git a/debian/0.2.x/control b/current/control
similarity index 100%
rename from debian/0.2.x/control
rename to current/control
diff --git a/debian/0.2.x/copyright b/current/copyright
similarity index 100%
rename from debian/0.2.x/copyright
rename to current/copyright
diff --git a/debian/0.2.x/default.tor-off b/current/default.tor-off
similarity index 100%
rename from debian/0.2.x/default.tor-off
rename to current/default.tor-off
diff --git a/debian/0.2.x/default.tor-on b/current/default.tor-on
similarity index 100%
rename from debian/0.2.x/default.tor-on
rename to current/default.tor-on
diff --git a/debian/0.2.x/docs b/current/docs
similarity index 100%
rename from debian/0.2.x/docs
rename to current/docs
diff --git a/debian/0.2.x/menu b/current/menu
similarity index 100%
rename from debian/0.2.x/menu
rename to current/menu
diff --git a/debian/0.2.x/patches/debians-tor-binary-path.patch b/current/patches/debians-tor-binary-path.patch
similarity index 100%
rename from debian/0.2.x/patches/debians-tor-binary-path.patch
rename to current/patches/debians-tor-binary-path.patch
diff --git a/debian/0.2.x/patches/series b/current/patches/series
similarity index 100%
rename from debian/0.2.x/patches/series
rename to current/patches/series
diff --git a/debian/0.2.x/po/POTFILES.in b/current/po/POTFILES.in
similarity index 100%
rename from debian/0.2.x/po/POTFILES.in
rename to current/po/POTFILES.in
diff --git a/debian/0.2.x/po/ca.po b/current/po/ca.po
similarity index 100%
rename from debian/0.2.x/po/ca.po
rename to current/po/ca.po
diff --git a/debian/0.2.x/po/cs.po b/current/po/cs.po
similarity index 100%
rename from debian/0.2.x/po/cs.po
rename to current/po/cs.po
diff --git a/debian/0.2.x/po/da.po b/current/po/da.po
similarity index 100%
rename from debian/0.2.x/po/da.po
rename to current/po/da.po
diff --git a/debian/0.2.x/po/de.po b/current/po/de.po
similarity index 100%
rename from debian/0.2.x/po/de.po
rename to current/po/de.po
diff --git a/debian/0.2.x/po/es.po b/current/po/es.po
similarity index 100%
rename from debian/0.2.x/po/es.po
rename to current/po/es.po
diff --git a/debian/0.2.x/po/fi.po b/current/po/fi.po
similarity index 100%
rename from debian/0.2.x/po/fi.po
rename to current/po/fi.po
diff --git a/debian/0.2.x/po/fr.po b/current/po/fr.po
similarity index 100%
rename from debian/0.2.x/po/fr.po
rename to current/po/fr.po
diff --git a/debian/0.2.x/po/it.po b/current/po/it.po
similarity index 100%
rename from debian/0.2.x/po/it.po
rename to current/po/it.po
diff --git a/debian/0.2.x/po/pt.po b/current/po/pt.po
similarity index 100%
rename from debian/0.2.x/po/pt.po
rename to current/po/pt.po
diff --git a/debian/0.2.x/po/ru.po b/current/po/ru.po
similarity index 100%
rename from debian/0.2.x/po/ru.po
rename to current/po/ru.po
diff --git a/debian/0.2.x/po/sv.po b/current/po/sv.po
similarity index 100%
rename from debian/0.2.x/po/sv.po
rename to current/po/sv.po
diff --git a/debian/0.2.x/po/templates.pot b/current/po/templates.pot
similarity index 100%
rename from debian/0.2.x/po/templates.pot
rename to current/po/templates.pot
diff --git a/debian/0.2.x/po/vi.po b/current/po/vi.po
similarity index 100%
rename from debian/0.2.x/po/vi.po
rename to current/po/vi.po
diff --git a/debian/0.2.x/po/zh_CN.po b/current/po/zh_CN.po
similarity index 100%
rename from debian/0.2.x/po/zh_CN.po
rename to current/po/zh_CN.po
diff --git a/debian/0.2.x/po/zh_TW.po b/current/po/zh_TW.po
similarity index 100%
rename from debian/0.2.x/po/zh_TW.po
rename to current/po/zh_TW.po
diff --git a/debian/0.2.x/postinst b/current/postinst
similarity index 100%
rename from debian/0.2.x/postinst
rename to current/postinst
diff --git a/debian/0.2.x/postrm b/current/postrm
similarity index 100%
rename from debian/0.2.x/postrm
rename to current/postrm
diff --git a/debian/0.2.x/rules b/current/rules
similarity index 100%
rename from debian/0.2.x/rules
rename to current/rules
diff --git a/debian/0.2.x/source/format b/current/source/format
similarity index 100%
rename from debian/0.2.x/source/format
rename to current/source/format
diff --git a/debian/0.2.x/templates b/current/templates
similarity index 100%
rename from debian/0.2.x/templates
rename to current/templates
diff --git a/debian/0.2.x/vidalia.desktop b/current/vidalia.desktop
similarity index 100%
rename from debian/0.2.x/vidalia.desktop
rename to current/vidalia.desktop
diff --git a/debian/0.2.x/vidalia.install b/current/vidalia.install
similarity index 100%
rename from debian/0.2.x/vidalia.install
rename to current/vidalia.install
diff --git a/debian/0.2.x/vidalia.lintian-overrides b/current/vidalia.lintian-overrides
similarity index 100%
rename from debian/0.2.x/vidalia.lintian-overrides
rename to current/vidalia.lintian-overrides
diff --git a/debian/0.2.x/vidalia.xpm b/current/vidalia.xpm
similarity index 100%
rename from debian/0.2.x/vidalia.xpm
rename to current/vidalia.xpm
diff --git a/debian/0.2.x/watch b/current/watch
similarity index 100%
rename from debian/0.2.x/watch
rename to current/watch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git
More information about the Pkg-privacy-commits
mailing list