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

[tor-browser/tor-browser-17.0.9esr-1] Change the default Firefox profile directory to be TBB-relative.
by mikeperry＠torproject.org 30 Sep '13

30 Sep '13

commit 87849bd0e5940d1973bf697a84e6b8ac2b4072aa Author: Kathleen Brade <brade(a)pearlcrescent.com> Date: Mon Sep 30 15:26:22 2013 -0700 Change the default Firefox profile directory to be TBB-relative. This should eliminate our need to rely on a wrapper script that sets $HOME and launches Firefox with -profile. See https://trac.torproject.org/projects/tor/ticket/9173. --- toolkit/xre/nsXREDirProvider.cpp | 104 ++++++-------------------------- toolkit/xre/nsXREDirProvider.h | 10 +-- xpcom/io/Makefile.in | 4 +- xpcom/io/nsAppFileLocationProvider.cpp | 77 +++++++++-------------- 4 files changed, 55 insertions(+), 140 deletions(-) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index ecf56c2..8432cca 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -31,6 +31,7 @@ #include "nsArrayEnumerator.h" #include "nsEnumeratorUtils.h" #include "nsReadableUtils.h" +#include "nsXPCOMPrivate.h" // for XPCOM_FILE_PATH_SEPARATOR #include "mozilla/Services.h" #include "mozilla/Omnijar.h" #include "mozilla/Preferences.h" @@ -166,9 +167,6 @@ nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult, aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { -#if !defined(XP_UNIX) || defined(XP_MACOSX) - rv = file->AppendNative(NS_LITERAL_CSTRING("Profiles")); -#endif // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { @@ -191,9 +189,6 @@ nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult, aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { -#if !defined(XP_UNIX) || defined(XP_MACOSX) - rv = file->AppendNative(NS_LITERAL_CSTRING("Profiles")); -#endif // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { @@ -1051,88 +1046,35 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) - nsresult rv; + NS_ENSURE_ARG_POINTER(aFile); nsCOMPtr<nsIFile> localDir; + nsresult rv = GetAppDir()->Clone(getter_AddRefs(localDir)); + NS_ENSURE_SUCCESS(rv, rv); + + int levelsToRemove = 1; #if defined(XP_MACOSX) - FSRef fsRef; - OSType folderType; - if (aLocal) { - folderType = kCachedDataFolderType; - } else { -#ifdef MOZ_THUNDERBIRD - folderType = kDomainLibraryFolderType; -#else - folderType = kApplicationSupportFolderType; + levelsToRemove += 4; #endif + while (localDir && (levelsToRemove > 0)) { + nsCOMPtr<nsIFile> parentDir; + rv = localDir->GetParent(getter_AddRefs(parentDir)); + NS_ENSURE_SUCCESS(rv, rv); + localDir = parentDir; + --levelsToRemove; } - OSErr err = ::FSFindFolder(kUserDomain, folderType, kCreateFolder, &fsRef); - NS_ENSURE_FALSE(err, NS_ERROR_FAILURE); - rv = NS_NewNativeLocalFile(EmptyCString(), true, getter_AddRefs(localDir)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsILocalFileMac> dirFileMac = do_QueryInterface(localDir); - NS_ENSURE_TRUE(dirFileMac, NS_ERROR_UNEXPECTED); + if (!localDir) + return NS_ERROR_FAILURE; - rv = dirFileMac->InitWithFSRef(&fsRef); + rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("Data" + XPCOM_FILE_PATH_SEPARATOR "Browser")); NS_ENSURE_SUCCESS(rv, rv); - localDir = do_QueryInterface(dirFileMac, &rv); -#elif defined(XP_WIN) - nsString path; if (aLocal) { - rv = GetShellFolderPath(CSIDL_LOCAL_APPDATA, path); - if (NS_FAILED(rv)) - rv = GetRegWindowsAppDataFolder(aLocal, path); - } - if (!aLocal || NS_FAILED(rv)) { - rv = GetShellFolderPath(CSIDL_APPDATA, path); - if (NS_FAILED(rv)) { - if (!aLocal) - rv = GetRegWindowsAppDataFolder(aLocal, path); - } + rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); + NS_ENSURE_SUCCESS(rv, rv); } - NS_ENSURE_SUCCESS(rv, rv); - - rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); -#elif defined(XP_OS2) -#if 0 /* For OS/2 we want to always use MOZILLA_HOME */ - // we want an environment variable of the form - // FIREFOX_HOME, etc - if (!gAppData) - return NS_ERROR_FAILURE; - nsDependentCString envVar(nsDependentCString(gAppData->name)); - envVar.Append("_HOME"); - char *pHome = getenv(envVar.get()); -#endif - char *pHome = getenv("MOZILLA_HOME"); - if (pHome && *pHome) { - rv = NS_NewNativeLocalFile(nsDependentCString(pHome), true, - getter_AddRefs(localDir)); - } else { - PPIB ppib; - PTIB ptib; - char appDir[CCHMAXPATH]; - - DosGetInfoBlocks(&ptib, &ppib); - DosQueryModuleName(ppib->pib_hmte, CCHMAXPATH, appDir); - *strrchr(appDir, '\\') = '\0'; - rv = NS_NewNativeLocalFile(nsDependentCString(appDir), true, getter_AddRefs(localDir)); - } -#elif defined(MOZ_WIDGET_GONK) - rv = NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/data/b2g"), true, - getter_AddRefs(localDir)); -#elif defined(XP_UNIX) - const char* homeDir = getenv("HOME"); - if (!homeDir || !*homeDir) - return NS_ERROR_FAILURE; - - rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, - getter_AddRefs(localDir)); -#else -#error "Don't know how to get product dir on your platform" -#endif NS_IF_ADDREF(*aFile = localDir); return rv; @@ -1346,16 +1288,8 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, nsCAutoString vendor; if (aProfileName && !aProfileName->IsEmpty()) { profile = *aProfileName; - } else if (aAppName) { - appName = *aAppName; - if (aVendorName) { - vendor = *aVendorName; - } } else if (gAppData->profile) { profile = gAppData->profile; - } else { - appName = gAppData->name; - vendor = gAppData->vendor; } nsresult rv; diff --git a/toolkit/xre/nsXREDirProvider.h b/toolkit/xre/nsXREDirProvider.h index 77d109f..d574f59 100644 --- a/toolkit/xre/nsXREDirProvider.h +++ b/toolkit/xre/nsXREDirProvider.h @@ -56,16 +56,16 @@ public: nsresult GetProfileDefaultsDir(nsIFile* *aResult); - static nsresult GetUserAppDataDirectory(nsIFile* *aFile) { + nsresult GetUserAppDataDirectory(nsIFile* *aFile) { return GetUserDataDirectory(aFile, false, nullptr, nullptr, nullptr); } - static nsresult GetUserLocalDataDirectory(nsIFile* *aFile) { + nsresult GetUserLocalDataDirectory(nsIFile* *aFile) { return GetUserDataDirectory(aFile, true, nullptr, nullptr, nullptr); } // By default GetUserDataDirectory gets profile path from gAppData, // but that can be overridden by using aProfileName/aAppName/aVendorName. - static nsresult GetUserDataDirectory(nsIFile** aFile, bool aLocal, + nsresult GetUserDataDirectory(nsIFile** aFile, bool aLocal, const nsACString* aProfileName, const nsACString* aAppName, const nsACString* aVendorName); @@ -101,8 +101,8 @@ public: protected: nsresult GetFilesInternal(const char* aProperty, nsISimpleEnumerator** aResult); - static nsresult GetUserDataDirectoryHome(nsIFile* *aFile, bool aLocal); - static nsresult GetSysUserExtensionsDirectory(nsIFile* *aFile); + nsresult GetUserDataDirectoryHome(nsIFile* *aFile, bool aLocal); + nsresult GetSysUserExtensionsDirectory(nsIFile* *aFile); #if defined(XP_UNIX) || defined(XP_MACOSX) static nsresult GetSystemExtensionsDirectory(nsIFile** aFile); #endif diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index 79ad5de..3fba891 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -162,7 +162,9 @@ DEFINES += -DHAVE_USR_LIB64_DIR endif endif -LOCAL_INCLUDES += -I.. +LOCAL_INCLUDES += \ + -I.. \ + -I$(srcdir)/../build ifeq ($(MOZ_PLATFORM_MAEMO),5) CFLAGS += $(MOZ_DBUS_CFLAGS) diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp index 1e667b8..3828eed 100644 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp @@ -13,6 +13,7 @@ #include "nsISimpleEnumerator.h" #include "prenv.h" #include "nsCRT.h" +#include "nsXPCOMPrivate.h" // for XPCOM_FILE_PATH_SEPARATOR #if defined(MOZ_WIDGET_COCOA) #include <Carbon/Carbon.h> @@ -283,9 +284,8 @@ NS_METHOD nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile **aLocalFile) //---------------------------------------------------------------------------------------- // GetProductDirectory - Gets the directory which contains the application data folder // -// UNIX : ~/.mozilla/ -// WIN : <Application Data folder on user's machine>\Mozilla -// Mac : :Documents:Mozilla: +// UNIX and WIN : <App Folder>/../Data/Browser +// Mac : <App Folder>/../../../../../Data/Browser //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsIFile **aLocalFile, bool aLocal) { @@ -295,38 +295,33 @@ NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsIFile **aLocalFile, b bool exists; nsCOMPtr<nsIFile> localDir; -#if defined(MOZ_WIDGET_COCOA) - FSRef fsRef; - OSType folderType = aLocal ? (OSType) kCachedDataFolderType : (OSType) kDomainLibraryFolderType; - OSErr err = ::FSFindFolder(kUserDomain, folderType, kCreateFolder, &fsRef); - if (err) return NS_ERROR_FAILURE; - NS_NewLocalFile(EmptyString(), true, getter_AddRefs(localDir)); - if (!localDir) return NS_ERROR_FAILURE; - nsCOMPtr<nsILocalFileMac> localDirMac(do_QueryInterface(localDir)); - rv = localDirMac->InitWithFSRef(&fsRef); - if (NS_FAILED(rv)) return rv; -#elif defined(XP_OS2) - nsCOMPtr<nsIProperties> directoryService = - do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); - if (NS_FAILED(rv)) return rv; - rv = directoryService->Get(NS_OS2_HOME_DIR, NS_GET_IID(nsIFile), getter_AddRefs(localDir)); - if (NS_FAILED(rv)) return rv; -#elif defined(XP_WIN) - nsCOMPtr<nsIProperties> directoryService = - do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv); - if (NS_FAILED(rv)) return rv; - const char* prop = aLocal ? NS_WIN_LOCAL_APPDATA_DIR : NS_WIN_APPDATA_DIR; - rv = directoryService->Get(prop, NS_GET_IID(nsIFile), getter_AddRefs(localDir)); - if (NS_FAILED(rv)) return rv; -#elif defined(XP_UNIX) - rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), true, getter_AddRefs(localDir)); - if (NS_FAILED(rv)) return rv; -#else -#error dont_know_how_to_get_product_dir_on_your_platform + rv = CloneMozBinDirectory(getter_AddRefs(localDir)); + NS_ENSURE_SUCCESS(rv, rv); + + int levelsToRemove = 1; +#if defined(XP_MACOSX) + levelsToRemove += 4; #endif + while (localDir && (levelsToRemove > 0)) { + nsCOMPtr<nsIFile> parentDir; + rv = localDir->GetParent(getter_AddRefs(parentDir)); + NS_ENSURE_SUCCESS(rv, rv); + localDir = parentDir; + --levelsToRemove; + } + + if (!localDir) + return NS_ERROR_FAILURE; + + rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("Data" + XPCOM_FILE_PATH_SEPARATOR "Browser")); + NS_ENSURE_SUCCESS(rv, rv); + + if (aLocal) { + rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); + NS_ENSURE_SUCCESS(rv, rv); + } - rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); - if (NS_FAILED(rv)) return rv; rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) @@ -343,10 +338,6 @@ NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsIFile **aLocalFile, b //---------------------------------------------------------------------------------------- // GetDefaultUserProfileRoot - Gets the directory which contains each user profile dir -// -// UNIX : ~/.mozilla/ -// WIN : <Application Data folder on user's machine>\Mozilla\Profiles -// Mac : :Documents:Mozilla:Profiles: //---------------------------------------------------------------------------------------- NS_METHOD nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile **aLocalFile, bool aLocal) { @@ -358,18 +349,6 @@ NS_METHOD nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsIFile **aLocalF rv = GetProductDirectory(getter_AddRefs(localDir), aLocal); if (NS_FAILED(rv)) return rv; -#if defined(MOZ_WIDGET_COCOA) || defined(XP_OS2) || defined(XP_WIN) - // These 3 platforms share this part of the path - do them as one - rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("Profiles")); - if (NS_FAILED(rv)) return rv; - - bool exists; - rv = localDir->Exists(&exists); - if (NS_SUCCEEDED(rv) && !exists) - rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0775); - if (NS_FAILED(rv)) return rv; -#endif - *aLocalFile = localDir; NS_ADDREF(*aLocalFile);

