April 2012 - tor-commits - lists.torproject.org

[torbrowser/maint-2.3] Win: Fix the http pipeline patch so it compiles
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 4a4879a1a95896d96acb0eabedd3f746526ee356 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 15:43:56 2012 +0200 Win: Fix the http pipeline patch so it compiles --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 21 ++++++++++++++++++- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch index 0615abd..684b1e6 100644 --- a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -40,7 +40,7 @@ index 6e1099d..3eec5b3 100644 - PRInt32 i, count = ent->mPendingQ.Length(); - for (i=0; i<count; ++i) { + PRInt32 i, h, count = ent->mPendingQ.Length(); -+ PRInt32 ind[count]; ++ PRInt32* ind = new PRInt32[count]; + ShuffleRequestOrder((PRUint32*)ind, (PRUint32)count); + + for (h=0; h<count; ++h) { @@ -48,6 +48,15 @@ index 6e1099d..3eec5b3 100644 nsHttpTransaction *trans = ent->mPendingQ[i]; if (trans->Caps() & NS_HTTP_ALLOW_PIPELINING) { pipeline->AddTransaction(trans); +@@ -365,6 +375,8 @@ + break; + } + } ++ ++ delete [] ind; + } + } + } @@ -898,12 +908,17 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent) ProcessSpdyPendingQ(ent); @@ -60,7 +69,7 @@ index 6e1099d..3eec5b3 100644 nsHttpConnection *conn = nsnull; - for (i = 0; i < count; ++i) { + -+ PRUint32 ind[count]; ++ PRUInt32* ind = new PRUInt32[count]; + ShuffleRequestOrder(ind, count); + + for (h=0; h<count; ++h) { @@ -68,6 +77,14 @@ index 6e1099d..3eec5b3 100644 trans = ent->mPendingQ[i]; // When this transaction has already established a half-open +@@ -927,6 +944,7 @@ + "something mutated pending queue from " + "GetConnection()"); + } ++ delete [] ind; + if (conn) { + LOG((" dispatching pending transaction...\n")); + @@ -1011,6 +1026,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap maxPersistConns = mMaxPersistConnsPerHost; }

1 0

[torbrowser/maint-2.2] Win: Fix the http pipeline patch so it compiles
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 4a4879a1a95896d96acb0eabedd3f746526ee356 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 15:43:56 2012 +0200 Win: Fix the http pipeline patch so it compiles --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 21 ++++++++++++++++++- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch index 0615abd..684b1e6 100644 --- a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -40,7 +40,7 @@ index 6e1099d..3eec5b3 100644 - PRInt32 i, count = ent->mPendingQ.Length(); - for (i=0; i<count; ++i) { + PRInt32 i, h, count = ent->mPendingQ.Length(); -+ PRInt32 ind[count]; ++ PRInt32* ind = new PRInt32[count]; + ShuffleRequestOrder((PRUint32*)ind, (PRUint32)count); + + for (h=0; h<count; ++h) { @@ -48,6 +48,15 @@ index 6e1099d..3eec5b3 100644 nsHttpTransaction *trans = ent->mPendingQ[i]; if (trans->Caps() & NS_HTTP_ALLOW_PIPELINING) { pipeline->AddTransaction(trans); +@@ -365,6 +375,8 @@ + break; + } + } ++ ++ delete [] ind; + } + } + } @@ -898,12 +908,17 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent) ProcessSpdyPendingQ(ent); @@ -60,7 +69,7 @@ index 6e1099d..3eec5b3 100644 nsHttpConnection *conn = nsnull; - for (i = 0; i < count; ++i) { + -+ PRUint32 ind[count]; ++ PRUInt32* ind = new PRUInt32[count]; + ShuffleRequestOrder(ind, count); + + for (h=0; h<count; ++h) { @@ -68,6 +77,14 @@ index 6e1099d..3eec5b3 100644 trans = ent->mPendingQ[i]; // When this transaction has already established a half-open +@@ -927,6 +944,7 @@ + "something mutated pending queue from " + "GetConnection()"); + } ++ delete [] ind; + if (conn) { + LOG((" dispatching pending transaction...\n")); + @@ -1011,6 +1026,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap maxPersistConns = mMaxPersistConnsPerHost; }

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 1344c9c6e824c19de3bf9fb1949aac615559a152 Merge: bb64a64 4a4879a Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 10:50:05 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 ...ize-HTTP-request-order-and-pipeline-depth.patch | 21 ++++++++++++++++++- 1 files changed, 19 insertions(+), 2 deletions(-)

1 0

[torbrowser/master] Win: Fix the http pipeline patch so it compiles
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 4a4879a1a95896d96acb0eabedd3f746526ee356 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 15:43:56 2012 +0200 Win: Fix the http pipeline patch so it compiles --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 21 ++++++++++++++++++- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch index 0615abd..684b1e6 100644 --- a/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0012-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -40,7 +40,7 @@ index 6e1099d..3eec5b3 100644 - PRInt32 i, count = ent->mPendingQ.Length(); - for (i=0; i<count; ++i) { + PRInt32 i, h, count = ent->mPendingQ.Length(); -+ PRInt32 ind[count]; ++ PRInt32* ind = new PRInt32[count]; + ShuffleRequestOrder((PRUint32*)ind, (PRUint32)count); + + for (h=0; h<count; ++h) { @@ -48,6 +48,15 @@ index 6e1099d..3eec5b3 100644 nsHttpTransaction *trans = ent->mPendingQ[i]; if (trans->Caps() & NS_HTTP_ALLOW_PIPELINING) { pipeline->AddTransaction(trans); +@@ -365,6 +375,8 @@ + break; + } + } ++ ++ delete [] ind; + } + } + } @@ -898,12 +908,17 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent) ProcessSpdyPendingQ(ent); @@ -60,7 +69,7 @@ index 6e1099d..3eec5b3 100644 nsHttpConnection *conn = nsnull; - for (i = 0; i < count; ++i) { + -+ PRUint32 ind[count]; ++ PRUInt32* ind = new PRUInt32[count]; + ShuffleRequestOrder(ind, count); + + for (h=0; h<count; ++h) { @@ -68,6 +77,14 @@ index 6e1099d..3eec5b3 100644 trans = ent->mPendingQ[i]; // When this transaction has already established a half-open +@@ -927,6 +944,7 @@ + "something mutated pending queue from " + "GetConnection()"); + } ++ delete [] ind; + if (conn) { + LOG((" dispatching pending transaction...\n")); + @@ -1011,6 +1026,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap maxPersistConns = mMaxPersistConnsPerHost; }

1 0

[torbrowser/maint-2.3] Lin: Don't build webkit support into Qt
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 1cf692430f07aa7c77c9d9661e900c8dc61a5063 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 12:30:55 2012 +0200 Lin: Don't build webkit support into Qt We don't use it, and we've also gotten rid of it on OS X --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 313c021..dec0294 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -55,7 +55,7 @@ build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && make install_sw touch $(STAMP_DIR)/build-openssl -QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-webkit -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS)

1 0

[torbrowser/maint-2.2] Lin: Don't build webkit support into Qt
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 1cf692430f07aa7c77c9d9661e900c8dc61a5063 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 12:30:55 2012 +0200 Lin: Don't build webkit support into Qt We don't use it, and we've also gotten rid of it on OS X --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 313c021..dec0294 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -55,7 +55,7 @@ build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && make install_sw touch $(STAMP_DIR)/build-openssl -QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples +QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-webkit -no-qt3support -fast -release -nomake demos -nomake examples QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && ./configure $(QT_OPTS)

1 0

[torbrowser/maint-2.3] OSX: Fix branding to use TorBrowser in Dock, too
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 48bbd95ee95ee5bea0871d62a387f83a97f75687 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 15:06:17 2012 +0200 OSX: Fix branding to use TorBrowser in Dock, too Otherwise the application would've been called "Firefox" in the Dock and when alt-tabbing around --- build-scripts/osx.mk | 18 +++++++++--------- .../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a87cf9e..d7af26c 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -106,8 +106,8 @@ build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) touch $(STAMP_DIR)/build-firefox copy-firefox: - -rm -rf $(BUILD_DIR)/Firefox.app - cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/Firefox.app + -rm -rf $(BUILD_DIR)/TorBrowser.app + cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.app build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." @@ -127,7 +127,7 @@ LIBEVENT=$(COMPILED_LIBS) VIDALIA=$(BUILT_DIR)/usr/local/bin/Vidalia.app/ TOR=$(COMPILED_BINS)/tor ## Someday, this will be our custom Firefox -FIREFOX=$(BUILD_DIR)/Firefox.app +FIREFOX=$(BUILD_DIR)/TorBrowser.app PIDGIN=$(COMPILED_BINS)/pidgin ## Location of utility applications @@ -236,8 +236,8 @@ TB_TMPDIR=$(DEST)/Contents/SharedSupport directory-structure: rm -fr $(DEST) mkdir -p $(APPDIR) - mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/profile - mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/plugins + mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/profile + mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/plugins mkdir -p $(DATADIR)/Tor mkdir -p $(DATADIR)/Vidalia mkdir -p $(DOCSDIR) @@ -274,9 +274,9 @@ install-firefox: configure-apps: ## Configure Firefox preferences #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default - cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini - cp config/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile - cp config/prefs.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js + cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profiles.ini + cp config/bookmarks.html $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile + cp config/prefs.js $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js cp config/Info.plist $(DEST)/Contents cp config/PkgInfo $(DEST)/Contents cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources @@ -387,7 +387,7 @@ patch-firefox-language: ## Fix prefs.js since extensions.checkCompatibility, false doesn't work update-extension-pref: sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js + sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) diff --git a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch index d546ae1..293a52e 100644 --- a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch +++ b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch @@ -16,7 +16,7 @@ index d170d47..6835b1e 100644 /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */ QString browserExecutable = - QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename); -+ QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/" + browserDirectoryFilename); ++ QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/TorBrowser.app/Contents/MacOS/" + browserDirectoryFilename); /* The profile is in <browserDirectory>/Data/profile */ QString profileDir = - QDir::toNativeSeparators(browserDirectory + "/Data/profile"); @@ -31,7 +31,7 @@ index d170d47..6835b1e 100644 - copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile"); + if (!browserDirObj.exists("Library/Application Support/Firefox/Profiles/profile")) { + browserDirObj.mkdir("Library/Application Support/Firefox/Profiles/profile"); -+ QString src = browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/defaults/profile"; ++ QString src = browserDirectory + "/Contents/MacOS/TorBrowser.app/Contents/MacOS/defaults/profile"; + QString dst = profileDir; + vNotice("Copying '%1' to '%2'").arg(src).arg(dst); + copy_dir(src, dst);

