February 2013 - tor-commits - lists.torproject.org

[torbrowser/master] Fix an exception on New Identity w/ NULL image firstPartyURI.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit bd9d79e513c3cbfc7915442599c2224dff147371 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 16:01:57 2013 -0800 Fix an exception on New Identity w/ NULL image firstPartyURI. --- ...solate-the-Image-Cache-per-url-bar-domain.patch | 59 +++++++++++-------- 1 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch index 862673b..3fb55cf 100644 --- a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch +++ b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch @@ -1,4 +1,4 @@ -From e2d2cca918467240f4265799ead98defb1139db0 Mon Sep 17 00:00:00 2001 +From 3454d300fca2eea0e652f8982ec996575886dd1a Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 6 Dec 2012 14:19:34 -0800 Subject: [PATCH 24/26] Isolate the Image Cache per url bar domain. @@ -10,7 +10,7 @@ not obey cacheKeys by default. embedding/browser/webBrowser/nsContextMenuInfo.cpp | 27 ++- extensions/cookie/nsCookiePermission.cpp | 3 + image/public/imgILoader.idl | 4 +- - image/src/imgLoader.cpp | 257 +++++++++++++------- + image/src/imgLoader.cpp | 262 +++++++++++++------- image/src/imgLoader.h | 20 +- image/src/imgRequest.cpp | 11 +- image/src/imgRequest.h | 3 + @@ -18,7 +18,7 @@ not obey cacheKeys by default. netwerk/cookie/nsICookiePermission.idl | 1 + toolkit/system/gnome/nsAlertsIconListener.cpp | 3 +- widget/cocoa/nsMenuItemIconX.mm | 9 +- - 12 files changed, 247 insertions(+), 118 deletions(-) + 12 files changed, 250 insertions(+), 120 deletions(-) diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index 8d58d8b..6a9c87c 100644 @@ -149,7 +149,7 @@ index da26463..ecff309 100644 in nsIPrincipal aLoadingPrincipal, in nsILoadGroup aLoadGroup, diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp -index ea51e8d..4d5cfd2 100644 +index ea51e8d..8f2e0c1 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -39,6 +39,7 @@ @@ -232,11 +232,11 @@ index ea51e8d..4d5cfd2 100644 + // content. + nsTArray<nsRefPtr<imgCacheEntry> > entries; + cache.Enumerate(EnumAllEntries, &entries); - -- nsRefPtr<imgRequest> request = getter_AddRefs(entry->GetRequest()); ++ + for (uint32_t i = 0; i < entries.Length(); ++i) { + bool isEqual = false; -+ + +- nsRefPtr<imgRequest> request = getter_AddRefs(entry->GetRequest()); + nsRefPtr<imgRequest> request = getter_AddRefs(entries[i]->GetRequest()); if (request) { - *_retval = request->Properties(); @@ -437,14 +437,14 @@ index ea51e8d..4d5cfd2 100644 + + return rv; +} - -- LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveFromCache", "uri", spec.get()); ++ +bool imgLoader::RemoveKeyFromCache(imgCacheTable &cache, + imgCacheQueue &queue, + nsCAutoString key) +{ + if (key.IsEmpty()) return false; -+ + +- LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveFromCache", "uri", spec.get()); + LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveKeyFromCache", "uri", key.get()); nsRefPtr<imgCacheEntry> entry; @@ -468,14 +468,14 @@ index ea51e8d..4d5cfd2 100644 + nsCOMPtr<nsIURI> imgURI = request->mURI; + nsCOMPtr<nsIURI> firstPartyURI = request->mFirstPartyURI; + -+ if (imgURI && firstPartyURI) { ++ if (imgURI) { + imgCacheTable &cache = GetCache(imgURI); + imgCacheQueue &queue = GetCacheQueue(imgURI); + nsCAutoString spec = GetCacheKey(firstPartyURI, imgURI); LOG_STATIC_FUNC_WITH_PARAM(gImgLog, "imgLoader::RemoveFromCache", "entry's uri", spec.get()); -@@ -1438,18 +1485,6 @@ bool imgLoader::RemoveFromCache(imgCacheEntry *entry) +@@ -1438,32 +1485,21 @@ bool imgLoader::RemoveFromCache(imgCacheEntry *entry) return false; } @@ -493,8 +493,9 @@ index ea51e8d..4d5cfd2 100644 - nsresult imgLoader::EvictEntries(imgCacheTable &aCacheToClear) { ++ nsresult rv = NS_OK; LOG_STATIC_FUNC(gImgLog, "imgLoader::EvictEntries table"); -@@ -1457,7 +1492,7 @@ nsresult imgLoader::EvictEntries(imgCacheTable &aCacheToClear) + // We have to make a temporary, since RemoveFromCache removes the element // from the queue, invalidating iterators. nsTArray<nsRefPtr<imgCacheEntry> > entries; @@ -503,7 +504,15 @@ index ea51e8d..4d5cfd2 100644 for (uint32_t i = 0; i < entries.Length(); ++i) if (!RemoveFromCache(entries[i])) -@@ -1490,11 +1525,10 @@ nsresult imgLoader::EvictEntries(imgCacheQueue &aQueueToClear) +- return NS_ERROR_FAILURE; ++ rv = NS_ERROR_FAILURE; + +- return NS_OK; ++ return rv; + } + + nsresult imgLoader::EvictEntries(imgCacheQueue &aQueueToClear) +@@ -1490,11 +1526,10 @@ nsresult imgLoader::EvictEntries(imgCacheQueue &aQueueToClear) nsIRequest::VALIDATE_NEVER | \ nsIRequest::VALIDATE_ONCE_PER_SESSION) @@ -517,7 +526,7 @@ index ea51e8d..4d5cfd2 100644 nsIURI *aReferrerURI, nsIPrincipal* aLoadingPrincipal, nsILoadGroup *aLoadGroup, -@@ -1513,8 +1547,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1513,8 +1548,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, if (!aURI) return NS_ERROR_NULL_POINTER; @@ -528,7 +537,7 @@ index ea51e8d..4d5cfd2 100644 LOG_SCOPE_WITH_PARAM(gImgLog, "imgLoader::LoadImage", "aURI", spec.get()); *_retval = nullptr; -@@ -1566,7 +1600,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1566,7 +1601,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, imgCacheTable &cache = GetCache(aURI); if (cache.Get(spec, getter_AddRefs(entry)) && entry) { @@ -537,7 +546,7 @@ index ea51e8d..4d5cfd2 100644 aLoadGroup, aObserver, aCX, requestFlags, true, aRequest, _retval, aPolicy, aLoadingPrincipal, corsmode)) { request = getter_AddRefs(entry->GetRequest()); -@@ -1605,7 +1639,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1605,7 +1640,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, rv = NewImageChannel(getter_AddRefs(newChannel), &forcePrincipalCheck, aURI, @@ -546,7 +555,7 @@ index ea51e8d..4d5cfd2 100644 aReferrerURI, aLoadGroup, mAcceptHeader, -@@ -1627,8 +1661,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1627,8 +1662,8 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, do_CreateInstance(NS_LOADGROUP_CONTRACTID); newChannel->SetLoadGroup(loadGroup); @@ -557,7 +566,7 @@ index ea51e8d..4d5cfd2 100644 // Pass the inner window ID of the loading document, if possible. nsCOMPtr<nsIDocument> doc = do_QueryInterface(aCX); -@@ -1676,7 +1710,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1676,7 +1711,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, } // Try to add the new request into the cache. @@ -566,7 +575,7 @@ index ea51e8d..4d5cfd2 100644 } else { LOG_MSG_WITH_PARAM(gImgLog, "imgLoader::LoadImage |cache hit|", "request", request); -@@ -1736,6 +1770,49 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, +@@ -1736,6 +1771,49 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, return NS_OK; } @@ -616,7 +625,7 @@ index ea51e8d..4d5cfd2 100644 /* imgIRequest loadImageWithChannel(in nsIChannel channel, in imgIDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener); */ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderObserver *aObserver, nsISupports *aCX, nsIStreamListener **listener, imgIRequest **_retval) { -@@ -1746,22 +1823,27 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb +@@ -1746,22 +1824,27 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb nsCOMPtr<nsIURI> uri; channel->GetURI(getter_AddRefs(uri)); @@ -649,7 +658,7 @@ index ea51e8d..4d5cfd2 100644 if (cache.Get(spec, getter_AddRefs(entry)) && entry) { // We don't want to kick off another network load. So we ask -@@ -1833,7 +1915,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb +@@ -1833,7 +1916,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb channel->GetOriginalURI(getter_AddRefs(originalURI)); // No principal specified here, because we're not passed one. @@ -658,7 +667,7 @@ index ea51e8d..4d5cfd2 100644 aCX, nullptr, imgIRequest::CORS_NONE); ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request.get())); -@@ -1845,7 +1927,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb +@@ -1845,7 +1928,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb NS_RELEASE(pl); // Try to add the new request into the cache. @@ -667,7 +676,7 @@ index ea51e8d..4d5cfd2 100644 rv = CreateNewProxyForRequest(request, loadGroup, aObserver, requestFlags, nullptr, _retval); -@@ -2132,6 +2214,7 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport +@@ -2132,6 +2215,7 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport int32_t corsmode = mRequest->GetCORSMode(); nsCOMPtr<nsIPrincipal> loadingPrincipal = mRequest->GetLoadingPrincipal(); @@ -675,7 +684,7 @@ index ea51e8d..4d5cfd2 100644 // Doom the old request's cache entry mRequest->RemoveFromCache(); -@@ -2142,16 +2225,16 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport +@@ -2142,16 +2226,16 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport // We use originalURI here to fulfil the imgIRequest contract on GetURI. nsCOMPtr<nsIURI> originalURI; channel->GetOriginalURI(getter_AddRefs(originalURI));

