commit 18a19dfa008a02d64759e8880a4b41b99317be27 Author: Arlo Breault <arlolra@gmail.com> Date: Thu Jan 25 11:29:30 2018 -0500 Bump to THUNDERBIRD_52_6_0_RELEASE --- ChangeLog | 11 ++++++----- projects/instantbird/0001-Set-Tor-Messenger-preferences.patch | 4 ++-- .../0002-Trac-21634-Autologin-default-should-be-false.patch | 4 ++-- projects/instantbird/0003-XMPP-in-band-registration.patch | 4 ++-- projects/instantbird/0004-Remove-search-from-UI.patch | 4 ++-- projects/instantbird/0005-Add-Tor-Messenger-branding.patch | 4 ++-- .../0006-Remove-option-for-configuring-account-picture.patch | 4 ++-- projects/instantbird/0007-Modify-top-protocol-defaults.patch | 4 ++-- projects/instantbird/0008-Modify-IRC-defaults.patch | 4 ++-- .../instantbird/0009-Do-not-set-default-XMPP-server.patch | 4 ++-- projects/instantbird/0010-Modify-themes.patch | 4 ++-- projects/instantbird/0011-Remove-logging-UI.patch | 4 ++-- projects/instantbird/0012-Cert-override.patch | 4 ++-- projects/instantbird/0013-Display-all-traffic-over-Tor.patch | 4 ++-- projects/instantbird/0014-Trac-17480-Content-sink.patch | 4 ++-- projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 ++-- ...Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch | 4 ++-- ...Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 ++-- ...018-Trac-17517-Use-different-color-for-Add-Exception.patch | 4 ++-- .../0019-Trac-21736-Hide-account-timestamp-from-message.patch | 4 ++-- ...Update-allowed-duplicated-files-for-Windows-and-Linu.patch | 4 ++-- .../0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch | 4 ++-- .../instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch | 4 ++-- projects/instantbird/config | 2 +- .../mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 4 ++-- 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 ++-- ...Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch | 4 ++-- projects/mozilla/config | 2 +- projects/tor-browser/config | 4 ++-- rbm.conf | 2 +- tor-browser-build | 2 +- 33 files changed, 66 insertions(+), 65 deletions(-) diff --git a/ChangeLog b/ChangeLog index 232ca08..7bed2b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,10 @@ -Tor Messenger 0.5.0b2 -- +Tor Messenger 0.6.0b1 -- * All Platforms - * Use the tor-browser-52.5.2esr-7.0-2-build1 tag on tor-browser - * Use the THUNDERBIRD_52_5_2_RELEASE tag on comm-esr52 - * Update tor-browser to 7.0.11 - * Update tor-browser-build to 9b4ba82 + * Use the tor-browser-52.6.0esr-7.5-2-build1 tag on tor-browser + * Use the THUNDERBIRD_52_6_0_RELEASE tag on comm-esr52 + * Update tor-browser to 7.5 + * Update tor-browser-build to d2dee35 + * Update rbm to 5c89374 * Linux * Trac 23806: libotr.so and libgcrypt.so are using RPATH * Trac 23542: Add snowflake pt diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 6f72e3d..6ea4e22 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,4 +1,4 @@ -From 9f237446ec634b48068b3e6ae3b1158fb7c3dd31 Mon Sep 17 00:00:00 2001 +From 34c6563cd7b3e482a17517b3dd9fab9e8f06b92a 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 @@ -574,5 +574,5 @@ index 127c86a662..68da4aaf28 100644 +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif -- -2.15.1 +2.16.1 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 8eba6f1..46312ee 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 382b2ccb519d650b8522f6fdc660e752b30bd396 Mon Sep 17 00:00:00 2001 +From 824fe80284ebc88d8e4eb3a6796073958bbffff6 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 @@ -35,5 +35,5 @@ index d51df3225c..904d22ba57 100644 </wizard> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index 6c01ecb..c22157e 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 7f4412b78fd81fa09f9f542965821b4c86e344cd Mon Sep 17 00:00:00 2001 +From 023e38c2518d3d5216d5971c9f563614c89851f4 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 @@ -392,5 +392,5 @@ index 43d0f19e3f..c46fb2f956 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index d36d51b..8c74818 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 04c1e1a846f69ff9cb58bfb28091ba4e5ed5ee92 Mon Sep 17 00:00:00 2001 +From c77757acbb98d1416bfde8331cd0b847f17e91f4 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 @@ -60,5 +60,5 @@ index fad67c190b..cfe2405ea3 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index 7b7c061..5047158 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 99a37597c2eac02cca973ddf4524510ed7c8f236 Mon Sep 17 00:00:00 2001 +From d184ad64581060a09abfc8b0b0eda896d3a3a9e3 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 @@ -5121,5 +5121,5 @@ index 15ec569c11..4a2d35d8a1 100644 -Info=Instantbird is installing your updates and will start in a few moments… +Info=Tor Messenger is installing your updates and will start in a few moments… -- -2.15.1 +2.16.1 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 7d4c39e..0bb61a0 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 abf2a50fcf5609d1796c1c5c44cf54e9e55822d5 Mon Sep 17 00:00:00 2001 +From 19fbccd930738129689db444c14caaa88256dd70 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 @@ -22,5 +22,5 @@ index 843f1eef57..71ee2c9ef8 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index 658ae86..e444aa5 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 7b7403932473c5c039e24a425e9526e5895e195b Mon Sep 17 00:00:00 2001 +From 90fe8eddc70aebfd2fcd3a052cf671e1f2561693 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 @@ -21,5 +21,5 @@ index 135b68386c..356321dbcc 100644 </hbox> </wizardpage> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index 407152a..dd69023 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 9ea545fd1f26cccb601f69f6d1955bb27d31098a Mon Sep 17 00:00:00 2001 +From 117f184e742b0cd567088abc19f6f3cd062b69da 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 @@ -61,5 +61,5 @@ index 43ed2ced4b..c2f16bee84 100644 ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.15.1 +2.16.1 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 f4e4a00..610008f 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 7a305b78ea440ca86de6819ef52e3ccbda8fc8e2 Mon Sep 17 00:00:00 2001 +From 76067dc0b0923aa8f4944e2f995cb6427357fccf 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 @@ -21,5 +21,5 @@ index 2afb15f059..1d2c167d3e 100644 options: { -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index ce9fd8a..24e5953 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From fb6803d8639fe4ff584bbe3c1a9c52cd93a81df5 Mon Sep 17 00:00:00 2001 +From 3de3d95ce980f03c92c7f97776c605c1107e7dde 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 @@ -74,5 +74,5 @@ index 454e366960..18ba1f95cc 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 82a9892..f6cfb9f 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 1562db21593cc47a639da5b55ddf54557d948a5b Mon Sep 17 00:00:00 2001 +From 0d06dd933e8d0a28390dff7ec2f781490938995b 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 @@ -39,5 +39,5 @@ index 7c9db1cdd8..2d7b2701ea 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index fc340b5..9a39ae5 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From 814e75470821e326bd3636c4c7279eb54c963759 Mon Sep 17 00:00:00 2001 +From 4444763ae6d5d8455a2480c55f0a3ebc18975158 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 @@ -60,5 +60,5 @@ index def78c809c..614d52bca2 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index 2db1eef..8141c92 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 1a887000b91677fc9ff36fbaefc304b6a0aa67fc Mon Sep 17 00:00:00 2001 +From e10f2a3843c865ff29f93f3b9b9043fcc1dc0865 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 @@ -34,5 +34,5 @@ index c46fb2f956..6b49c84fad 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index 8c29f66..13abea0 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 72f5121499c3e56e7d4f46ba61733ce9fe963e6a Mon Sep 17 00:00:00 2001 +From db2e3298866a97da24b404346afdfa45b4950434 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 @@ -107,5 +107,5 @@ index 3b8ccfa2b3..ba41da76aa 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 0fddfb0..42ba83e 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From b82d9d43ab3029d134838b84aac30b19dee7fe67 Mon Sep 17 00:00:00 2001 +From 99a60a16cde347122930dbf462a2de8ce265265d 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 @@ -8915,5 +8915,5 @@ index bc25396873..e46815dfe3 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.15.1 +2.16.1 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 d5c1be9..0dcb826 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,4 +1,4 @@ -From f725ff8d023e462ee31ff258fa44867d750df413 Mon Sep 17 00:00:00 2001 +From 7b3e3521314764e3e79ec1571b2d52dafdbee0a7 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Tue, 29 Aug 2017 14:45:29 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg @@ -53,5 +53,5 @@ index 80421b8ca2..6520757ddd 100644 .indicator { -- -2.15.1 +2.16.1 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 a09ac59..56be5eb 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 8d33984c9d0158fb22e341de66d831a92d3e73cc Mon Sep 17 00:00:00 2001 +From 257faaee085297d838d3451857ab5b65c7ad854a 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 @@ -48,5 +48,5 @@ index c52c8c637d..0069219fa6 100644 Components.interfaces.nsIWebProgress.NOTIFY_ALL); let url = request.url; -- -2.15.1 +2.16.1 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 2e03830..6250d1a 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 04bde61de0e18c0d414bd770ec159b6bb0391761 Mon Sep 17 00:00:00 2001 +From a360d37b4abda463c32f6cb5586fdf94667f27f5 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 @@ -19,5 +19,5 @@ index 807184209b..8ce7f9ad81 100644 + color: #fff; +} -- -2.15.1 +2.16.1 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 5427ec5..a380206 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 c25dc351a7505de41b738deeef91a3108151ccaf Mon Sep 17 00:00:00 2001 +From 96c94a4c3cca3caf7b326254c4ff2745dc430913 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 @@ -60,5 +60,5 @@ index 68da4aaf28..19334b382a 100644 /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this -- -2.15.1 +2.16.1 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 002eab4..d32a054 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 c6a68a1a30bf8f9712267fc8eb3f8c3593129f9f Mon Sep 17 00:00:00 2001 +From 646047420aea51535d91c09ed7aaf0011c6fd0ea 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 @@ -94,5 +94,5 @@ index 988dc2d35a..940418bc9d 100644 # Variants of paths in mozilla/browser/installer/allowed-dupes.mn # and mail/installer/allowed-dupes.mn: -- -2.15.1 +2.16.1 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 033e8b2..06d2af5 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 929040712ccff38035bd0467dd88bade4df9d968 Mon Sep 17 00:00:00 2001 +From b6e51b8b315b26ceb0e93c65b132e3479cc64ea0 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 @@ -138,5 +138,5 @@ index efb0b77aee..05a4deb462 100644 + +onionAddress.label=%S is %S's onion address. -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 0b60d89..6f8fd36 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 9047105e20c92a5d19a530767fabc589e42c0243 Mon Sep 17 00:00:00 2001 +From 27b4c11fd2587708dde1a4034044e2358a18a2ba 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 @@ -166,5 +166,5 @@ index 6b49c84fad..de7fe8ed11 100644 <!ENTITY registerXMPP.label "Create this new account on the server"> +<!ENTITY tempXMPP.label "Create a temporary account automatically"> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/config b/projects/instantbird/config index af76c55..446330c 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_5_2_RELEASE +hg_hash: THUNDERBIRD_52_6_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 a65b534..e78e36b 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 3c602b58475e59fceec154d726883b977e10f0ee Mon Sep 17 00:00:00 2001 +From 6ee07445bcfa1ef74934ecc7a7862afd10d0927d Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Fri, 1 Sep 2017 17:39:04 -0400 Subject: [PATCH 1/5] Trac 19910: Prevents STARTTLS in XMPP @@ -115,5 +115,5 @@ index a21dfa4a5a11..5429637c1c3a 100644 void SetNamedPipeFD(PRFileDesc *fd) { mFD = fd; } -- -2.15.1 +2.16.1 diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 1101f3c..5c24cdb 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 fe815268d93c2811701fd75ab22af59224fdf742 Mon Sep 17 00:00:00 2001 +From a1f8139363a279d8c948ef621e860e306eca2167 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/5] Trac 16475: Block flash too @@ -29,5 +29,5 @@ index cd1707beaf5f..d014832e0595 100644 } -- -2.15.1 +2.16.1 diff --git a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch index 3169a3c..ce7636d 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 6ad2adc7411088f3292e35bcf61bee81da9dd252 Mon Sep 17 00:00:00 2001 +From 4502122ff76eb1c6de00f3db49b6ff3121f1e9ce Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm@torproject.org> Date: Thu, 25 Jun 2015 12:18:43 +0200 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.15.1 +2.16.1 diff --git a/projects/mozilla/0004-Updater-fixups-for-TM.patch b/projects/mozilla/0004-Updater-fixups-for-TM.patch index 14af5e9..305bc0f 100644 --- a/projects/mozilla/0004-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0004-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From ae52907f0690ad6bd2e1b1a1cf873988b75db227 Mon Sep 17 00:00:00 2001 +From 26c0c11d82d4192f68cdb87ea4dd2d5f6f6d52e3 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Fri, 1 Sep 2017 17:45:40 -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.15.1 +2.16.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 d1ca4cd..1e327f6 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 fa4d583dcdebc6c7bcea3913123751dad50932ac Mon Sep 17 00:00:00 2001 +From bd9333d8dfd64559b4d33f06b3871740104259f5 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Sat, 3 Dec 2016 10:01:52 -0800 Subject: [PATCH 5/5] Permit storing exceptions even w/ inPrivateBrowsingMode @@ -20,5 +20,5 @@ index 0ca24a614dca..df50701729ce 100644 + return false; // PrivateBrowsingUtils.isWindowPrivate(window); } -- -2.15.1 +2.16.1 diff --git a/projects/mozilla/config b/projects/mozilla/config index ce97d5f..39a2f81 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: tor-browser-52.5.2esr-7.0-2-build1 +version: tor-browser-52.6.0esr-7.5-2-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 341df9f..56c4171 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 7.0.11 +version: 7.5 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files: @@ -22,7 +22,7 @@ var: steps: tor-browser-alpha: tor-browser-alpha: '[% INCLUDE build %]' - version: 7.5a10 + version: 8.0a1 targets: linux-x86_64: diff --git a/rbm.conf b/rbm.conf index b108c6f..74af21e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -14,7 +14,7 @@ buildconf: num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "8" %]' var: - tormessenger_version: '0.5.0b2' + tormessenger_version: '0.6.0b1' copyright_year: '2018' project_name: tor-messenger multi_lingual: 0 diff --git a/tor-browser-build b/tor-browser-build index c4db919..d2dee35 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit c4db919cd945f421f36ec1c358bce15ecc192590 +Subproject commit d2dee352354ee77cd26ac37bef41322df2729ff8