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

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 1374281. r=jld
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit 722a1a652291a27657ed1a0b7eefd134519daa8f Author: Gian-Carlo Pascutto <gcp(a)mozilla.com> Date: Mon Jun 19 20:07:38 2017 +0200 Bug 1374281. r=jld MozReview-Commit-ID: Ko5m5i4Wkd6 --HG-- extra : rebase_source : 3076315ef3639a89f752addbb01d5d08a9c2db75 --- security/sandbox/linux/broker/SandboxBroker.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/security/sandbox/linux/broker/SandboxBroker.cpp b/security/sandbox/linux/broker/SandboxBroker.cpp index a31d1fc6684a..d79656c3407f 100644 --- a/security/sandbox/linux/broker/SandboxBroker.cpp +++ b/security/sandbox/linux/broker/SandboxBroker.cpp @@ -360,6 +360,10 @@ AllowOpen(int aReqFlags, int aPerms) if (aReqFlags & O_CREAT) { needed |= SandboxBroker::MAY_CREATE; } + // Linux allows O_TRUNC even with O_RDONLY + if (aReqFlags & O_TRUNC) { + needed |= SandboxBroker::MAY_WRITE; + } return (aPerms & needed) == needed; }

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 1337162 - Enable the Linux content sandbox for non-Nightly builds. r=ted
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit 8bf9587a88239cdac723a5b1c37ef46a90a49c21 Author: Gian-Carlo Pascutto <gcp(a)mozilla.com> Date: Mon Feb 27 18:01:33 2017 +0100 Bug 1337162 - Enable the Linux content sandbox for non-Nightly builds. r=ted MozReview-Commit-ID: 65aPquHzyfP --HG-- extra : rebase_source : 017080e3ae33289bb0b6a790027f9d02c380d47b --- old-configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/old-configure.in b/old-configure.in index 620e38b40eaa..24fb1f5fc5cc 100644 --- a/old-configure.in +++ b/old-configure.in @@ -3997,14 +3997,14 @@ if test -n "$gonkdir"; then MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX fi -case "$OS_TARGET:$NIGHTLY_BUILD" in -WINNT:*) +case "$OS_TARGET" in +WINNT) MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX ;; -Darwin:*) +Darwin) MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX ;; -Linux:1) +Linux) case $CPU_ARCH in x86_64|x86) MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 1317802 - don't stop for SIGSYS in .gdbinit; r=jld
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit 08e00435a6657b00a06f7650276944d9b36ee36d Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Wed Nov 16 01:13:22 2016 -0500 Bug 1317802 - don't stop for SIGSYS in .gdbinit; r=jld The sandboxing code generates this signal nowadays, which makes debugging with tools like rr quite frustrating. DONTBUILD because NPOTB --- .gdbinit | 1 + 1 file changed, 1 insertion(+) diff --git a/.gdbinit b/.gdbinit index dd9a005f67a1..08f1fc0f2011 100644 --- a/.gdbinit +++ b/.gdbinit @@ -16,6 +16,7 @@ handle SIGPIPE noprint nostop pass # sandboxing code on older kernels. handle SIG38 noprint nostop pass handle SIG64 noprint nostop pass +handle SIGSYS noprint nostop pass # Show the concrete types behind nsIFoo set print object on

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 1386279 - Renovate Linux sandbox file broker handling of access(). r=gcp
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit 018cc6d1fd6751a21bb46aa1b9afc7ca96a42c8c Author: Jed Davis <jld(a)mozilla.com> Date: Tue Aug 8 18:02:31 2017 -0600 Bug 1386279 - Renovate Linux sandbox file broker handling of access(). r=gcp 1. X_OK is now allowed, and is limited only by the MAY_ACCESS permission. 2. The actual access() syscall is now used, if access is granted by the broker policy. This fixed bug 1382246, which explains the background. MozReview-Commit-ID: 926429PlBnL --HG-- extra : rebase_source : 6ae54c4c25e1389fa3af75b0bdf727323448294a --- security/sandbox/linux/broker/SandboxBroker.cpp | 14 ++------------ security/sandbox/linux/gtest/TestBroker.cpp | 15 +++++++++++---- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/security/sandbox/linux/broker/SandboxBroker.cpp b/security/sandbox/linux/broker/SandboxBroker.cpp index d79656c3407f..56215b89b232 100644 --- a/security/sandbox/linux/broker/SandboxBroker.cpp +++ b/security/sandbox/linux/broker/SandboxBroker.cpp @@ -306,7 +306,7 @@ AllowOperation(int aReqFlags, int aPerms) static bool AllowAccess(int aReqFlags, int aPerms) { - if (aReqFlags & ~(R_OK|W_OK|F_OK)) { + if (aReqFlags & ~(R_OK|W_OK|X_OK|F_OK)) { return false; } int needed = 0; @@ -569,17 +569,7 @@ SandboxBroker::ThreadMain(void) case SANDBOX_FILE_ACCESS: if (permissive || AllowAccess(req.mFlags, perms)) { - // This can't use access() itself because that uses the ruid - // and not the euid. In theory faccessat() with AT_EACCESS - // would work, but Linux doesn't actually implement the - // flags != 0 case; glibc has a hack which doesn't even work - // in this case so it'll ignore the flag, and Bionic just - // passes through the syscall and always ignores the flags. - // - // Instead, because we've already checked the requested - // r/w/x bits against the policy, just return success if the - // file exists and hope that's close enough. - if (stat(pathBuf, (struct stat*)&respBuf) == 0) { + if (access(pathBuf, req.mFlags) == 0) { resp.mError = 0; } else { resp.mError = -errno; diff --git a/security/sandbox/linux/gtest/TestBroker.cpp b/security/sandbox/linux/gtest/TestBroker.cpp index a311e181a9b1..bf5e58acbc40 100644 --- a/security/sandbox/linux/gtest/TestBroker.cpp +++ b/security/sandbox/linux/gtest/TestBroker.cpp @@ -133,6 +133,8 @@ SandboxBrokerTest::GetPolicy() const policy->AddPath(MAY_READ | MAY_WRITE, "/tmp", AddAlways); policy->AddPath(MAY_READ | MAY_WRITE | MAY_CREATE, "/tmp/blublu", AddAlways); policy->AddPath(MAY_READ | MAY_WRITE | MAY_CREATE, "/tmp/blublublu", AddAlways); + // This should be non-writable by the user running the test: + policy->AddPath(MAY_READ | MAY_WRITE, "/etc", AddAlways); return Move(policy); } @@ -206,6 +208,14 @@ TEST_F(SandboxBrokerTest, Access) EXPECT_EQ(-EACCES, Access("/proc/self", R_OK)); EXPECT_EQ(-EACCES, Access("/proc/self/stat", F_OK)); + + EXPECT_EQ(0, Access("/tmp", X_OK)); + EXPECT_EQ(0, Access("/tmp", R_OK|X_OK)); + EXPECT_EQ(0, Access("/tmp", R_OK|W_OK|X_OK)); + EXPECT_EQ(0, Access("/proc/self", X_OK)); + + EXPECT_EQ(0, Access("/etc", R_OK|X_OK)); + EXPECT_EQ(-EACCES, Access("/etc", W_OK)); } TEST_F(SandboxBrokerTest, Stat) @@ -257,10 +267,7 @@ TEST_F(SandboxBrokerTest, Chmod) close(fd); // Set read only. SandboxBroker enforces 0600 mode flags. ASSERT_EQ(0, Chmod("/tmp/blublu", S_IRUSR)); - // SandboxBroker doesn't use real access(), it just checks against - // the policy. So it can't see the change in permisions here. - // This won't work: - // EXPECT_EQ(-EACCES, Access("/tmp/blublu", W_OK)); + EXPECT_EQ(-EACCES, Access("/tmp/blublu", W_OK)); statstruct realStat; EXPECT_EQ(0, statsyscall("/tmp/blublu", &realStat)); EXPECT_EQ((mode_t)S_IRUSR, realStat.st_mode & 0777);

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 18101: Suppress upload file dialog proxy bypass (linux)
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit eb7cb8fe69de4ca08b8aa2ece0faeb7ea6217004 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Sep 20 09:35:38 2017 -0700 Bug 18101: Suppress upload file dialog proxy bypass (linux) --- widget/gtk/nsFilePicker.cpp | 14 +++----------- widget/gtk/nsFilePicker.h | 2 -- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp index 172cb4444849..d1ab963e1012 100644 --- a/widget/gtk/nsFilePicker.cpp +++ b/widget/gtk/nsFilePicker.cpp @@ -170,7 +170,6 @@ NS_IMPL_ISUPPORTS(nsFilePicker, nsIFilePicker) nsFilePicker::nsFilePicker() : mSelectedType(0) , mRunning(false) - , mAllowURLs(false) #if (MOZ_WIDGET_GTK == 3) , mFileChooserDelegate(nullptr) #endif @@ -240,13 +239,6 @@ nsFilePicker::InitNative(nsIWidget *aParent, } NS_IMETHODIMP -nsFilePicker::AppendFilters(int32_t aFilterMask) -{ - mAllowURLs = !!(aFilterMask & filterAllowURLs); - return nsBaseFilePicker::AppendFilters(aFilterMask); -} - -NS_IMETHODIMP nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) { if (aFilter.EqualsLiteral("..apps")) { @@ -402,9 +394,9 @@ nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1); - if (mAllowURLs) { - gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE); - } + + // Don't allow remote URLs. + gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), TRUE); if (action == GTK_FILE_CHOOSER_ACTION_OPEN || action == GTK_FILE_CHOOSER_ACTION_SAVE) { GtkWidget *img_preview = gtk_image_new(); diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h index 2b5042098c65..f7b1bf639bdd 100644 --- a/widget/gtk/nsFilePicker.h +++ b/widget/gtk/nsFilePicker.h @@ -25,7 +25,6 @@ public: // nsIFilePicker (less what's in nsBaseFilePicker) NS_IMETHOD Open(nsIFilePickerShownCallback *aCallback) override; - NS_IMETHOD AppendFilters(int32_t aFilterMask) override; NS_IMETHOD AppendFilter(const nsAString& aTitle, const nsAString& aFilter) override; NS_IMETHOD SetDefaultString(const nsAString& aString) override; @@ -62,7 +61,6 @@ protected: int16_t mSelectedType; int16_t mResult; bool mRunning; - bool mAllowURLs; nsCString mFileURL; nsString mTitle; nsString mDefault;

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] squash! Bug 6253: Add canvas image extraction prompt.
by gk＠torproject.org 21 Sep '17

21 Sep '17

commit 69666b09b12a51ce30d7b0d0e669eb773aca4e0f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 20 09:26:21 2017 -0400 squash! Bug 6253: Add canvas image extraction prompt. When processing the ShowCanvasPermissionPrompt message in the main (parent) process, avoid returning an error from the IPC handler if the browser element cannot be obtained. Prior to this change, canvas prompt requests that arrived as a tab was closing would generate an error, which in turn caused the main process to kill the content process. --- dom/ipc/TabParent.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index ff1b41afafdb..9731561ce0b3 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -3281,7 +3281,12 @@ bool TabParent::RecvShowCanvasPermissionPrompt(const nsCString& firstPartyURI) { nsCOMPtr<nsIBrowser> browser = do_QueryInterface(mFrameElement); - NS_ENSURE_TRUE(browser, false); + if (!browser) { + // If the tab is being closed, the browser may not be available. + // In this case we can ignore the request. + return true; + } + nsCOMPtr<nsIObserverService> os = services::GetObserverService(); NS_ENSURE_TRUE(os, false); nsresult rv = os->NotifyObservers(browser, "canvas-permissions-prompt",

1 0

[tor-browser-build/master] Bug 23384: Fix ssh key for mcs
by boklm＠torproject.org 21 Sep '17

21 Sep '17

commit 57e3f2513809d98c419b5b30f85326c7250e68b1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 21 17:56:01 2017 +0200 Bug 23384: Fix ssh key for mcs --- tools/ansible/roles/tbb-team/files/mcs.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-team/files/mcs.pub b/tools/ansible/roles/tbb-team/files/mcs.pub index 669c324..af8dd08 100644 --- a/tools/ansible/roles/tbb-team/files/mcs.pub +++ b/tools/ansible/roles/tbb-team/files/mcs.pub @@ -1 +1 @@ -ssh key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDipHBalbwyEb0AWwbRPa+pxGGSyFTkoOtyn76AqTD6WZIJKBBe4PkkqkJOI7STWxwVkbzTZoC1UyzUCXc3L/bxt85bopAgg0EucM3z3t6XX3kbaDPEGi+mhA4lFYdpJmWe1wbDhiAMYSAONnVcRgmk6bPkgRBWM5zCshOOS5/hs1HW6/zOzgJX6+B7vLYiccHkRj9YeOln+OyR+ko1nFovBFIeDw5DjZqNHki0/hBe1SpaBKCUWHBwkugmvI3Q/VL5pQhWAcMwqEmEcosmX5SPBsAn8217u0mPLcW2cAx30Yj95lfO3LzOV27dnqYfT0IN4gysm2S9Z0mV7yMgSkgV mcs +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDipHBalbwyEb0AWwbRPa+pxGGSyFTkoOtyn76AqTD6WZIJKBBe4PkkqkJOI7STWxwVkbzTZoC1UyzUCXc3L/bxt85bopAgg0EucM3z3t6XX3kbaDPEGi+mhA4lFYdpJmWe1wbDhiAMYSAONnVcRgmk6bPkgRBWM5zCshOOS5/hs1HW6/zOzgJX6+B7vLYiccHkRj9YeOln+OyR+ko1nFovBFIeDw5DjZqNHki0/hBe1SpaBKCUWHBwkugmvI3Q/VL5pQhWAcMwqEmEcosmX5SPBsAn8217u0mPLcW2cAx30Yj95lfO3LzOV27dnqYfT0IN4gysm2S9Z0mV7yMgSkgV mcs

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit 7306051c8869bcdad0cf55b5d65c4a4238056a86 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 15:45:50 2017 +0000 Update translations for liveusb-creator_completed --- nb/nb.po | 232 +++++++++++++++++++++++---------------------------------------- 1 file changed, 83 insertions(+), 149 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 8864cd041..541ace282 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-14 14:52+0200\n" -"PO-Revision-Date: 2017-09-14 20:22+0000\n" +"POT-Creation-Date: 2017-09-20 18:02+0200\n" +"PO-Revision-Date: 2017-09-21 15:29+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -105,179 +105,179 @@ msgstr "Klarer ikke å fjerne katalog fra tidligere LiveOS: %(message)s" msgid "Cannot find device %s" msgstr "Kan ikke finne enhet %s" -#: ../tails_installer/creator.py:699 +#: ../tails_installer/creator.py:701 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Klarer ikke å skrive til %(device)s, hopper over." -#: ../tails_installer/creator.py:719 +#: ../tails_installer/creator.py:725 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "Noen partisjoner på målenheten %(device)s er montert. De vil avmontert før installasjonsprosessen starter." -#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986 +#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Ukjent filsystem. Din enhet må kanskje omformateres." -#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989 +#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994 #, python-format msgid "Unsupported filesystem: %s" msgstr "Ikke støttet filsystem: %s" -#: ../tails_installer/creator.py:782 +#: ../tails_installer/creator.py:788 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" msgstr "Ukjent GLib-unntak under montering av enhet: %(message)s" -#: ../tails_installer/creator.py:786 +#: ../tails_installer/creator.py:792 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Klarer ikke å laste enhet: %(message)s" -#: ../tails_installer/creator.py:791 +#: ../tails_installer/creator.py:797 msgid "No mount points found" msgstr "Ingen lastepunkter funnet" -#: ../tails_installer/creator.py:802 +#: ../tails_installer/creator.py:808 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Angir unmount_device for '%(device)s'" -#: ../tails_installer/creator.py:812 +#: ../tails_installer/creator.py:818 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Avmonterer monterte filsystem på '%(device)s'" -#: ../tails_installer/creator.py:816 +#: ../tails_installer/creator.py:822 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "Avmonterer '%(udi)s' på '%(device)s'" -#: ../tails_installer/creator.py:826 +#: ../tails_installer/creator.py:832 #, python-format msgid "Mount %s exists after unmounting" msgstr "%s eksisterer fortsatt etter frakoblingsforsøk" -#: ../tails_installer/creator.py:839 +#: ../tails_installer/creator.py:845 #, python-format msgid "Partitioning device %(device)s" msgstr "Partisjonerer enheten %(device)s" -#: ../tails_installer/creator.py:917 +#: ../tails_installer/creator.py:920 #, python-format msgid "Updating properties of system partition %(system_partition)s" msgstr "Oppdaterer egenskaper for systempartisjon %(system_partition)s" -#: ../tails_installer/creator.py:971 +#: ../tails_installer/creator.py:976 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Enheten '%(device)s' støttes ikke, rapporter som feil." -#: ../tails_installer/creator.py:974 +#: ../tails_installer/creator.py:979 msgid "Trying to continue anyway." msgstr "Prøver å fortsette uansett. " -#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376 +#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381 msgid "Verifying filesystem..." msgstr "Verifiserer filsystem…" -#: ../tails_installer/creator.py:1007 +#: ../tails_installer/creator.py:1012 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Kan ikke endre volum etikett: %(message)s" -#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409 +#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414 msgid "Installing bootloader..." msgstr "Installerer oppstartslaster…" -#: ../tails_installer/creator.py:1038 +#: ../tails_installer/creator.py:1043 #, python-format msgid "Could not find the '%s' COM32 module" msgstr "Fant ikke '%s' COM32-modul" -#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427 +#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432 #, python-format msgid "Removing %(file)s" msgstr "Fjerner %(file)s" -#: ../tails_installer/creator.py:1158 +#: ../tails_installer/creator.py:1163 #, python-format msgid "%s already bootable" msgstr "%s kan brukes ved oppstart" -#: ../tails_installer/creator.py:1178 +#: ../tails_installer/creator.py:1183 msgid "Unable to find partition" msgstr "Klarer ikke å finne partisjon" -#: ../tails_installer/creator.py:1201 +#: ../tails_installer/creator.py:1206 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formaterer %(device)s til FAT32" -#: ../tails_installer/creator.py:1261 +#: ../tails_installer/creator.py:1266 msgid "Could not find syslinux' gptmbr.bin" msgstr "Fant ikke gptmbr.bin for SYSLINUX" -#: ../tails_installer/creator.py:1274 +#: ../tails_installer/creator.py:1279 #, python-format msgid "Reading extracted MBR from %s" msgstr "Leser utpakket MBR fra %s" -#: ../tails_installer/creator.py:1278 +#: ../tails_installer/creator.py:1283 #, python-format msgid "Could not read the extracted MBR from %(path)s" msgstr "Kunne ikke lese utpakket MBR fra %(path)s" -#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292 +#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Tilbakestiller Master Boot Record av %s" -#: ../tails_installer/creator.py:1297 +#: ../tails_installer/creator.py:1302 msgid "Drive is a loopback, skipping MBR reset" msgstr "Stasjonen er en loopback, hopper over tilbakestilling av MBR" -#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555 +#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Kalkulerer SHA1 av %s" -#: ../tails_installer/creator.py:1326 +#: ../tails_installer/creator.py:1331 msgid "Synchronizing data on disk..." msgstr "Synkroniserer data på stasjonen…" -#: ../tails_installer/creator.py:1368 +#: ../tails_installer/creator.py:1373 msgid "Error probing device" msgstr "Feil ved sondering av enhet" -#: ../tails_installer/creator.py:1370 +#: ../tails_installer/creator.py:1375 msgid "Unable to find any supported device" msgstr "Fant ingen enhet som støttes" -#: ../tails_installer/creator.py:1380 +#: ../tails_installer/creator.py:1385 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Sjekk at USB enheten din er koblet til og formatert med FAT filsystem" -#: ../tails_installer/creator.py:1383 +#: ../tails_installer/creator.py:1388 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "Filsystemet er ikke støttet: %s\nTa en sikkerhetskopi av USB-enheten og formater med FAT-filsystem" -#: ../tails_installer/creator.py:1450 +#: ../tails_installer/creator.py:1455 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Klarte ikke å hente Win32_LogicalDisk; win32com spørringen ga ingen resultat" -#: ../tails_installer/creator.py:1503 +#: ../tails_installer/creator.py:1508 msgid "Cannot find" msgstr "Finner ikke" -#: ../tails_installer/creator.py:1504 +#: ../tails_installer/creator.py:1509 msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." @@ -308,40 +308,48 @@ msgstr "Installasjonen er fullført! (%s)" msgid "Tails installation failed!" msgstr "Tails-installasjon mislyktes" -#: ../tails_installer/gui.py:364 +#: ../tails_installer/gui.py:363 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "Advarsel: Dette verktøyet må kjøres som Administrator. For å gjøre det, høyreklikker du på ikonet og åpner Egenskaper. Under kompatibilitets fanen, kryss av i boksen for \"Kjør dette programmet som administrator\"." -#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31 +#: ../tails_installer/gui.py:375 msgid "Tails Installer" msgstr "Tails-installasjonskandidat" -#: ../tails_installer/gui.py:473 +#: ../tails_installer/gui.py:454 +msgid "Upgrade" +msgstr "Oppgrader" + +#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7 +msgid "Install" +msgstr "Innstaller" + +#: ../tails_installer/gui.py:465 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" msgstr "%(size)s %(vendor)s %(model)s enhet (%(device)s)" -#: ../tails_installer/gui.py:484 +#: ../tails_installer/gui.py:476 msgid "No ISO image selected" msgstr "Ingen ISO-avbildning valgt" -#: ../tails_installer/gui.py:485 +#: ../tails_installer/gui.py:477 msgid "Please select a Tails ISO image." msgstr "Velg Tails ISO-avbildningen." -#: ../tails_installer/gui.py:524 +#: ../tails_installer/gui.py:516 msgid "No device suitable to install Tails could be found" msgstr "Fant ingen egnet enhet for installasjon av Tails" -#: ../tails_installer/gui.py:526 +#: ../tails_installer/gui.py:518 #, python-format msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." msgstr "Plugg inn en USB-minnepinne eller SD-kort på minst %0.1f GB." -#: ../tails_installer/gui.py:560 +#: ../tails_installer/gui.py:552 #, python-format msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " @@ -349,42 +357,42 @@ msgid "" "different model." msgstr "USB-minnepinnen \"%(pretty_name)s\" er satt opp som ikke-fjernbar av fabrikken og Tails klarer ikke å starte fra den. Prøv å installere på en annen modell." -#: ../tails_installer/gui.py:570 +#: ../tails_installer/gui.py:562 #, python-format msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." msgstr "Enheten \"%(pretty_name)s\" har for liten lagringsplass for å installere Tails (minst %(size)s Gb er påkrevet)" -#: ../tails_installer/gui.py:592 +#: ../tails_installer/gui.py:584 msgid "An error happened while installing Tails" msgstr "Feil under installasjon av Tails" -#: ../tails_installer/gui.py:604 +#: ../tails_installer/gui.py:596 msgid "Refreshing releases..." msgstr "Oppdaterer utgivelser…" -#: ../tails_installer/gui.py:609 +#: ../tails_installer/gui.py:601 msgid "Releases updated!" msgstr "Utgivelser oppdatert!" -#: ../tails_installer/gui.py:651 +#: ../tails_installer/gui.py:643 msgid "Installation complete!" msgstr "Installasjonen er fullført!" -#: ../tails_installer/gui.py:652 +#: ../tails_installer/gui.py:644 msgid "Installation was completed." msgstr "Installasjonen er fullført." -#: ../tails_installer/gui.py:701 +#: ../tails_installer/gui.py:693 msgid "Unable to mount device" msgstr "Klarer ikke å laste enhet" -#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736 +#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730 msgid "Confirm the target USB stick" msgstr "Bekreft hvilet USB-minne du vil installere på" -#: ../tails_installer/gui.py:709 +#: ../tails_installer/gui.py:701 #, python-format msgid "" "%(size)s %(vendor)s %(model)s device (%(device)s)\n" @@ -392,39 +400,48 @@ msgid "" "All data on this USB stick will be lost." msgstr "%(size)s %(vendor)s %(model)s enhet (%(device)s)\n\nAll data på dette USB-minnet vil gå tapt." -#: ../tails_installer/gui.py:728 +#: ../tails_installer/gui.py:717 #, python-format +msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" +msgstr "%(parent_size)s %(vendor)s %(model)s enhet (%(device)s)" + +#: ../tails_installer/gui.py:725 msgid "" -"%(vendor)s %(model)s device (%(device)s)\n" "\n" -"%(persistence_message)s" -msgstr "%(vendor)s %(model)s device (%(device)s)\n\n%(persistence_message)s" +"\n" +"The persistent storage on this USB stick will be preserved." +msgstr "\n\nDet vedvarene lageret på denne USB-minnepinnen vil bli beholdt." + +#: ../tails_installer/gui.py:726 +#, python-format +msgid "%(description)s%(persistence_message)s" +msgstr "%(description)s%(persistence_message)s" -#: ../tails_installer/gui.py:782 +#: ../tails_installer/gui.py:776 msgid "Download complete!" msgstr "Nedlasting fullført!" -#: ../tails_installer/gui.py:786 +#: ../tails_installer/gui.py:780 msgid "Download failed: " msgstr "Nedlasting mislyktes: " -#: ../tails_installer/gui.py:787 +#: ../tails_installer/gui.py:781 msgid "You can try again to resume your download" msgstr "Du kan prøve igjen for å gjenoppta din nedlasting" -#: ../tails_installer/gui.py:795 +#: ../tails_installer/gui.py:789 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "Den valgte filen er uleselig. Sørg for at du har de nødvendige rettighetene eller velg en annen fil." -#: ../tails_installer/gui.py:801 +#: ../tails_installer/gui.py:795 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "Kunne ikke bruke den angitte filen. Du kan være heldigere hvis du flytter ISOen din til root (f.eks: C:\\)" -#: ../tails_installer/gui.py:807 +#: ../tails_installer/gui.py:801 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s valgt" @@ -495,86 +512,3 @@ msgstr "USB minne å installere på:" #: ../data/tails-installer.ui.h:6 msgid "Reinstall (delete all data)" msgstr "Reinstaller (slett all data)" - -#: ../data/tails-installer.ui.h:7 -msgid "Install Tails" -msgstr "Installer Tails" - -#: ../data/tails-installer-launcher.ui.h:1 -msgid "" -"To run Tails Installer you need an ISO image which can be downloaded from " -"the Tails website: <a " -"href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" -msgstr "For å kjøre Tails-installasjonskandidaten trenger du en ISO-avbildning som kan lastes ned fra Tails sin nettside: <a href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" - -#: ../data/tails-installer-launcher.ui.h:2 -msgid "Install" -msgstr "Innstaller" - -#: ../data/tails-installer-launcher.ui.h:3 -msgid "• Install Tails on a new USB stick." -msgstr "• Installer Tails på en ny USB-minnepinne." - -#: ../data/tails-installer-launcher.ui.h:4 -msgid "• The USB stick that you install on is formatted and all data is lost." -msgstr "• USB-minnepinnen du prøver å installere på er formatert og all data har gått tapt." - -#: ../data/tails-installer-launcher.ui.h:5 -msgid "Upgrade" -msgstr "Oppgrader" - -#: ../data/tails-installer-launcher.ui.h:6 -msgid "• Upgrade a Tails USB stick to the version of an ISO image." -msgstr "• Oppgrader en Tails-USB-minnepinne til versjonen fra en ISO-avbildning." - -#: ../data/tails-installer-launcher.ui.h:7 -msgid "" -"• The encrypted persistent storage of the Tails USB stick that you upgrade " -"is preserved." -msgstr "• Det vedvarende lageret til en Tails-USB-minnepinne du oppgraderer er beholdt." - -#: ../data/tails-installer-launcher.ui.h:8 -msgid "" -"Need help? Read the <a " -"href=\"https://tails.boum.org/doc/first_steps/installation/\">documentation</a>" -msgstr "Behov for hjelp? Les <a href=\"https://tails.boum.org/doc/first_steps/installation/\">dokumentasjonen</a>" - -#: ../data/tails-installer-launcher.ui.h:9 -msgid "Install by cloning" -msgstr "Installer ved å klone" - -#: ../data/tails-installer-launcher.ui.h:10 -msgid "" -"• Install Tails on another USB stick by copying the Tails system that you " -"are currently using." -msgstr "• Installer Tails på en annen USB-minnepinne ved å kopiere Tails-systemet du bruker for øyeblikket." - -#: ../data/tails-installer-launcher.ui.h:11 -msgid "" -"• The encrypted persistent storage of the Tails USB stick that you are " -"currently using is not copied." -msgstr "• Det krypterte vedvarende lageret på en Tails-USB-minnepinne du bruker for øyeblikket har ikke blitt kopiert." - -#: ../data/tails-installer-launcher.ui.h:12 -msgid "Upgrade by cloning" -msgstr "Oppgrader ved å klone" - -#: ../data/tails-installer-launcher.ui.h:13 -msgid "" -"• Upgrade another Tails USB stick to the same version of Tails that you are " -"currently using." -msgstr "• Oppgrader en annen Tails-USB-minnepinne til samme versjon av Tails som du bruker for øyeblikket." - -#: ../data/tails-installer-launcher.ui.h:14 -msgid "Upgrade from ISO" -msgstr "Oppgrader fra ISO" - -#: ../data/tails-installer-launcher.ui.h:15 -msgid "• Upgrade another Tails USB stick to the version of an ISO image." -msgstr "• Oppgrader en annen Tails-USB-minnepinne til versjonen fra en ISO-avbildning." - -#: ../data/tails-installer-launcher.ui.h:16 -msgid "" -"Need help? Read the <a " -"href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a>" -msgstr "Behov for hjelp? Les <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">dokumentasjonen</a>"

1 0

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

21 Sep '17

commit 2b64e573f1b4a4b0c16c3ea46243294695ec320e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 15:45:44 2017 +0000 Update translations for liveusb-creator --- nb/nb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 7f93b9014..541ace282 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 18:02+0200\n" -"PO-Revision-Date: 2017-09-21 01:33+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-09-21 15:29+0000\n" +"Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -403,19 +403,19 @@ msgstr "%(size)s %(vendor)s %(model)s enhet (%(device)s)\n\nAll data på dette U #: ../tails_installer/gui.py:717 #, python-format msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(parent_size)s %(vendor)s %(model)s enhet (%(device)s)" #: ../tails_installer/gui.py:725 msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "" +msgstr "\n\nDet vedvarene lageret på denne USB-minnepinnen vil bli beholdt." #: ../tails_installer/gui.py:726 #, python-format msgid "%(description)s%(persistence_message)s" -msgstr "" +msgstr "%(description)s%(persistence_message)s" #: ../tails_installer/gui.py:776 msgid "Download complete!"

1 0

[tor/master] Avoid assertion failure for state file clock skew
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit ad814cad41a101a3afd03ed0fdc55e2efd696abf Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Sep 20 18:47:15 2017 -0500 Avoid assertion failure for state file clock skew The clock_skew_warning() refactoring allowed calls from or_state_load() to control_event_bootstrap_problem() to occur prior bootstrap phase 0, causing an assertion failure. Initialize the bootstrap status prior to calling clock_skew_warning() from or_state_load(). --- changes/bug23607 | 4 ++++ src/or/statefile.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/changes/bug23607 b/changes/bug23607 new file mode 100644 index 000000000..7aa48a94c --- /dev/null +++ b/changes/bug23607 @@ -0,0 +1,4 @@ + o Minor bugfixes (bootstrapping): + - Avoid an assertion failure when logging a state file clock skew + very early in bootstrapping. Fixes bug 23607; bugfix on + 0.3.2.1-alpha. diff --git a/src/or/statefile.c b/src/or/statefile.c index 86f26419b..2d579a022 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -34,6 +34,7 @@ #include "config.h" #include "confparse.h" #include "connection.h" +#include "control.h" #include "entrynodes.h" #include "hibernate.h" #include "rephist.h" @@ -405,9 +406,14 @@ or_state_load(void) /* Warn the user if their clock has been set backwards, * they could be tricked into using old consensuses */ time_t apparent_skew = time(NULL) - new_state->LastWritten; - if (apparent_skew < 0) + if (apparent_skew < 0) { + /* Initialize bootstrap event reporting because we might call + * clock_skew_warning() before the bootstrap state is + * initialized, causing an asserttion failure. */ + control_event_bootstrap(BOOTSTRAP_STATUS_STARTING, 0); clock_skew_warning(NULL, (long)apparent_skew, 1, LD_GENERAL, "local state file", fname); + } } else { log_info(LD_GENERAL, "Initialized state"); }

1 0