1 0

[torbrowser/master] Reset default search engine to startpage.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 82e963c4dd00d49ac6eeacf8e0d171cad7317b6b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 12:50:49 2013 -0800 Reset default search engine to startpage. The prefs have become localized properties.. This may or may not survive on non en_US builds? --- build-scripts/config/pound_tor.js | 4 --- .../0014-Add-DDG-and-StartPage-to-Omnibox.patch | 26 ++++++++++++++++++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index c509a37..28390be 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -109,8 +109,4 @@ pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); // Omnibox settings -pref("browser.search.order.1", "Startpage"); -pref("browser.search.order.2", "DuckDuckGo"); -pref("browser.search.order.3", "Google"); -pref("browser.search.selectedEngine", "Startpage"); pref("keyword.URL", "https://startpage.com/do/search?q="); diff --git a/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch b/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch index c50adff..caa96f6 100644 --- a/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch +++ b/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch @@ -1,4 +1,4 @@ -From 8b96f6a7116c524ae946736c98c2e2fa75460609 Mon Sep 17 00:00:00 2001 +From ab1a01ca37e8ca848c2629d8b1d0768094d3a1ea Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 25 Apr 2012 15:03:46 -0700 Subject: [PATCH 14/26] Add DDG and StartPage to Omnibox. @@ -6,13 +6,35 @@ Subject: [PATCH 14/26] Add DDG and StartPage to Omnibox. You mean there are search engines that don't require captchas if you don't have a cookie? Holy crap. Get those in there now. --- + .../en-US/chrome/browser-region/region.properties | 8 +++--- browser/locales/en-US/searchplugins/duckduckgo.xml | 29 ++++++++++++++++++++ browser/locales/en-US/searchplugins/list.txt | 2 + browser/locales/en-US/searchplugins/startpage.xml | 11 +++++++ - 3 files changed, 42 insertions(+), 0 deletions(-) + 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 browser/locales/en-US/searchplugins/duckduckgo.xml create mode 100644 browser/locales/en-US/searchplugins/startpage.xml +diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties +index c3a980c..9c21f04 100644 +--- a/browser/locales/en-US/chrome/browser-region/region.properties ++++ b/browser/locales/en-US/chrome/browser-region/region.properties +@@ -3,12 +3,12 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=Startpage + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google +-browser.search.order.2=Yahoo +-browser.search.order.3=Bing ++browser.search.order.1=Startpage ++browser.search.order.2=DuckDuckGo ++browser.search.order.3=Google + + # This is the default set of web based feed handlers shown in the reader + # selection UI diff --git a/browser/locales/en-US/searchplugins/duckduckgo.xml b/browser/locales/en-US/searchplugins/duckduckgo.xml new file mode 100644 index 0000000..4f00b4d