1 0

[doctor/master] Pluralizing 'nickname_to_relay'
by atagar＠torproject.org 30 Sep '13

30 Sep '13

commit ed76f2f4157a4b239d86a4d599259a7c98c92a09 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 30 15:21:04 2013 -0700 Pluralizing 'nickname_to_relay' Oops, forgot to change the name of the variable when we made it map nicknames to a list of relays instead. --- sybil_checker.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sybil_checker.py b/sybil_checker.py index ae43f8c..3dada88 100755 --- a/sybil_checker.py +++ b/sybil_checker.py @@ -78,15 +78,15 @@ def send_email(new_relays): # Constructs a mapping of nicknames to router status entries so we can # provide a listing that's sorted by nicknames. - nickname_to_relay = {} + nickname_to_relays = {} for entry in new_relays: - nickname_to_relay.setdefault(entry.nickname, []).append(entry) + nickname_to_relays.setdefault(entry.nickname, []).append(entry) relay_entries = [] - for nickname in sorted(nickname_to_relay.keys()): - for relay in nickname_to_relay[nickname]: + for nickname in sorted(nickname_to_relays.keys()): + for relay in nickname_to_relays[nickname]: relay_entries.append(RELAY_ENTRY % (relay.nickname, relay.fingerprint, relay.address, relay.or_port, relay.version, relay.exit_policy)) try:

