[Pkg-privacy-commits] [vidalia] 153/160: Adjust-filename-of-the-cookie-authentication-file-to.patch: new patch that adjusts the filename of the Tor cookie authentication file to match Debian's default.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository vidalia.

commit 1558681378360414ef971e66cbbd915e66895c00
Author: intrigeri <intrigeri at boum.org>
Date:   Thu Aug 14 09:30:41 2014 +0000

    Adjust-filename-of-the-cookie-authentication-file-to.patch: new patch that adjusts the filename of the Tor cookie authentication file to match Debian's default.
---
 ...name-of-the-cookie-authentication-file-to.patch | 73 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 74 insertions(+)

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
new file mode 100644
index 0000000..3b37ea2
--- /dev/null
+++ b/debian/patches/Adjust-filename-of-the-cookie-authentication-file-to.patch
@@ -0,0 +1,73 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Thu, 14 Aug 2014 09:28:19 +0000
+Subject: Adjust filename of the cookie authentication file to match Debian's
+ default.
+
+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(-)
+
+diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
+index fef48ec..6c66240 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);
+ 
+@@ -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)
+ }
+ 
+ /** Searches for and attempts to load the control authentication cookie. This
+- * assumes the cookie is named 'control_auth_cookie'. If <b>cookiePath</b> is
++ * assumes the cookie is named 'control.authcookie'. If <b>cookiePath</b> is
+  * 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)
+   /* Search for the cookie file */
+   foreach (QString path, pathList) {
+     QString cookieFile = QFileInfo(path).isFile() ?
+-                          path : path + "/control_auth_cookie";
++                          path : path + "/control.authcookie";
+     vDebug("Checking for authentication cookie in '%1'").arg(cookieFile);
+     if (!QFileInfo(cookieFile).exists())
+       continue;
+diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
+index a434e66..a2ad35a 100644
+--- a/src/vidalia/MainWindow.h
++++ b/src/vidalia/MainWindow.h
+@@ -212,7 +212,7 @@ private:
+   /** Authenticates Vidalia to Tor's control port. */
+   bool 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
+    * <b>cookiePath</b> is 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. */
diff --git a/debian/patches/series b/debian/patches/series
index a608de8..04880dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 debians-tor-binary-path.patch
 use-control-socket.patch
+Adjust-filename-of-the-cookie-authentication-file-to.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git