1 0

[torbrowser/master] Switch to Firefox's native click-to-play for plugins.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit db11fa55d2a27a01f766bb0c90858381fd9f0c97 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 12:23:54 2013 -0800 Switch to Firefox's native click-to-play for plugins. The UI is much easier to understand and use than NoScript's. Unfortunately, we still need NoScript's UI for WebGL and HTML5 video. --- build-scripts/config/extension-overrides.js | 7 ++++++- build-scripts/config/pound_tor.js | 1 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/extension-overrides.js b/build-scripts/config/extension-overrides.js index d498177..273e104 100644 --- a/build-scripts/config/extension-overrides.js +++ b/build-scripts/config/extension-overrides.js @@ -4,11 +4,11 @@ # Torbutton Preferences: pref("extensions.torbutton.fresh_install", false); +pref("extensions.torbutton.tor_enabled", true); pref("extensions.torbutton.proxies_applied", true); pref("extensions.torbutton.settings_applied", true); pref("extensions.torbutton.socks_host", "127.0.0.1"); pref("extensions.torbutton.socks_port", 9050); -pref("extensions.torbutton.tor_enabled", true); pref("extensions.torbutton.tz_string", "UTC+00:00"); # HTTPS Everywhere Preferences: @@ -46,3 +46,8 @@ pref("noscript.STS.enabled", false); pref("noscript.subscription.lastCheck", -142148139); pref("noscript.temp", ""); pref("noscript.untrusted", ""); +// Now handled by plugins.click_to_play +pref("noscript.forbidFlash", false); +pref("noscript.forbidSilverlight", false); +pref("noscript.forbidJava", false); +pref("noscript.forbidPlugins", false); diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index c42d13c..c509a37 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -83,6 +83,7 @@ pref("network.protocol-handler.warn-external.mailto", true); pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); +pref("plugins.click_to_play", true); // Network and performance pref("network.http.pipelining", true);

1 0

