[tbb-commits] [tor-browser-bundle/maint-3.6] Properly apply patch 11654.

[mikeperry at torproject.org]

commit b1aac2b64d108dd0d8e3b0ce90b5275d06bf76b4
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Aug 6 15:24:50 2014 -0700

    Properly apply patch 11654.
---
 Bundle-Data/Docs/ChangeLog.txt |    2 ++
 gitian/patches/bug11156.patch  |   27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 38eef4b..88bb0d6 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -2,6 +2,8 @@ Tor Browser Bundle 3.6.4 -- Aug 6 2014
  * All Platforms
    * Update Tor to 0.2.4.23
    * Update Tor launcher to 0.2.5.6
+   * Backported Tor Patches:
+     * Bug 11654: Properly apply the fix for malformed bug11156 log message
    * Update NoScript to 2.6.8.36
      * Bug 9516: Send Tor Launcher log messages to Browser Console
    * Update Torbutton to 1.6.11.1
diff --git a/gitian/patches/bug11156.patch b/gitian/patches/bug11156.patch
index d9f8e7a..68fcde9 100644
--- a/gitian/patches/bug11156.patch
+++ b/gitian/patches/bug11156.patch
@@ -273,3 +273,30 @@ index 0000000..97c70b2
 -- 
 1.9.1
 
+From 6a584ab03670b40031704f2c32bd8f41cb74d694 Mon Sep 17 00:00:00 2001
+From: George Kadianakis <desnacked at riseup.net>
+Date: Thu, 1 May 2014 14:44:29 +0100
+Subject: [PATCH 1/2] Fix a misuse of strlcpy() introduced by the #11156 patch.
+
+---
+ src/or/nodelist.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/or/nodelist.c b/src/or/nodelist.c
+index a38a6d4..09232f9 100644
+--- a/src/or/nodelist.c
++++ b/src/or/nodelist.c
+@@ -1510,8 +1510,8 @@ update_router_have_minimum_dir_info(void)
+   }
+ 
+   if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) {
+-    log_notice(LD_DIR, "Delaying dir fetches: %s", delay_fetches_msg);
+-    strlcpy(dir_info_status, "%s",  sizeof(dir_info_status));
++    log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg);
++    strlcpy(dir_info_status, delay_fetches_msg,  sizeof(dir_info_status));
+     res = 0;
+     goto done;
+   }
+-- 
+1.9.1
+