On 14/10/10 18:06, Dererk wrote: > On 14/10/10 17:11, Adam D. Barratt wrote: > >> On Sat, 2010-10-09 at 06:37 -0300, Dererk wrote: >> >> >>> I'm asking for a pre-approval to upload vidalia to t-p-u. >>> The package in unstable includes a new upstream release, and basically >>> this pkg version deals just with improving user experience (#592773). >>> It went through exhaustive l10n English review and l10n translation >>> round. >>> >>> >> Was README.Debian part of that review? >> > Thanks for the hints! I'll ask it to be reviewed too and come back when > it's ready. > Hi once again. I've requested l10n English team to review the file mentioned above containing user documentation about the 'Vidalia' Debian package (Thanks Justin!). I've attached both, partial[*] and full patchs against the current Squeeze candidate version of Vidalia. I hereby ask for permission to upload it through t-p-u. Greetings, Dererk ref: * without the po/ and templates files that changed and that makes the patch scaring :0) -- BOFH excuse #329: Server depressed, needs Prozac
Attachment:
vidalia-0.2.9-tpu-full.patch.gz
Description: application/gzip
diff -xpo -x templates -ruN vidalia-0.2.9/debian/changelog vidalia-0.2.9-1+squeeze1/debian/changelog
--- vidalia-0.2.9/debian/changelog 2010-05-21 16:47:53.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/changelog 2010-10-04 11:36:18.584171886 -0300
@@ -1,3 +1,13 @@
+vidalia (0.2.9-1+squeeze1) testing-proposed-updates; urgency=low
+
+ * Improved debconf templates and set a default answer case
+ (Closes: #592773, #598240, #599050).
+ * Cleaning unrequired build-deps, since we know use quilt source format.
+ * Update Standard-version to 3.9.1 (no changes needed).
+ * Include Vcs-* fields on control file.
+
+ -- Ulises Vitulli <dererk@debian.org> Sat, 25 Sep 2010 07:30:17 -0300
+
vidalia (0.2.9-1) unstable; urgency=low
[ Vern Sun ]
@@ -9,7 +19,7 @@
[ Ulises Vitulli ]
* New upstream release.
- * The 'Cowabunga' upload.
+ * The 'Cowabung' upload.
* Reviewed Debconf templates by l10n Team (Closes: #579715),
Thanks Christian Perrier:
- Portuguese, thanks Américo Monteiro (Closes: #579767).
diff -xpo -x templates -ruN vidalia-0.2.9/debian/config vidalia-0.2.9-1+squeeze1/debian/config
--- vidalia-0.2.9/debian/config 2010-05-20 21:56:39.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/config 2010-09-27 10:36:50.383957613 -0300
@@ -5,10 +5,9 @@
. /usr/share/debconf/confmodule
fi
-
seen='false'
askuser() {
- question='vidalia/info'
+ question='vidalia/tor-daemon-interaction'
db_input high $question || true
db_go || true
db_get $question
@@ -22,18 +21,18 @@
askuser
seen='true'
case "$RET" in
- (no)
+ (nothing)
if [ -f /etc/default/tor.vidalia ]; then
ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
fi
;;
- (yes-now)
+ (one-off)
invoke-rc.d --force tor stop
if [ -f /etc/default/tor.vidalia ]; then
ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
fi
;;
- (yes-always)
+ (permanent)
invoke-rc.d --force tor stop
ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-off /etc/default/tor.vidalia
;;
@@ -45,7 +44,7 @@
# still running?? (e.g. chroot)
if [ "$seen" = "false" ]; then
askuser
- if [ "$RET" = "true" ]; then
+ if [ "$RET" = "nothing" ] || [ "$RET" = "one-off" ]; then
echo -n "Stopping tor daemon: "
pkill -x tor > /dev/null && echo "tor." || echo 'Failed!'
fi
diff -xpo -x templates -ruN vidalia-0.2.9/debian/control vidalia-0.2.9-1+squeeze1/debian/control
--- vidalia-0.2.9/debian/control 2010-05-20 21:56:39.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/control 2010-09-27 10:36:50.383957613 -0300
@@ -2,10 +2,12 @@
Section: net
Priority: extra
Maintainer: Vern Sun <s5unty@gmail.com>
-Uploaders: Ulises Vitulli <uvitulli@fi.uba.ar>, Erinn Clark <erinn@torproject.org>
-Build-Depends: debhelper (>= 6.0.7~), 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.4
+Uploaders: Ulises Vitulli <dererk@debian.org>, Erinn Clark <erinn@torproject.org>
+Build-Depends: debhelper (>= 6.0.7~), autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g)
+Standards-Version: 3.9.1
Homepage: http://www.vidalia-project.net
+Vcs-Git: git://git.debian.org/collab-maint/vidalia.git/
+Vcs-Browser: http://git.debian.org/?p=collab-maint/vidalia.git
Package: vidalia
Architecture: any
diff -xpo -x templates -ruN vidalia-0.2.9/debian/postrm vidalia-0.2.9-1+squeeze1/debian/postrm
--- vidalia-0.2.9/debian/postrm 2010-05-20 21:56:39.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/postrm 2010-09-27 10:36:50.391974345 -0300
@@ -1,8 +1,6 @@
#!/bin/sh
set -e
-#DEBHELPER#
-
if [ "$1" = "purge" ]; then
echo " Removing /etc/default/tor.vidalia"
rm -f /etc/default/tor.vidalia
@@ -11,4 +9,4 @@
fi
fi
-exit 0
+#DEBHELPER#
diff -xpo -x templates -ruN vidalia-0.2.9/debian/README.Debian vidalia-0.2.9-1+squeeze1/debian/README.Debian
--- vidalia-0.2.9/debian/README.Debian 2010-05-20 21:56:39.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/README.Debian 2010-10-14 19:59:20.050762922 -0300
@@ -1,43 +1,124 @@
Vidalia for Debian
------------------
-There are currently two ways of communication supported between
-Tor daemon (carried with 'tor' package), and Vidalia interface:
+ For the anxious and impatient
+ -----------------------------
-1. Letting Vidalia start Tor process on its own.
+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'.
+
+
+
+
+ Full and complete explanation
+ -----------------------------
+
+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.
+
+Vidalia supports three different ways of talking to Tor:
+
+1. Let Vidalia start the Tor process on its own.
---------------------------------------------
- This is default option on debconf while configuring vidalia package
- (easy reconfigurable by running 'dpkg-reconfigure vidalia').
+ ------> "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 ***************************
+ | |
+ | |
+ | In the remote and unlikely event of a bug existing in the |
+ | Tor routing algorithm or implementation itself, it might be |
+ | _relatively_ easy, or at least possible, for a remote user to |
+ | gain access to the data of the user launching Vidalia (what's |
+ | known as a "privilege escalation" attack) |
+ | |
+ | |
+ | This will be much more difficult if you run Vidalia using |
+ | either of the two alternatives described below. |
+ | |
+ | |
+ | ** Please consider using them if possible! ** |
+ | |
+ | |
+ *********************** FOR PARANOIDS ONLY ***************************
+
+
- This is now handled in the debconf front-end to Vidalia. If you decide you no
- longer wish to have Vidalia control Tor, and want to re-enable Tor's ability to
- start when your machine boots, dpkg-reconfigure vidalia and choose 'no'.
+2. Enable Tor to use CookieAuthentication to communicate with Vidalia.
+ -------------------------------------------------------------------
+
+ * The best password is the one you don't have to know about *
+
+ This method consists of a password-less authentication. This means
+ you won't have to remember any password, but you'll have to grab a
+ 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.
-2. Enable Tor to use a control port to communicate with Vidalia.
+ You will end up having something like this:
+
+# grep Cookie /etc/tor/torrc
+CookieAuthentication 1
+
+ Now start/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,
+ by default at '/var/lib/tor/control_auth_cookie'
+
+ 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.
+
+ This is my preferred and recommended method, simple and easy, no
+ passwords.
+
+
+
+3. Enable Tor to use a control port to communicate with Vidalia.
-------------------------------------------------------------
- This can be easily done by editing Tor configuration file, by default
- '/etc/tor/torrc', adding or uncommenting the 'ControlPort=9051' option,
- and adding the proper value to 'HashedControlPassword', as shown below:
+ 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)
+# 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 have to have something like this:
- # grep Control /etc/tor/torrc
- ControlPort 9051
- HashedControlPassword 16:167F667A98F859D2600BD708B48B95343FEF7800B479E2AA4284ACF029
-
- Then start/restart Tor daemon and then run Vidalia GUI.
- It will ask Tor what auth modes it accepts and if everything is OK,
- You will be asked for the password, in the example, 'SOME_PASSWORD_HERE'
- (as you pass it with --hash-password, not the hash).
+ You will end up with something like this:
+
+# 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!
+
- -- Ulises Vitulli <uvitulli@fi.uba.ar> Wed, 17 Sep 2008 17:24:06 -0300
- (Updated by Erinn Clark <erinn@torproject.org> Sun, 04 Apr 2010 20:16:07 -0700)
+ -- Ulises Vitulli <dererk@debian.org> Thu, 14 Oct 2010 19:58:20 -0300
diff -xpo -x templates -ruN vidalia-0.2.9/debian/README.source vidalia-0.2.9-1+squeeze1/debian/README.source
--- vidalia-0.2.9/debian/README.source 2010-05-20 21:56:39.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/README.source 1969-12-31 21:00:00.000000000 -0300
@@ -1,39 +0,0 @@
-Building Vidalia from source
-============================
-
-#
-# getting the upstream sources
-#
-New official upstream tarballs are located here http://www.torproject.org/vidalia/
-
-
-#
-# Debian specific patches
-#
-Debian specific patches reside in debian/patches/ and are applied automagically
- by dpkg-source on building time.
-
-#
-# using pbuilder
-#
-tar -zxf vidalia-0.1.15.tar.gz
-cd vidalia-0.1.15/
-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.15/ and call there e.g.:
- % ln -sf ../vidalia-0.1.15.tar.gz vidalia_0.1.15.orig.tar.gz
- % dch -i
- % pdebuild
-
-the resulting files are found in /var/cache/pbuilder/result/
-
diff -xpo -x templates -ruN vidalia-0.2.9/debian/rules vidalia-0.2.9-1+squeeze1/debian/rules
--- vidalia-0.2.9/debian/rules 2010-05-20 21:56:39.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/rules 2010-09-27 10:36:50.391974345 -0300
@@ -14,10 +14,6 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-# Used for repacking upstream tarball
-UPVERSION=$(shell echo `head -n 1 debian/changelog|sed -e 's/^[^(]*(\([^)]*\)).*/\1/'`|sed -e 's/-.*//')
-
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
Attachment:
signature.asc
Description: OpenPGP digital signature