1 0

[doctor/master] Don't drop relays with identical nicknames
by atagar＠torproject.org 30 Sep '13

30 Sep '13

commit 1586ad248bf0ce994bcdb1ffe0261bb829ac59ee Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 30 14:55:03 2013 -0700 Don't drop relays with identical nicknames When our sybil checker sends notifications it sorts the relays by their nickname. To do this I constructed a 'nickname => descriptor' hash, but I forgot nicknames are not always unique. Actually, they very frequently aren't due to Unnamed entries. Constructing a 'nickname => [list of descriptors]' hash instead. Caught by Linus when yatei had an outage since we claimed 60 new relays but only listed 34. --- sybil_checker.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sybil_checker.py b/sybil_checker.py index 56f344f..af7c39e 100755 --- a/sybil_checker.py +++ b/sybil_checker.py @@ -62,14 +62,19 @@ def main(): def send_email(new_relays): - # constructs a mapping of nicknames to router status entries so we can provide a listing that's sorted by nicknames + # Constructs a mapping of nicknames to router status entries so we can + # provide a listing that's sorted by nicknames. + + nickname_to_relay = {} + + for entry in new_relays: + nickname_to_relay.setdefault(entry.nickname, []).append(entry) - nickname_to_relay = dict((entry.nickname, entry) for entry in new_relays) relay_entries = [] for nickname in sorted(nickname_to_relay.keys()): - relay = nickname_to_relay[nickname] - relay_entries.append(RELAY_ENTRY % (relay.nickname, relay.fingerprint, relay.address, relay.or_port, relay.version, relay.exit_policy)) + for relay in nickname_to_relay[nickname]: + relay_entries.append(RELAY_ENTRY % (relay.nickname, relay.fingerprint, relay.address, relay.or_port, relay.version, relay.exit_policy)) try: body = EMAIL_BODY % len(new_relays)

