- tor-commits - lists.torproject.org

[torbrowser/master] Rebase patches to Firefox 7.0.
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit a9287e590da71d3cbc170c3bb7af1b52a88e2b03 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Sep 28 13:29:39 2011 -0700 Rebase patches to Firefox 7.0. --- ...nents.interfaces-lookupMethod-from-conten.patch | 50 +++++++++++ ...ock-Components.interfaces-lookupMethod-fr.patch | 50 ----------- ...fox6-Make-Permissions-Manager-memory-only.patch | 94 -------------------- ...0002-Make-Permissions-Manager-memory-only.patch | 94 ++++++++++++++++++++ ...-Make-Intermediate-Cert-Store-memory-only.patch | 43 --------- ...-Make-Intermediate-Cert-Store-memory-only.patch | 43 +++++++++ ...th-headers-before-the-modify-request-obse.patch | 12 ++-- .../0005-Add-a-string-based-cacheKey.patch | 14 ++-- ...6-Randomize-HTTP-pipeline-order-and-depth.patch | 16 ++-- .../0007-Block-all-plugins-except-flash.patch | 28 +++--- ...ontent-pref-service-memory-only-clearable.patch | 2 +- 11 files changed, 223 insertions(+), 223 deletions(-) diff --git a/src/current-patches/0001-Block-Components.interfaces-lookupMethod-from-conten.patch b/src/current-patches/0001-Block-Components.interfaces-lookupMethod-from-conten.patch new file mode 100644 index 0000000..70070d2 --- /dev/null +++ b/src/current-patches/0001-Block-Components.interfaces-lookupMethod-from-conten.patch @@ -0,0 +1,50 @@ +From b31cf77e084355158252629efd6bf794212d807a Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Mon, 20 Jun 2011 17:07:41 -0700 +Subject: [PATCH 1/8] Block Components.interfaces,lookupMethod from content + +This patch removes the ability of content script to access +Components.interfaces.* as well as call or access Components.lookupMethod. + +These two interfaces seem to be exposed to content script only to make our +lives difficult. Components.lookupMethod can undo our JS hooks, and +Components.interfaces is useful for fingerprinting the platform, OS, and +Firebox version. + +They appear to have no other legitimate use. See also: +https://bugzilla.mozilla.org/show_bug.cgi?id=429070 +https://trac.torproject.org/projects/tor/ticket/2873 +https://trac.torproject.org/projects/tor/ticket/2874 +--- + js/src/xpconnect/src/xpccomponents.cpp | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/js/src/xpconnect/src/xpccomponents.cpp b/js/src/xpconnect/src/xpccomponents.cpp +index 664021e..9c8c415 100644 +--- a/js/src/xpconnect/src/xpccomponents.cpp ++++ b/js/src/xpconnect/src/xpccomponents.cpp +@@ -4393,7 +4393,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval) + NS_IMETHODIMP + nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval) + { +- static const char* allowed[] = { "isSuccessCode", "lookupMethod", nsnull }; ++ // XXX: Pref observer? Also, is this what we want? Seems like a plan ++ //static const char* allowed[] = { "isSuccessCode", "lookupMethod", nsnull }; ++ static const char* allowed[] = { "isSuccessCode", nsnull }; + *_retval = xpc_CheckAccessList(methodName, allowed); + return NS_OK; + } +@@ -4402,7 +4404,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c + NS_IMETHODIMP + nsXPCComponents::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval) + { +- static const char* allowed[] = { "interfaces", "interfacesByID", "results", nsnull}; ++ // XXX: Pref observer? Also, is this what we want? Seems like a plan ++ // static const char* allowed[] = { "interfaces", "interfacesByID", "results", nsnull}; ++ static const char* allowed[] = { "results", nsnull}; + *_retval = xpc_CheckAccessList(propertyName, allowed); + return NS_OK; + } +-- +1.7.3.4 + diff --git a/src/current-patches/0001-Firefox6-Block-Components.interfaces-lookupMethod-fr.patch b/src/current-patches/0001-Firefox6-Block-Components.interfaces-lookupMethod-fr.patch deleted file mode 100644 index cfef3c2..0000000 --- a/src/current-patches/0001-Firefox6-Block-Components.interfaces-lookupMethod-fr.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1e21a3046829028f07c9bd13945e8bbeee2d5aad Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Mon, 20 Jun 2011 17:07:41 -0700 -Subject: [PATCH 1/7] Firefox6: Block Components.interfaces,lookupMethod from content - -This patch removes the ability of content script to access -Components.interfaces.* as well as call or access Components.lookupMethod. - -These two interfaces seem to be exposed to content script only to make our -lives difficult. Components.lookupMethod can undo our JS hooks, and -Components.interfaces is useful for fingerprinting the platform, OS, and -Firebox version. - -They appear to have no other legitimate use. See also: -https://bugzilla.mozilla.org/show_bug.cgi?id=429070 -https://trac.torproject.org/projects/tor/ticket/2873 -https://trac.torproject.org/projects/tor/ticket/2874 ---- - js/src/xpconnect/src/xpccomponents.cpp | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/js/src/xpconnect/src/xpccomponents.cpp b/js/src/xpconnect/src/xpccomponents.cpp -index c1d3e30..48c8b6a 100644 ---- a/js/src/xpconnect/src/xpccomponents.cpp -+++ b/js/src/xpconnect/src/xpccomponents.cpp -@@ -4231,7 +4231,9 @@ nsXPCComponents::CanCreateWrapper(const nsIID * iid, char **_retval) - NS_IMETHODIMP - nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, char **_retval) - { -- static const char* allowed[] = { "isSuccessCode", "lookupMethod", nsnull }; -+ // XXX: Pref observer? Also, is this what we want? Seems like a plan -+ //static const char* allowed[] = { "isSuccessCode", "lookupMethod", nsnull }; -+ static const char* allowed[] = { "isSuccessCode", nsnull }; - *_retval = xpc_CheckAccessList(methodName, allowed); - return NS_OK; - } -@@ -4240,7 +4242,9 @@ nsXPCComponents::CanCallMethod(const nsIID * iid, const PRUnichar *methodName, c - NS_IMETHODIMP - nsXPCComponents::CanGetProperty(const nsIID * iid, const PRUnichar *propertyName, char **_retval) - { -- static const char* allowed[] = { "interfaces", "interfacesByID", "results", nsnull}; -+ // XXX: Pref observer? Also, is this what we want? Seems like a plan -+ // static const char* allowed[] = { "interfaces", "interfacesByID", "results", nsnull}; -+ static const char* allowed[] = { "results", nsnull}; - *_retval = xpc_CheckAccessList(propertyName, allowed); - return NS_OK; - } --- -1.7.3.4 - diff --git a/src/current-patches/0002-Firefox6-Make-Permissions-Manager-memory-only.patch b/src/current-patches/0002-Firefox6-Make-Permissions-Manager-memory-only.patch deleted file mode 100644 index ac1ae8b..0000000 --- a/src/current-patches/0002-Firefox6-Make-Permissions-Manager-memory-only.patch +++ /dev/null @@ -1,94 +0,0 @@ -From c8cbe2617fd627f3edbd64c7ddaf99e6dd0301fb Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Mon, 20 Jun 2011 17:07:56 -0700 -Subject: [PATCH 2/7] Firefox6: Make Permissions Manager memory-only - -This patch exposes a pref 'permissions.memory_only' that properly isolates the -permissions manager to memory, which is responsible for all user specified -site permissions, as well as stored STS policy. - -The pref does successfully clear the permissions manager memory if toggled. It -does not need to be set in prefs.js, and can be handled by Torbutton. - -https://trac.torproject.org/projects/tor/ticket/2950 ---- - extensions/cookie/nsPermissionManager.cpp | 34 ++++++++++++++++++++++++++-- - 1 files changed, 31 insertions(+), 3 deletions(-) - -diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp -index 773a973..5387397 100644 ---- a/extensions/cookie/nsPermissionManager.cpp -+++ b/extensions/cookie/nsPermissionManager.cpp -@@ -58,6 +58,10 @@ - #include "mozStorageHelper.h" - #include "mozStorageCID.h" - #include "nsXULAppAPI.h" -+#include "nsCOMPtr.h" -+#include "nsIPrefService.h" -+#include "nsIPrefBranch.h" -+#include "nsIPrefBranch2.h" - - static nsPermissionManager *gPermissionManager = nsnull; - -@@ -227,6 +231,11 @@ nsPermissionManager::Init() - mObserverService->AddObserver(this, "profile-do-change", PR_TRUE); - } - -+ nsCOMPtr<nsIPrefBranch2> pbi = do_GetService(NS_PREFSERVICE_CONTRACTID); -+ if (pbi) { -+ pbi->AddObserver("permissions.", this, PR_FALSE); -+ } -+ - if (IsChildProcess()) { - // Get the permissions from the parent process - InfallibleTArray<IPC::Permission> perms; -@@ -275,8 +284,18 @@ nsPermissionManager::InitDB(PRBool aRemoveFile) - if (!storage) - return NS_ERROR_UNEXPECTED; - -+ PRBool memory_db = false; -+ nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); -+ if (prefs) { -+ prefs->GetBoolPref("permissions.memory_only", &memory_db); -+ } -+ - // cache a connection to the hosts database -- rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn)); -+ if (memory_db) { -+ rv = storage->OpenSpecialDatabase("memory", getter_AddRefs(mDBConn)); -+ } else { -+ rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn)); -+ } - NS_ENSURE_SUCCESS(rv, rv); - - PRBool ready; -@@ -286,7 +305,11 @@ nsPermissionManager::InitDB(PRBool aRemoveFile) - rv = permissionsFile->Remove(PR_FALSE); - NS_ENSURE_SUCCESS(rv, rv); - -- rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn)); -+ if (memory_db) { -+ rv = storage->OpenSpecialDatabase("memory", getter_AddRefs(mDBConn)); -+ } else { -+ rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn)); -+ } - NS_ENSURE_SUCCESS(rv, rv); - - mDBConn->GetConnectionReady(&ready); -@@ -805,7 +828,12 @@ NS_IMETHODIMP nsPermissionManager::Observe(nsISupports *aSubject, const char *aT - { - ENSURE_NOT_CHILD_PROCESS; - -- if (!nsCRT::strcmp(aTopic, "profile-before-change")) { -+ if (nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) == 0) { -+ if (!nsCRT::strcmp(someData, NS_LITERAL_STRING("permissions.memory_only").get())) { -+ // XXX: Should we remove the file? Probably not.. -+ InitDB(PR_FALSE); -+ } -+ } else if (!nsCRT::strcmp(aTopic, "profile-before-change")) { - // The profile is about to change, - // or is going away because the application is shutting down. - if (!nsCRT::strcmp(someData, NS_LITERAL_STRING("shutdown-cleanse").get())) { --- -1.7.3.4 - diff --git a/src/current-patches/0002-Make-Permissions-Manager-memory-only.patch b/src/current-patches/0002-Make-Permissions-Manager-memory-only.patch new file mode 100644 index 0000000..0429cca --- /dev/null +++ b/src/current-patches/0002-Make-Permissions-Manager-memory-only.patch @@ -0,0 +1,94 @@ +From 9eff68b74bb38d535c1d09246c8c2893f05edd1b Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Mon, 20 Jun 2011 17:07:56 -0700 +Subject: [PATCH 2/8] Make Permissions Manager memory-only + +This patch exposes a pref 'permissions.memory_only' that properly isolates the +permissions manager to memory, which is responsible for all user specified +site permissions, as well as stored STS policy. + +The pref does successfully clear the permissions manager memory if toggled. It +does not need to be set in prefs.js, and can be handled by Torbutton. + +https://trac.torproject.org/projects/tor/ticket/2950 +--- + extensions/cookie/nsPermissionManager.cpp | 34 ++++++++++++++++++++++++++-- + 1 files changed, 31 insertions(+), 3 deletions(-) + +diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp +index 773a973..5387397 100644 +--- a/extensions/cookie/nsPermissionManager.cpp ++++ b/extensions/cookie/nsPermissionManager.cpp +@@ -58,6 +58,10 @@ + #include "mozStorageHelper.h" + #include "mozStorageCID.h" + #include "nsXULAppAPI.h" ++#include "nsCOMPtr.h" ++#include "nsIPrefService.h" ++#include "nsIPrefBranch.h" ++#include "nsIPrefBranch2.h" + + static nsPermissionManager *gPermissionManager = nsnull; + +@@ -227,6 +231,11 @@ nsPermissionManager::Init() + mObserverService->AddObserver(this, "profile-do-change", PR_TRUE); + } + ++ nsCOMPtr<nsIPrefBranch2> pbi = do_GetService(NS_PREFSERVICE_CONTRACTID); ++ if (pbi) { ++ pbi->AddObserver("permissions.", this, PR_FALSE); ++ } ++ + if (IsChildProcess()) { + // Get the permissions from the parent process + InfallibleTArray<IPC::Permission> perms; +@@ -275,8 +284,18 @@ nsPermissionManager::InitDB(PRBool aRemoveFile) + if (!storage) + return NS_ERROR_UNEXPECTED; + ++ PRBool memory_db = false; ++ nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); ++ if (prefs) { ++ prefs->GetBoolPref("permissions.memory_only", &memory_db); ++ } ++ + // cache a connection to the hosts database +- rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn)); ++ if (memory_db) { ++ rv = storage->OpenSpecialDatabase("memory", getter_AddRefs(mDBConn)); ++ } else { ++ rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn)); ++ } + NS_ENSURE_SUCCESS(rv, rv); + + PRBool ready; +@@ -286,7 +305,11 @@ nsPermissionManager::InitDB(PRBool aRemoveFile) + rv = permissionsFile->Remove(PR_FALSE); + NS_ENSURE_SUCCESS(rv, rv); + +- rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn)); ++ if (memory_db) { ++ rv = storage->OpenSpecialDatabase("memory", getter_AddRefs(mDBConn)); ++ } else { ++ rv = storage->OpenDatabase(permissionsFile, getter_AddRefs(mDBConn)); ++ } + NS_ENSURE_SUCCESS(rv, rv); + + mDBConn->GetConnectionReady(&ready); +@@ -805,7 +828,12 @@ NS_IMETHODIMP nsPermissionManager::Observe(nsISupports *aSubject, const char *aT + { + ENSURE_NOT_CHILD_PROCESS; + +- if (!nsCRT::strcmp(aTopic, "profile-before-change")) { ++ if (nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) == 0) { ++ if (!nsCRT::strcmp(someData, NS_LITERAL_STRING("permissions.memory_only").get())) { ++ // XXX: Should we remove the file? Probably not.. ++ InitDB(PR_FALSE); ++ } ++ } else if (!nsCRT::strcmp(aTopic, "profile-before-change")) { + // The profile is about to change, + // or is going away because the application is shutting down. + if (!nsCRT::strcmp(someData, NS_LITERAL_STRING("shutdown-cleanse").get())) { +-- +1.7.3.4 + diff --git a/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch deleted file mode 100644 index 34a2a3e..0000000 --- a/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 66d789bb9eb916dc909f7fda79f988c4360a3924 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Fri, 19 Aug 2011 17:58:23 -0700 -Subject: [PATCH 3/7] Firefox6: Make Intermediate Cert Store memory-only. - -This patch makes the intermediate SSL cert store exist in memory only. - -The pref must be set before startup in prefs.js. -https://trac.torproject.org/projects/tor/ticket/2949 ---- - security/manager/ssl/src/nsNSSComponent.cpp | 15 ++++++++++++++- - 1 files changed, 14 insertions(+), 1 deletions(-) - -diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp -index 7a8569b..828c3eb 100644 ---- a/security/manager/ssl/src/nsNSSComponent.cpp -+++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -1729,8 +1729,21 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox) - // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as - // "/usr/lib/nss/libnssckbi.so". - PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; -- SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", -+ PRBool nocertdb = false; -+ mPrefBranch->GetBoolPref("security.nocertdb", &nocertdb); -+ -+ // XXX: We can also do the the following to only disable the certdb. -+ // Leaving this codepath in as a fallback in case InitNODB fails -+ if (nocertdb) -+ init_flags |= NSS_INIT_NOCERTDB; -+ -+ SECStatus init_rv; -+ if (nocertdb) { -+ init_rv = ::NSS_NoDB_Init(NULL); -+ } else { -+ init_rv = ::NSS_Initialize(profileStr.get(), "", "", - SECMOD_DB, init_flags); -+ } - - if (init_rv != SECSuccess) { - PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); --- -1.7.3.4 - diff --git a/src/current-patches/0003-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/0003-Make-Intermediate-Cert-Store-memory-only.patch new file mode 100644 index 0000000..0d3c991 --- /dev/null +++ b/src/current-patches/0003-Make-Intermediate-Cert-Store-memory-only.patch @@ -0,0 +1,43 @@ +From 6b2fed2b29f239c1c85e32bd417bacc3fd7155a7 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Fri, 19 Aug 2011 17:58:23 -0700 +Subject: [PATCH 3/8] Make Intermediate Cert Store memory-only. + +This patch makes the intermediate SSL cert store exist in memory only. + +The pref must be set before startup in prefs.js. +https://trac.torproject.org/projects/tor/ticket/2949 +--- + security/manager/ssl/src/nsNSSComponent.cpp | 15 ++++++++++++++- + 1 files changed, 14 insertions(+), 1 deletions(-) + +diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp +index 11cb2bd..fd717f4 100644 +--- a/security/manager/ssl/src/nsNSSComponent.cpp ++++ b/security/manager/ssl/src/nsNSSComponent.cpp +@@ -1757,8 +1757,21 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox) + // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as + // "/usr/lib/nss/libnssckbi.so". + PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; +- SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", ++ PRBool nocertdb = false; ++ mPrefBranch->GetBoolPref("security.nocertdb", &nocertdb); ++ ++ // XXX: We can also do the the following to only disable the certdb. ++ // Leaving this codepath in as a fallback in case InitNODB fails ++ if (nocertdb) ++ init_flags |= NSS_INIT_NOCERTDB; ++ ++ SECStatus init_rv; ++ if (nocertdb) { ++ init_rv = ::NSS_NoDB_Init(NULL); ++ } else { ++ init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); ++ } + + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); +-- +1.7.3.4 + diff --git a/src/current-patches/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch b/src/current-patches/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch index 522407b..24ab5fd 100644 --- a/src/current-patches/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch +++ b/src/current-patches/0004-Add-HTTP-auth-headers-before-the-modify-request-obse.patch @@ -1,7 +1,7 @@ -From 3e7e9375aff79629b13332cf250715b155535a5b Mon Sep 17 00:00:00 2001 +From 273ae174b0db5c37d39bb4aefdf1ce3c14fee3d6 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 2 Sep 2011 15:33:20 -0700 -Subject: [PATCH 4/7] Add HTTP auth headers before the modify-request observer. +Subject: [PATCH 4/8] Add HTTP auth headers before the modify-request observer. Otherwise, how are we supposed to modify them? @@ -11,10 +11,10 @@ Thanks to Georg Koppen for spotting both the problem and this fix. 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 7038338..7a3254e 100644 +index cd11187..144ecb7 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -311,9 +311,6 @@ nsHttpChannel::Connect(PRBool firstTime) +@@ -287,9 +287,6 @@ nsHttpChannel::Connect(PRBool firstTime) return NS_ERROR_DOCUMENT_NOT_CACHED; } @@ -24,7 +24,7 @@ index 7038338..7a3254e 100644 if (mLoadFlags & LOAD_NO_NETWORK_IO) { return NS_ERROR_DOCUMENT_NOT_CACHED; } -@@ -3687,6 +3684,9 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) +@@ -3621,6 +3618,9 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) AddCookiesToRequest(); @@ -34,7 +34,7 @@ index 7038338..7a3254e 100644 // notify "http-on-modify-request" observers gHttpHandler->OnModifyRequest(this); -@@ -4758,7 +4758,10 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn) +@@ -4693,7 +4693,10 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn) // this authentication attempt (bug 84794). // TODO: save cookies from auth response and send them here (bug 572151). AddCookiesToRequest(); diff --git a/src/current-patches/0005-Add-a-string-based-cacheKey.patch b/src/current-patches/0005-Add-a-string-based-cacheKey.patch index 1a3b214..3d5fd54 100644 --- a/src/current-patches/0005-Add-a-string-based-cacheKey.patch +++ b/src/current-patches/0005-Add-a-string-based-cacheKey.patch @@ -1,7 +1,7 @@ -From 29844b8d74f033c3a2682af40f4b3ee6183450f4 Mon Sep 17 00:00:00 2001 +From b777a0bc7898314cf13f8ad30a3ed072f4246941 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 2 Sep 2011 20:47:02 -0700 -Subject: [PATCH 5/7] Add a string-based cacheKey. +Subject: [PATCH 5/8] Add a string-based cacheKey. Used for isolating cache according to same-origin policy. --- @@ -29,10 +29,10 @@ index 2da46d6..4ee5774 100644 * may fail if the disk cache is not present. The value of this attribute * is usually only settable during the processing of a channel's diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 7a3254e..cef5eaa 100644 +index 144ecb7..0c8f8ae 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -2379,6 +2379,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, +@@ -2313,6 +2313,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, cacheKey.Append(buf); } @@ -45,7 +45,7 @@ index 7a3254e..cef5eaa 100644 if (!cacheKey.IsEmpty()) { cacheKey.AppendLiteral("uri="); } -@@ -4658,6 +4664,22 @@ nsHttpChannel::SetCacheForOfflineUse(PRBool value) +@@ -4593,6 +4599,22 @@ nsHttpChannel::SetCacheForOfflineUse(PRBool value) } NS_IMETHODIMP @@ -69,10 +69,10 @@ index 7a3254e..cef5eaa 100644 { value = mOfflineCacheClientID; diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h -index dd0d7f4..f5016a8 100644 +index a64ec07..7e89afe 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h -@@ -312,6 +312,7 @@ private: +@@ -303,6 +303,7 @@ private: nsCOMPtr<nsICacheEntryDescriptor> mOfflineCacheEntry; nsCacheAccessMode mOfflineCacheAccess; nsCString mOfflineCacheClientID; diff --git a/src/current-patches/0006-Randomize-HTTP-pipeline-order-and-depth.patch b/src/current-patches/0006-Randomize-HTTP-pipeline-order-and-depth.patch index 818d450..76ce04d 100644 --- a/src/current-patches/0006-Randomize-HTTP-pipeline-order-and-depth.patch +++ b/src/current-patches/0006-Randomize-HTTP-pipeline-order-and-depth.patch @@ -1,7 +1,7 @@ -From 1c5c12f3c28b6c618f2273d2fe36d7c898b7f012 Mon Sep 17 00:00:00 2001 +From f68b858073e7c16236430ee349fb565ac18cf3d4 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat, 3 Sep 2011 00:10:35 -0700 -Subject: [PATCH 6/7] Randomize HTTP pipeline order and depth. +Subject: [PATCH 6/8] Randomize HTTP pipeline order and depth. Also turn up maximum depth to 12. @@ -13,7 +13,7 @@ http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf 2 files changed, 81 insertions(+), 1 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 108f2c5..6961ab6 100644 +index c754f83..6a522ec 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -93,6 +93,11 @@ nsHttpConnectionMgr::nsHttpConnectionMgr() @@ -28,7 +28,7 @@ index 108f2c5..6961ab6 100644 } nsHttpConnectionMgr::~nsHttpConnectionMgr() -@@ -794,7 +799,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent, +@@ -822,7 +827,7 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent, nsHttpPipeline *pipeline = nsnull; if (conn->SupportsPipelining() && (caps & NS_HTTP_ALLOW_PIPELINING)) { LOG((" looking to build pipeline...\n")); @@ -37,7 +37,7 @@ index 108f2c5..6961ab6 100644 trans = pipeline; } -@@ -867,6 +872,77 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent, +@@ -895,6 +900,77 @@ nsHttpConnectionMgr::BuildPipeline(nsConnectionEntry *ent, return PR_TRUE; } @@ -116,7 +116,7 @@ index 108f2c5..6961ab6 100644 nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans) { diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h -index fc3ed1d..7dde291 100644 +index 695cd8f..1806d17 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.h +++ b/netwerk/protocol/http/nsHttpConnectionMgr.h @@ -48,6 +48,7 @@ @@ -127,7 +127,7 @@ index fc3ed1d..7dde291 100644 #include "nsIObserver.h" #include "nsITimer.h" -@@ -264,6 +265,7 @@ private: +@@ -270,6 +271,7 @@ private: nsresult DispatchTransaction(nsConnectionEntry *, nsAHttpTransaction *, PRUint8 caps, nsHttpConnection *); PRBool BuildPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **); @@ -135,7 +135,7 @@ index fc3ed1d..7dde291 100644 nsresult ProcessNewTransaction(nsHttpTransaction *); nsresult EnsureSocketThreadTargetIfOnline(); nsresult CreateTransport(nsConnectionEntry *, nsHttpTransaction *); -@@ -339,6 +341,8 @@ private: +@@ -345,6 +347,8 @@ private: PRUint64 mTimeOfNextWakeUp; // Timer for next pruning of dead connections. nsCOMPtr<nsITimer> mTimer; diff --git a/src/current-patches/0007-Block-all-plugins-except-flash.patch b/src/current-patches/0007-Block-all-plugins-except-flash.patch index d2c54dc..eae5f1f 100644 --- a/src/current-patches/0007-Block-all-plugins-except-flash.patch +++ b/src/current-patches/0007-Block-all-plugins-except-flash.patch @@ -1,6 +1,6 @@ -From dfabac8eddc37d794e23d25de3f1ef602ad4ad86 Mon Sep 17 00:00:00 2001 +From 32c9fdda43a02e738cbe9c7207795ed92bf835b9 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Thu, 8 Sep 2011 08:40:05 -0700 +Date: Wed, 28 Sep 2011 13:24:20 -0700 Subject: [PATCH 7/8] Block all plugins except flash. We cannot use the @mozilla.org/extensions/blocklist;1 service, because we @@ -17,12 +17,12 @@ on a better way. Until then, it is delta-darwinism for us. 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp -index 93c2413..1dc4ee0 100644 +index 2c2ad7d..eba8c24 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp -@@ -2062,6 +2062,35 @@ class nsDefaultComparator<pluginFileinDirectory, pluginFileinDirectory> - - typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void); +@@ -2014,6 +2014,35 @@ PRBool nsPluginHost::IsDuplicatePlugin(nsPluginTag * aPluginTag) + return PR_FALSE; + } +PRBool nsPluginHost::GhettoBlacklist(nsIFile *pluginFile) +{ @@ -53,25 +53,25 @@ index 93c2413..1dc4ee0 100644 + return PR_TRUE; // fuck 'em. blacklist. +} + + typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void); + nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, - PRBool aCreatePluginList, - PRBool *aPluginsChanged) -@@ -2197,6 +2226,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, +@@ -2135,6 +2164,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, continue; } -+ if (GhettoBlacklist(file)) { -+ continue; ++ if (GhettoBlacklist(localfile)) { ++ continue; + } + // if it is not found in cache info list or has been changed, create a new one if (!pluginTag) { - nsPluginFile pluginFile(file); + nsPluginFile pluginFile(localfile); diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h -index b1b8759..d6e237f 100644 +index cb43042..41dbf63 100644 --- a/dom/plugins/base/nsPluginHost.h +++ b/dom/plugins/base/nsPluginHost.h -@@ -283,6 +283,8 @@ private: +@@ -282,6 +282,8 @@ private: // Loads all cached plugins info into mCachedPlugins nsresult ReadPluginInfo(); diff --git a/src/current-patches/0008-Make-content-pref-service-memory-only-clearable.patch b/src/current-patches/0008-Make-content-pref-service-memory-only-clearable.patch index 75f0c0c..3b46894 100644 --- a/src/current-patches/0008-Make-content-pref-service-memory-only-clearable.patch +++ b/src/current-patches/0008-Make-content-pref-service-memory-only-clearable.patch @@ -1,4 +1,4 @@ -From 3964288545a78c28ca4585ac51bd7d9b8ccb3503 Mon Sep 17 00:00:00 2001 +From cdf48e30d76f7e1c349cdf8597e9cdc94623b8d8 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu, 8 Sep 2011 08:40:17 -0700 Subject: [PATCH 8/8] Make content pref service memory-only + clearable

