[tor-commits] [tor-messenger-build/master] Bump tags for ESR 45.9.0

arlo at torproject.org arlo at torproject.org
Wed Apr 19 23:35:44 UTC 2017 

commit 8e52e53ceaf8d8ef3f2e8d8c49fdf1252b78eeb8
Author: Arlo Breault <arlolra at gmail.com>
Date:   Wed Apr 19 17:43:15 2017 -0400

    Bump tags for ESR 45.9.0
---
 ChangeLog                                                             | 2 ++
 projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch      | 4 ++--
 projects/mozilla/0002-Trac-16475-Block-flash-too.patch                | 4 ++--
 .../0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch   | 4 ++--
 .../0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch   | 4 ++--
 projects/mozilla/0005-OSX-package-as-tar.bz2.patch                    | 4 ++--
 projects/mozilla/0006-Updater-fixups-for-TM.patch                     | 4 ++--
 .../0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch   | 4 ++--
 projects/mozilla/config                                               | 2 +-
 projects/tor-browser/config                                           | 2 +-
 10 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa9197d..bbbb088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Tor Messenger 0.4.0b3 --
  * All Platforms
+   * Use the tor-browser-45.9.0esr-6.5-1-build3 tag on tor-browser
+   * Update tor-browser to 6.5.2
    * Add some missing localization for Twitter's actions
    * Trac 21736: Hide the timestamp and account from message selection templates
 
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 bd10b77..68a4a68 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 d7324cb7d256053d8fee8640db6735e2637c8a44 Mon Sep 17 00:00:00 2001
+From 3d87efd8e803a273e823fb614279dce106c6e025 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra at gmail.com>
 Date: Mon, 10 Oct 2016 10:52:52 -0700
 Subject: [PATCH 1/7] Trac 19910: Prevents STARTTLS in XMPP
@@ -116,5 +116,5 @@ index 568c700e2bae..1793001df2c9 100644
  
  private:
 -- 
-2.12.0
+2.12.2
 
diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch
index a8390b3..1820c42 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 f63790c8c4fc4df231845ce88ece94740c6db0c1 Mon Sep 17 00:00:00 2001
+From bfa290a2ec4dfaac469082c4039f3f3fb40c01ea Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra at gmail.com>
 Date: Thu, 6 Oct 2016 20:13:35 -0700
 Subject: [PATCH 2/7] Trac 16475: Block flash too
@@ -29,5 +29,5 @@ index 5345ce7c8764..15692365ee63 100644
  }
  
 -- 
-2.12.0
+2.12.2
 
diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch
index b432fc0..482f7ac 100644
--- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch
+++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch
@@ -1,4 +1,4 @@
-From cdb8439f55dd55d9c7d9bf4787d3fff2be39578b Mon Sep 17 00:00:00 2001
+From 283a2e77d639da7eacdef33e662b2cf88960561b Mon Sep 17 00:00:00 2001
 From: Jonathan Kew <jkew at mozilla.com>
 Date: Sun, 9 Oct 2016 09:18:37 -0700
 Subject: [PATCH 3/7] Trac 20206: Avoid the need to download the font Osaka
@@ -61,5 +61,5 @@ index e3d98b13c6de..fc8ca9d14656 100644
  // optimization hint for fonts with localized names to be read in at startup, otherwise read in at lookup miss
  // names are canonical family names (typically English names)
 -- 
-2.12.0
+2.12.2
 
diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch
index 0b6e851..e6e8535 100644
--- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch
+++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch
@@ -1,4 +1,4 @@
-From e3d76abbb2c87689671f8cf0c685f847afa62c2b Mon Sep 17 00:00:00 2001
+From a65ab3c9a3941ebe6dc96215f6929c94f57c9568 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra at gmail.com>
 Date: Wed, 23 Mar 2016 19:52:07 -0700
 Subject: [PATCH 4/7] Trac 18331: Update OS X toolchain to work with ESR 45
@@ -119,5 +119,5 @@ index 0e4d118523c8..e0ad0d3c0365 100644
  /*
   * gcc atomic ops. These are available on several other compilers as well.
 -- 
-2.12.0
+2.12.2
 
diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch
index 003e5ff..efd5d96 100644
--- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch
+++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch
@@ -1,4 +1,4 @@
-From a8b8203b05477cea7b1102726a8cc581512c22e8 Mon Sep 17 00:00:00 2001
+From f6c4d4176d03a8b528bfc5342f538506c02f01c6 Mon Sep 17 00:00:00 2001
 From: Nicolas Vigier <boklm at torproject.org>
 Date: Thu, 25 Jun 2015 12:18:43 +0200
 Subject: [PATCH 5/7] OSX: package as tar.bz2
@@ -21,5 +21,5 @@ index 5c11ed2ef2ec..0c7bf282baab 100644
  ifeq (,$(filter-out WINNT, $(OS_ARCH)))
  MOZ_PKG_FORMAT  = ZIP
 -- 
-2.12.0
+2.12.2
 
diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch
index 665486e..52a0f18 100644
--- a/projects/mozilla/0006-Updater-fixups-for-TM.patch
+++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch
@@ -1,4 +1,4 @@
-From 7a39e91c507ae3655ee8ef2dfe919b9bb409dc9a Mon Sep 17 00:00:00 2001
+From d45245d692854faa9574014cab658e935e8537e1 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra at gmail.com>
 Date: Sun, 9 Oct 2016 09:34:38 -0700
 Subject: [PATCH 6/7] Updater fixups for TM
@@ -803,5 +803,5 @@ index c45961ac54e7..23d6fbe2929a 100644
    nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir));
    NS_ENSURE_SUCCESS(rv, rv);
 -- 
-2.12.0
+2.12.2
 
diff --git a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch
index a866f76..973d8d9 100644
--- a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch
+++ b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch
@@ -1,4 +1,4 @@
-From cdbfa65631576f1d5076cf2011f4d44810040730 Mon Sep 17 00:00:00 2001
+From 1fc38f7c038bdc501943e42b7ec3752aa4a732a3 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra at gmail.com>
 Date: Sat, 3 Dec 2016 10:01:52 -0800
 Subject: [PATCH 7/7] Permit storing exceptions even w/ inPrivateBrowsingMode
@@ -20,5 +20,5 @@ index 640791f898fc..a8abfe9886c4 100644
 +  return false;  // PrivateBrowsingUtils.isWindowPrivate(window);
  }
 -- 
-2.12.0
+2.12.2
 
diff --git a/projects/mozilla/config b/projects/mozilla/config
index 519276f..29e172e 100644
--- a/projects/mozilla/config
+++ b/projects/mozilla/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: tor-browser-45.8.0esr-6.5-2-build1
+version: tor-browser-45.9.0esr-6.5-1-build3
 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 136178c..3b1f7b5 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 6.5.1
+version: 6.5.2
 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]'
 
 input_files:

More information about the tor-commits mailing list