[torbrowser/master] Remove plugin-blocking prefs.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit ddd455a6d38c10a50f666b362e8fdb7ec99d7e31 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Feb 8 22:13:34 2013 -0800 Remove plugin-blocking prefs. The Firefox patch is more precise. --- build-scripts/config/pound_tor.js | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index 38eb3f2..c42d13c 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -94,15 +94,6 @@ pref("security.ssl.enable_false_start", true); pref("network.http.keep-alive.timeout", 20); pref("network.http.connection-retry-timeout", 0); -// Plugin blocking (overkill?) -pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm"); -pref("plugin.scan.4xPluginFolder", false); -pref("plugin.scan.Acrobat", "99.0"); -pref("plugin.scan.Quicktime", "99.0"); -pref("plugin.scan.SunJRE", "99.0"); -pref("plugin.scan.WindowsMediaPlayer", "99.0"); -pref("plugin.scan.plid.all", false); - // Extension support pref("extensions.autoDisableScopes", 0); pref("extensions.bootstrappedAddons", "{}");

1 0

[torbrowser/master] Add bundle deps to linux build description
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 024da80afe6718fbf6bae97fcfa36b2a32093a58 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Feb 8 22:13:15 2013 -0800 Add bundle deps to linux build description --- docs/buildmachine_setups/linux-x86.txt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/docs/buildmachine_setups/linux-x86.txt b/docs/buildmachine_setups/linux-x86.txt index 4926e1c..598ddb7 100644 --- a/docs/buildmachine_setups/linux-x86.txt +++ b/docs/buildmachine_setups/linux-x86.txt @@ -22,6 +22,8 @@ 10. sudo aptitude build-dep iceweasel -11. sudo aptitude install zlib1g-dev g++ libxext-dev cmake autoconf2.13 mesa-common-dev +11. sudo aptitude install zlib1g-dev g++ libxext-dev cmake autoconf2.13 mesa-common-dev tcl8.5 tardy 12. make -f linux-alpha.mk build-all-binaries + +13. make -f linux-alpha.mk compressed-bundle_en-US # or all-bundles

1 0