1 0

[doctor/master] Suppressing sybil notification if not run in the last three hours
by atagar＠torproject.org 30 Sep '13

30 Sep '13

commit 3d0869304dbd178b04b911b8b49ec2316731b7ef Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 30 15:14:53 2013 -0700 Suppressing sybil notification if not run in the last three hours Our sybil checker compares a list of all fingerprints we've ever seen to the current consensus to see how many new additions there have been. As such it always goes off if it hasn't been run for a long while. We got one of these false alarms when yatei went down for thirty hours. Suppressing email notifications when we haven't run in the last three hours. --- sybil_checker.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sybil_checker.py b/sybil_checker.py index af7c39e..ae43f8c 100755 --- a/sybil_checker.py +++ b/sybil_checker.py @@ -8,6 +8,7 @@ relays. If so then this sends an email notification. """ import os +import time import traceback import util @@ -37,8 +38,20 @@ def main(): prior_fingerprints = load_fingerprints() downloader = DescriptorDownloader(timeout = 60) + dry_run = False + if not prior_fingerprints: log.debug("We don't have any existing fingerprints so this will be a dry-run. No notifications will be sent.") + dry_run = True + else: + last_modified = os.stat(FINGERPRINTS_FILE).st_mtime # unix timestamp for when it was last modified + seconds_ago = int(time.time() - last_modified) + + log.debug("Our fingerprint was last modified at %s (%i seconds ago)." % (time.ctime(last_modified), seconds_ago)) + + if seconds_ago > (3 * 60 * 60): + log.debug("Fingerprint file was last modified over three hours ago. No notifications will be sent for this run.") + dry_run = True query = downloader.get_consensus() query.run(True) @@ -54,7 +67,7 @@ def main(): new_fingerprints = current_fingerprints.difference(prior_fingerprints) log.debug("%i new relays found" % len(new_fingerprints)) - if prior_fingerprints and len(new_fingerprints) >= 50: + if not dry_run and len(new_fingerprints) >= 50: log.debug("Sending a notification...") send_email([relays[fp] for fp in new_fingerprints])

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 30 Sep '13