1 0

[torbrowser/master] bump firefox to 7.0, tor to 0.2.2.33, and downgrade https-everywhere to 1.0.3
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 07c4e10d6a6240aa79a9c70767839a98caea8498 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 00:07:49 2011 +0100 bump firefox to 7.0, tor to 0.2.2.33, and downgrade https-everywhere to 1.0.3 --- build-scripts/versions.mk | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1e36e0f..c44c3b5 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -2,17 +2,16 @@ RELEASE_VER=2.2.32 -HTTPSEVERY_VER=1.0.0development.5 -FIREFOX_VER=6.0.2 +HTTPSEVERY_VER=1.0.3 +FIREFOX_VER=7.0 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.1.2.7 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 -POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.32 +TOR_VER=0.2.2.33 TORBUTTON_VER=1.4.3 VIDALIA_VER=0.2.14 ZLIB_VER=1.4.0

1 0

[torbrowser/master] Merge branch 'bug4093' into maint-2.2
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 8140d34b1cfa2626f0a81002c45500326d2c95ed Merge: 689b151 98c3b35 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 15:42:18 2011 +0100 Merge branch 'bug4093' into maint-2.2 src/RelativeLink/RelativeLink.sh | 4 +--- src/RelativeLink/RelativeLinkOSX.sh | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-)