1 0

[torbrowser/maint-2.2] OSX: Fix branding to use TorBrowser in Dock, too
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 48bbd95ee95ee5bea0871d62a387f83a97f75687 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Apr 27 15:06:17 2012 +0200 OSX: Fix branding to use TorBrowser in Dock, too Otherwise the application would've been called "Firefox" in the Dock and when alt-tabbing around --- build-scripts/osx.mk | 18 +++++++++--------- .../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index a87cf9e..d7af26c 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -106,8 +106,8 @@ build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) touch $(STAMP_DIR)/build-firefox copy-firefox: - -rm -rf $(BUILD_DIR)/Firefox.app - cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/Firefox.app + -rm -rf $(BUILD_DIR)/TorBrowser.app + cp -r $(FIREFOX_DIR)/obj*/dist/*.app $(BUILD_DIR)/TorBrowser.app build-all-binaries: build-zlib build-openssl build-vidalia build-libevent build-tor build-firefox echo "If we're here, we've done something right." @@ -127,7 +127,7 @@ LIBEVENT=$(COMPILED_LIBS) VIDALIA=$(BUILT_DIR)/usr/local/bin/Vidalia.app/ TOR=$(COMPILED_BINS)/tor ## Someday, this will be our custom Firefox -FIREFOX=$(BUILD_DIR)/Firefox.app +FIREFOX=$(BUILD_DIR)/TorBrowser.app PIDGIN=$(COMPILED_BINS)/pidgin ## Location of utility applications @@ -236,8 +236,8 @@ TB_TMPDIR=$(DEST)/Contents/SharedSupport directory-structure: rm -fr $(DEST) mkdir -p $(APPDIR) - mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/profile - mkdir -p $(APPDIR)/Firefox.app/Contents/MacOS/Data/plugins + mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/profile + mkdir -p $(APPDIR)/TorBrowser.app/Contents/MacOS/Data/plugins mkdir -p $(DATADIR)/Tor mkdir -p $(DATADIR)/Vidalia mkdir -p $(DOCSDIR) @@ -274,9 +274,9 @@ install-firefox: configure-apps: ## Configure Firefox preferences #mkdir -p $(DEST)/.mozilla/Firefox/firefox.default - cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profiles.ini - cp config/bookmarks.html $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile - cp config/prefs.js $(DEST)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js + cp -R config/firefox-profiles.ini $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profiles.ini + cp config/bookmarks.html $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile + cp config/prefs.js $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js cp config/Info.plist $(DEST)/Contents cp config/PkgInfo $(DEST)/Contents cp config/qt.conf $(DEST)/Contents/MacOS/Vidalia.app/Contents/Resources @@ -387,7 +387,7 @@ patch-firefox-language: ## Fix prefs.js since extensions.checkCompatibility, false doesn't work update-extension-pref: sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js - sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js + sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/prefs.js print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) diff --git a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch index d546ae1..293a52e 100644 --- a/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch +++ b/src/current-patches/vidalia/0001-Adapt-paths-etc-for-OS-X-TBB.patch @@ -16,7 +16,7 @@ index d170d47..6835b1e 100644 /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */ QString browserExecutable = - QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename); -+ QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/" + browserDirectoryFilename); ++ QDir::toNativeSeparators(browserDirectory + "/Contents/MacOS/TorBrowser.app/Contents/MacOS/" + browserDirectoryFilename); /* The profile is in <browserDirectory>/Data/profile */ QString profileDir = - QDir::toNativeSeparators(browserDirectory + "/Data/profile"); @@ -31,7 +31,7 @@ index d170d47..6835b1e 100644 - copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile"); + if (!browserDirObj.exists("Library/Application Support/Firefox/Profiles/profile")) { + browserDirObj.mkdir("Library/Application Support/Firefox/Profiles/profile"); -+ QString src = browserDirectory + "/Contents/MacOS/Firefox.app/Contents/MacOS/defaults/profile"; ++ QString src = browserDirectory + "/Contents/MacOS/TorBrowser.app/Contents/MacOS/defaults/profile"; + QString dst = profileDir; + vNotice("Copying '%1' to '%2'").arg(src).arg(dst); + copy_dir(src, dst);

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit bb64a64a4801bbb4fcb78bf8c76d7f0ddb41b390 Merge: 404a66e 48bbd95 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 10:09:00 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 18 +++++++++--------- .../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit bb64a64a4801bbb4fcb78bf8c76d7f0ddb41b390 Merge: 404a66e 48bbd95 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 10:09:00 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 18 +++++++++--------- .../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)

1 0