30 Sep '13

commit cf8694a2352c037d573ac6a9f1f11a0f009efd8d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 30 22:15:55 2013 +0000 Update translations for liveusb-creator --- pt_BR/pt_BR.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 4e6b908..52c0b13 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -7,6 +7,7 @@ # Daniel S. Koda <danielskoda(a)gmail.com>, 2008 # eduardolvt, 2013 # Augustine <evandro(a)geocities.com>, 2013 +# gv1974 <g.lucio(a)ig.com.br>, 2013 # Igor Pires Soares <igor(a)projetofedora.org>, 2008 # Rafael Gomes <rafaelgomes(a)projetofedora.org>, 2009 # NICEcookie <rafaelmartinsrm(a)gmail.com>, 2012 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-09-09 09:44+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-09-30 22:08+0000\n" +"Last-Translator: gv1974 <g.lucio(a)ig.com.br>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -150,7 +151,7 @@ msgstr "Download falhou: " #: ../liveusb/gui.py:88 #, python-format msgid "Downloading %s..." -msgstr "Fazendo download %s..." +msgstr "Baixando %s..." #: ../liveusb/creator.py:1102 msgid "Drive is a loopback, skipping MBR reset" @@ -322,7 +323,7 @@ msgstr "Algumas partições dos dispositivos USB %(device)s estão montadas. Ela #: ../liveusb/creator.py:131 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "Tipo da fonte não suporta verificação de MD5, pulando" +msgstr "Tipo de fonte não suporta verificação de MD5, pulando" #: ../liveusb/creator.py:1130 msgid "Synchronizing data on disk..."

1 0

[stem/master] Halo for windrose icon
by atagar＠torproject.org 30 Sep '13

30 Sep '13

commit a5f9e9cd5b4662bc5d34e19621fa9667cf71a07d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 30 14:39:29 2013 -0700 Halo for windrose icon Adding a blue halo for the center of the windrose. This doesn't address the main thing I dislike about the icon, which is the pixelation of the black lines, but still it makes it look a bit nicer. I've tried several things to address the black line pixilation (blur, thickening, etc) but this is the best improvement I've yet found. --- docs/_static/section/tutorials/resources/windrose.xcf | Bin 0 -> 32577 bytes docs/_static/section/tutorials/windrose.png | Bin 8319 -> 11168 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/_static/section/tutorials/resources/windrose.xcf b/docs/_static/section/tutorials/resources/windrose.xcf new file mode 100644 index 0000000..01c9da9 Binary files /dev/null and b/docs/_static/section/tutorials/resources/windrose.xcf differ diff --git a/docs/_static/section/tutorials/windrose.png b/docs/_static/section/tutorials/windrose.png index da799d9..7de0bb2 100644 Binary files a/docs/_static/section/tutorials/windrose.png and b/docs/_static/section/tutorials/windrose.png differ

1 0

[tor-browser/tor-browser-17.0.9esr-1] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 30 Sep '13

30 Sep '13