1 0

[torbrowser/master] give windows makefile the ability to use both normal wget and the python wget steven made
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit ff24c49c8444afcb0d8606c7997daa8cfef56fb5 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 30 03:04:12 2011 +0100 give windows makefile the ability to use both normal wget and the python wget steven made --- build-scripts/windows.mk | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index d62aeff..9d721db 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -50,7 +50,8 @@ PIDGIN=$(FETCH_DIR)/PidginPortable-$(PIDGIN_VER) PWD:=$(shell pwd) PYTHON=/c/Python26/python.exe SEVENZIP="/c/Program Files/7-Zip/7z.exe" -WGET=$(PYTHON) $(PWD)/pyget.py +PYGET=$(PYTHON) $(PWD)/pyget.py +WGET=wget VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py WINRAR="/c/Program Files/WinRAR/WinRAR.exe" CC=gcc @@ -346,7 +347,7 @@ launcher: ## Torbutton development version torbutton.xpi: - $(WGET) -O $@ $(TORBUTTON) + $(PYGET) -O $@ $(TORBUTTON) ## English comes as default langpack_en-US.xpi: @@ -354,19 +355,19 @@ langpack_en-US.xpi: ## BetterPrivacy betterprivacy.xpi: - $(WGET) -O $@ $(BETTERPRIVACY) + $(PYGET) -O $@ $(BETTERPRIVACY) ## NoScript development version noscript.xpi: - $(WGET) -O $@ $(NOSCRIPT) + $(PYGET) -O $@ $(NOSCRIPT) ## HTTPS Everywhere httpseverywhere.xpi: - $(WGET) -O $@ $(HTTPSEVERYWHERE) + $(PYGET) -O $@ $(HTTPSEVERYWHERE) ## Generic language pack rule langpack_%.xpi: - $(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi + $(PYGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi ## ## Customize the bundle

