commit 7771c1378bd74a12d06a0a3429dbaec8743383ad Author: Sukhbir Singh sukhbir@torproject.org Date: Tue Jan 30 11:22:10 2018 -0500
Use proper formatting for mozilla/ patches --- ...0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 6 ++--- .../mozilla/0002-Trac-16475-Block-flash-too.patch | 6 ++--- projects/mozilla/0003-OSX-package-as-tar.bz2.patch | 6 ++--- projects/mozilla/0004-Updater-fixups-for-TM.patch | 6 ++--- ...ing-exceptions-even-w-inPrivateBrowsingMo.patch | 6 ++--- ...Bug-23231-disable-STL-Wrappers-on-Windows.patch | 27 ++++++++++++++++++++++ 6 files changed, 42 insertions(+), 15 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 e78e36b..d634f0b 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 6ee07445bcfa1ef74934ecc7a7862afd10d0927d Mon Sep 17 00:00:00 2001 +From 4015b1fc6b60638ec28bdfb568ff263e4a69783a 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 +Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP
* Revert "Bug 3875: Use Optimistic Data SOCKS variant."
@@ -115,5 +115,5 @@ index a21dfa4a5a11..5429637c1c3a 100644 void SetNamedPipeFD(PRFileDesc *fd) { mFD = fd; }
-- -2.16.1 +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 5c24cdb..81d60d3 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 a1f8139363a279d8c948ef621e860e306eca2167 Mon Sep 17 00:00:00 2001 +From add0c6cef2e16013a4e937477fa74156589d310f 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 +Subject: [PATCH 2/6] Trac 16475: Block flash too
* Builds on "Bug #3547: Block all plugins except flash." --- @@ -29,5 +29,5 @@ index cd1707beaf5f..d014832e0595 100644 }
-- -2.16.1 +2.11.0
diff --git a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch index ce7636d..33108b5 100644 --- a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch @@ -1,7 +1,7 @@ -From 4502122ff76eb1c6de00f3db49b6ff3121f1e9ce Mon Sep 17 00:00:00 2001 +From 4a6547f057868dcf8a6660632f2a84dcbdc9ff30 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 +Subject: [PATCH 3/6] OSX: package as tar.bz2
--- toolkit/mozapps/installer/upload-files.mk | 2 +- @@ -21,5 +21,5 @@ index 51633178226c..64584f579390 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.16.1 +2.11.0
diff --git a/projects/mozilla/0004-Updater-fixups-for-TM.patch b/projects/mozilla/0004-Updater-fixups-for-TM.patch index 305bc0f..9d3053d 100644 --- a/projects/mozilla/0004-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0004-Updater-fixups-for-TM.patch @@ -1,7 +1,7 @@ -From 26c0c11d82d4192f68cdb87ea4dd2d5f6f6d52e3 Mon Sep 17 00:00:00 2001 +From 7bd981927d912cb20dc16658deccc9fa77a92690 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 +Subject: [PATCH 4/6] Updater fixups for TM
* Remove updater links
@@ -804,5 +804,5 @@ index c45961ac54e7..23d6fbe2929a 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.16.1 +2.11.0
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 1e327f6..9f9e15f 100644 --- a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,7 +1,7 @@ -From bd9333d8dfd64559b4d33f06b3871740104259f5 Mon Sep 17 00:00:00 2001 +From 7abd599adc7c76757e56cea3a4c73c1daa3c1781 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 +Subject: [PATCH 5/6] Permit storing exceptions even w/ inPrivateBrowsingMode
--- security/manager/pki/resources/content/exceptionDialog.js | 3 ++- @@ -20,5 +20,5 @@ index 0ca24a614dca..df50701729ce 100644 + return false; // PrivateBrowsingUtils.isWindowPrivate(window); } -- -2.16.1 +2.11.0
diff --git a/projects/mozilla/0006-Bug-23231-disable-STL-Wrappers-on-Windows.patch b/projects/mozilla/0006-Bug-23231-disable-STL-Wrappers-on-Windows.patch new file mode 100644 index 0000000..1c3db22 --- /dev/null +++ b/projects/mozilla/0006-Bug-23231-disable-STL-Wrappers-on-Windows.patch @@ -0,0 +1,27 @@ +From c8b565a24def7c0c39d134bb8a85a28b0395826c Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier boklm@torproject.org +Date: Sat, 12 Aug 2017 22:00:13 +0200 +Subject: [PATCH 6/6] Bug 23231: disable STL Wrappers on Windows + +Workaround for: +https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 +--- + old-configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/old-configure.in b/old-configure.in +index f5a2f05629ce..e247551461b6 100644 +--- a/old-configure.in ++++ b/old-configure.in +@@ -1338,7 +1338,7 @@ MOZ_CXX11 + AC_LANG_C + + case "${OS_TARGET}" in +-Darwin) ++WINNT|Darwin) + ;; + *) + STL_FLAGS="-I${DIST}/stl_wrappers" +-- +2.11.0 +