[torbrowser/master] Make the SOCKS and Control ports fixed at 915x on all platforms.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 11dc86220229b12124e52c173485ea29c09e6572 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Feb 10 15:35:46 2013 -0800 Make the SOCKS and Control ports fixed at 915x on all platforms. It turns out Firefox 17 caches proxy settings somewhere for requests. Changing them at startup produces a race condition for the Tor test in HTTPS-Everywhere's SSL observatory. If HTTPS-Everywhere tests check.torproject.org before we managed to set our socks port to the new auto value, check.torproject.org fails to ever work again (with a proxy unreachable error). We could fix this in HTTPS-Everywhere, I guess, but this fix is simpler and deals with the root issue, and will also make it easier to make Vidalia an optional download at a later date. Note I only changed the alpha config files here... We'll need to backport this/copy them somehow for TBB-stable. --- build-scripts/config/alpha/torrc | 2 ++ build-scripts/config/alpha/torrc-linux | 4 ++-- build-scripts/config/alpha/torrc-obfsproxy | 2 ++ build-scripts/config/alpha/torrc-obfsproxy-linux | 4 ++-- build-scripts/config/alpha/torrc-obfsproxy-osx | 4 ++-- build-scripts/config/alpha/torrc-osx | 5 +++-- build-scripts/config/alpha/vidalia.conf.ff | 2 +- build-scripts/config/alpha/vidalia.conf.ff+pidgin | 2 +- .../config/alpha/vidalia.conf.ff+pidgin-linux | 2 +- build-scripts/config/alpha/vidalia.conf.ff-linux | 3 +-- .../config/alpha/vidalia.conf.ff-obfsproxy | 2 +- .../config/alpha/vidalia.conf.ff-obfsproxy-linux | 3 +-- .../config/alpha/vidalia.conf.ff-obfsproxy-osx | 3 +-- build-scripts/config/alpha/vidalia.conf.ff-osx | 3 +-- build-scripts/config/extension-overrides.js | 2 +- build-scripts/config/pound_tor.js | 4 ++-- build-scripts/config/prefs.xml | 2 +- src/osx-sandboxes/tor-sandbox/tor-enforce-10.5.sb | 4 ++-- src/osx-sandboxes/tor-sandbox/tor-enforce.sb | 4 ++-- 19 files changed, 29 insertions(+), 28 deletions(-) diff --git a/build-scripts/config/alpha/torrc b/build-scripts/config/alpha/torrc index 2d63da9..16f9486 100644 --- a/build-scripts/config/alpha/torrc +++ b/build-scripts/config/alpha/torrc @@ -9,3 +9,5 @@ Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. SocksListenAddress 127.0.0.1 +SocksPort 9150 +ControlPort 9151 diff --git a/build-scripts/config/alpha/torrc-linux b/build-scripts/config/alpha/torrc-linux index 05f5345..7d11921 100644 --- a/build-scripts/config/alpha/torrc-linux +++ b/build-scripts/config/alpha/torrc-linux @@ -8,6 +8,6 @@ GeoIPFile ./Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort auto SocksListenAddress 127.0.0.1 -ControlPort auto +SocksPort 9150 +ControlPort 9151 diff --git a/build-scripts/config/alpha/torrc-obfsproxy b/build-scripts/config/alpha/torrc-obfsproxy index 5df778a..5a53e51 100644 --- a/build-scripts/config/alpha/torrc-obfsproxy +++ b/build-scripts/config/alpha/torrc-obfsproxy @@ -9,6 +9,8 @@ Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. SocksListenAddress 127.0.0.1 +SocksPort 9150 +ControlPort 9151 UseBridges 1 diff --git a/build-scripts/config/alpha/torrc-obfsproxy-linux b/build-scripts/config/alpha/torrc-obfsproxy-linux index 59ca799..8aa0937 100644 --- a/build-scripts/config/alpha/torrc-obfsproxy-linux +++ b/build-scripts/config/alpha/torrc-obfsproxy-linux @@ -8,9 +8,9 @@ GeoIPFile ./Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort auto SocksListenAddress 127.0.0.1 -ControlPort auto +SocksPort 9150 +ControlPort 9151 UseBridges 1 diff --git a/build-scripts/config/alpha/torrc-obfsproxy-osx b/build-scripts/config/alpha/torrc-obfsproxy-osx index 80d343d..7a63423 100644 --- a/build-scripts/config/alpha/torrc-obfsproxy-osx +++ b/build-scripts/config/alpha/torrc-obfsproxy-osx @@ -8,9 +8,9 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort auto SocksListenAddress 127.0.0.1 -ControlPort auto +SocksPort 9150 +ControlPort 9151 UseBridges 1 diff --git a/build-scripts/config/alpha/torrc-osx b/build-scripts/config/alpha/torrc-osx index 4c7f0d9..f9c71d5 100644 --- a/build-scripts/config/alpha/torrc-osx +++ b/build-scripts/config/alpha/torrc-osx @@ -8,6 +8,7 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort auto SocksListenAddress 127.0.0.1 -ControlPort auto +SocksPort 9150 +ControlPort 9151 + diff --git a/build-scripts/config/alpha/vidalia.conf.ff b/build-scripts/config/alpha/vidalia.conf.ff index 1d9d2fa..d557a0c 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff +++ b/build-scripts/config/alpha/vidalia.conf.ff @@ -8,7 +8,7 @@ PluginsDirectory=..\\..\\Data\\plugins DefaultPluginsDirectory=..\\DefaultData\\plugins [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=.\\tor.exe Torrc=..\\Data\\Tor\\torrc DataDirectory=..\\Data\\Tor diff --git a/build-scripts/config/alpha/vidalia.conf.ff+pidgin b/build-scripts/config/alpha/vidalia.conf.ff+pidgin index d5d4a9b..8ba1157 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff+pidgin +++ b/build-scripts/config/alpha/vidalia.conf.ff+pidgin @@ -8,6 +8,6 @@ ProxyExecutableArguments=-c .\\Data\\Polipo\\polipo.conf RunProxyAtStart=true [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=.\\App\\tor.exe Torrc=.\\Data\\Tor\\torrc diff --git a/build-scripts/config/alpha/vidalia.conf.ff+pidgin-linux b/build-scripts/config/alpha/vidalia.conf.ff+pidgin-linux index 8354f0b..21f3810 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff+pidgin-linux +++ b/build-scripts/config/alpha/vidalia.conf.ff+pidgin-linux @@ -8,6 +8,6 @@ ProxyExecutableArguments=-c Data/Polipo/polipo.conf RunProxyAtStart=true [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=./App/tor Torrc=./Data/Tor/torrc diff --git a/build-scripts/config/alpha/vidalia.conf.ff-linux b/build-scripts/config/alpha/vidalia.conf.ff-linux index 26c66be..d0274e6 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-linux +++ b/build-scripts/config/alpha/vidalia.conf.ff-linux @@ -9,8 +9,7 @@ PluginsDirectory=../../Data/profile/extensions DefaultPluginsDirectory=./extensions [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=./tor Torrc=../Data/Tor/torrc -AutoControl=true DataDirectory=../Data/Tor diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy index a781b7a..9519101 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy @@ -8,7 +8,7 @@ PluginsDirectory=..\\..\\Data\\plugins DefaultPluginsDirectory=..\\DefaultData\\plugins [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=.\\tor.exe Torrc=..\\Data\\Tor\\torrc DataDirectory=..\\Data\\Tor diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux index cb97dc2..829deb7 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux @@ -9,10 +9,9 @@ PluginsDirectory=../../Data/profile/extensions DefaultPluginsDirectory=./extensions [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=./tor Torrc=../Data/Tor/torrc -AutoControl=true DataDirectory=../Data/Tor [Network] diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx index 833fbe4..1d3d806 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx @@ -8,10 +8,9 @@ DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=../../../tor Torrc=../../../../../Library/Vidalia/torrc -AutoControl=true DataDirectory=../../../../Resources/Data/Tor/ [Network] diff --git a/build-scripts/config/alpha/vidalia.conf.ff-osx b/build-scripts/config/alpha/vidalia.conf.ff-osx index f698d2b..8b00cc2 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-osx +++ b/build-scripts/config/alpha/vidalia.conf.ff-osx @@ -8,8 +8,7 @@ DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en [Tor] -ControlPort=9051 +ControlPort=9151 TorExecutable=../../../tor Torrc=../../../../../Library/Vidalia/torrc -AutoControl=true DataDirectory=../../../../Resources/Data/Tor/ diff --git a/build-scripts/config/extension-overrides.js b/build-scripts/config/extension-overrides.js index 273e104..4a5939f 100644 --- a/build-scripts/config/extension-overrides.js +++ b/build-scripts/config/extension-overrides.js @@ -8,7 +8,7 @@ pref("extensions.torbutton.tor_enabled", true); pref("extensions.torbutton.proxies_applied", true); pref("extensions.torbutton.settings_applied", true); pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9050); +pref("extensions.torbutton.socks_port", 9150); pref("extensions.torbutton.tz_string", "UTC+00:00"); # HTTPS Everywhere Preferences: diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index 28390be..762e402 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -69,10 +69,10 @@ pref("network.http.spdy.enabled", false); // Stores state and may have keepalive // Proxy and proxy security pref("network.proxy.socks", "127.0.0.1"); -pref("network.proxy.socks_port", 9050); +pref("network.proxy.socks_port", 9150); pref("network.proxy.socks_remote_dns", true); pref("network.proxy.type", 1); -pref("network.security.ports.banned", "8118,8123,9050,9051"); +pref("network.security.ports.banned", "8118,8123,9050,9051,9150,9151"); pref("network.dns.disablePrefetch", true); pref("network.protocol-handler.external-default", false); pref("network.protocol-handler.external.mailto", false); diff --git a/build-scripts/config/prefs.xml b/build-scripts/config/prefs.xml index 52d40a6..a5a5a9f 100644 --- a/build-scripts/config/prefs.xml +++ b/build-scripts/config/prefs.xml @@ -5,7 +5,7 @@ <pref name='proxy'> <pref name='type' type='string' value='socks5'/> <pref name='host' type='string' value='127.0.0.1'/> - <pref name='port' type='int' value='9050'/> + <pref name='port' type='int' value='9150'/> <pref name='username' type='string' value=''/> <pref name='password' type='string' value=''/> <pref name='socks4_remotedns' type='bool' value='1'/> diff --git a/src/osx-sandboxes/tor-sandbox/tor-enforce-10.5.sb b/src/osx-sandboxes/tor-sandbox/tor-enforce-10.5.sb index 83e2f77..ce593d2 100755 --- a/src/osx-sandboxes/tor-sandbox/tor-enforce-10.5.sb +++ b/src/osx-sandboxes/tor-sandbox/tor-enforce-10.5.sb @@ -80,8 +80,8 @@ (allow network-inbound ; we do want to be more specific than this. - ;(to tcp4 "*:9050") - ;(to tcp4 "*:9051")) + ;(to tcp4 "*:9150") + ;(to tcp4 "*:9151")) (to tcp4 "*:*")) (allow network-outbound) diff --git a/src/osx-sandboxes/tor-sandbox/tor-enforce.sb b/src/osx-sandboxes/tor-sandbox/tor-enforce.sb index ad31d2c..fcb2129 100644 --- a/src/osx-sandboxes/tor-sandbox/tor-enforce.sb +++ b/src/osx-sandboxes/tor-sandbox/tor-enforce.sb @@ -81,8 +81,8 @@ (global-name "com.apple.system.notification_center")) (allow network-inbound - (local tcp "localhost:9050") - (local tcp "localhost:9051")) + (local tcp "localhost:9150") + (local tcp "localhost:9151")) (allow network-outbound) ; (remote tcp "*:*"))

1 0

[torbrowser/master] Bug 8178: Disable WebRTC in Tor Browser.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 8381c2adf6b9c20ec89a7b84064dd59620a60ac6 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Feb 9 18:43:33 2013 -0800 Bug 8178: Disable WebRTC in Tor Browser. Potential UDP proxy bypass. --- build-scripts/config/dot_mozconfig | 1 + build-scripts/config/mozconfig-osx-i386 | 1 + build-scripts/config/mozconfig-osx-x86_64 | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index c4522b3..635b009 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -14,3 +14,4 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index 57f943d..385b1e1 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -28,6 +28,7 @@ ac_add_options --enable-strip ac_add_options --disable-debug ac_add_options --disable-tests ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc export CFLAGS="-Wno-return-type" export CXXFLAGS="-Wno-return-type" diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index 8136100..ba727dd 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -30,6 +30,7 @@ ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug +ac_add_options --disable-webrtc export CFLAGS="-Wno-return-type" export CXXFLAGS="-Wno-return-type"

1 0

[torbrowser/master] Disable initial welcome page load.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 45d501670086b70251ef48d36a38c180d9d9f3b6 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Feb 11 16:11:58 2013 -0800 Disable initial welcome page load. --- build-scripts/config/pound_tor.js | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index 762e402..b789b3a 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -2,11 +2,14 @@ # Tor Browser Bundle # Do not edit this file. -// Disable browser auto updaters +// Disable browser auto updaters and associated homepage notifications pref("app.update.auto", false); pref("app.update.enabled", false); pref("browser.search.update", false); pref("browser.rights.3.shown", true); +pref("browser.startup.homepage_override.mstone", "ignore"); +pref("startup.homepage_welcome_url", ""); +pref("startup.homepage_override_url", ""); // Disk activity: Disable Browsing History Storage pref("browser.privatebrowsing.autostart", true);

1 0

[torbrowser/master] Really fix omnibox: Add region.properties to omni.ja and langpacks.
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit d44af3f0f411eb2bc71dbbd6f7962544c19dc7c9 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Feb 11 17:10:06 2013 -0800 Really fix omnibox: Add region.properties to omni.ja and langpacks. --- build-scripts/config/region.properties | 49 ++++++++++++++++++++++++++++++++ build-scripts/linux-alpha.mk | 43 ++++++++++++++++++---------- build-scripts/osx-alpha.mk | 41 +++++++++++++++++--------- build-scripts/windows-alpha.mk | 44 +++++++++++++++++++---------- 4 files changed, 133 insertions(+), 44 deletions(-) diff --git a/build-scripts/config/region.properties b/build-scripts/config/region.properties new file mode 100644 index 0000000..9c21f04 --- /dev/null +++ b/build-scripts/config/region.properties @@ -0,0 +1,49 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Default search engine +browser.search.defaultenginename=Startpage + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=Startpage +browser.search.order.2=DuckDuckGo +browser.search.order.3=Google + +# This is the default set of web based feed handlers shown in the reader +# selection UI +browser.contentHandlers.types.0.title=Google +browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s +browser.contentHandlers.types.1.title=My Yahoo! +browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s + +# URL for site-specific search engines +# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site +# to be searched and the user's search query. Place them in the appropriate location +# for your locale's URL but do not translate them. +browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} + +# increment this number when anything gets changed in the list below. This will +# cause Firefox to re-read these prefs and inject any new handlers into the +# profile database. Note that "new" is defined as "has a different URL"; this +# means that it's not possible to update the name of existing handler, so +# don't make any spelling errors here. +gecko.handlerService.defaultHandlersVersion=3 + +# The default set of protocol handlers for webcal: +gecko.handlerService.schemes.webcal.0.name=30 Boxes +gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s + +# The default set of protocol handlers for mailto: +gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail +gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s +gecko.handlerService.schemes.mailto.1.name=Gmail +gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s + +# The default set of protocol handlers for irc: +gecko.handlerService.schemes.irc.0.name=Mibbit +gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s + +# The default set of protocol handlers for ircs: +gecko.handlerService.schemes.ircs.0.name=Mibbit +gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 069b685..182087c 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -324,14 +324,21 @@ configure-apps: mkdir -p $(DEST)/Data/profile/preferences cp config/extension-overrides.js $(DEST)/Data/profile/preferences - ## Patch Firefox default home page - CHROME_EN_DIR=$(APPDIR)/Firefox/chrome/en-US; \ - mkdir -p "$$CHROME_EN_DIR/locale/branding"; \ - sed -e "s/SHPONKA/en-US/g" config/browserconfig.properties \ - > "$$CHROME_EN_DIR/locale/branding/browserconfig.properties"; \ - (cd $(APPDIR)/Firefox; \ - zip -u omni.ja chrome/en-US/locale/branding/browserconfig.properties); \ - rm -rf "$$CHROME_EN_DIR" + ## Patch Firefox default home page and omnibox + LC="en-US"; \ + PFILE="omni.ja"; \ + FFDIR=$(APPDIR)/Firefox/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ + rm -rf "$$CHROMEDIR" ## Configure Pidgin ifeq ($(USE_PIDGIN),1) @@ -428,13 +435,19 @@ ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Data/profile/extensions cp langpack_$(LANGCODE).xpi $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi ## Patch Firefox default home page within language pack - CHROMEDIR=$(BUNDLE)/Data/profile/extensions/chrome; \ - mkdir -p "$$CHROMEDIR"; \ - sed -e "s/SHPONKA/$(LANGCODE)/g" config/browserconfig.properties \ - > "$$CHROMEDIR/$(LANGCODE)/locale/branding/browserconfig.properties"; \ - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions; \ - zip -u langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi \ - chrome/$(LANGCODE)/locale/branding/browserconfig.properties); \ + LC=$(LANGCODE); \ + PFILE=langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi; \ + FFDIR=$(BUNDLE)/Data/profile/extensions/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ rm -rf "$$CHROMEDIR" endif diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index fc281b3..6d12ae4 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -326,13 +326,20 @@ configure-apps: ## Override Firefox extension preferences mkdir -p $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/preferences cp config/extension-overrides.js $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/Data/profile/preferences/ - ## Patch Firefox default home page - CHROMEDIR=$(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/chrome; \ - mkdir -p "$$CHROMEDIR/en-US/locale/branding"; \ - sed -e "s/SHPONKA/en-US/g" config/browserconfig.properties \ - > "$$CHROMEDIR/en-US/locale/branding/browserconfig.properties"; \ - (cd $(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS; \ - zip -u omni.ja chrome/en-US/locale/branding/browserconfig.properties);\ + ## Patch Firefox default home page and omnibox + LC="en-US"; \ + PFILE="omni.ja"; \ + FFDIR=$(DEST)/Contents/MacOS/TorBrowser.app/Contents/MacOS/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ rm -rf "$$CHROMEDIR" cp config/Info.plist $(DEST)/Contents @@ -424,13 +431,19 @@ ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi ## Patch Firefox default home page within language pack - CHROMEDIR=$(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/chrome; \ - mkdir -p "$$CHROMEDIR/$(LANGCODE)/locale/branding"; \ - sed -e "s/SHPONKA/$(LANGCODE)/g" config/browserconfig.properties \ - > "$$CHROMEDIR/$(LANGCODE)/locale/branding/browserconfig.properties"; \ - (cd $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/; \ - zip -u langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi \ - chrome/$(LANGCODE)/locale/branding/browserconfig.properties); \ + LC=$(LANGCODE); \ + PFILE=langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi; \ + FFDIR=$(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + zip -u "$$PFILE" "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ rm -rf "$$CHROMEDIR" endif diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index cc48da9..8131b88 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -326,14 +326,21 @@ configure-apps: cp config/extension-overrides.js \ $(DEST)/FirefoxPortable/Data/profile/preferences/ - ## Patch Firefox default home page - CHROMEDIR=$(DEST)/FirefoxPortable/App/Firefox/chrome; \ - mkdir -p "$$CHROMEDIR/en-US/locale/branding"; \ - sed -e "s/SHPONKA/en-US/g" config/browserconfig.properties \ - > "$$CHROMEDIR/en-US/locale/branding/browserconfig.properties"; \ - (cd $(DEST)/FirefoxPortable/App/Firefox; \ - $(SEVENZIP) u -tzip omni.ja \ - chrome/en-US/locale/branding/browserconfig.properties); \ + ## Patch Firefox default home page and omnibox + LC="en-US"; \ + PFILE="omni.ja"; \ + FFDIR=$(DEST)/FirefoxPortable/App/Firefox/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + $(SEVENZIP) u -tzip "$$PFILE" \ + "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ rm -rf "$$CHROMEDIR" ## Set up alternate launcher @@ -409,13 +416,20 @@ install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) mv langpack_$(LANGCODE).xpi $(BUNDLE)/FirefoxPortable/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi ## Patch Firefox default home page within language pack - CHROMEDIR=$(BUNDLE)/FirefoxPortable/Data/profile/extensions/chrome; \ - mkdir -p "$$CHROMEDIR/$(LANGCODE)/locale/branding"; \ - sed -e "s/SHPONKA/$(LANGCODE)/g" config/browserconfig.properties \ - > "$$CHROMEDIR/$(LANGCODE)/locale/branding/browserconfig.properties"; \ - (cd $(BUNDLE)/FirefoxPortable/Data/profile/extensions; \ - $(SEVENZIP) u -tzip langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi \ - chrome/$(LANGCODE)/locale/branding/browserconfig.properties); \ + LC=$(LANG); \ + PFILE=langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi; \ + FFDIR=$(BUNDLE)/FirefoxPortable/Data/profile/extensions/; \ + CHROMEDIR="$$FFDIR/chrome/"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/branding"; \ + mkdir -p "$$CHROMEDIR/$$LC/locale/browser-region"; \ + cp config/region.properties \ + "$$CHROMEDIR/$$LC/locale/browser-region/"; \ + sed -e "s/SHPONKA/$$LC/g" config/browserconfig.properties \ + > "$$CHROMEDIR/$$LC/locale/branding/browserconfig.properties"; \ + (cd "$$FFDIR"; \ + $(SEVENZIP) u -tzip "$$PFILE" \ + "chrome/$$LC/locale/branding/browserconfig.properties" \ + "chrome/$$LC/locale/browser-region/region.properties"); \ rm -rf "$$CHROMEDIR" endif rm -fr $(DUMMYPROFILE)

1 0

[torbrowser/master] Bump torbutton version...
by erinn＠torproject.org 19 Feb '13

19 Feb '13

commit 24705d402dd4a2aba21cf91197ce05c9f27cf623 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Feb 11 19:15:56 2013 -0800 Bump torbutton version... Probably going to change a few more times, but better to actually have it in the repo, I think? --- build-scripts/versions-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index abc7578..e974167 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -12,7 +12,7 @@ TOR_VER=0.2.4.10-alpha PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.2esr MOZBUILD_VER=1.5.1 -TORBUTTON_VER=1.5.0pre-alpha +TORBUTTON_VER=1.5.0pre6-alpha NOSCRIPT_VER=2.6.4.4 HTTPSEVERYWHERE_VER=4.0development.5 PDFJS_VER=0.7.1

1 0