Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package vidalia.
Compared to the version in Wheezy, 0.2.20-2 brings two selected upstream commits
cherry-picked to fix important usability issues (#699178 and #699179).
The upstream release I cherry-picked the commits from was out last July, and the
updated package has been in sid since 18 days with no reported regression, so it
looks like a relatively safe update for Wheezy.
unblock vidalia/0.2.20-2
Cheers!
-- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (990, 'testing'), (1, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.7-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru vidalia-0.2.20/debian/changelog vidalia-0.2.20/debian/changelog
--- vidalia-0.2.20/debian/changelog 2012-07-14 07:19:30.000000000 +0200
+++ vidalia-0.2.20/debian/changelog 2013-02-02 17:02:10.000000000 +0100
@@ -1,3 +1,15 @@
+vidalia (0.2.20-2) unstable; urgency=low
+
+ * New patches cherry-picked from upstream 0.2.21:
+ - Fix-wrong-uptime-bandwidth-in-relay-list.patch (Closes: #699178)
+ This is upstream commit b3d4f7f with the changes/* file removed.
+ - Populate-the-relay-list-at-startup.patch (Closes: #699179)
+ This is taken from upstream commit b00f51dc, but with the fix for
+ upstream Trac#6482 (that doesn't seem worth a freeze exception) and
+ the changes/* file removed.
+
+ -- intrigeri <intrig...@debian.org> Sat, 02 Feb 2013 17:02:01 +0100
+
vidalia (0.2.20-1) unstable; urgency=low
[ Ulises Vitulli ]
diff -Nru vidalia-0.2.20/debian/patches/Fix-wrong-uptime-bandwidth-in-relay-list.patch vidalia-0.2.20/debian/patches/Fix-wrong-uptime-bandwidth-in-relay-list.patch
--- vidalia-0.2.20/debian/patches/Fix-wrong-uptime-bandwidth-in-relay-list.patch 1970-01-01 01:00:00.000000000 +0100
+++ vidalia-0.2.20/debian/patches/Fix-wrong-uptime-bandwidth-in-relay-list.patch 2013-02-02 17:02:10.000000000 +0100
@@ -0,0 +1,52 @@
+From: intrigeri <intrig...@boum.org>
+Date: Mon, 28 Jan 2013 17:24:47 +0100
+Subject: Fix wrong uptime/bandwidth in relay list (Closes: #699178).
+
+This is upstream commit b3d4f7f with the changes/* file removed.
+---
+ src/torcontrol/RouterDescriptor.cpp | 7 ++++---
+ src/vidalia/network/RouterDescriptorView.cpp | 8 +++++---
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/torcontrol/RouterDescriptor.cpp b/src/torcontrol/RouterDescriptor.cpp
+index 26051c1..2c2b147 100644
+--- a/src/torcontrol/RouterDescriptor.cpp
++++ b/src/torcontrol/RouterDescriptor.cpp
+@@ -106,7 +106,8 @@ RouterDescriptor::appendRouterStatusInfo(const RouterStatus &rs)
+ _ip = rs.ipAddress();
+ _orPort = rs.orPort();
+ _dirPort = rs.dirPort();
+- _avgBandwidth = rs.bandwidth();
+- _burstBandwidth = rs.bandwidth();
+- _observedBandwidth = rs.bandwidth();
++ _avgBandwidth = rs.bandwidth() * 1024;
++ _burstBandwidth = rs.bandwidth() * 1024;
++ _observedBandwidth = rs.bandwidth() * 1024;
++ _published = rs.published();
+ }
+diff --git a/src/vidalia/network/RouterDescriptorView.cpp b/src/vidalia/network/RouterDescriptorView.cpp
+index bb4b19d..8700612 100644
+--- a/src/vidalia/network/RouterDescriptorView.cpp
++++ b/src/vidalia/network/RouterDescriptorView.cpp
+@@ -106,7 +106,8 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist)
+
+ /* Add the IP address and router platform information */
+ html.append(trow(tcol(b(tr("IP Address:"))) + tcol(rd.ip().toString())));
+- html.append(trow(tcol(b(tr("Platform:"))) + tcol(rd.platform())));
++ if (!rd.platform().isEmpty())
++ html.append(trow(tcol(b(tr("Platform:"))) + tcol(rd.platform())));
+
+ /* If the router is online, then show the uptime and bandwidth stats. */
+ if (!rd.offline()) {
+@@ -121,8 +122,9 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist)
+ }
+
+ /* Date the router was published */
+- html.append(trow(tcol(b(tr("Last Updated:"))) +
+- tcol(string_format_datetime(rd.published()) + " GMT")));
++ if (!rd.published().isNull())
++ html.append(trow(tcol(b(tr("Last Updated:"))) +
++ tcol(string_format_datetime(rd.published()) + " GMT")));
+
+ html.append("</table>");
+
diff -Nru vidalia-0.2.20/debian/patches/Populate-the-relay-list-at-startup.patch vidalia-0.2.20/debian/patches/Populate-the-relay-list-at-startup.patch
--- vidalia-0.2.20/debian/patches/Populate-the-relay-list-at-startup.patch 1970-01-01 01:00:00.000000000 +0100
+++ vidalia-0.2.20/debian/patches/Populate-the-relay-list-at-startup.patch 2013-02-02 17:02:10.000000000 +0100
@@ -0,0 +1,27 @@
+From: intrigeri <intrig...@boum.org>
+Date: Mon, 28 Jan 2013 17:31:03 +0100
+Subject: Populate the relay list at startup (Closes: #699179)
+
+This is taken from upstream commit b00f51dc, but with the fix for upstream
+Trac#6482 (that doesn't seem worth a freeze exception) and the changes/*
+file removed.
+---
+ src/vidalia/network/NetViewer.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp
+index 1d48b96..cfba2ea 100644
+--- a/src/vidalia/network/NetViewer.cpp
++++ b/src/vidalia/network/NetViewer.cpp
+@@ -312,6 +312,11 @@ void
+ NetViewer::loadNetworkStatus()
+ {
+ NetworkStatus networkStatus = _torControl->getNetworkStatus();
++ if (networkStatus.isEmpty()) {
++ _refreshTimer.setInterval(2000);
++ } else {
++ _refreshTimer.setInterval(60*60*1000);
++ }
+
+ bool usingMicrodescriptors = _torControl->useMicrodescriptors();
+
diff -Nru vidalia-0.2.20/debian/patches/series vidalia-0.2.20/debian/patches/series
--- vidalia-0.2.20/debian/patches/series 2012-07-14 01:41:36.000000000 +0200
+++ vidalia-0.2.20/debian/patches/series 2013-02-02 17:02:10.000000000 +0100
@@ -1,2 +1,4 @@
debians-tor-binary-path.patch
use-control-socket.patch
+Fix-wrong-uptime-bandwidth-in-relay-list.patch
+Populate-the-relay-list-at-startup.patch
