[Pkg-privacy-commits] [vidalia] 25/26: Refresh quilt patches to make them apply on Vidalia 0.3.x.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:15:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch experimental
in repository vidalia.
commit a40479df744aa7a6f691a97ec6a3fd0b1145a2f5
Author: intrigeri <intrigeri at boum.org>
Date: Mon Aug 18 09:05:21 2014 +0000
Refresh quilt patches to make them apply on Vidalia 0.3.x.
---
...name-of-the-cookie-authentication-file-to.patch | 60 ++++++++++------------
debian/patches/debians-tor-binary-path.patch | 14 +++--
debian/patches/use-control-socket.patch | 19 ++++---
3 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/debian/patches/Adjust-filename-of-the-cookie-authentication-file-to.patch b/debian/patches/Adjust-filename-of-the-cookie-authentication-file-to.patch
index 3b37ea2..2979e24 100644
--- a/debian/patches/Adjust-filename-of-the-cookie-authentication-file-to.patch
+++ b/debian/patches/Adjust-filename-of-the-cookie-authentication-file-to.patch
@@ -6,41 +6,33 @@ Subject: Adjust filename of the cookie authentication file to match Debian's
Debian's system-wide Tor service sets this torrc parameter:
CookieAuthFile /var/run/tor/control.authcookie
---
- src/vidalia/MainWindow.cpp | 10 +++++-----
- src/vidalia/MainWindow.h | 2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ src/vidalia/MainWindow.cpp | 8 ++++----
+ src/vidalia/MainWindow.h | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
-index fef48ec..6c66240 100644
+index e3cacb0..6641195 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
-@@ -1500,14 +1500,14 @@ MainWindow::authenticate()
- /* Try to load an auth cookie and send it to Tor */
- QByteArray cookie = loadControlCookie(pi.cookieAuthFile());
- while (cookie.isEmpty()) {
-- /* Prompt the user to find their control_auth_cookie */
-+ /* Prompt the user to find their control.authcookie */
- int ret = VMessageBox::question(this,
- tr("Cookie Authentication Required"),
- p(tr("The Tor software requires Vidalia to send the "
- "contents of an authentication cookie, but Vidalia "
- "was unable to find one."))
- + p(tr("Would you like to browse for the file "
-- "'control_auth_cookie' yourself?")),
-+ "'control.authcookie' yourself?")),
- VMessageBox::Browse|VMessageBox::Default,
- VMessageBox::Cancel|VMessageBox::Escape);
+@@ -1569,7 +1569,7 @@ MainWindow::tryCookie(const ProtocolInfo &pi, bool safe)
+ "contents of an authentication cookie, but Vidalia "
+ "was unable to find one."))
+ + p(tr("Would you like to browse for the file "
+- "'control_auth_cookie' yourself?")),
++ "'control.authcookie' yourself?")),
+ VMessageBox::Browse|VMessageBox::Default,
+ VMessageBox::Cancel|VMessageBox::Escape);
-@@ -1516,7 +1516,7 @@ MainWindow::authenticate()
- QString cookieDir = QFileDialog::getOpenFileName(this,
- tr("Data Directory"),
- settings.getDataDirectory(),
-- tr("Control Cookie (control_auth_cookie)"));
-+ tr("Control Cookie (control.authcookie)"));
- if (cookieDir.isEmpty())
- goto cancel;
- cookieDir = QFileInfo(cookieDir).absolutePath();
-@@ -1680,7 +1680,7 @@ MainWindow::authenticationFailed(QString errmsg)
+@@ -1578,7 +1578,7 @@ MainWindow::tryCookie(const ProtocolInfo &pi, bool safe)
+ QString cookieDir = QFileDialog::getOpenFileName(this,
+ tr("Data Directory"),
+ settings.getDataDirectory(),
+- tr("Control Cookie (control_auth_cookie)"));
++ tr("Control Cookie (control.authcookie)"));
+ if (cookieDir.isEmpty())
+ return false;
+ cookieDir = QFileInfo(cookieDir).absolutePath();
+@@ -1632,7 +1632,7 @@ MainWindow::checkTorVersion()
}
/** Searches for and attempts to load the control authentication cookie. This
@@ -49,7 +41,7 @@ index fef48ec..6c66240 100644
* empty, this method will search some default locations depending on the
* current platform. <b>cookiePath</b> can point to either a cookie file or a
* directory containing the cookie file. */
-@@ -1709,7 +1709,7 @@ MainWindow::loadControlCookie(QString cookiePath)
+@@ -1661,7 +1661,7 @@ MainWindow::loadControlCookie(QString cookiePath)
/* Search for the cookie file */
foreach (QString path, pathList) {
QString cookieFile = QFileInfo(path).isFile() ?
@@ -59,12 +51,12 @@ index fef48ec..6c66240 100644
if (!QFileInfo(cookieFile).exists())
continue;
diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
-index a434e66..a2ad35a 100644
+index e5befa3..c25671f 100644
--- a/src/vidalia/MainWindow.h
+++ b/src/vidalia/MainWindow.h
-@@ -212,7 +212,7 @@ private:
+@@ -241,7 +241,7 @@ private:
/** Authenticates Vidalia to Tor's control port. */
- bool authenticate();
+ void authenticate();
/** Searches for and attempts to load the control authentication cookie.
- * This assumes the cookie is named 'control_auth_cookie'. If
+ * This assumes the cookie is named 'control.authcookie'. If
diff --git a/debian/patches/debians-tor-binary-path.patch b/debian/patches/debians-tor-binary-path.patch
index 6f5a0e9..3267d4b 100644
--- a/debian/patches/debians-tor-binary-path.patch
+++ b/debian/patches/debians-tor-binary-path.patch
@@ -1,10 +1,16 @@
Author: dererk
Description: Even though upstream has implemented a block of code to perform this check, as Tor's binary is located in /usr/sbin path, regular users are likely to lack that path in their PATH enviroment variable. This patch purpose is setting it to the right Debian's Tor package.
-Index: git/src/vidalia/config/TorSettings.cpp
+
===================================================================
---- git.orig/src/vidalia/config/TorSettings.cpp 2012-07-12 01:21:46.000000000 -0300
-+++ git/src/vidalia/config/TorSettings.cpp 2012-07-12 01:22:54.000000000 -0300
-@@ -83,7 +83,8 @@
+---
+ src/vidalia/config/TorSettings.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp
+index 25de975..417fee6 100644
+--- a/src/vidalia/config/TorSettings.cpp
++++ b/src/vidalia/config/TorSettings.cpp
+@@ -83,7 +83,8 @@ TorSettings::TorSettings(TorControl *torControl)
else
setDefault(SETTING_TOR_EXECUTABLE, programFiles + "\\Tor\\tor.exe");
#else
diff --git a/debian/patches/use-control-socket.patch b/debian/patches/use-control-socket.patch
index eab5ac4..fd4fca3 100644
--- a/debian/patches/use-control-socket.patch
+++ b/debian/patches/use-control-socket.patch
@@ -1,10 +1,15 @@
Author: dererk
Description: Switch to Control Socket by default, this involves using Debian Tor from 0.2.2.29-beta or above
-Index: git/src/vidalia/config/TorSettings.cpp
-===================================================================
---- git.orig/src/vidalia/config/TorSettings.cpp 2012-02-11 22:21:38.000000000 -0300
-+++ git/src/vidalia/config/TorSettings.cpp 2012-02-11 22:21:38.000000000 -0300
-@@ -49,7 +49,7 @@
+
+---
+ src/vidalia/config/TorSettings.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp
+index 417fee6..610fd16 100644
+--- a/src/vidalia/config/TorSettings.cpp
++++ b/src/vidalia/config/TorSettings.cpp
+@@ -54,7 +54,7 @@
/** Default to using hashed password authentication */
#define DEFAULT_AUTH_METHOD PasswordAuth
/** Default control method */
@@ -13,8 +18,8 @@ Index: git/src/vidalia/config/TorSettings.cpp
/** Default socket path */
#define DEFAULT_SOCKET_PATH ""
-@@ -86,7 +86,7 @@
- setDefault(SETTING_CONTROL_PORT, 9051);
+@@ -94,7 +94,7 @@ TorSettings::TorSettings(TorControl *torControl)
+ setDefault(SETTING_SOCKS_PORT, 9050);
setDefault(SETTING_AUTH_METHOD, toString(DEFAULT_AUTH_METHOD));
setDefault(SETTING_CONTROL_METHOD, DEFAULT_CONTROL_METHOD);
- setDefault(SETTING_SOCKET_PATH, DEFAULT_SOCKET_PATH);
--
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