1 0

[torbrowser/master] bump all tbb versions to 2.2.33-1, update changelogs and readmes
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit eb42c2f2ca4e144b036f082508635c5a2bda12ed Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 16:14:09 2011 +0100 bump all tbb versions to 2.2.33-1, update changelogs and readmes --- README.LINUX-2.2 | 8 ++++---- README.OSX-2.2 | 8 ++++---- README.WIN-2.2 | 10 +++++----- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 12 ++++++++++++ changelog.windows-2.2 | 12 ++++++++++++ 10 files changed, 55 insertions(+), 20 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 2f23ecf..5448f89 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0.2 +Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) +Firefox (Aurora) 7.0 \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.7 - |_ HTTPS-Everywhere 1.0.0development.5 + |_ NoScript 2.1.2.8 + |_ HTTPS-Everywhere 1.0.3 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 0f63125..fd6ae31 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0.2 +Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 7.0 \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.7 - |_ HTTPS-Everywhere 1.0.0development.5 + |_ NoScript 2.1.2.8 + |_ HTTPS-Everywhere 1.0.3 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 90f8fc7..bd27aa1 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 6.0.2 - \_ Firefox (Aurora) 6.0.2 +Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) +FirefoxPortable 7.0 + \_ Firefox (Aurora) 7.0 \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.7 - |_ HTTPS-Everywhere 1.0.0development.5 + |_ NoScript 2.1.2.8 + |_ HTTPS-Everywhere 1.0.3 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 3d6c6bf..c37447d 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=4 +BUILD_NUM=1 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d19576e..1ea955b 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=4 +BUILD_NUM=1 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index c44c3b5..af6335e 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,20 +1,20 @@ #!/usr/bin/make -RELEASE_VER=2.2.32 +RELEASE_VER=2.2.33 HTTPSEVERY_VER=1.0.3 FIREFOX_VER=7.0 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.1.2.7 -OPENSSL_VER=1.0.0d +NOSCRIPT_VER=2.1.2.8 +OPENSSL_VER=1.0.0e OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 TOR_VER=0.2.2.33 TORBUTTON_VER=1.4.3 VIDALIA_VER=0.2.14 -ZLIB_VER=1.4.0 +ZLIB_VER=1.2.5 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 741887c..d62aeff 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=4 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 15edc9c..df90085 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-1); suite=linux + + * Update Firefox to 7 + * Update OpenSSL to 1.0.0e (closes: #3996) + * Update Tor to 0.2.2.33 + * Update NoScript to 2.1.2.8 + * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to + use development versions of extensions (closes: #4050) + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:52:32 BST 2011 + Tor Browser Bundle (2.2.32-4); suite=linux * Fix Makefile to allow for automatic retrieval of Qt and libpng (closes: #2255) diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 72c0058..75eb8d8 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.33-1); suite=osx + + * Update Firefox to 7 + * Update Tor to 0.2.2.33 + * Update NoScript to 2.1.2.8 + * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to + use development versions of extensions (closes: #4050) + * Stop TBB from logging so much information to the system by only allowing + dyld log library loads to syslog when it is in debug mode (closes: #4093) + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:44:48 BST 2011 + Tor Browser Bundle (2.2.32-4); suite=osx * New Firefox patches diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index b09bbf3..510cac2 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.33-1); suite=windows + + * Update Firefox to 7 + * Update OpenSSL to 1.0.0e (closes: #3996) + * Update Tor to 0.2.2.33 + * Update NoScript to 2.1.2.8 + * Downgrade HTTPS Everywhere to 1.0.3, because we don't want stable TBBs to + use development versions of extensions (closes: #4050) + * Begin building Vidalia with DEP/ASLR + + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 29 15:51:02 BST 2011 + Tor Browser Bundle (2.2.32-4); suite=windows * Disable automatic port selection to accommodate Windows users with

