[Pkg-privacy-commits] [vidalia] 99/160: Rebase patches, drop Do-not-warn-about-Tor-version.patch.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:14:40 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 a38a64a9a99eb6c530a173cdeda2ea63111b4d33
Author: intrigeri <intrigeri at boum.org>
Date: Tue Feb 21 01:02:41 2012 +0100
Rebase patches, drop Do-not-warn-about-Tor-version.patch.
A feature dedicated to us was implemented upstream, and allows disabling the Tor
version check.
---
debian/patches/Do-not-warn-about-Tor-version.patch | 73 ----------
debian/patches/series | 1 -
debian/patches/tails-remove-useless-controls.patch | 56 +++++---
debian/patches/vidalia-bridgeconf.patch | 159 +++++++++++----------
4 files changed, 119 insertions(+), 170 deletions(-)
diff --git a/debian/patches/Do-not-warn-about-Tor-version.patch b/debian/patches/Do-not-warn-about-Tor-version.patch
deleted file mode 100644
index 89fd3d6..0000000
--- a/debian/patches/Do-not-warn-about-Tor-version.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Mon, 28 Nov 2011 11:47:51 +0100
-Subject: Do not warn about Tor version.
-
-Tails has its own security warning system, and Vidalia's one advises users
-upgrade actions that are not appropriate in the context of Tails.
----
- src/vidalia/MainWindow.cpp | 12 +-----------
- src/vidalia/log/StatusEventWidget.cpp | 13 -------------
- 2 files changed, 1 insertions(+), 24 deletions(-)
-
-diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
-index 4f0225b..caefca9 100644
---- a/src/vidalia/MainWindow.cpp
-+++ b/src/vidalia/MainWindow.cpp
-@@ -147,10 +147,6 @@ MainWindow::MainWindow()
- this, SLOT(authenticationFailed(QString)));
-
- _torControl->setEvent(TorEvents::GeneralStatus);
-- connect(_torControl, SIGNAL(dangerousTorVersion(tc::TorVersionStatus,
-- QString, QStringList)),
-- this, SLOT(dangerousTorVersion(tc::TorVersionStatus,
-- QString, QStringList)));
-
- _torControl->setEvent(TorEvents::ClientStatus);
- connect(_torControl, SIGNAL(bootstrapStatusChanged(BootstrapStatus)),
-@@ -1572,13 +1568,7 @@ void
- MainWindow::checkTorVersion()
- {
- QString status;
-- if (_torControl->getInfo("status/version/current", status)) {
-- if (!status.compare("old", Qt::CaseInsensitive)
-- || !status.compare("unrecommended", Qt::CaseInsensitive)
-- || !status.compare("obsolete", Qt::CaseInsensitive)) {
-- displayTorVersionWarning();
-- }
-- }
-+ _torControl->getInfo("status/version/current", status);
- }
-
- /** Called when Tor thinks its version is old or unrecommended, and displays
-diff --git a/src/vidalia/log/StatusEventWidget.cpp b/src/vidalia/log/StatusEventWidget.cpp
-index 4bd11d0..b1c72cb 100644
---- a/src/vidalia/log/StatusEventWidget.cpp
-+++ b/src/vidalia/log/StatusEventWidget.cpp
-@@ -48,10 +48,6 @@ StatusEventWidget::StatusEventWidget(QWidget *parent)
- this, SLOT(customContextMenuRequested(QPoint)));
- connect(tc, SIGNAL(authenticated()), this, SLOT(authenticated()));
- connect(tc, SIGNAL(disconnected()), this, SLOT(disconnected()));
-- connect(tc, SIGNAL(dangerousTorVersion(tc::TorVersionStatus, QString,
-- QStringList)),
-- this, SLOT(dangerousTorVersion(tc::TorVersionStatus, QString,
-- QStringList)));
- connect(tc, SIGNAL(circuitEstablished()), this, SLOT(circuitEstablished()));
- connect(tc, SIGNAL(bug(QString)), this, SLOT(bug(QString)));
- connect(tc, SIGNAL(clockSkewed(int, QString)),
-@@ -272,15 +268,6 @@ StatusEventWidget::authenticated()
- // in which case we missed the CIRCUIT_ESTABLISHED event. So fake it.
- if (tc->isCircuitEstablished())
- circuitEstablished();
--
-- // Check on the status of Tor's version, in case we missed that event too
-- QString status = tc->getInfo("status/version/current").toString();
-- if (! status.compare("old", Qt::CaseInsensitive)
-- || ! status.compare("obsolete", Qt::CaseInsensitive)) {
-- dangerousTorVersion(tc::ObsoleteTorVersion, version, QStringList());
-- } else if (! status.compare("unrecommended", Qt::CaseInsensitive)) {
-- dangerousTorVersion(tc::UnrecommendedTorVersion, version, QStringList());
-- }
- }
-
- void
---
diff --git a/debian/patches/series b/debian/patches/series
index eddd00d..9e38729 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-Do-not-warn-about-Tor-version.patch
debians-tor-binary-path.patch
vidalia-bridgeconf.patch
tails-remove-useless-controls.patch
diff --git a/debian/patches/tails-remove-useless-controls.patch b/debian/patches/tails-remove-useless-controls.patch
index 31fd32a..65519d7 100644
--- a/debian/patches/tails-remove-useless-controls.patch
+++ b/debian/patches/tails-remove-useless-controls.patch
@@ -1,8 +1,18 @@
-Index: git/src/vidalia/MainWindow.cpp
-===================================================================
---- git.orig/src/vidalia/MainWindow.cpp 2011-08-30 15:46:46.291104580 +0200
-+++ git/src/vidalia/MainWindow.cpp 2011-08-30 15:46:52.247165530 +0200
-@@ -211,8 +211,7 @@
+From: Vern Sun <s5unty at gmail.com>
+Date: Mon, 28 Nov 2011 11:44:36 +0100
+Subject: tails-remove-useless-controls
+
+---
+ src/vidalia/MainWindow.cpp | 60 +------------------
+ src/vidalia/MainWindow.h | 1 -
+ src/vidalia/MainWindow.ui | 138 --------------------------------------------
+ 3 files changed, 2 insertions(+), 197 deletions(-)
+
+diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
+index b404802..67b8aa0 100644
+--- a/src/vidalia/MainWindow.cpp
++++ b/src/vidalia/MainWindow.cpp
+@@ -215,8 +215,7 @@ MainWindow::MainWindow()
this, SLOT(upnpError(UPNPControl::UPNPError)));
#endif
@@ -12,7 +22,7 @@ Index: git/src/vidalia/MainWindow.cpp
show();
/* Optimistically hope that the tray icon gets added. */
_trayIcon.show();
-@@ -235,7 +234,6 @@
+@@ -249,7 +248,6 @@ MainWindow::setVisible(bool visible)
/* In Gnome, will hide buttons if Vidalia is run on startup. */
if (!QSystemTrayIcon::isSystemTrayAvailable()) {
/* Don't let people hide the main window, since that's all they have. */
@@ -20,7 +30,7 @@ Index: git/src/vidalia/MainWindow.cpp
ui.btnHide->hide();
/* Causes window to not appear in Enlightenment. */
//setMinimumHeight(height()-ui.btnHide->height());
-@@ -251,16 +249,6 @@
+@@ -265,16 +263,6 @@ MainWindow::retranslateUi()
ui.retranslateUi(this);
updateTorStatus(_status);
@@ -37,7 +47,7 @@ Index: git/src/vidalia/MainWindow.cpp
_actionShowBandwidth->setText(tr("Bandwidth Graph"));
_actionShowMessageLog->setText(tr("Message Log"));
-@@ -409,9 +397,6 @@
+@@ -423,9 +411,6 @@ MainWindow::close()
void
MainWindow::createActions()
{
@@ -47,7 +57,7 @@ Index: git/src/vidalia/MainWindow.cpp
_actionExit = new QAction(tr("Exit"), this);
connect(_actionExit, SIGNAL(triggered()), this, SLOT(close()));
-@@ -454,7 +439,6 @@
+@@ -468,7 +453,6 @@ MainWindow::createActions()
/* Don't give the menu items icons on OS X, since they end up in the
* application menu bar. Menu bar items on OS X typically do not have
* icons. */
@@ -55,7 +65,7 @@ Index: git/src/vidalia/MainWindow.cpp
_actionExit->setIcon(QIcon(IMG_EXIT));
_actionShowBandwidth->setIcon(QIcon(IMG_BWGRAPH));
_actionShowMessageLog->setIcon(QIcon(IMG_MESSAGELOG));
-@@ -492,8 +476,6 @@
+@@ -506,8 +490,6 @@ QMenu*
MainWindow::createTrayMenu()
{
QMenu *menu = new QMenu(this);
@@ -64,7 +74,7 @@ Index: git/src/vidalia/MainWindow.cpp
menu->addAction(_actionShowBandwidth);
menu->addAction(_actionShowMessageLog);
menu->addAction(_actionShowNetworkMap);
-@@ -523,7 +505,6 @@
+@@ -537,7 +519,6 @@ MainWindow::createMenuBar()
/* Mac users sure like their shortcuts. Actions NOT mentioned below
* don't explicitly need shortcuts, since they are merged to the default
* menubar and get the default shortcuts anyway. */
@@ -72,7 +82,7 @@ Index: git/src/vidalia/MainWindow.cpp
_actionShowBandwidth->setShortcut(tr("Ctrl+B"));
_actionShowMessageLog->setShortcut(tr("Ctrl+L"));
_actionShowNetworkMap->setShortcut(tr("Ctrl+N"));
-@@ -550,8 +531,6 @@
+@@ -564,8 +545,6 @@ MainWindow::createMenuBar()
fileMenu->addAction(_actionShowConfig);
QMenu *torMenu = _menuBar->addMenu(tr("Tor"));
@@ -81,7 +91,7 @@ Index: git/src/vidalia/MainWindow.cpp
torMenu->addAction(_actionNewIdentity);
QMenu *viewMenu = _menuBar->addMenu(tr("View"));
-@@ -872,20 +851,7 @@
+@@ -896,20 +875,7 @@ MainWindow::updateTorStatus(TorStatus status)
actionText = tr("Start Tor");
trayIconFile = IMG_TOR_STOPPED;
statusIconFile = IMG_TOR_STOPPED_48;
@@ -103,7 +113,7 @@ Index: git/src/vidalia/MainWindow.cpp
setStartupProgressVisible(false);
} else if (status == Stopping) {
if (_delayedShutdownStarted) {
-@@ -896,32 +862,10 @@
+@@ -920,32 +886,10 @@ MainWindow::updateTorStatus(TorStatus status)
}
trayIconFile = IMG_TOR_STOPPING;
statusIconFile = IMG_TOR_STOPPING_48;
@@ -136,11 +146,11 @@ Index: git/src/vidalia/MainWindow.cpp
setStartupProgressVisible(true);
setStartupProgress(STARTUP_PROGRESS_STARTING, statusText);
} else if (status == CircuitEstablished) {
-Index: git/src/vidalia/MainWindow.h
-===================================================================
---- git.orig/src/vidalia/MainWindow.h 2011-08-30 15:46:46.291104580 +0200
-+++ git/src/vidalia/MainWindow.h 2011-08-30 15:46:52.247165530 +0200
-@@ -280,7 +280,6 @@
+diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
+index 8cf424b..4900df0 100644
+--- a/src/vidalia/MainWindow.h
++++ b/src/vidalia/MainWindow.h
+@@ -280,7 +280,6 @@ private:
/** Defines the actions for the tray menu */
QAction* _actionShowControlPanel;
@@ -148,10 +158,10 @@ Index: git/src/vidalia/MainWindow.h
QAction* _actionShowConfig;
QAction* _actionShowAbout;
QAction* _actionExit;
-Index: git/src/vidalia/MainWindow.ui
-===================================================================
---- git.orig/src/vidalia/MainWindow.ui 2011-08-30 15:44:10.457509573 +0200
-+++ git/src/vidalia/MainWindow.ui 2011-08-30 15:46:52.247165530 +0200
+diff --git a/src/vidalia/MainWindow.ui b/src/vidalia/MainWindow.ui
+index 586af36..de90734 100644
+--- a/src/vidalia/MainWindow.ui
++++ b/src/vidalia/MainWindow.ui
@@ -224,32 +224,6 @@
<property name="spacing" >
<number>6</number>
diff --git a/debian/patches/vidalia-bridgeconf.patch b/debian/patches/vidalia-bridgeconf.patch
index 3c1853b..7f26597 100644
--- a/debian/patches/vidalia-bridgeconf.patch
+++ b/debian/patches/vidalia-bridgeconf.patch
@@ -1,56 +1,20 @@
-Index: git/src/vidalia/config/NetworkSettings.cpp
-===================================================================
---- git.orig/src/vidalia/config/NetworkSettings.cpp 2011-08-30 15:44:10.457509573 +0200
-+++ git/src/vidalia/config/NetworkSettings.cpp 2011-08-30 15:46:46.291104580 +0200
-@@ -16,6 +16,8 @@
- #include "NetworkSettings.h"
- #include "TorControl.h"
-
-+#include <QRegExp>
-+
- #define SETTING_FASCIST_FIREWALL "FascistFirewall"
- #define SETTING_REACHABLE_ADDRESSES "ReachableAddresses"
-
-@@ -291,6 +293,21 @@
- return value(SETTING_TUNNEL_DIR_CONNS).toBool();
- }
-
-+/** Returns true if no real bridges are configured. */
-+bool
-+NetworkSettings::noRealBridges() {
-+ /* Regexp matches loopback on any port */
-+ QRegExp bogusBridge("^127(\\.\\d{1,3}){3}:\\d{1,5}$");
-+ QStringList bridges = localValue(SETTING_BRIDGE_LIST).toStringList();
-+
-+ QStringListIterator it(bridges);
-+ while (it.hasNext())
-+ if (!it.next().contains(bogusBridge))
-+ return false;
-+
-+ return true;
-+}
-+
- /** Converts the ProxyType <b>type</b> to a string to store in the
- * configuration file. */
- QString
-Index: git/src/vidalia/config/NetworkSettings.h
-===================================================================
---- git.orig/src/vidalia/config/NetworkSettings.h 2011-08-30 15:44:10.457509573 +0200
-+++ git/src/vidalia/config/NetworkSettings.h 2011-08-30 15:46:46.291104580 +0200
-@@ -98,6 +98,9 @@
- * connections through a one-hop circuit. */
- bool getTunnelDirConns();
-
-+ /** Returns true if no real bridges are configured. */
-+ bool noRealBridges();
-+
- private:
- /** Converts the ProxyType <b>type</b> to a string to store in the
- * configuration file. */
-Index: git/src/vidalia/MainWindow.cpp
-===================================================================
---- git.orig/src/vidalia/MainWindow.cpp 2011-08-30 15:44:10.457509573 +0200
-+++ git/src/vidalia/MainWindow.cpp 2011-08-30 15:46:46.291104580 +0200
+From: Vern Sun <s5unty at gmail.com>
+Date: Mon, 28 Nov 2011 11:44:36 +0100
+Subject: vidalia-bridgeconf
+
+---
+ src/vidalia/MainWindow.cpp | 46 ++++++++++++++++++++++++++++++++
+ src/vidalia/MainWindow.h | 2 +
+ src/vidalia/Vidalia.cpp | 25 ++++++++++++-----
+ src/vidalia/Vidalia.h | 5 +++
+ src/vidalia/config/NetworkSettings.cpp | 17 ++++++++++++
+ src/vidalia/config/NetworkSettings.h | 3 ++
+ 6 files changed, 90 insertions(+), 8 deletions(-)
+
+diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
+index d170d47..b404802 100644
+--- a/src/vidalia/MainWindow.cpp
++++ b/src/vidalia/MainWindow.cpp
@@ -23,6 +23,7 @@
#include "ControlPasswordInputDialog.h"
#include "TorSettings.h"
@@ -59,7 +23,7 @@ Index: git/src/vidalia/MainWindow.cpp
#ifdef USE_AUTOUPDATE
#include "UpdatesAvailableDialog.h"
#endif
-@@ -1456,6 +1457,20 @@
+@@ -1510,6 +1511,20 @@ MainWindow::authenticated()
if (status.isValid())
bootstrapStatusChanged(status);
}
@@ -80,7 +44,7 @@ Index: git/src/vidalia/MainWindow.cpp
}
/** Called when Vidalia fails to authenticate to Tor. The failure reason is
-@@ -1803,6 +1818,37 @@
+@@ -1860,6 +1875,37 @@ MainWindow::showServerConfigDialog()
showConfigDialog(ConfigDialog::Server);
}
@@ -118,11 +82,11 @@ Index: git/src/vidalia/MainWindow.cpp
/** Called when the user selects the "New Identity" action from the menu. */
void
MainWindow::newIdentity()
-Index: git/src/vidalia/MainWindow.h
-===================================================================
---- git.orig/src/vidalia/MainWindow.h 2011-08-30 15:44:10.457509573 +0200
-+++ git/src/vidalia/MainWindow.h 2011-08-30 15:46:46.291104580 +0200
-@@ -114,6 +114,8 @@
+diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
+index dc251e1..8cf424b 100644
+--- a/src/vidalia/MainWindow.h
++++ b/src/vidalia/MainWindow.h
+@@ -114,6 +114,8 @@ private slots:
void showConfigDialog(ConfigDialog::Page page = ConfigDialog::General);
/** Displays the Configuration dialog, set to the Server page. */
void showServerConfigDialog();
@@ -131,10 +95,10 @@ Index: git/src/vidalia/MainWindow.h
/** Called when the "show on startup" checkbox is toggled. */
void toggleShowOnStartup(bool checked);
/** Called when the web browser or IM client have stopped */
-Index: git/src/vidalia/Vidalia.cpp
-===================================================================
---- git.orig/src/vidalia/Vidalia.cpp 2011-08-30 15:44:10.457509573 +0200
-+++ git/src/vidalia/Vidalia.cpp 2011-08-30 15:46:46.295104621 +0200
+diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp
+index 53b41c9..d2d1d8f 100644
+--- a/src/vidalia/Vidalia.cpp
++++ b/src/vidalia/Vidalia.cpp
@@ -40,14 +40,15 @@
#include <stdlib.h>
@@ -159,7 +123,7 @@ Index: git/src/vidalia/Vidalia.cpp
#define ARG_READ_PASSWORD_FROM_STDIN \
"read-password-from-stdin" /**< Read password from stdin. */
-@@ -58,6 +59,7 @@
+@@ -58,6 +59,7 @@ QString Vidalia::_language; /**< The current language. */
TorControl* Vidalia::_torControl = 0; /**< Main TorControl object. */
Log Vidalia::_log;
QList<QTranslator *> Vidalia::_translators;
@@ -167,7 +131,7 @@ Index: git/src/vidalia/Vidalia.cpp
/** Catches debugging messages from Qt and sends them to Vidalia's logs. If Qt
-@@ -124,6 +126,9 @@
+@@ -124,6 +126,9 @@ Vidalia::Vidalia(QStringList args, int &argc, char **argv)
/* Set the GUI style appropriately. */
setStyle(_args.value(ARG_GUISTYLE));
@@ -177,7 +141,7 @@ Index: git/src/vidalia/Vidalia.cpp
/* Creates a TorControl object, used to talk to Tor. */
_torControl = new TorControl(TorSettings().getControlMethod());
-@@ -217,6 +222,10 @@
+@@ -217,6 +222,10 @@ Vidalia::showUsageMessageBox()
out << trow(tcol("-"ARG_LANGUAGE" <language>") +
tcol(tr("Sets Vidalia's language.") +
"<br>[" + LanguageSupport::languageCodes().join("|") + "]"));
@@ -188,11 +152,11 @@ Index: git/src/vidalia/Vidalia.cpp
out << "</table>";
VMessageBox::information(0,
-Index: git/src/vidalia/Vidalia.h
-===================================================================
---- git.orig/src/vidalia/Vidalia.h 2011-08-30 15:44:10.457509573 +0200
-+++ git/src/vidalia/Vidalia.h 2011-08-30 15:46:46.295104621 +0200
-@@ -74,6 +74,10 @@
+diff --git a/src/vidalia/Vidalia.h b/src/vidalia/Vidalia.h
+index b7d09f4..88cb858 100644
+--- a/src/vidalia/Vidalia.h
++++ b/src/vidalia/Vidalia.h
+@@ -74,6 +74,10 @@ public:
/** Returns Vidalia's main TorControl object. */
static TorControl* torControl() { return _torControl; }
@@ -203,7 +167,7 @@ Index: git/src/vidalia/Vidalia.h
/** Returns the location Vidalia uses for its data files. */
static QString dataDirectory();
-@@ -158,6 +162,7 @@
+@@ -158,6 +162,7 @@ private:
static TorControl* _torControl; /**< Vidalia's main TorControl object.*/
static Log _log; /**< Logs debugging messages to file or stdout. */
static QList<QTranslator *> _translators; /**< List of installed translators. */
@@ -211,3 +175,52 @@ Index: git/src/vidalia/Vidalia.h
};
#endif
+diff --git a/src/vidalia/config/NetworkSettings.cpp b/src/vidalia/config/NetworkSettings.cpp
+index 0229442..49fb144 100644
+--- a/src/vidalia/config/NetworkSettings.cpp
++++ b/src/vidalia/config/NetworkSettings.cpp
+@@ -16,6 +16,8 @@
+ #include "NetworkSettings.h"
+ #include "TorControl.h"
+
++#include <QRegExp>
++
+ #define SETTING_FASCIST_FIREWALL "FascistFirewall"
+ #define SETTING_REACHABLE_ADDRESSES "ReachableAddresses"
+
+@@ -284,6 +286,21 @@ NetworkSettings::getTunnelDirConns()
+ return value(SETTING_TUNNEL_DIR_CONNS).toBool();
+ }
+
++/** Returns true if no real bridges are configured. */
++bool
++NetworkSettings::noRealBridges() {
++ /* Regexp matches loopback on any port */
++ QRegExp bogusBridge("^127(\\.\\d{1,3}){3}:\\d{1,5}$");
++ QStringList bridges = localValue(SETTING_BRIDGE_LIST).toStringList();
++
++ QStringListIterator it(bridges);
++ while (it.hasNext())
++ if (!it.next().contains(bogusBridge))
++ return false;
++
++ return true;
++}
++
+ /** Converts the ProxyType <b>type</b> to a string to store in the
+ * configuration file. */
+ QString
+diff --git a/src/vidalia/config/NetworkSettings.h b/src/vidalia/config/NetworkSettings.h
+index aa5d88a..94f9196 100644
+--- a/src/vidalia/config/NetworkSettings.h
++++ b/src/vidalia/config/NetworkSettings.h
+@@ -97,6 +97,9 @@ public:
+ * connections through a one-hop circuit. */
+ bool getTunnelDirConns();
+
++ /** Returns true if no real bridges are configured. */
++ bool noRealBridges();
++
+ private:
+ /** Converts the ProxyType <b>type</b> to a string to store in the
+ * configuration file. */
--
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