[tor-commits] [tor-messenger-build/esr52] Fix rebase of mozilla/ patches

[sukhbir at torproject.org]

commit ce272c028576c2c89263c49ffd4c0aab9e9e3f85
Author: Arlo Breault <arlolra at gmail.com>
Date:   Fri Sep 1 18:07:44 2017 -0400

    Fix rebase of mozilla/ patches
---
 .../mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch  | 12 +++++++-----
 projects/mozilla/0002-Trac-16475-Block-flash-too.patch       |  4 ++--
 projects/mozilla/0003-OSX-package-as-tar.bz2.patch           |  4 ++--
 projects/mozilla/0004-Updater-fixups-for-TM.patch            |  4 ++--
 ...ermit-storing-exceptions-even-w-inPrivateBrowsingMo.patch |  4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
index 421eb25..754f617 100644
--- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
+++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
@@ -1,9 +1,11 @@
-From 517e61f71f911bc2b2fbed5ccdd5acce1f39f1f6 Mon Sep 17 00:00:00 2001
+From c0d3a7d4edcba39a098e5025271f7b7d59344304 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra at gmail.com>
-Date: Tue, 25 Jul 2017 15:51:22 -0400
+Date: Fri, 1 Sep 2017 17:39:04 -0400
 Subject: [PATCH 1/5] Trac 19910: Prevents STARTTLS in XMPP
 
- * Revert "Bug #3875: Use Optimistic Data SOCKS variant."
+ * Revert "Bug 3875: Use Optimistic Data SOCKS variant."
+
+This reverts commit 9b0df5bf5da258439fb0a697f81e903882c315a9.
 ---
  netwerk/base/nsSocketTransport2.cpp | 44 ++++++++-----------------------------
  netwerk/base/nsSocketTransport2.h   |  4 +---
@@ -11,7 +13,7 @@ Subject: [PATCH 1/5] Trac 19910: Prevents STARTTLS in XMPP
  3 files changed, 11 insertions(+), 40 deletions(-)
 
 diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp
-index 4399465fe534..a5df391fb7d5 100644
+index 4399465fe534..1bfd1fc91525 100644
 --- a/netwerk/base/nsSocketTransport2.cpp
 +++ b/netwerk/base/nsSocketTransport2.cpp
 @@ -1983,26 +1983,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags)
@@ -38,7 +40,7 @@ index 4399465fe534..a5df391fb7d5 100644
 -    }
 -    else if (((mState == STATE_CONNECTING) || (mState = STATE_SENTGET)) &&
 -             !gIOService->IsNetTearingDown()) {
-+    else if (mState == STATE_CONNECTING) {
++    else if ((mState == STATE_CONNECTING) && !gIOService->IsNetTearingDown()) {
          // We do not need to do PR_ConnectContinue when we are already
          // shutting down.
  
diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch
index 31d6238..23a9447 100644
--- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch
+++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch
@@ -1,6 +1,6 @@
-From 387fbb26920e7c9230647136ff21fef0a4574aa7 Mon Sep 17 00:00:00 2001
+From 9772edfd02bf499342c3089473a807dcf47b2525 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra at gmail.com>
-Date: Tue, 25 Jul 2017 15:52:29 -0400
+Date: Thu, 6 Oct 2016 20:13:35 -0700
 Subject: [PATCH 2/5] Trac 16475: Block flash too
 
  * Builds on "Bug #3547: Block all plugins except flash."
diff --git a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch
index 1366752..8a9d260 100644
--- a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch
+++ b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch
@@ -1,6 +1,6 @@
-From bc3be7cdeaee5a30282c4ef42e99a2c38b3709f1 Mon Sep 17 00:00:00 2001
+From 6a753441870fcaf9b1c59f373b59e2242c9f3739 Mon Sep 17 00:00:00 2001
 From: Nicolas Vigier <boklm at torproject.org>
-Date: Tue, 25 Jul 2017 16:17:08 -0400
+Date: Thu, 25 Jun 2015 12:18:43 +0200
 Subject: [PATCH 3/5] OSX: package as tar.bz2
 
 ---
diff --git a/projects/mozilla/0004-Updater-fixups-for-TM.patch b/projects/mozilla/0004-Updater-fixups-for-TM.patch
index 3044404..ab99be9 100644
--- a/projects/mozilla/0004-Updater-fixups-for-TM.patch
+++ b/projects/mozilla/0004-Updater-fixups-for-TM.patch
@@ -1,6 +1,6 @@
-From 5f2d3904f8d068bb9b48e521d609bc971f34fee3 Mon Sep 17 00:00:00 2001
+From cfc8d680995fed12cc63633699dc28b40bb124a3 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra at gmail.com>
-Date: Tue, 25 Jul 2017 16:20:49 -0400
+Date: Fri, 1 Sep 2017 17:45:40 -0400
 Subject: [PATCH 4/5] Updater fixups for TM
 
  * Remove updater links
diff --git a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch
index 2a3b041..5e83e5a 100644
--- a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch
+++ b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch
@@ -1,6 +1,6 @@
-From 0de194c75c3667d40ba6c48496c7b710efde2b19 Mon Sep 17 00:00:00 2001
+From 013421c4b0d74bc94fb3b460e7d3bcc0293f9c0f Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra at gmail.com>
-Date: Tue, 25 Jul 2017 16:24:25 -0400
+Date: Sat, 3 Dec 2016 10:01:52 -0800
 Subject: [PATCH 5/5] Permit storing exceptions even w/ inPrivateBrowsingMode
 
 ---