commit 806e7d966af3bedc443aa2190cddc8ff2ff1d145 Author: Arlo Breault <arlolra@gmail.com> Date: Fri Jan 5 11:55:23 2018 -0500 Bump to THUNDERBIRD_52_5_2_RELEASE --- ChangeLog | 6 +++--- 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 ++-- projects/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 ++-- .../0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch | 4 ++-- .../0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 ++-- .../0018-Trac-17517-Use-different-color-for-Add-Exception.patch | 4 ++-- .../0019-Trac-21736-Hide-account-timestamp-from-message.patch | 4 ++-- .../0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch | 4 ++-- .../0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch | 4 ++-- projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch | 4 ++-- projects/instantbird/config | 2 +- projects/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 ++-- .../0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch | 4 ++-- projects/mozilla/config | 2 +- projects/tor-browser/config | 4 ++-- rbm.conf | 2 +- 32 files changed, 62 insertions(+), 62 deletions(-) diff --git a/ChangeLog b/ChangeLog index 113cebd..232ca08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,8 @@ Tor Messenger 0.5.0b2 -- * All Platforms - * Use the tor-browser-52.4.1esr-7.0-1-build1 tag on tor-browser - * Use the THUNDERBIRD_52_4_0_RELEASE tag on comm-esr52 - * Update tor-browser to 7.0.7 + * 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 * Linux * Trac 23806: libotr.so and libgcrypt.so are using RPATH diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index fe7b455..6f72e3d 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,4 +1,4 @@ -From 530e8521e6172972a3e9c4d69865dd97e521ed34 Mon Sep 17 00:00:00 2001 +From 9f237446ec634b48068b3e6ae3b1158fb7c3dd31 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.14.3 +2.15.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 d9e0f09..8eba6f1 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 f76db2f793d280880541285dc7533a4e381083d9 Mon Sep 17 00:00:00 2001 +From 382b2ccb519d650b8522f6fdc660e752b30bd396 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.14.3 +2.15.1 diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index b9f9110..6c01ecb 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 1e96ec6fad1e2b1b7d6699a0161936e2463ec9fc Mon Sep 17 00:00:00 2001 +From 7f4412b78fd81fa09f9f542965821b4c86e344cd 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.14.3 +2.15.1 diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index 1f864ef..d36d51b 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 91be0bc3c7093ad8823f0de71926a84057357a5f Mon Sep 17 00:00:00 2001 +From 04c1e1a846f69ff9cb58bfb28091ba4e5ed5ee92 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.14.3 +2.15.1 diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index 9a34620..7b7c061 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 1a8e824e9b38bcedfa3f6e8255469dd1863edd74 Mon Sep 17 00:00:00 2001 +From 99a37597c2eac02cca973ddf4524510ed7c8f236 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.14.3 +2.15.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 f910f34..7d4c39e 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 fb13a8d6251ad6eb048f661f732ddec18b917626 Mon Sep 17 00:00:00 2001 +From abf2a50fcf5609d1796c1c5c44cf54e9e55822d5 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.14.3 +2.15.1 diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index 18750fa..658ae86 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 75f578f9833babab49cccdd5d6496754c8d0c94c Mon Sep 17 00:00:00 2001 +From 7b7403932473c5c039e24a425e9526e5895e195b 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.14.3 +2.15.1 diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index 8c43f4f..407152a 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From ef2faa5bfbc3166e03de603600254510b76402af Mon Sep 17 00:00:00 2001 +From 9ea545fd1f26cccb601f69f6d1955bb27d31098a 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.14.3 +2.15.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 421f02d..f4e4a00 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 48c971c3fcdd13fbd32783db0b1710f620d54d64 Mon Sep 17 00:00:00 2001 +From 7a305b78ea440ca86de6819ef52e3ccbda8fc8e2 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.14.3 +2.15.1 diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index 4b6449f..ce9fd8a 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From 0effabf509de5abb22f355dacd17b325cbb39e23 Mon Sep 17 00:00:00 2001 +From fb6803d8639fe4ff584bbe3c1a9c52cd93a81df5 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.14.3 +2.15.1 diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 88ce54f..82a9892 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 390d4ce4ae7970d76f295ae25a9f04919a0efe01 Mon Sep 17 00:00:00 2001 +From 1562db21593cc47a639da5b55ddf54557d948a5b 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.14.3 +2.15.1 diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index f87befc..fc340b5 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From 5e2b4241edebbf012e52dc1114dde5bb6320d0a9 Mon Sep 17 00:00:00 2001 +From 814e75470821e326bd3636c4c7279eb54c963759 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.14.3 +2.15.1 diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index 41e9293..2db1eef 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 cb56ac3066fb156f05e689325de8efd01a7bca98 Mon Sep 17 00:00:00 2001 +From 1a887000b91677fc9ff36fbaefc304b6a0aa67fc 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.14.3 +2.15.1 diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index 8bd4d61..8c29f66 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 1c29a80881d013c03bc0c4b0c4a3183b8068a847 Mon Sep 17 00:00:00 2001 +From 72f5121499c3e56e7d4f46ba61733ce9fe963e6a 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.14.3 +2.15.1 diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 103470e..0fddfb0 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From 9b8d29300d007b91dc38d3f7525de44dbf21a5fd Mon Sep 17 00:00:00 2001 +From b82d9d43ab3029d134838b84aac30b19dee7fe67 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.14.3 +2.15.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 779bc11..d5c1be9 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 6ebd41fb23aeb3a2821dabbfc5f68f22d146be00 Mon Sep 17 00:00:00 2001 +From f725ff8d023e462ee31ff258fa44867d750df413 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.14.3 +2.15.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 b489a60..a09ac59 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 6664ef2d7316926680b7086b60c5f9dfbd3644b6 Mon Sep 17 00:00:00 2001 +From 8d33984c9d0158fb22e341de66d831a92d3e73cc 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.14.3 +2.15.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 3f041db..2e03830 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 ac3ab316aa809246e17d740582a9a0842795e80f Mon Sep 17 00:00:00 2001 +From 04bde61de0e18c0d414bd770ec159b6bb0391761 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.14.3 +2.15.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 2926eef..5427ec5 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 02f6b39fb7db8d1f8cd8bd0be52647fd0323d008 Mon Sep 17 00:00:00 2001 +From c25dc351a7505de41b738deeef91a3108151ccaf 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.14.3 +2.15.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 d7bca7d..002eab4 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 24ca6d8fb0750f0fb52c23a96ade0ed5a1d0bfa3 Mon Sep 17 00:00:00 2001 +From c6a68a1a30bf8f9712267fc8eb3f8c3593129f9f 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.14.3 +2.15.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 959c48c..033e8b2 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 2bd322d66d462514bc4e3187e5faccd45f76f7aa Mon Sep 17 00:00:00 2001 +From 929040712ccff38035bd0467dd88bade4df9d968 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.14.3 +2.15.1 diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 1dea7b5..0b60d89 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 1e357cc9e11b9929b430a150a3bbfb34fda9d503 Mon Sep 17 00:00:00 2001 +From 9047105e20c92a5d19a530767fabc589e42c0243 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.14.3 +2.15.1 diff --git a/projects/instantbird/config b/projects/instantbird/config index 2005ff9..af76c55 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_4_0_RELEASE +hg_hash: THUNDERBIRD_52_5_2_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 adbeee3..a65b534 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 a48d843404cf7121f2c6d0902ae995d240377552 Mon Sep 17 00:00:00 2001 +From 3c602b58475e59fceec154d726883b977e10f0ee 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.14.3 +2.15.1 diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 4f95767..1101f3c 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 4fcd867d487ba1afa85bc77abd5558e71b16d3cf Mon Sep 17 00:00:00 2001 +From fe815268d93c2811701fd75ab22af59224fdf742 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.14.3 +2.15.1 diff --git a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch index 149ffe8..3169a3c 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 08a85b8e8de24bfe323831986a0821d8510b9f55 Mon Sep 17 00:00:00 2001 +From 6ad2adc7411088f3292e35bcf61bee81da9dd252 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.14.3 +2.15.1 diff --git a/projects/mozilla/0004-Updater-fixups-for-TM.patch b/projects/mozilla/0004-Updater-fixups-for-TM.patch index a1a9105..14af5e9 100644 --- a/projects/mozilla/0004-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0004-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From 9de45a092169f7cb4fa7fc67bbb304ac9d87bf2c Mon Sep 17 00:00:00 2001 +From ae52907f0690ad6bd2e1b1a1cf873988b75db227 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.14.3 +2.15.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 be75f90..d1ca4cd 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 2545c1febc9aa88af07323732fb92186897026a5 Mon Sep 17 00:00:00 2001 +From fa4d583dcdebc6c7bcea3913123751dad50932ac 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.14.3 +2.15.1 diff --git a/projects/mozilla/config b/projects/mozilla/config index 74bc34a..ce97d5f 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: tor-browser-52.4.1esr-7.0-1-build1 +version: tor-browser-52.5.2esr-7.0-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 f4cb8f4..341df9f 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 7.0.7 +version: 7.0.11 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.5a5 + version: 7.5a10 targets: linux-x86_64: diff --git a/rbm.conf b/rbm.conf index e5938e4..b108c6f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,7 +15,7 @@ buildconf: var: tormessenger_version: '0.5.0b2' - copyright_year: '2017' + copyright_year: '2018' project_name: tor-messenger multi_lingual: 0 build_mar: 1