[Pkg-privacy-commits] [vidalia] 02/03: Drop vidalia-bridgeconf.patch: we now configure bridges with Tor Launcher.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:16:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to annotated tag debian/0.2.21-3+tails1
in repository vidalia.
commit ad760d09b28463421755d893887156c8f9f238ef
Author: intrigeri <intrigeri at boum.org>
Date: Sat Apr 5 16:14:48 2014 +0000
Drop vidalia-bridgeconf.patch: we now configure bridges with Tor Launcher.
---
debian/patches/series | 1 -
debian/patches/vidalia-bridgeconf.patch | 214 --------------------------------
2 files changed, 215 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 9e38729..4ba3bde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
debians-tor-binary-path.patch
-vidalia-bridgeconf.patch
tails-remove-useless-controls.patch
use-control-socket.patch
diff --git a/debian/patches/vidalia-bridgeconf.patch b/debian/patches/vidalia-bridgeconf.patch
deleted file mode 100644
index c3d07bf..0000000
--- a/debian/patches/vidalia-bridgeconf.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-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(-)
-
---- a/src/vidalia/MainWindow.cpp
-+++ b/src/vidalia/MainWindow.cpp
-@@ -23,6 +23,7 @@
- #include "ControlPasswordInputDialog.h"
- #include "TorSettings.h"
- #include "ServerSettings.h"
-+#include "NetworkSettings.h"
- #ifdef USE_AUTOUPDATE
- #include "UpdatesAvailableDialog.h"
- #endif
-@@ -1585,6 +1586,20 @@
- if (status.isValid())
- bootstrapStatusChanged(status);
- }
-+
-+ NetworkSettings netSettings(_torControl);
-+ if (Vidalia::showBridgeConfOnStart() && netSettings.noRealBridges()) {
-+ if (!netSettings.getUseBridges()) {
-+ netSettings.setUseBridges(true);
-+ netSettings.apply();
-+ }
-+ if (showBridgeHelp() == VMessageBox::Help) {
-+ showConfigDialog(ConfigDialog::Network);
-+ showHelpDialog("bridges");
-+ } else {
-+ showConfigDialog(ConfigDialog::Network);
-+ }
-+ }
- }
-
- /** Called when Vidalia fails to authenticate to Tor. The failure reason is
-@@ -1935,6 +1950,37 @@
- showConfigDialog(ConfigDialog::Server);
- }
-
-+/** Displays a help message explaining how to get and setup bridges. */
-+int
-+MainWindow::showBridgeHelp()
-+{
-+ QString bridgeHelp;
-+ QTextStream out(&bridgeHelp);
-+
-+ out << p(tr("You have started T(A)ILS in bridge mode. In order to get "
-+ "Internet access you must configure at least one working "
-+ "bridge (note that bridges are sometimes offline so it is "
-+ "a good idea to configure several of them).")) +
-+ p(tr("Note: you might see a bridge listed as 127.0.0.1:*. In "
-+ "that case, just ignore it and <b>leave it be</b>. It's "
-+ "there to work around a deficiency in Tor's current bridge "
-+ "handling - removing it may disable bridge mode.")) +
-+ p(tr("If you don't know what a bridge is, please read the "
-+ "\"<i>What are bridge relays?</i>\" section in the Vidalia "
-+ "help.")) +
-+ p(tr("If you don't know any bridges and don't know where to get "
-+ "them, please read the \"<i>How do I find a bridge relay?</i>\" "
-+ "section of the Vidalia help.")) +
-+ p(tr("You can access Vidalia's bridge help by pressing the Help "
-+ "button below."))
-+ << endl;
-+
-+ return VMessageBox::information(this, tr("T(A)ILS Bridge Mode Help"),
-+ bridgeHelp,
-+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
-+ VMessageBox::Help);
-+}
-+
- /** Called when the user selects the "New Identity" action from the menu. */
- void
- MainWindow::newIdentity()
---- a/src/vidalia/MainWindow.h
-+++ b/src/vidalia/MainWindow.h
-@@ -114,6 +114,8 @@
- void showConfigDialog(ConfigDialog::Page page = ConfigDialog::General);
- /** Displays the Configuration dialog, set to the Server page. */
- void showServerConfigDialog();
-+ /** Displays a help message explaining how to get and setup bridges. */
-+ int showBridgeHelp();
- /** Called when the "show on startup" checkbox is toggled. */
- void toggleShowOnStartup(bool checked);
- /** Called when the web browser or IM client have stopped */
---- a/src/vidalia/Vidalia.cpp
-+++ b/src/vidalia/Vidalia.cpp
-@@ -39,14 +39,15 @@
- #include <stdlib.h>
-
- /* Available command-line arguments. */
--#define ARG_LANGUAGE "lang" /**< Argument specifying language. */
--#define ARG_GUISTYLE "style" /**< Argument specfying GUI style. */
--#define ARG_RESET "reset" /**< Reset Vidalia's saved settings. */
--#define ARG_HELP "help" /**< Display usage informatino. */
--#define ARG_DATADIR "datadir" /**< Directory to use for data files. */
--#define ARG_PIDFILE "pidfile" /**< Location and name of our pidfile.*/
--#define ARG_LOGFILE "logfile" /**< Location of our logfile. */
--#define ARG_LOGLEVEL "loglevel" /**< Log verbosity. */
-+#define ARG_LANGUAGE "lang" /**< Argument specifying language. */
-+#define ARG_GUISTYLE "style" /**< Argument specfying GUI style. */
-+#define ARG_RESET "reset" /**< Reset Vidalia's saved settings. */
-+#define ARG_HELP "help" /**< Display usage informatino. */
-+#define ARG_DATADIR "datadir" /**< Directory to use for data files. */
-+#define ARG_PIDFILE "pidfile" /**< Location and name of our pidfile.*/
-+#define ARG_LOGFILE "logfile" /**< Location of our logfile. */
-+#define ARG_LOGLEVEL "loglevel" /**< Log verbosity. */
-+#define ARG_BRIDGECONF "bridgeconf" /**< Display network conf on start. */
- #define ARG_READ_PASSWORD_FROM_STDIN \
- "read-password-from-stdin" /**< Read password from stdin. */
-
-@@ -57,6 +58,7 @@
- TorControl* Vidalia::_torControl = 0; /**< Main TorControl object. */
- Log Vidalia::_log;
- QList<QTranslator *> Vidalia::_translators;
-+bool Vidalia::_showBridgeConfOnStart = false;
-
-
- /** Catches debugging messages from Qt and sends them to Vidalia's logs. If Qt
-@@ -123,6 +125,9 @@
- /* Set the GUI style appropriately. */
- setStyle(_args.value(ARG_GUISTYLE));
-
-+ if (_args.contains(ARG_BRIDGECONF))
-+ _showBridgeConfOnStart = true;
-+
- /* Creates a TorControl object, used to talk to Tor. */
- _torControl = new TorControl(TorSettings().getControlMethod());
-
-@@ -212,6 +217,10 @@
- out << trow(tcol("-"ARG_LANGUAGE" <language>") +
- tcol(tr("Sets Vidalia's language.") +
- "<br>[" + LanguageSupport::languageCodes().join("|") + "]"));
-+ out << trow(tcol("-"ARG_BRIDGECONF) +
-+ tcol(tr("Shows the bridge configuration dialog immediately "
-+ "after Vidalia has started and informs the user how to "
-+ "get and setup bridges.")));
- out << "</table>";
-
- VMessageBox::information(0,
---- a/src/vidalia/Vidalia.h
-+++ b/src/vidalia/Vidalia.h
-@@ -75,6 +75,10 @@
- /** Returns Vidalia's main TorControl object. */
- static TorControl* torControl() { return _torControl; }
-
-+ /** Returns true if we should show the network config page on start and
-+ * guide the user through setting up bridges. */
-+ static bool showBridgeConfOnStart() { return _showBridgeConfOnStart; }
-+
- /** Returns the location Vidalia uses for its data files. */
- static QString dataDirectory();
- /** Returns the default location of Vidalia's data directory. */
-@@ -153,6 +157,7 @@
- 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. */
-+ static bool _showBridgeConfOnStart;
- };
-
- #endif
---- 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 @@
- 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
---- a/src/vidalia/config/NetworkSettings.h
-+++ b/src/vidalia/config/NetworkSettings.h
-@@ -97,6 +97,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. */
--
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