[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor-messenger-build/master] Rebase patches for the 45.6.0 release

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor-messenger-build/master] Rebase patches for the 45.6.0 release
From: arlo@xxxxxxxxxxxxxx
Date: Tue, 13 Dec 2016 22:00:44 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 13 Dec 2016 17:00:56 -0500
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Arlo Breault <arlolra@xxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 8b5d8cedfb51e726842527f4a6fc01b37874c765
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Tue Dec 13 14:00:03 2016 -0800

    Rebase patches for the 45.6.0 release
---
 ChangeLog                                                             | 4 ++--
 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 +-
 .../0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch   | 2 +-
 projects/mozilla/config                                               | 2 +-
 projects/tor-browser/config                                           | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f3761a..3923b54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
 Tor Messenger 0.3.0b2 --
  * All Platforms
-   * Use the tor-browser-45.5.1esr-6.0-1-build1 tag on tor-browser
+   * Use the tor-browser-45.6.0esr-6.0-1-build1 tag on tor-browser
    * Use the THUNDERBIRD_45_5_1_RELEASE tag on comm-esr45
    * Update ctypes-otr to f34a5848
-   * Update tor-browser to 6.0.7
+   * Update tor-browser to 6.0.8
    * Don't allow javascript: links in themes
    * Permit storing cert. exceptions in private browsing mode
    * Bugzilla 1321420: Add a pref to disable JavaScript in browser requests
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 51b38dd..d4faed1 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 bd289165bfce9d0239d67571755cee1048e9433b Mon Sep 17 00:00:00 2001
+From d107a09da25db93e19b8512c29205de2aa0387c1 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Mon, 10 Oct 2016 10:52:52 -0700
 Subject: [PATCH 1/7] 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 afd5a37..2f0ab05 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 a37fd7380b807ff8e4cebaef8a5817c670816091 Mon Sep 17 00:00:00 2001
+From 6c422054720f3ec350854c5560c36061b6146149 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Thu, 6 Oct 2016 20:13:35 -0700
 Subject: [PATCH 2/7] 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 8a60703..faa24fa 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 39f09114b425a248516f27296a57b91978d47b81 Mon Sep 17 00:00:00 2001
+From f3465153bc87a2e9c57d0fe8e796d4a09bcc0e24 Mon Sep 17 00:00:00 2001
 From: Jonathan Kew <jkew@xxxxxxxxxxx>
 Date: Sun, 9 Oct 2016 09:18:37 -0700
 Subject: [PATCH 3/7] 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 f656910..1e7c83b 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 074aeb6d15c5098991d0d7e652eddbf3b72f91d7 Mon Sep 17 00:00:00 2001
+From 0f7fcd0b4dba93f3e652838f9d9f988e9e8b8726 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Wed, 23 Mar 2016 19:52:07 -0700
 Subject: [PATCH 4/7] 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 ce20f8e..2c24d45 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 a758107c5d793f0bfb686a5b60c70037b8ebf1bb Mon Sep 17 00:00:00 2001
+From 4c88cc660df421c77335f0d5fb73ea97430ed441 Mon Sep 17 00:00:00 2001
 From: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
 Date: Thu, 25 Jun 2015 12:18:43 +0200
 Subject: [PATCH 5/7] 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 6a8ad5a..54397a6 100644
--- a/projects/mozilla/0006-Updater-fixups-for-TM.patch
+++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch
@@ -1,4 +1,4 @@
-From 63d8e00c912bdbe1c336ecf4276e123d59c41be3 Mon Sep 17 00:00:00 2001
+From 803f92640e5a0856a5c78ccba5c4845144b88af3 Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Sun, 9 Oct 2016 09:34:38 -0700
 Subject: [PATCH 6/7] Updater fixups for TM
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 c976f0d..dce5f48 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 943386570317551f9e2540e8a90ed7f5c8ce9b45 Mon Sep 17 00:00:00 2001
+From ef983cda8e98135413d12e8d7f4c3787db92670e Mon Sep 17 00:00:00 2001
 From: Arlo Breault <arlolra@xxxxxxxxx>
 Date: Sat, 3 Dec 2016 10:01:52 -0800
 Subject: [PATCH 7/7] Permit storing exceptions even w/ inPrivateBrowsingMode
diff --git a/projects/mozilla/config b/projects/mozilla/config
index 6d5f826..e936de2 100644
--- a/projects/mozilla/config
+++ b/projects/mozilla/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: tor-browser-45.5.1esr-6.0-1-build1
+version: tor-browser-45.6.0esr-6.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 b1e035f..c0337b9 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 6.0.7
+version: 6.0.8
 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]'
 
 input_files:

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor-messenger-build/master] Apply prefs in bugzilla 1262010
Next by Author: [tor-commits] [tor-messenger-build/master] Add a pref to disable JavaScript in browser requests
Previous by thread: [tor-commits] [sandboxed-tor-browser/master] Keep the Grsec PaX override till 7.0.0 release.
Next by thread: [tor-commits] [tor/master] Remove AuthDirMaxServersPerAuthAddr
Index(es):
- Author
- Thread