commit 8658c44f5fd2e9881e676488098aa4fb38ceced1 Author: Arlo Breault arlolra@gmail.com Date: Sat Dec 3 10:07:46 2016 -0800

Permit storing cert exceptions in private browsing mode --- ChangeLog | 1 + ...0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 10 ++++----- .../mozilla/0002-Trac-16475-Block-flash-too.patch | 6 +++--- ...Avoid-the-need-to-download-the-font-Osaka.patch | 8 ++++---- ...Update-OS-X-toolchain-to-work-with-ESR-45.patch | 10 ++++----- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 6 +++--- projects/mozilla/0006-Updater-fixups-for-TM.patch | 10 ++++----- ...ing-exceptions-even-w-inPrivateBrowsingMo.patch | 24 ++++++++++++++++++++++ projects/mozilla/config | 1 + 9 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 78e111c..fdb0def 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Tor Messenger 0.3.0b2 -- * Use the THUNDERBIRD_45_5_1_RELEASE tag on comm-esr45 * Update tor-browser to 6.0.7 * 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 * Bugzilla 1321641: Disable svg and mathml in content

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 93e415b..51b38dd 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,7 +1,7 @@ From bd289165bfce9d0239d67571755cee1048e9433b 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 +Subject: [PATCH 1/7] Trac 19910: Prevents STARTTLS in XMPP

* Revert "Bug #3875: Use Optimistic Data SOCKS variant."

@@ -13,7 +13,7 @@ This reverts commit 9064546a5e54d94054d944dd910a5db3a67032dc. 3 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp -index c35a587..6a758f9 100644 +index c35a587830d8..6a758f9acaad 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp @@ -1887,26 +1887,8 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) @@ -86,7 +86,7 @@ index c35a587..6a758f9 100644 mCondition = ErrorAccordingToNSPR(code); } diff --git a/netwerk/base/nsSocketTransport2.h b/netwerk/base/nsSocketTransport2.h -index b7fbc76..b508335 100644 +index b7fbc76a79a8..b508335c7e55 100644 --- a/netwerk/base/nsSocketTransport2.h +++ b/netwerk/base/nsSocketTransport2.h @@ -190,9 +190,7 @@ private: @@ -101,7 +101,7 @@ index b7fbc76..b508335 100644

// Safer way to get and automatically release PRFileDesc objects. diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp -index 568c700..1793001 100644 +index 568c700e2bae..1793001df2c9 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp @@ -79,9 +79,7 @@ public: @@ -116,5 +116,5 @@ index 568c700..1793001 100644

private: -- -2.10.2 +2.11.0

diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 10f6209..afd5a37 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,7 +1,7 @@ From a37fd7380b807ff8e4cebaef8a5817c670816091 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 +Subject: [PATCH 2/7] Trac 16475: Block flash too

* Builds on "Bug #3547: Block all plugins except flash." --- @@ -9,7 +9,7 @@ Subject: [PATCH 2/6] Trac 16475: Block flash too 1 file changed, 9 deletions(-)

diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp -index 5345ce7..1569236 100644 +index 5345ce7c8764..15692365ee63 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -2081,15 +2081,6 @@ PRBool nsPluginHost::GhettoBlacklist(nsIFile *pluginFile) @@ -29,5 +29,5 @@ index 5345ce7..1569236 100644 }

-- -2.10.2 +2.11.0

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 e0eb945..8a60703 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,7 +1,7 @@ From 39f09114b425a248516f27296a57b91978d47b81 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 +Subject: [PATCH 3/7] Trac 20206: Avoid the need to download the font Osaka