commit b1531a61cc33e9234a5d1d228a07a07d4e9e4c1b Author: Georg Koppen <g.koppen(a)jondos.de> Date: Mon Sep 30 10:21:18 2013 +0200 fixup! Tor Browser's Firefox preference overrides. setting 'layers.acceleration.disabled' to 'true' to fix blank Tor Network Settings on Windows --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0d2dae2..c8ff052 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -121,7 +121,10 @@ pref("xpinstall.whitelist.add.36", ""); pref("keyword.URL", "https://startpage.com/do/search?q="); // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? +// If only the first one is set to true then the Tor Network Settings are blank +// on some Windows machines. pref("gfx.direct2d.disabled", true); +pref("layers.acceleration.disabled", true); // Version placeholder pref("torbrowser.version", "UNKNOWN");

1 0

[torbutton/master] Bug #9587: about:tor lacks the TBB 3.X version number.
by mikeperry＠torproject.org 30 Sep '13

30 Sep '13

commit 38c513dde4ef47d797d1f8b85e50de991db6087b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 30 22:07:48 2013 -0400 Bug #9587: about:tor lacks the TBB 3.X version number. --- src/chrome/content/aboutTor/aboutTor.xhtml | 1 + src/chrome/content/torbutton.js | 15 +++++++++++++++ src/chrome/skin/aboutTor.css | 12 ++++++++++++ 3 files changed, 28 insertions(+) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index e948edc..ce06941 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -50,6 +50,7 @@ function resizeToolbarIconArrow() </head> <body dir="&locale.dir;" onload="onLoad();"> <div id="torstatus" class="top"> + <div id="torstatus-version"/> <div id="torstatus-image"/> <div class="hideIfTorOff"> <h1>&aboutTor.success.label;</h1> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ed87a0c..e66e7ef 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -854,6 +854,21 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { aDoc.body.setAttribute("torNeedsUpdate", "yes"); else aDoc.body.removeAttribute("torNeedsUpdate"); + + try + { + const kBrandBundle = "chrome://branding/locale/brand.properties"; + let brandBundle = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService) + .createBundle(kBrandBundle); + let productName = brandBundle.GetStringFromName("brandFullName"); + let tbbVersion = m_tb_prefs.getCharPref("torbrowser.version"); + let e = aDoc.getElementById("torstatus-version"); + + while (e.firstChild) + e.removeChild(e.firstChild); + e.appendChild(aDoc.createTextNode(productName + '\n' + tbbVersion)); + } catch (e) {} } return isAboutTor; diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index b5e8f02..12f8a09 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -34,6 +34,18 @@ body[toron] { background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); } +#torstatus-version { + position: fixed; + top: 6px; + right: 6px; + height: 30px; + width: 200px; + font-family: "Liberation Sans", Arial, Helvetica, sans-serif; + font-size: 1.4em; + white-space: pre-wrap; + text-align: right; +} + body[toron] #torstatus-image { background-image: url('chrome://torbutton/content/aboutTor/tor-on.png'); }

1 0

[torbutton/master] Merge branch 'bug9587'
by mikeperry＠torproject.org 30 Sep '13

30 Sep '13

commit 7120c21a39e24bb41e7eb49f1ed004e7bb65f607 Merge: 67aee46 38c513d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 30 13:49:32 2013 -0700 Merge branch 'bug9587' src/chrome/content/aboutTor/aboutTor.xhtml | 1 + src/chrome/content/torbutton.js | 15 +++++++++++++++ src/chrome/skin/aboutTor.css | 12 ++++++++++++ 3 files changed, 28 insertions(+)

1 0

[tor-browser-bundle/master] Bug 9084: Fix TBB3.0 startup crash on Windows XP
by mikeperry＠torproject.org 30 Sep '13

30 Sep '13

