commit a6048ed04fe0be8bc0a78b364d5b4864d26547f8 Author: Arlo Breault <arlolra@gmail.com> Date: Wed Nov 9 11:50:42 2016 -0800 Pull in fixup for updater on tor-browser-45.5.0esr-6.0-1 --- projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 2 +- projects/mozilla/0002-Trac-16475-Block-flash-too.patch | 2 +- .../0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch | 2 +- .../0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch | 2 +- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 2 +- projects/mozilla/0006-Updater-fixups-for-TM.patch | 2 +- projects/mozilla/config | 2 +- 7 files changed, 7 insertions(+), 7 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 1ce4cfc..f365561 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 d05e3b60489252ad72c367af074432ab30251b3b Mon Sep 17 00:00:00 2001 +From 428362e2eee5c06ec84c6d52ff0327d1cbb8beda Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Mon, 10 Oct 2016 10:52:52 -0700 Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index d4cc5a8..19481d3 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 8f56d8580b3fb8a8355bc477d2353184ebf8ff31 Mon Sep 17 00:00:00 2001 +From 05842dca95a626ccdad123be15353b00ff03a7f0 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/6] Trac 16475: Block flash too 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 667d46a..4cd9013 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 6dcf4662033b55c53401ed57e7d25d22ccf3e15b Mon Sep 17 00:00:00 2001 +From 401acfb1085f0ac9de8628a4f87d522fccbae8b1 Mon Sep 17 00:00:00 2001 From: Jonathan Kew <jkew@mozilla.com> Date: Sun, 9 Oct 2016 09:18:37 -0700 Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka 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 06c97ca..0331884 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 ed613224bf375dd049edccdb6f1de8cfc5f9a149 Mon Sep 17 00:00:00 2001 +From 283d30517d1795fff99c0c193eeabe06043b591b Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Wed, 23 Mar 2016 19:52:07 -0700 Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45 diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index 927e8cf..18652a0 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 283a123b62870f7f8060d6e9164082f25b67927b Mon Sep 17 00:00:00 2001 +From 386cca851618f0d19f7ce07483c0b290e178ce46 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm@torproject.org> Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 5/6] OSX: package as tar.bz2 diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index a0d7f47..0dd6a00 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From 94a4585f80a62a42f06e5433ba122e36ec60c418 Mon Sep 17 00:00:00 2001 +From 8f449e5b031577a45b80a58c798ad89bcf1ce2a6 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra@gmail.com> Date: Sun, 9 Oct 2016 09:34:38 -0700 Subject: [PATCH 6/6] Updater fixups for TM diff --git a/projects/mozilla/config b/projects/mozilla/config index ca7d2b0..1c224be 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git -git_hash: e5dafab84b9b073bf1e510a8272c6ca35b4e396d +git_hash: f0382d95b8145b91bae099024bce64affff34523 input_files: - filename: 0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch - filename: 0002-Trac-16475-Block-flash-too.patch