1 0

[torbrowser/master] update name of windows changelog in windows makefile
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 797fe84498de96470e2bdeee8996c6026240ff53 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 30 03:04:38 2011 +0100 update name of windows changelog in windows makefile --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 9d721db..739317f 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -291,7 +291,7 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.win-2.2 $(DOCSDIR)/changelog + cp ../changelog.windows-2.2 $(DOCSDIR)/changelog cp ../README.WIN-2.2 $(DOCSDIR)/README-TorBrowserBundle ## Copy over FirefoxPortable

1 0

[torbrowser/master] a wild firefox 7.0.1 appears to prove that there is no god
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit bbef1f7a356da590a2cae5d6d389b9ba44740f99 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 30 03:07:47 2011 +0100 a wild firefox 7.0.1 appears to prove that there is no god --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index af6335e..8856a87 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.33 HTTPSEVERY_VER=1.0.3 -FIREFOX_VER=7.0 +FIREFOX_VER=7.0.1 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.1.2.8

1 0

[torbrowser/master] bump all tbb versions, update changelogs and readmes for firefox 7.0.1
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 7a8765f0bb3c3fc3eb8affdf753d7272691ffbe3 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 30 16:34:22 2011 +0100 bump all tbb versions, update changelogs and readmes for firefox 7.0.1 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 6 ++++++ changelog.osx-2.2 | 6 ++++++ changelog.windows-2.2 | 6 ++++++ 9 files changed, 25 insertions(+), 7 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 5448f89..914b537 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) -Firefox (Aurora) 7.0 +Firefox (Aurora) 7.0.1 \_ Torbutton 1.4.3 |_ NoScript 2.1.2.8 |_ HTTPS-Everywhere 1.0.3 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index fd6ae31..dcb3e7e 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 7.0 +Firefox (Aurora) 7.0.1 \_ Torbutton 1.4.3 |_ NoScript 2.1.2.8 |_ HTTPS-Everywhere 1.0.3 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index bd27aa1..3cc6141 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,8 +6,8 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) -FirefoxPortable 7.0 - \_ Firefox (Aurora) 7.0 +FirefoxPortable 7.0.1 + \_ Firefox (Aurora) 7.0.1 \_ Torbutton 1.4.3 |_ NoScript 2.1.2.8 |_ HTTPS-Everywhere 1.0.3 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c37447d..bd16d4d 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 1ea955b..d2de9dc 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 739317f..b3e199c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index df90085..285914c 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.33-2); suite=linux + + * Update Firefox to 7.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 30 16:32:50 BST 2011 + Tor Browser Bundle (2.2.33-1); suite=linux * Update Firefox to 7 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 75eb8d8..ad31c2e 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.33-2); suite=osx + + * Update Firefox to 7.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 30 16:31:59 BST 2011 + Tor Browser Bundle (2.2.33-1); suite=osx * Update Firefox to 7 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 510cac2..f183ae4 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.2.33-2); suite=windows + + * Update Firefox to 7.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 30 16:32:33 BST 2011 + Tor Browser Bundle (2.2.33-1); suite=windows * Update Firefox to 7