commit fc14747c24c87085f6ca502d1643dd2e7a0ea7a0 Author: Georg Koppen <georg(a)getfoxyproxy.org> Date: Sun Sep 22 21:11:14 2013 +0200 Bug 9084: Fix TBB3.0 startup crash on Windows XP We link against msvcr100 (which we ship) which needs small patches in nspr and gcc; the latter in order to get the runtime libraries recompiled properly. --- gitian/descriptors/windows/gitian-firefox.yml | 77 +++++++++++++++++++++---- gitian/fetch-inputs.sh | 29 ++++++++-- gitian/gpg/BINUTILS.gpg | Bin 0 -> 25772 bytes gitian/gpg/GCC.gpg | Bin 0 -> 2635 bytes gitian/versions | 6 ++ 5 files changed, 98 insertions(+), 14 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index c1b2675..698cf35 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -15,6 +15,7 @@ packages: - "mingw-w64" - "g++-mingw-w64-i686" - "mingw-w64-tools" +- "libmpc-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" @@ -22,6 +23,8 @@ remotes: files: # XXX: we need to make this input tarball deterministic :/ - "mingw-w64-svn-snapshot.zip" +- "binutils.tar.bz2" +- "gcc.tar.bz2" - "torbrowser.version" - "re-dzip.sh" - "dzip.sh" @@ -45,11 +48,30 @@ script: | #sudo bash -c 'echo "deb http://archive.ubuntu.com/ubuntu raring main restricted universe multiverse" >> /etc/apt/sources.list' #sudo apt-get update #sudo apt-get install -y g++-mingw-w64-i686 mingw-w64-tools mingw-w64 - # - # Build the latest MinGW-w64 headers and CRT + + # Build the latest MinGW-w64 headers, CRT and runtime libraries to get Tor + # Browser going on all Windows platforms >= XP. In order to do so we link + # against msvcr100 (which we ship with the browser) as msvcrt on Windows XP + # does not contain the secure functions Firefox uses. That in turn makes it + # necessary to re-compile the mingw-w64 runtime libraries as well as they are + # linked against msvcrt by default. See bug 9084 for a more detailed + # discussion. + # FIXME: We need sudo for all of this because otherwise # the toolchain can't find the alternate prefix for the CRT headers :/ - # + + # We don't want to link against msvcrt.dll due to bug 9084. + i686-w64-mingw32-g++ -dumpspecs > msvcr100.spec + sed 's/msvcrt/msvcr100/' -i msvcr100.spec + + mkdir binutils + cd binutils + tar -xjvf ../binutils.tar.bz2 + binutils-*/configure --prefix=/usr --target=i686-w64-mingw32 --disable-multilib + make + sudo make install + cd .. + mkdir mingw-w64 cd mingw-w64 unzip ../mingw-w64-svn-snapshot.zip @@ -57,10 +79,27 @@ script: | mkdir mingw-w64-headers32 && cd mingw-w64-headers32 ../mingw-w64-svn/mingw-w64-headers/configure --host=i686-w64-mingw32 --prefix=/usr/i686-w64-mingw32/ --enable-sdk=all --enable-secure-api --enable-idl sudo make install + sudo ln -s /usr/i686-w64-mingw32 /usr/mingw + sudo mkdir -p /usr/i686-w64-mingw32/lib + cd .. + cd .. + # First stage of gcc compilation + mkdir gcc + cd gcc + tar -xjvf ../gcc.tar.bz2 + # Linking libgcc against msvcrt is hard-coded... + sed 's/msvcrt/msvcr100/' -i gcc-*/gcc/config/i386/t-mingw-w32 + # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take + # CFLAGS_FOR_TARGET. + export CFLAGS_FOR_TARGET="-specs=/home/ubuntu/build/msvcr100.spec" + gcc-*/configure --prefix=/usr --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ + make all-gcc + sudo make install-gcc cd .. # + cd mingw-w64 mkdir mingw-w64-crt32 && cd mingw-w64-crt32 - ../mingw-w64-svn/mingw-w64-crt/configure --host=i686-w64-mingw32 --prefix=/usr/i686-w64-mingw32/ + ../mingw-w64-svn/mingw-w64-crt/configure --host=i686-w64-mingw32 --prefix=/usr/i686-w64-mingw32 make sudo make install cd .. @@ -70,12 +109,33 @@ script: | make sudo make install cd .. - # cd .. + # Second stage of gcc compilation + cd gcc + make + sudo make install # + cd .. # cd tor-browser mv .mozconfig-mingw .mozconfig + # FIXME + # Ideally, using LDFLAGS (and e.g. DLLFLAGS for NSS) would be enough to get + # all Firefox libraries linked against msvcr100. Alas, this does not hold for + # NSPR. Without patching it we get a "missing entry points for _strcmpi in + # msvcr100.dll". Now, this should be fixed in rev>=6179 as the def file there + # contains a proper patch according to the mingw-w64 developers. + # However, even with this patch the _strcmpi issue is still popping up, + # probably due to a bug in our current linking setup. The small patch below + # is therefore just a workaround which should get fixed but is at least + # justified as the signature of _strcmpi and _stricmp is the same, see: + # http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. + sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c + export HOST_LDFLAGS=" " + export LDFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" + # Our flags don't get passed to NSS. We need to do that manually using an + # obscure one. + export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed cat ../torbrowser.version >> browser/app/profile/000-tor-browser.js.fixed mv browser/app/profile/000-tor-browser.js.fixed browser/app/profile/000-tor-browser.js @@ -99,15 +159,12 @@ script: | #sudo mv /usr/bin/i686-w64-mingw32-ld /usr/bin/i686-w64-mingw32-ld.orig #sudo cp ~/build/bin/i686-w64-mingw32-ld /usr/bin/ # - export HOST_LDFLAGS=" " - export LDFLAGS="-nostdlib -lgcc -lmsvcr100 -L/home/ubuntu/build/" make $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/App/Firefox/ - cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $INSTDIR/App/Firefox/ - cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libssp*.dll $INSTDIR/App/Firefox/ - cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libstdc*dll $INSTDIR/App/Firefox/ + cp -a /usr/i686-w64-mingw32/lib/libgcc_s_sjlj-1.dll $INSTDIR/App/Firefox/ + cp -a /usr/i686-w64-mingw32/lib/libstdc*dll $INSTDIR/App/Firefox/ cp -a ~/build/msvcr100.dll $INSTDIR/App/Firefox/ # # XXX: What the hell are these three bytes anyways? diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 2e25a5e..cce3331 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -38,9 +38,10 @@ trap "bash '$CLEANUP'; rm -f '$CLEANUP'" EXIT verify() { local file="$1"; shift local keyring="$1"; shift + local suffix="$1"; shift local f - for f in "$file" "$file.asc" "$keyring"; do + for f in "$file" "$file.$suffix" "$keyring"; do if ! [ -e "$f" ]; then echo >&2 "Error: Required file $f does not exist."; exit 1 fi @@ -52,7 +53,7 @@ verify() { echo "rm -rf '$gpghome'" >> "$CLEANUP" exec 3> "$tmpfile" - GNUPGHOME="$gpghome" gpg --no-options --no-default-keyring --trust-model=always --keyring="$keyring" --status-fd=3 --verify "$file.asc" "$file" >/dev/null 2>&1 + GNUPGHOME="$gpghome" gpg --no-options --no-default-keyring --trust-model=always --keyring="$keyring" --status-fd=3 --verify "$file.$suffix" "$file" >/dev/null 2>&1 if grep -q '^\[GNUPG:\] GOODSIG ' "$tmpfile"; then return 0 else @@ -99,16 +100,33 @@ for i in OPENSSL # OBFSPROXY do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" + SUFFIX="asc" get "${!PACKAGE}" "$URL" - get "${!PACKAGE}.asc" "$URL.asc" + get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" - if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg"; then + if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then echo "$i: GPG signature is broken for ${URL}" mv "${!PACKAGE}" "${!PACKAGE}.badgpg" exit 1 fi done +for i in BINUTILS GCC +do + PACKAGE="${i}_PACKAGE" + URL="${i}_URL" + SUFFIX="sig" + get "${!PACKAGE}" "${!URL}" + get "${!PACKAGE}.$SUFFIX" "${!URL}.$SUFFIX" + + if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then + echo "$i: GPG signature is broken for ${!URL}" + mv "${!PACKAGE}" "${!PACKAGE}.badgpg" + exit 1 + fi +done + + for i in TOOLCHAIN4 OSXSDK MSVCR100 do PACKAGE="${i}_PACKAGE" @@ -186,6 +204,9 @@ done ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$PDFJS_PACKAGE" uriloader(a)pdf.js.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz +ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 +ln -sf "$GCC_PACKAGE" gcc.tar.bz2 + # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/gpg/BINUTILS.gpg b/gitian/gpg/BINUTILS.gpg new file mode 100644 index 0000000..f24bb01 Binary files /dev/null and b/gitian/gpg/BINUTILS.gpg differ diff --git a/gitian/gpg/GCC.gpg b/gitian/gpg/GCC.gpg new file mode 100644 index 0000000..e62de27 Binary files /dev/null and b/gitian/gpg/GCC.gpg differ diff --git a/gitian/versions b/gitian/versions index 1488b07..c601dc1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,6 +17,8 @@ GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1e FIREFOX_LANG_VER=17.0.9esr +BINUTILS_VER=2.22 +GCC_VER=4.6.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -26,6 +28,8 @@ TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll +BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 +GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 # Hashes for things with weak sigs or no sigs OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 @@ -39,3 +43,5 @@ MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACK… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… +BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} +GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}

1 0