commit cc648a0d03d6f6741d4d38ca5e6a0b605d90be0a Author: Arlo Breault arlolra@gmail.com Date: Tue Aug 29 14:53:20 2017 -0400
Update for ESR 52.3.0 --- ChangeLog | 7 +++++++ .../instantbird/0001-Set-Tor-Messenger-preferences.patch | 2 +- ...0002-Trac-21634-Autologin-default-should-be-false.patch | 2 +- projects/instantbird/0003-XMPP-in-band-registration.patch | 2 +- projects/instantbird/0004-Remove-search-from-UI.patch | 2 +- projects/instantbird/0005-Add-Tor-Messenger-branding.patch | 2 +- ...006-Remove-option-for-configuring-account-picture.patch | 2 +- .../instantbird/0007-Modify-top-protocol-defaults.patch | 2 +- projects/instantbird/0008-Modify-IRC-defaults.patch | 2 +- .../instantbird/0009-Do-not-set-default-XMPP-server.patch | 2 +- projects/instantbird/0010-Modify-themes.patch | 2 +- projects/instantbird/0011-Remove-logging-UI.patch | 2 +- projects/instantbird/0012-Cert-override.patch | 2 +- .../instantbird/0013-Display-all-traffic-over-Tor.patch | 2 +- projects/instantbird/0014-Trac-17480-Content-sink.patch | 2 +- .../instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...-1321641-Use-built-in-functions-instead-of-an-svg.patch | 4 ++-- ...-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch | 2 +- ...-Trac-17517-Use-different-color-for-Add-Exception.patch | 2 +- ...19-Trac-21736-Hide-account-timestamp-from-message.patch | 2 +- ...ate-allowed-duplicated-files-for-Windows-and-Linu.patch | 2 +- .../0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch | 2 +- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 2 +- projects/instantbird/config | 2 +- .../0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 14 +++++++------- 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 ++-- ...mit-storing-exceptions-even-w-inPrivateBrowsingMo.patch | 4 ++-- projects/mozilla/config | 2 +- projects/tor-browser/config | 2 +- projects/tor-launcher/config | 2 +- 32 files changed, 49 insertions(+), 42 deletions(-)
diff --git a/ChangeLog b/ChangeLog index d1cbab3..5b97025 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tor Messenger 0.5.0b1 -- + * All Platforms + * Use the tor-browser-52.3.0esr-7.0-1-build1 tag on tor-browser + * Use the THUNDERBIRD_52_3_0_RELEASE tag on comm-esr52 + * Update tor-browser to 7.0.4 + * Update tor-launcher to 0.2.12.3 + Tor Messenger 0.4.0b3 -- June 13, 2017 * All Platforms * Use the tor-browser-45.9.0esr-6.5-1-build3 tag on tor-browser diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 09ed103..f1ec406 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,4 +1,4 @@ -From 730e73eb45eb1bd60f48b887e08fea837eb2fb40 Mon Sep 17 00:00:00 2001 +From 44eadb31b5f73252cf991328b014b9cb64bde155 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 14:30:41 -0400 Subject: [PATCH 01/22] Set Tor Messenger preferences diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index 8a31703..8594e83 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,4 +1,4 @@ -From f30bf9e5ec7b7cc90e2e1a2bf37ec5688d00297a Mon Sep 17 00:00:00 2001 +From eeef298b165b6c91bcb7da7c288d332e1805e823 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/22] Trac 21634: Autologin default should be false diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index a1ac6fd..2819f5e 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 9c7ed538de969fdaef7de441d275d4c2cd294d9a Mon Sep 17 00:00:00 2001 +From c67cae1deee24e2b440c967d720d033e176e5b8d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 15:09:40 -0400 Subject: [PATCH 03/22] XMPP in-band registration diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index a63aed3..ac73869 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From b6f227a7743eff289177a7c855eb60c87d492f47 Mon Sep 17 00:00:00 2001 +From 8f329c1df365a64ecce561b0c4a46d7c683e7a1d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 04/22] Remove search from UI diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index 7dff68d..df7bb63 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 752e23122e3d407fe1bb316e5f1ca71e53415d69 Mon Sep 17 00:00:00 2001 +From ec0c0fdf2242795ec29678476a14498e9e7251c3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 15:46:51 -0400 Subject: [PATCH 05/22] Add Tor Messenger branding diff --git a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch index 161a25a..737f6ed 100644 --- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch +++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch @@ -1,4 +1,4 @@ -From 90c949783c917b45c02ef7b6767ee22a4a8e92fe Mon Sep 17 00:00:00 2001 +From ef2d5cf0c6c44393e80d968491d6f62840ca803e Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 06/22] Remove option for configuring account picture diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index db878ff..584a267 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From e0736b7a8ca7cea1720015c47552b6b7d7175085 Mon Sep 17 00:00:00 2001 +From a3ebacee503fb025e13110a5838645f3f9b250c9 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Wed, 26 Jul 2017 16:16:09 -0400 Subject: [PATCH 07/22] Modify top protocol defaults diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index 4ccae28..b0e28aa 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 14ebf2df4c9c5e7a0d2c3a9268e10b393fe63d3b Mon Sep 17 00:00:00 2001 +From 47fb77f57e3ab7dea49d6a8061873e2125117dde Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 08/22] Modify IRC defaults diff --git a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch index 4af3d80..3b9e94e 100644 --- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch +++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch @@ -1,4 +1,4 @@ -From 9ea7c5e3a1bc12ced843b1d4e19b67f333b47f10 Mon Sep 17 00:00:00 2001 +From d6131e4b0851b15a5adfd89177eb772de73ee958 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Fri, 28 Jul 2017 12:11:57 -0400 Subject: [PATCH 09/22] Do not set default XMPP server diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index 3998f61..b840e86 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From 85ab3e684647cb41335fcc712c94a26248669a3d Mon Sep 17 00:00:00 2001 +From 3206bed9480c826f7c70ba4804076248959772ad Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 10/22] Modify themes diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 12ad58e..78c03c8 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 6427bba530252605b5895dca13514397b36bb086 Mon Sep 17 00:00:00 2001 +From af3bcdcb928902e44f28e872ed7ed1eeea4f4a7d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 11/22] Remove logging UI diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index c306165..f4879f1 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From e39504d2376db51c2cc5b77101b94a9fe13cd8ea Mon Sep 17 00:00:00 2001 +From 4acec30f0d25ad8c3661ab279748336ef230a7a2 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 12/22] Cert override diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index b532820..b11ecf4 100644 --- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From 3dc1f46d93c261253f12d108c6e06b715d0a9ba1 Mon Sep 17 00:00:00 2001 +From 73321adb92aa81f60de281208634d5a62566428b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 13/22] Display all traffic over Tor diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index 8f457f0..41c2309 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 9ce5029c19bd6d1ddb1cd0d7f91b9fc3451cb7d8 Mon Sep 17 00:00:00 2001 +From a5c9e85e965f28e05997dbddac9c84903ada9cb4 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 14/22] Trac 17480: Content sink diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 7b7f0e6..cf9f76e 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From 8e54edd20a485ac7e015d6371383e20afd5401e9 Mon Sep 17 00:00:00 2001 +From a83c92268dbd0959427525d85245de8364c3b120 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE diff --git a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index 17acc1d..8bf5458 100644 --- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,6 +1,6 @@ -From ac74be92685ee7544465667b0acb55d1aedb814c Mon Sep 17 00:00:00 2001 +From 563a445eccd41b832f43cfe3465785870591528e Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com -Date: Wed, 26 Jul 2017 17:14:19 -0400 +Date: Tue, 29 Aug 2017 14:45:29 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg for bubbles filter
diff --git a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index 2993bff..f107bb8 100644 --- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From ee7295bd39f49a23166feae02f2a1b68d52352c5 Mon Sep 17 00:00:00 2001 +From bcc668d8a25bce408c9e908975891f21447cd8ea Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 26 Jul 2017 16:35:33 -0400 Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in diff --git a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch index 91457c2..5ce547d 100644 --- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From 8514adfb848b12498b5e819b60211cd6d2a53dd0 Mon Sep 17 00:00:00 2001 +From e27529ddb8f28889416f6ec829d4f13c05ec1b53 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy huyvq.c633@gmail.com Date: Wed, 26 Jul 2017 16:38:19 -0400 Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception diff --git a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch index 9d661c8..0d636c8 100644 --- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch +++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch @@ -1,4 +1,4 @@ -From 6234ea255a9e81a93287eab492733ffd8c03424f Mon Sep 17 00:00:00 2001 +From 7f60ba9eca14bd39eefa3fb732fd0f2db83b2ff6 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy huyvq.c633@gmail.com Date: Sun, 2 Apr 2017 13:07:09 -0400 Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message diff --git a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch index 4fbe1da..ca1d7a9 100644 --- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch +++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch @@ -1,4 +1,4 @@ -From c73ff7051711ba1c44b8d3efc158930ee57b2b73 Mon Sep 17 00:00:00 2001 +From eaf813e223ec20118a82ed81f08598cfaf7a81ef Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Thu, 27 Jul 2017 15:16:54 -0400 Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index e3abbd2..3425782 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,4 +1,4 @@ -From a98e6bc72aa36c55fc6eccd872ca943e61d752b3 Mon Sep 17 00:00:00 2001 +From ce9b1c114e07ca2e2633d01cb68e96f9e9423263 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Tue, 15 Aug 2017 16:40:33 -0400 Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 51d95ed..4d81dbe 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From bf433088d6f7c9af269c0d42a623f164062f09ae Mon Sep 17 00:00:00 2001 +From e64cd7dfd68993fe6734be0a6cd4eb965c3942b4 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts diff --git a/projects/instantbird/config b/projects/instantbird/config index 3fa05ec..ed09aa0 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr52/ -hg_hash: THUNDERBIRD_52_2_1_RELEASE +hg_hash: THUNDERBIRD_52_3_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]"
var: 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 289aaf5..421eb25 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,4 +1,4 @@ -From 47866985426887345c52a66f100f6562a77b6036 Mon Sep 17 00:00:00 2001 +From 517e61f71f911bc2b2fbed5ccdd5acce1f39f1f6 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 25 Jul 2017 15:51:22 -0400 Subject: [PATCH 1/5] Trac 19910: Prevents STARTTLS in XMPP @@ -11,10 +11,10 @@ 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 f200b6899d97..cd57ca43aa5c 100644 +index 4399465fe534..a5df391fb7d5 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp -@@ -1975,26 +1975,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) +@@ -1983,26 +1983,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) // Update poll timeout in case it was changed mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE]; } @@ -42,7 +42,7 @@ index f200b6899d97..cd57ca43aa5c 100644 // We do not need to do PR_ConnectContinue when we are already // shutting down.
-@@ -2018,14 +1999,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) +@@ -2026,14 +2007,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) Telemetry::PRCONNECTCONTINUE_BLOCKING_TIME_OFFLINE); }
@@ -58,7 +58,7 @@ index f200b6899d97..cd57ca43aa5c 100644 // // we are connected! // -@@ -2052,17 +2026,17 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) +@@ -2060,17 +2034,17 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) // If the connect is still not ready, then continue polling... // if ((PR_WOULD_BLOCK_ERROR == code) || (PR_IN_PROGRESS_ERROR == code)) { @@ -84,7 +84,7 @@ index f200b6899d97..cd57ca43aa5c 100644 mCondition = ErrorAccordingToNSPR(code); } diff --git a/netwerk/base/nsSocketTransport2.h b/netwerk/base/nsSocketTransport2.h -index 8f3fa87161a1..34e20e586aad 100644 +index b4baed233ff1..7c85ccdc409f 100644 --- a/netwerk/base/nsSocketTransport2.h +++ b/netwerk/base/nsSocketTransport2.h @@ -201,9 +201,7 @@ private: @@ -113,5 +113,5 @@ index a21dfa4a5a11..5429637c1c3a 100644 void SetNamedPipeFD(PRFileDesc *fd) { mFD = fd; }
-- -2.11.0 +2.14.1
diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index c42af9e..31d6238 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,4 +1,4 @@ -From 9511ebe130412f96508d5f87eee3e3f97581022c Mon Sep 17 00:00:00 2001 +From 387fbb26920e7c9230647136ff21fef0a4574aa7 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 25 Jul 2017 15:52:29 -0400 Subject: [PATCH 2/5] Trac 16475: Block flash too @@ -29,5 +29,5 @@ index cd1707beaf5f..d014832e0595 100644 }
-- -2.11.0 +2.14.1
diff --git a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch index 7b8ce68..1366752 100644 --- a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From 86db5ef4a59fb21e3dae75d2f0ceefece74d1f6c Mon Sep 17 00:00:00 2001 +From bc3be7cdeaee5a30282c4ef42e99a2c38b3709f1 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier boklm@torproject.org Date: Tue, 25 Jul 2017 16:17:08 -0400 Subject: [PATCH 3/5] OSX: package as tar.bz2 @@ -21,5 +21,5 @@ index 51633178226c..64584f579390 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.11.0 +2.14.1
diff --git a/projects/mozilla/0004-Updater-fixups-for-TM.patch b/projects/mozilla/0004-Updater-fixups-for-TM.patch index 8c85eea..3044404 100644 --- a/projects/mozilla/0004-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0004-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From cf9b262ca725395db496066c6b301ea0aa3869f4 Mon Sep 17 00:00:00 2001 +From 5f2d3904f8d068bb9b48e521d609bc971f34fee3 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 25 Jul 2017 16:20:49 -0400 Subject: [PATCH 4/5] Updater fixups for TM @@ -804,5 +804,5 @@ index c45961ac54e7..23d6fbe2929a 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.11.0 +2.14.1
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 3246473..2a3b041 100644 --- a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,4 +1,4 @@ -From abd12b5b92fb29a5f1d798e6bfc553b61d951461 Mon Sep 17 00:00:00 2001 +From 0de194c75c3667d40ba6c48496c7b710efde2b19 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 25 Jul 2017 16:24:25 -0400 Subject: [PATCH 5/5] Permit storing exceptions even w/ inPrivateBrowsingMode @@ -20,5 +20,5 @@ index 0ca24a614dca..df50701729ce 100644 + return false; // PrivateBrowsingUtils.isWindowPrivate(window); } -- -2.11.0 +2.14.1
diff --git a/projects/mozilla/config b/projects/mozilla/config index 2f74428..bbbf55d 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: tor-browser-52.2.0esr-7.0-1-build1 +version: tor-browser-52.3.0esr-7.0-1-build1 filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git git_hash: '[% c("version") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index ad7444e..395c07f 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 7.0.2 +version: 7.0.4 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]'
input_files: diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 2db0104..de39ebb 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.12.2 +version: 0.2.12.3 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: gk.gpg