1 0

[torbrowser/master] move all of the extension download locations to one file, and update noscript's url
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit b44210d6f9c79aa5c7e3b9fc0caf8558f6def7c5 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 30 17:29:57 2011 +0100 move all of the extension download locations to one file, and update noscript's url --- build-scripts/linux.mk | 5 ----- build-scripts/osx.mk | 5 ----- build-scripts/versions.mk | 6 ++++++ build-scripts/windows.mk | 5 ----- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index bd16d4d..090ee8e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -183,11 +183,6 @@ endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi -## Where to download Torbutton from -TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi -NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi -BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi -HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi ## Where to download Mozilla language packs MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releas… diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d2de9dc..5d5dbc1 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -172,11 +172,6 @@ endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi -## Where to download Torbutton from -TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi -NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi -BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi -HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi ## Where to download Mozilla language packs MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releas… diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 8856a87..f36759c 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -19,6 +19,12 @@ ZLIB_VER=1.2.5 ## Extension IDs FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} +## Extensions +TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi +NOSCRIPT=https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi +BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi +HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi + ## File names for the source packages ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index b3e199c..8bfa747 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -161,11 +161,6 @@ endif ## Extensions to install by default DEFAULT_EXTENSIONS=torbutton.xpi -## Where to download Torbutton from -TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi -NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi -BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi -HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi ## Where to download Mozilla language packs MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releas…

1 0

[torbrowser/master] update windows version string to remove nonexistent arch type that causes trailing dash in torbrowser.version (closes: #4160)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 022c82c8b67f2ab63135fcd9368834af3f05dbbf Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 4 17:59:43 2011 +0100 update windows version string to remove nonexistent arch type that causes trailing dash in torbrowser.version (closes: #4160) --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8bfa747..1d9bd04 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -469,8 +469,8 @@ print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME)

1 0