* Bug 1283573 - Don't attempt to look up a single-face-family name if the corresponding main family isn't available. r=mstange @@ -11,7 +11,7 @@ Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/gfx/thebes/gfxMacPlatformFontList.mm b/gfx/thebes/gfxMacPlatformFontList.mm -index eb7a788..5c63e69 100644 +index eb7a7889ae6a..5c63e698726a 100644 --- a/gfx/thebes/gfxMacPlatformFontList.mm +++ b/gfx/thebes/gfxMacPlatformFontList.mm @@ -735,15 +735,24 @@ gfxMacPlatformFontList::InitSingleFaceList() @@ -44,7 +44,7 @@ index eb7a788..5c63e69 100644 LOG_FONTLIST(("(fontlist-singleface) family name: %s, key: %s\n", NS_ConvertUTF16toUTF8(familyName).get(), diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index e855cdb..2891c80 100644 +index e855cdbcb949..2891c804601d 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -3577,9 +3577,9 @@ pref("font.name.monospace.x-math", "Courier"); @@ -61,5 +61,5 @@ index e855cdb..2891c80 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.10.2 +2.11.0

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 6598c3a..f656910 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,7 +1,7 @@ From 074aeb6d15c5098991d0d7e652eddbf3b72f91d7 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 +Subject: [PATCH 4/7] Trac 18331: Update OS X toolchain to work with ESR 45

* We're reverting the patch, "Adjust atomic ops code to be more compatible with thread sanitizer tools." @@ -14,7 +14,7 @@ Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45 3 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/intl/icu/source/common/putilimp.h b/intl/icu/source/common/putilimp.h -index 55ec0ae..ac083b0 100644 +index 55ec0ae6ece5..ac083b0e449f 100644 --- a/intl/icu/source/common/putilimp.h +++ b/intl/icu/source/common/putilimp.h @@ -1,7 +1,7 @@ @@ -49,7 +49,7 @@ index 55ec0ae..ac083b0 100644 /*===========================================================================*/ /** @{ Programs used by ICU code */ diff --git a/intl/icu/source/common/umutex.cpp b/intl/icu/source/common/umutex.cpp -index 69eab79..dff0b47 100644 +index 69eab79ff945..dff0b4723736 100644 --- a/intl/icu/source/common/umutex.cpp +++ b/intl/icu/source/common/umutex.cpp @@ -344,8 +344,8 @@ umtx_atomic_dec(u_atomic_int32_t *p) { @@ -73,7 +73,7 @@ index 69eab79..dff0b47 100644

U_NAMESPACE_END diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h -index 0e4d118..e0ad0d3 100644 +index 0e4d118523c8..e0ad0d3c0365 100644 --- a/intl/icu/source/common/umutex.h +++ b/intl/icu/source/common/umutex.h @@ -1,6 +1,6 @@ @@ -119,5 +119,5 @@ index 0e4d118..e0ad0d3 100644 /* * gcc atomic ops. These are available on several other compilers as well. -- -2.10.2 +2.11.0

diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index 5272b75..ce20f8e 100644 --- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch @@ -1,14 +1,14 @@ From a758107c5d793f0bfb686a5b60c70037b8ebf1bb 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 +Subject: [PATCH 5/7] OSX: package as tar.bz2

--- toolkit/mozapps/installer/upload-files.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk -index 5c11ed2..0c7bf28 100644 +index 5c11ed2ef2ec..0c7bf282baab 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -4,7 +4,7 @@ @@ -21,5 +21,5 @@ index 5c11ed2..0c7bf28 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.10.2 +2.11.0

diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index fd54e53..6a8ad5a 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,7 +1,7 @@ From 63d8e00c912bdbe1c336ecf4276e123d59c41be3 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 +Subject: [PATCH 6/7] Updater fixups for TM

* Remove updater links

@@ -526,7 +526,7 @@ z<Hj~T<`88N3sa$~O~s4yQz$7wxFYzlvl`kV4U7(93})ejnwEPfj7PS+Eo(dWGOA)$ lxF+BV*FuA*n)rXh{eOL`E@}ETfW-g+002ovPDHLkV1nm~vr+&6

diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js -index 40e76c8..5565b9c 100644 +index 40e76c889234..5565b9c54f8c 100644 --- a/toolkit/mozapps/update/content/updates.js +++ b/toolkit/mozapps/update/content/updates.js @@ -979,7 +979,7 @@ var gUpdatesFoundBasicPage = { @@ -539,7 +539,7 @@ index 40e76c8..5565b9c 100644 updateMoreInfoURL.hidden = true;

diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul -index 6066802..c82bc77 100644 +index 6066802a65af..c82bc77ce8a7 100644 --- a/toolkit/mozapps/update/content/updates.xul +++ b/toolkit/mozapps/update/content/updates.xul @@ -121,8 +121,7 @@ @@ -693,7 +693,7 @@ zHAIICCiYIYSX`mIUcOp4Id^^h+f`jW<`?chRNi!yt6Nd*2j3*8u$&(cmR(l9;<#d+ W@ahR1{w+qA19CVV{J*b~TmS$gHy@k;

diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp -index c45961a..23d6fbe 100644 +index c45961ac54e7..23d6fbe2929a 100644 --- a/xpcom/io/TorFileUtils.cpp +++ b/xpcom/io/TorFileUtils.cpp @@ -16,7 +16,7 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile) @@ -706,5 +706,5 @@ index c45961a..23d6fbe 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.10.2 +2.11.0

diff --git a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch new file mode 100644 index 0000000..c976f0d --- /dev/null +++ b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -0,0 +1,24 @@ +From 943386570317551f9e2540e8a90ed7f5c8ce9b45 Mon Sep 17 00:00:00 2001 +From: Arlo Breault arlolra@gmail.com +Date: Sat, 3 Dec 2016 10:01:52 -0800 +Subject: [PATCH 7/7] Permit storing exceptions even w/ inPrivateBrowsingMode + +--- + security/manager/pki/resources/content/exceptionDialog.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/security/manager/pki/resources/content/exceptionDialog.js b/security/manager/pki/resources/content/exceptionDialog.js +index 640791f898fc..a8abfe9886c4 100644 +--- a/security/manager/pki/resources/content/exceptionDialog.js ++++ b/security/manager/pki/resources/content/exceptionDialog.js +@@ -356,5 +356,6 @@ function addException() { + * Returns true if this dialog is in private browsing mode. + */ + function inPrivateBrowsingMode() { +- return PrivateBrowsingUtils.isWindowPrivate(window); ++ // Let us store exceptions in private browsing mode. ++ return false; // PrivateBrowsingUtils.isWindowPrivate(window); + } +-- +2.11.0 + diff --git a/projects/mozilla/config b/projects/mozilla/config index ec93ff5..6d5f826 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -12,3 +12,4 @@ input_files: - filename: 0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch - filename: 0005-OSX-package-as-tar.bz2.patch - filename: 0006-Updater-fixups-for-TM.patch + - filename: 0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch